diff options
author | Adam Borowski <kilobyte@angband.pl> | 2010-09-30 15:09:08 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2010-09-30 15:09:56 +0200 |
commit | a5913c2314eea9027193ae33e68646f95d231cac (patch) | |
tree | 702809d01c887722212607e530dce942da7ad350 | |
parent | 1c7237e65efe66c1130c2865c76c18fc19b51cb7 (diff) | |
download | crawl-ref-a5913c2314eea9027193ae33e68646f95d231cac.tar.gz crawl-ref-a5913c2314eea9027193ae33e68646f95d231cac.zip |
... and check if it works.
35 files changed, 2 insertions, 39 deletions
diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des index 3cdb097e8c..c3e0a0224f 100644 --- a/crawl-ref/source/dat/des/branches/lair.des +++ b/crawl-ref/source/dat/des/branches/lair.des @@ -990,4 +990,3 @@ MAP ................... ........... ENDMAP - diff --git a/crawl-ref/source/dat/des/builder/arena.des b/crawl-ref/source/dat/des/builder/arena.des index 6d3d0d4e29..f22b1306cd 100644 --- a/crawl-ref/source/dat/des/builder/arena.des +++ b/crawl-ref/source/dat/des/builder/arena.des @@ -621,4 +621,3 @@ X.......A.......X X...............X XXXXXXXXXXXXXXXXX ENDMAP - diff --git a/crawl-ref/source/dat/des/portals/bailey.des b/crawl-ref/source/dat/des/portals/bailey.des index da115dabd7..21d0432a41 100644 --- a/crawl-ref/source/dat/des/portals/bailey.des +++ b/crawl-ref/source/dat/des/portals/bailey.des @@ -987,4 +987,3 @@ c..........12cccccc.....13c.....c.....14+....5......5c cc...<.....1cccccccc....1ccccccccc....1ccc..........cc cccccccccccccccccccccccccccccccccccccccccccccccccccccc ENDMAP - diff --git a/crawl-ref/source/dat/des/portals/ossuary.des b/crawl-ref/source/dat/des/portals/ossuary.des index 5dad5ff0dc..c52b3df809 100644 --- a/crawl-ref/source/dat/des/portals/ossuary.des +++ b/crawl-ref/source/dat/des/portals/ossuary.des @@ -1023,4 +1023,3 @@ cc......c.............c~~~c c2.cccccccc1ccc1ccc1ccccccc cccc ccc ccc ccc ENDMAP - diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des index e5688c3f60..37499d9ff0 100644 --- a/crawl-ref/source/dat/des/portals/sewer.des +++ b/crawl-ref/source/dat/des/portals/sewer.des @@ -734,4 +734,3 @@ OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO ENDMAP - diff --git a/crawl-ref/source/dat/des/tutorial/tutorial.des b/crawl-ref/source/dat/des/tutorial/tutorial.des index b3d1df280e..b29e8f3784 100644 --- a/crawl-ref/source/dat/des/tutorial/tutorial.des +++ b/crawl-ref/source/dat/des/tutorial/tutorial.des @@ -538,4 +538,3 @@ vvvvvvvvv.WWWW.vvvvvvvvvvvvvv vvvvvvvvvv....vvvvvvvvvvvvvvv vvvvvvvvvvvvvvvvvvvvvvvvvvvvv ENDMAP - diff --git a/crawl-ref/source/dat/des/variable/altar.des b/crawl-ref/source/dat/des/variable/altar.des index 20a0e1b00b..c1bb5ce48e 100644 --- a/crawl-ref/source/dat/des/variable/altar.des +++ b/crawl-ref/source/dat/des/variable/altar.des @@ -1708,4 +1708,3 @@ MAP .xxxxxx. ........ ENDMAP - diff --git a/crawl-ref/source/dat/lua/stash.lua b/crawl-ref/source/dat/lua/stash.lua index c246a58fc9..734ce441ba 100644 --- a/crawl-ref/source/dat/lua/stash.lua +++ b/crawl-ref/source/dat/lua/stash.lua @@ -71,4 +71,3 @@ end --- If you want dumps (.lst files) to be annotated, uncomment this line: -- ch_stash_dump_annotate_item = ch_stash_search_annotate_item - diff --git a/crawl-ref/source/dgl-message.h b/crawl-ref/source/dgl-message.h index cd0118bd24..6d2f2d9e5f 100644 --- a/crawl-ref/source/dgl-message.h +++ b/crawl-ref/source/dgl-message.h @@ -9,4 +9,3 @@ void check_messages(); #endif #endif - diff --git a/crawl-ref/source/geom2d.cc b/crawl-ref/source/geom2d.cc index ca49fcd324..ca0f1a2ed1 100644 --- a/crawl-ref/source/geom2d.cc +++ b/crawl-ref/source/geom2d.cc @@ -170,4 +170,3 @@ vector degree_to_vector(double d) } } - diff --git a/crawl-ref/source/godpassive.cc b/crawl-ref/source/godpassive.cc index 9fc3f2829f..354fcb8839 100644 --- a/crawl-ref/source/godpassive.cc +++ b/crawl-ref/source/godpassive.cc @@ -163,4 +163,3 @@ void jiyva_eat_offlevel_items() } } } - diff --git a/crawl-ref/source/godpassive.h b/crawl-ref/source/godpassive.h index 7043dbeea6..3fee2b6d94 100644 --- a/crawl-ref/source/godpassive.h +++ b/crawl-ref/source/godpassive.h @@ -27,4 +27,3 @@ void che_handle_change(che_change_type ct, int diff); void jiyva_eat_offlevel_items(); #endif - diff --git a/crawl-ref/source/godprayer.h b/crawl-ref/source/godprayer.h index 03f2f4e387..c43d54fe36 100644 --- a/crawl-ref/source/godprayer.h +++ b/crawl-ref/source/godprayer.h @@ -17,4 +17,3 @@ piety_gain_t sacrifice_item_stack(const item_def& item); void offer_items(); #endif - diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index b53176ff4a..fc0d66dc1c 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -455,4 +455,3 @@ bool unwield_item(bool showMsgs) return (true); } - diff --git a/crawl-ref/source/l_spells.cc b/crawl-ref/source/l_spells.cc index 9eb54273bd..ba9decae45 100644 --- a/crawl-ref/source/l_spells.cc +++ b/crawl-ref/source/l_spells.cc @@ -21,4 +21,3 @@ const struct luaL_reg spells_dlib[] = { "toxic_radiance", _toxic_radiance }, { NULL, NULL } }; - diff --git a/crawl-ref/source/los.cc b/crawl-ref/source/los.cc index 15f5ebaa52..d3e9f64296 100644 --- a/crawl-ref/source/los.cc +++ b/crawl-ref/source/los.cc @@ -958,4 +958,3 @@ void los_changed() invalidate_los(); _handle_los_change(); } - diff --git a/crawl-ref/source/losglobal.h b/crawl-ref/source/losglobal.h index f861fc4f90..2fad6726d4 100644 --- a/crawl-ref/source/losglobal.h +++ b/crawl-ref/source/losglobal.h @@ -15,4 +15,3 @@ void invalidate_los(); bool cell_see_cell(const coord_def& p, const coord_def& q, los_type l); #endif - diff --git a/crawl-ref/source/luaterp.h b/crawl-ref/source/luaterp.h index 72262daf52..f12136ec0c 100644 --- a/crawl-ref/source/luaterp.h +++ b/crawl-ref/source/luaterp.h @@ -5,4 +5,3 @@ void debug_terp_dlua(); bool luaterp_running(); #endif - diff --git a/crawl-ref/source/mon_resist_def.cc b/crawl-ref/source/mon_resist_def.cc index dd59135979..f5adf7d80b 100644 --- a/crawl-ref/source/mon_resist_def.cc +++ b/crawl-ref/source/mon_resist_def.cc @@ -111,5 +111,3 @@ short mon_resist_def::get_resist_level(mon_resist_flags res_type) const default: return (0); } } - - diff --git a/crawl-ref/source/mon_resist_def.h b/crawl-ref/source/mon_resist_def.h index eab6d34807..86b5f90dac 100644 --- a/crawl-ref/source/mon_resist_def.h +++ b/crawl-ref/source/mon_resist_def.h @@ -46,4 +46,3 @@ inline mon_resist_def operator | (int a, const mon_resist_def &b) typedef mon_resist_def mrd; #endif - diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 8416e31dd9..be982b65ad 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -6235,7 +6235,7 @@ static const char *enchant_names[] = "petrified", "lowered_mr", "soul_ripe", "slowly_dying", "eat_items", "aquatic_land", "spore_production", "slouch", "swift", "tide", "insane", "silenced", "awaken_forest", "exploding", "bleeding", - "tethered", "severed", "antimagic", "fading_away", "preparing_resurrect", "regen", + "tethered", "severed", "antimagic", "fading_away", "preparing_resurrect", "regen", "magic_res", "mirror_dam", "stoneskin", "fear inspiring", "buggy", }; @@ -6461,4 +6461,3 @@ void mon_enchant::set_duration(const monster* mons, const mon_enchant *added) if (duration > maxduration) maxduration = duration; } - diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h index 5afe2db35f..149c0a7eff 100644 --- a/crawl-ref/source/mutation-data.h +++ b/crawl-ref/source/mutation-data.h @@ -1324,4 +1324,3 @@ } #endif - diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc index 6ebb3bb24c..4524f8a394 100644 --- a/crawl-ref/source/ng-wanderer.cc +++ b/crawl-ref/source/ng-wanderer.cc @@ -963,5 +963,3 @@ void create_wanderer(void) _wanderer_cover_equip_holes(equip_slot); } - - diff --git a/crawl-ref/source/ng-wanderer.h b/crawl-ref/source/ng-wanderer.h index b33d908a63..62ccdb5e74 100644 --- a/crawl-ref/source/ng-wanderer.h +++ b/crawl-ref/source/ng-wanderer.h @@ -4,4 +4,3 @@ void create_wanderer(); #endif - diff --git a/crawl-ref/source/place-info.h b/crawl-ref/source/place-info.h index 20b7a7f9b0..de62fcdf50 100644 --- a/crawl-ref/source/place-info.h +++ b/crawl-ref/source/place-info.h @@ -45,4 +45,3 @@ public: }; #endif - diff --git a/crawl-ref/source/player-equip.h b/crawl-ref/source/player-equip.h index 1753ab3730..fe1c5f4ce2 100644 --- a/crawl-ref/source/player-equip.h +++ b/crawl-ref/source/player-equip.h @@ -12,4 +12,3 @@ bool meld_slot(equipment_type slot, bool msg=true); bool unmeld_slot(equipment_type slot, bool msg=true); #endif - diff --git a/crawl-ref/source/random-weight.h b/crawl-ref/source/random-weight.h index 8ef1291b69..adac043366 100644 --- a/crawl-ref/source/random-weight.h +++ b/crawl-ref/source/random-weight.h @@ -25,4 +25,3 @@ T* random_choose_weighted(std::vector<std::pair<T, int> >& choices) } #endif - diff --git a/crawl-ref/source/rltiles/tool/tile_colour.cc b/crawl-ref/source/rltiles/tool/tile_colour.cc index b5569ee073..3c6ac3765c 100644 --- a/crawl-ref/source/rltiles/tool/tile_colour.cc +++ b/crawl-ref/source/rltiles/tool/tile_colour.cc @@ -298,5 +298,3 @@ bool write_png(const char *filename, tile_colour *pixels, return (true); } - - diff --git a/crawl-ref/source/rltiles/tool/tile_page.cc b/crawl-ref/source/rltiles/tool/tile_page.cc index cf8401e38f..eeb1828b5c 100644 --- a/crawl-ref/source/rltiles/tool/tile_page.cc +++ b/crawl-ref/source/rltiles/tool/tile_page.cc @@ -168,4 +168,3 @@ void tile_page::add_variation(int var_idx, int base_idx, int colour) m_tiles[base_idx]->add_variation(colour, var_idx); } - diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc index bf93168cf6..fb0eedb00e 100644 --- a/crawl-ref/source/show.cc +++ b/crawl-ref/source/show.cc @@ -337,4 +337,3 @@ void show_update_emphasis() if (stairs[i].destination.is_valid()) env.map_knowledge(stairs[i].position).flags &= ~MAP_EMPHASIZE; } - diff --git a/crawl-ref/source/stairs.cc b/crawl-ref/source/stairs.cc index 56a769cb67..52398efce4 100644 --- a/crawl-ref/source/stairs.cc +++ b/crawl-ref/source/stairs.cc @@ -911,7 +911,7 @@ void down_stairs(dungeon_feature_type force_stair, && player_in_branch( BRANCH_VESTIBULE_OF_HELL )) { // Down stairs in vestibule are one-way! - // This doesn't make any sense. Why would there be any down stairs + // This doesn't make any sense. Why would there be any down stairs // in the Vestibule? {due, 9/2010} mpr("A mysterious force prevents you from descending the staircase."); return; diff --git a/crawl-ref/source/stairs.h b/crawl-ref/source/stairs.h index bff7ae4ec1..641d123a08 100644 --- a/crawl-ref/source/stairs.h +++ b/crawl-ref/source/stairs.h @@ -16,4 +16,3 @@ void new_level(); int runes_in_pack(std::vector<int> &runes); #endif - diff --git a/crawl-ref/source/status.h b/crawl-ref/source/status.h index 487843041d..d983794eaf 100644 --- a/crawl-ref/source/status.h +++ b/crawl-ref/source/status.h @@ -38,4 +38,3 @@ void fill_status_info(int status, status_info* info); void init_duration_index(); #endif - diff --git a/crawl-ref/source/tagstring.h b/crawl-ref/source/tagstring.h index 509cc26fcb..351fbcc0a3 100644 --- a/crawl-ref/source/tagstring.h +++ b/crawl-ref/source/tagstring.h @@ -9,4 +9,3 @@ std::string colour_string(std::string in, int col); #endif - diff --git a/crawl-ref/source/util/includes.sh b/crawl-ref/source/util/includes.sh index 35ec7ecf05..b38e254de4 100644 --- a/crawl-ref/source/util/includes.sh +++ b/crawl-ref/source/util/includes.sh @@ -108,4 +108,3 @@ cleanup () /^AppHdr.h /d; / artefact.cc/d' } - |