diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-03 15:00:03 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-03 15:00:03 +0000 |
commit | b84db940665bbe61b706f0b69eb661ea4118800b (patch) | |
tree | b741e9580b0197db51ec8f80bd5f53d539dba076 | |
parent | e41cf44e27b292e4814eff6060f5fd05a041c471 (diff) | |
download | crawl-ref-b84db940665bbe61b706f0b69eb661ea4118800b.tar.gz crawl-ref-b84db940665bbe61b706f0b69eb661ea4118800b.zip |
Remove debugging statement, minor clean up.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6369 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/acr.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/beam.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/debug.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/it_use3.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/misc.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spells1.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spells2.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/stuff.cc | 4 |
9 files changed, 15 insertions, 16 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 6fcbf754ce..1977eaea2d 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -4110,7 +4110,9 @@ static bool _initialise(void) #endif set_cursor_enabled(false); - viewwindow(1, false); // This just puts the view up for the first turn. + + // This just puts the view up for the first turn. + viewwindow(true, false); activate_notes(true); diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 5ace0228a4..ccc1cf730c 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1987,7 +1987,7 @@ void fire_beam(bolt &pbolt, item_def *item, bool drop_item) #ifdef MISSILE_TRAILS_OFF // mv: It's not optimal but is usually enough. if (!pbolt.is_beam || pbolt.name[0] == '0') - viewwindow(1,false); + viewwindow(true, false); #endif } @@ -2424,7 +2424,7 @@ bool mass_enchantment( enchant_type wh_enchant, int pow, int origin, if (m_attempted) *m_attempted = 0; - viewwindow(0, false); + viewwindow(false, false); if (pow > 200) pow = 200; diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index d146230f75..e7cb5544b2 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -750,7 +750,7 @@ static void _wizard_go_to_level(const level_pos &pos) #endif save_game_state(); new_level(); - viewwindow(1, true); + viewwindow(true, true); // Tell stash-tracker and travel that we've changed levels. trackers_init_new_level(true); diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 36be52164d..58949f87a8 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -903,7 +903,7 @@ void tome_of_power(int slot) } else { - viewwindow(1, false); + viewwindow(true, false); int temp_rand = random2(23) + random2(you.skills[SK_EVOCATIONS] / 3); diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 9ac66044ca..460002a040 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2419,9 +2419,6 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, } } - mprf(MSGCH_DIAGNOSTICS, "bow_brand: %d, ammo_brand: %d", - bow_brand, ammo_brand); - // The chief advantage here is the extra damage this does // against susceptible creatures. diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 132d82a60d..14f1e568d5 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1637,7 +1637,7 @@ void up_stairs(dungeon_feature_type force_stair, new_level(); - viewwindow(1, true); + viewwindow(true, true); // Left Zot without enough runes to get back in (probably because // of dropping some runes within Zot), but need to get back in Zot @@ -2190,7 +2190,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, TileNewLevel(newlevel); #endif // USE_TILE - viewwindow(1, true); + viewwindow(true, true); if (collect_travel_data) { diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 1ea322128b..c86d698493 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -264,7 +264,7 @@ void cast_fire_storm(int pow, bolt &beam) if (explosion(beam, false, false, true, true, false) > 0) mpr("A raging storm of fire appears!"); - viewwindow(1, false); + viewwindow(true, false); } void cast_chain_lightning(int pow) diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index ec85a04ab2..a8ec9cab63 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -617,7 +617,7 @@ void cast_toxic_radiance(void) mpr("You radiate a sickly green light!"); show_green = GREEN; - viewwindow(1, false); + viewwindow(true, false); more(); mesclr(); @@ -693,7 +693,7 @@ void cast_refrigeration(int pow) mpr("The heat is drained from your surroundings."); show_green = LIGHTCYAN; - viewwindow(1, false); + viewwindow(true, false); more(); mesclr(); @@ -762,7 +762,7 @@ void drain_life(int pow) ASSERT( pow <= 27 ); show_green = DARKGREY; - viewwindow(1, false); + viewwindow(true, false); more(); mesclr(); diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 17af5f072e..159b09ae48 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -761,8 +761,8 @@ void redraw_screen(void) update_turn_count(); activate_notes(note_status); - viewwindow(1, false); -} // end redraw_screen() + viewwindow(true, false); +} // STEPDOWN FUNCTION to replace conditional chains in spells2.cc 12jan2000 {dlb} // it is a bit more extensible and optimizes the logical structure, as well |