thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AVALANCHE: Fix naming convention, reduce the scope of a couple of variables

Browse source
This commit is contained in:
Strangerke 2013-10-04 17:12:35 +02:00
parent 9a4d1683c9
commit 49960992ca
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/avalanche/animation.cpp
View file

@ -434,15 +434,12 @@ byte Animation::geidaPed(byte ped) {
* on the screen. * on the screen.
*/ */
void Animation::catacombMove(byte ped) { void Animation::catacombMove(byte ped) {
int32 here; // XY_uint16 is _catacombX+_catacombY*256. Thus, every room in the
uint16 xy_uint16;
// XY_uint16 is cat_x+cat_y*256. Thus, every room in the
// catacombs has a different number for it. // catacombs has a different number for it.
xy_uint16 = _vm->_catacombX + _vm->_catacombY * 256; uint16 xy = _vm->_catacombX + _vm->_catacombY * 256;
_geidaSpin = 0; _geidaSpin = 0;
switch (xy_uint16) { switch (xy) {
case 1801: // Exit catacombs case 1801: // Exit catacombs
_vm->flipRoom(kRoomLustiesRoom, 4); _vm->flipRoom(kRoomLustiesRoom, 4);
_vm->_dialogs->displayText("Phew! Nice to be out of there!"); _vm->_dialogs->displayText("Phew! Nice to be out of there!");
@ -467,7 +464,7 @@ void Animation::catacombMove(byte ped) {
if (!_vm->_enterCatacombsFromLustiesRoom) if (!_vm->_enterCatacombsFromLustiesRoom)
_vm->loadRoom(29); _vm->loadRoom(29);
here = _vm->kCatacombMap[_vm->_catacombY - 1][_vm->_catacombX - 1]; int32 here = _vm->kCatacombMap[_vm->_catacombY - 1][_vm->_catacombX - 1];
switch (here & 0xf) { // West. switch (here & 0xf) { // West.
case 0: // no connection (wall) case 0: // no connection (wall)
@ -596,7 +593,7 @@ void Animation::catacombMove(byte ped) {
case 0x1: case 0x1:
_vm->_background->draw(-1, -1, 21); _vm->_background->draw(-1, -1, 21);
if ((xy_uint16 == 2051) && (_vm->_geidaFollows)) if ((xy == 2051) && (_vm->_geidaFollows))
_vm->_magics[12]._operation = kMagicExclaim; _vm->_magics[12]._operation = kMagicExclaim;
else else
_vm->_magics[12]._operation = kMagicSpecial; // Right exit south. _vm->_magics[12]._operation = kMagicSpecial; // Right exit south.
@ -694,7 +691,7 @@ void Animation::catacombMove(byte ped) {
break; break;
} }
switch (xy_uint16) { switch (xy) {
case 514: case 514:
_vm->_background->draw(-1, -1, 16); _vm->_background->draw(-1, -1, 16);
break; // [2,2] : "Art Gallery" sign over door. break; // [2,2] : "Art Gallery" sign over door.