diff options
| -rw-r--r-- | engines/avalanche/acci2.cpp | 9 | ||||
| -rw-r--r-- | engines/avalanche/gyro2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 3 | ||||
| -rw-r--r-- | engines/avalanche/roomnums.h | 4 | ||||
| -rw-r--r-- | engines/avalanche/sequence2.cpp | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 87f89fa8ec..f4b9686b36 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1885,12 +1885,11 @@ void Acci::do_that() { else { ok = true; for (ff = 0; ff < thats.size(); ff++) { - for (fv = 0; fv < words[_vm->_gyro->dna.pass_num + first_password - 1].w.size(); fv++) { - Common::String temp = realwords[ff]; - temp.toUppercase(); - if (words[_vm->_gyro->dna.pass_num + first_password - 1].w[fv] != temp[fv]) + Common::String temp = realwords[ff]; + temp.toUppercase(); + for (fv = 0; fv < words[_vm->_gyro->dna.pass_num + first_password].w.size(); fv++) + if (words[_vm->_gyro->dna.pass_num + first_password].w[fv] != temp[fv]) ok = false; - } } if (ok) { diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h index ec78028fcf..c3711c57ad 100644 --- a/engines/avalanche/gyro2.h +++ b/engines/avalanche/gyro2.h @@ -82,7 +82,7 @@ struct dnatype { /* here goes... */ /* Ux, uy, & ww now all belong to Trip5 */ byte winestate; /* 0=good (Notts), 1=passable(Argent) ... 3=vinegar.*/ bool cwytalot_gone; /* Has Cwytalot rushed off to Jerusalem yet?*/ - byte pass_num; /* Number of the passuint16 for this game. */ + byte pass_num; /* Number of the passw for this game. */ bool ayles_is_awake; /* pretty obvious! */ byte drawbridge_open; /* Between 0 (shut) and 4 (open). */ byte avaricius_talk; /* How much Avaricius has said to you. */ diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index e3de0da0e9..76b8bcdc54 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -443,7 +443,8 @@ void Lucerna::enterroom(byte x, byte ped) { _vm->_trip->tr[1].call_eachstep = true; _vm->_trip->tr[1].eachstep = _vm->_trip->procgeida_procs; - } else _vm->_gyro->whereis[1] = r__nowhere; + } else + _vm->_gyro->whereis[1] = r__nowhere; break; case r__brummieroad: { diff --git a/engines/avalanche/roomnums.h b/engines/avalanche/roomnums.h index fb99f5c780..3032f71db6 100644 --- a/engines/avalanche/roomnums.h +++ b/engines/avalanche/roomnums.h @@ -48,7 +48,7 @@ const byte r__avvysgarden = 15; const byte r__aylesoffice = 16; const byte r__argentpub = 19; const byte r__brummieroad = 20; -const byte r__lusties = 21; /*{ ? not sure }*/ +const byte r__bridge = 21; /*{ ? not sure }*/ const byte r__entrancehall = 22; const byte r__lustiesroom = 23; const byte r__westhall = 25; @@ -59,7 +59,7 @@ const byte r__catacombs = 29; //{ -------------- } -const byte r__bridge = 40; +const byte r__lusties = 40; const byte r__robins = 42; const byte r__outsidenottspub = 46; const byte r__nottspub = 47; diff --git a/engines/avalanche/sequence2.cpp b/engines/avalanche/sequence2.cpp index 6439df26fe..f41ac128c6 100644 --- a/engines/avalanche/sequence2.cpp +++ b/engines/avalanche/sequence2.cpp @@ -90,11 +90,11 @@ void Sequence::shove_left() { void Sequence::call_sequencer() { switch (seq[0]) { case 0: - return; - break; /* No more routines. */ - case 177: + return; // No more routines. + break; + case 177: // Flip room. _vm->_gyro->dna.user_moves_avvy = true; - _vm->_trip->fliproom(_vm->_gyro->dna.flip_to_where, _vm->_gyro->dna.flip_to_ped); /* 177 = Flip room. */ + _vm->_trip->fliproom(_vm->_gyro->dna.flip_to_where, _vm->_gyro->dna.flip_to_ped); if (seq[0] == 177) shove_left(); break; |