diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-10-31 18:46:31 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-10-31 18:46:31 +0000 |
| commit | 6d39625c75d41561f8e5a22d17b1eb33f56ea9b8 (patch) | |
| tree | 72d16ccb315bf51a7732b7c7e021a7ebad6340b5 | |
| parent | a9a42e796f70733df88a447e53a0042307c27280 (diff) | |
| download | crawl-ref-6d39625c75d41561f8e5a22d17b1eb33f56ea9b8.tar.gz crawl-ref-6d39625c75d41561f8e5a22d17b1eb33f56ea9b8.zip | |
If auto_list is set, do a --More-- prompt after identifying items if the identify scroll has further ids to offer.
Fixed older MinGWs carping about tx and ty being possibly uninitialised in beam.cc.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@315 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/beam.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells1.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 644e0bf981..66a81ca570 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1214,7 +1214,7 @@ static void zappy( char z_type, int power, struct bolt &pbolt ) void fire_beam( struct bolt &pbolt, item_def *item ) { bool beamTerminate; // has beam been 'stopped' by something? - int tx, ty; // test(new) x,y - integer + int tx = 0, ty = 0; // test(new) x,y - integer int rangeRemaining; #if DEBUG_DIAGNOSTICS diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 84704ce2bf..2fa28bc78c 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -419,11 +419,13 @@ void identify(int power) // output identified item in_name( item_slot, DESC_INVENTORY_EQUIP, str_pass ); mpr( str_pass ); - if (item_slot == you.equip[EQ_WEAPON]) you.wield_change = true; id_used--; + + if (Options.auto_list && id_used > 0) + more(); } while (id_used > 0); } // end identify() |