[Scummvm-cvs-logs] SF.net SVN: scummvm: [29058] scummvm/trunk/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Sep 23 18:52:53 CEST 2007
Revision: 29058
http://scummvm.svn.sourceforge.net/scummvm/?rev=29058&view=rev
Author: sev
Date: 2007-09-23 09:52:53 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Rename class variables to conform our code conventions
Modified Paths:
--------------
scummvm/trunk/engines/agi/preagi_mickey.cpp
scummvm/trunk/engines/agi/preagi_mickey.h
Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp 2007-09-23 16:48:33 UTC (rev 29057)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp 2007-09-23 16:52:53 UTC (rev 29058)
@@ -178,7 +178,7 @@
void Mickey::printDatString(int iStr) {
char *buffer = (char *)malloc(256);
- int iDat = getDat(game.iRoom);
+ int iDat = getDat(_game.iRoom);
MSA_DAT_HEADER hdr;
char szFile[256] = {0};
@@ -297,7 +297,7 @@
break;
}
nWords = menu.row[iRow].count;
- clickToMove = false;
+ _clickToMove = false;
for (int i = 0; i <= menu.row[0].count; i++)
if (menu.row[0].entry[i].szText[0] == 71 && menu.row[0].entry[i].szText[1] == 79) // GO
@@ -364,25 +364,25 @@
*sel0 = goIndex; *sel1 = northIndex;
drawMenu(menu, *sel0, *sel1);
_vm->_gfx->setCursorPalette(false);
- clickToMove = true;
+ _clickToMove = true;
} else if (southIndex >= 0 && (event.mouse.x >= 20 && event.mouse.x <= (IDI_MSA_PIC_WIDTH + 10) * 2) &&
(event.mouse.y >= IDI_MSA_PIC_HEIGHT - 10 && event.mouse.y <= IDI_MSA_PIC_HEIGHT)) {
*sel0 = goIndex; *sel1 = southIndex;
drawMenu(menu, *sel0, *sel1);
_vm->_gfx->setCursorPalette(false);
- clickToMove = true;
+ _clickToMove = true;
} else if (westIndex >= 0 && (event.mouse.y >= 0 && event.mouse.y <= IDI_MSA_PIC_HEIGHT) &&
(event.mouse.x >= 20 && event.mouse.x <= 30)) {
*sel0 = goIndex; *sel1 = westIndex;
drawMenu(menu, *sel0, *sel1);
_vm->_gfx->setCursorPalette(false);
- clickToMove = true;
+ _clickToMove = true;
} else if (eastIndex >= 0 && (event.mouse.y >= 0 && event.mouse.y <= IDI_MSA_PIC_HEIGHT) &&
(event.mouse.x >= IDI_MSA_PIC_WIDTH * 2 && event.mouse.x <= (IDI_MSA_PIC_WIDTH + 10) * 2)) {
*sel0 = goIndex; *sel1 = eastIndex;
drawMenu(menu, *sel0, *sel1);
_vm->_gfx->setCursorPalette(false);
- clickToMove = true;
+ _clickToMove = true;
} else {
_vm->_gfx->setCursorPalette(false);
}
@@ -408,7 +408,7 @@
switch (event.kbd.keycode) {
case Common::KEYCODE_2:
// Hidden message
- if (game.iRoom == IDI_MSA_PIC_MERCURY_CAVE_0) {
+ if (_game.iRoom == IDI_MSA_PIC_MERCURY_CAVE_0) {
for (int i = 0; i < 5; i++) {
printExeMsg(IDO_MSA_HIDDEN_MSG[i]);
}
@@ -487,7 +487,7 @@
for (;;) {
for (;;) {
if (getMenuSelRow(menu, sel0, sel1, 0)) {
- if (clickToMove)
+ if (_clickToMove)
break;
*sel1 = 0;
if (getMenuSelRow(menu, sel0, sel1, 1)) {
@@ -495,7 +495,7 @@
}
}
}
- if (clickToMove || getMenuSelRow(menu, sel0, sel1, 2)) {
+ if (_clickToMove || getMenuSelRow(menu, sel0, sel1, 2)) {
break;
}
}
@@ -530,12 +530,12 @@
int pBuf = 0;
// change planet name in ship airlock menu
- if (game.iRoom == IDI_MSA_PIC_SHIP_AIRLOCK) {
- strcpy((char *)menu->row[1].entry[2].szText, IDS_MSA_NAME_PLANET[game.iPlanet]);
+ if (_game.iRoom == IDI_MSA_PIC_SHIP_AIRLOCK) {
+ strcpy((char *)menu->row[1].entry[2].szText, IDS_MSA_NAME_PLANET[_game.iPlanet]);
}
// exit if fix unnecessary
- if (!game.iRmMenu[game.iRoom]) {
+ if (!_game.iRmMenu[_game.iRoom]) {
centerMenu(menu);
return;
}
@@ -546,7 +546,7 @@
// read patches
readOfsData(
IDOFS_MSA_MENU_PATCHES,
- game.nRmMenu[game.iRoom] + game.iRmMenu[game.iRoom] - 1,
+ _game.nRmMenu[_game.iRoom] + _game.iRmMenu[_game.iRoom] - 1,
buffer, sizeof(buffer)
);
@@ -647,12 +647,12 @@
_vm->clearScreen(IDA_DEFAULT);
- sprintf(szLine, IDS_MSA_DEBUG_ROOM, game.iRoom);
+ sprintf(szLine, IDS_MSA_DEBUG_ROOM, _game.iRoom);
_vm->drawStr(5, 10, IDA_DEFAULT, szLine);
- if (game.iRoom < IDI_MSA_MAX_PIC_ROOM) {
- if (game.iRmObj[game.iRoom] != IDI_MSA_OBJECT_NONE) {
- sprintf(szLine, IDS_MSA_DEBUG_OBJ, game.iRmObj[game.iRoom]);
+ if (_game.iRoom < IDI_MSA_MAX_PIC_ROOM) {
+ if (_game.iRmObj[_game.iRoom] != IDI_MSA_OBJECT_NONE) {
+ sprintf(szLine, IDS_MSA_DEBUG_OBJ, _game.iRmObj[_game.iRoom]);
_vm->drawStr(7, 10, IDA_DEFAULT, szLine);
}
} else {
@@ -718,7 +718,7 @@
0xF0, 1, 0xF9, 2, 43, 45, 0xFF
};
- switch(game.iRoom) {
+ switch(_game.iRoom) {
case IDI_MSA_PIC_EARTH_SHIP:
case IDI_MSA_PIC_VENUS_SHIP:
case IDI_MSA_PIC_NEPTUNE_SHIP:
@@ -744,7 +744,7 @@
_vm->_picture->setPattern(2, 0);
for (int i = 0; i < 12; i++) {
- iColor = game.nFrame + i;
+ iColor = _game.nFrame + i;
if (iColor > 15) iColor -= 15;
objLight[1] = iColor;
@@ -757,8 +757,8 @@
_vm->_picture->showPic(10, 0, IDI_MSA_PIC_WIDTH, IDI_MSA_PIC_HEIGHT);
- game.nFrame--;
- if (game.nFrame < 0) game.nFrame = 15;
+ _game.nFrame--;
+ if (_game.nFrame < 0) _game.nFrame = 15;
playSound(IDI_MSA_SND_PRESS_BLUE);
}
@@ -767,10 +767,10 @@
case IDI_MSA_PIC_SHIP_CONTROLS:
// draw XL30 screen
- if (game.fAnimXL30) {
- if (game.nFrame > 5) game.nFrame = 0;
- drawObj((ENUM_MSA_OBJECT)(IDI_MSA_OBJECT_XL31 + game.nFrame), 0, 4);
- game.nFrame++;
+ if (_game.fAnimXL30) {
+ if (_game.nFrame > 5) _game.nFrame = 0;
+ drawObj((ENUM_MSA_OBJECT)(IDI_MSA_OBJECT_XL31 + _game.nFrame), 0, 4);
+ _game.nFrame++;
};
break;
@@ -778,16 +778,16 @@
default:
// draw crystal
- if (game.iRoom == IDI_MSA_XTAL_ROOM_XY[game.iPlanet][0]) {
- if (!game.fHasXtal) {
- switch(game.iPlanet) {
+ if (_game.iRoom == IDI_MSA_XTAL_ROOM_XY[_game.iPlanet][0]) {
+ if (!_game.fHasXtal) {
+ switch(_game.iPlanet) {
case IDI_MSA_PLANET_VENUS:
- if (game.iRmMenu[game.iRoom] != 2) break;
+ if (_game.iRmMenu[_game.iRoom] != 2) break;
default:
drawObj(
IDI_MSA_OBJECT_CRYSTAL,
- IDI_MSA_XTAL_ROOM_XY[game.iPlanet][1],
- IDI_MSA_XTAL_ROOM_XY[game.iPlanet][2]
+ IDI_MSA_XTAL_ROOM_XY[_game.iPlanet][1],
+ IDI_MSA_XTAL_ROOM_XY[_game.iPlanet][2]
);
break;
}
@@ -805,17 +805,17 @@
// Draw room picture
if (true) { // (!getDebug()) { // TODO
- if (game.iRoom == IDI_MSA_PIC_TITLE) {
+ if (_game.iRoom == IDI_MSA_PIC_TITLE) {
drawPic(IDI_MSA_PIC_TITLE);
} else {
- drawPic(game.iRmPic[game.iRoom]);
+ drawPic(_game.iRmPic[_game.iRoom]);
- if (game.iRoom == IDI_MSA_PIC_SHIP_CONTROLS) {
+ if (_game.iRoom == IDI_MSA_PIC_SHIP_CONTROLS) {
// Draw ship control room window
- if (game.fFlying) {
+ if (_game.fFlying) {
drawObj(IDI_MSA_OBJECT_W_SPACE, 0, 0);
} else {
- drawObj((ENUM_MSA_OBJECT)(IDI_MSA_OBJECT_W_EARTH + game.iPlanet), 0, 1);
+ drawObj((ENUM_MSA_OBJECT)(IDI_MSA_OBJECT_W_EARTH + _game.iPlanet), 0, 1);
}
}
}
@@ -826,14 +826,14 @@
}
// Draw room objects
- if (game.iRoom >= IDI_MSA_MAX_PIC_ROOM) {
+ if (_game.iRoom >= IDI_MSA_MAX_PIC_ROOM) {
drawRoomAnimation();
return;
}
- if (game.iRmObj[game.iRoom] != IDI_MSA_OBJECT_NONE) {
+ if (_game.iRmObj[_game.iRoom] != IDI_MSA_OBJECT_NONE) {
readOfsData(IDO_MSA_ROOM_OBJECT_XY_OFFSETS,
- game.iRmObj[game.iRoom], buffer, sizeof(buffer));
+ _game.iRmObj[_game.iRoom], buffer, sizeof(buffer));
nObjs = buffer[pBuf++];
@@ -925,12 +925,12 @@
void Mickey::printRoomDesc() {
// print room description
- printDesc(game.iRoom);
+ printDesc(_game.iRoom);
waitAnyKeyAnim();
// print extended room description
- if (game.oRmTxt[game.iRoom]) {
- printExeMsg(game.oRmTxt[game.iRoom] + IDI_MSA_OFS_EXE);
+ if (_game.oRmTxt[_game.iRoom]) {
+ printExeMsg(_game.oRmTxt[_game.iRoom] + IDI_MSA_OFS_EXE);
}
}
@@ -952,7 +952,7 @@
if (_vm->getSelection(kSelAnyKey) == 0)
return false;
} else {
- infile->read(&game, sizeof(MSA_GAME));
+ infile->read(&_game, sizeof(MSA_GAME));
diskerror = false;
delete infile;
}
@@ -998,7 +998,7 @@
if (_vm->getSelection(kSelAnyKey) == 0)
return;
} else {
- outfile->write(&game, sizeof(MSA_GAME));
+ outfile->write(&_game, sizeof(MSA_GAME));
diskerror = false;
delete outfile;
}
@@ -1009,7 +1009,7 @@
void Mickey::showPlanetInfo() {
for (int i = 0; i < IDI_MSA_MAX_PLANET_INFO; i++) {
- printExeStr(IDO_MSA_PLANET_INFO[game.iPlanet][i]);
+ printExeStr(IDO_MSA_PLANET_INFO[_game.iPlanet][i]);
waitAnyKey();
}
}
@@ -1051,15 +1051,15 @@
//_vm->_gfx->doUpdate();
//_vm->_system->updateScreen(); // TODO: this should go in the game's main loop
- game.fStoryShown = true;
+ _game.fStoryShown = true;
}
int Mickey::getPlanet() {
- if (!game.nButtons)
+ if (!_game.nButtons)
return -1;
for (int iPlanet = 0; iPlanet < IDI_MSA_MAX_DAT; iPlanet++) {
- if (!strcmp(IDS_MSA_ADDR_PLANET[iPlanet], game.szAddr)) {
+ if (!strcmp(IDS_MSA_ADDR_PLANET[iPlanet], _game.szAddr)) {
return iPlanet;
}
}
@@ -1071,21 +1071,21 @@
char szButtons[12] = {0};
// check if too many buttons pressed
- if (game.nButtons == IDI_MSA_MAX_BUTTON) {
- game.nButtons = 0;
- memset(game.szAddr, 0, sizeof(game.szAddr));
+ if (_game.nButtons == IDI_MSA_MAX_BUTTON) {
+ _game.nButtons = 0;
+ memset(_game.szAddr, 0, sizeof(_game.szAddr));
printExeMsg(IDO_MSA_TOO_MANY_BUTTONS_PRESSED);
return;
}
// add button press to address
- game.nButtons++;
- game.szAddr[game.nButtons - 1] = (char)iButton;
+ _game.nButtons++;
+ _game.szAddr[_game.nButtons - 1] = (char)iButton;
// format buttons string
for (int i = 0; i < IDI_MSA_MAX_BUTTON; i++) {
- szButtons[i * 2] = game.szAddr[i];
- if (game.szAddr[i + 1]) szButtons[(i * 2) + 1] = ',';
+ szButtons[i * 2] = _game.szAddr[i];
+ if (_game.szAddr[i + 1]) szButtons[(i * 2) + 1] = ',';
}
// print pressed buttons
@@ -1109,7 +1109,7 @@
printExeMsg(IDO_MSA_GAME_OVER[3]);
playSound(IDI_MSA_SND_GAME_OVER);
- if (game.fItemUsed[IDI_MSA_ITEM_LETTER]) {
+ if (_game.fItemUsed[IDI_MSA_ITEM_LETTER]) {
drawPic(IDI_MSA_PIC_EARTH_MINNIE);
printExeMsg(IDO_MSA_GAME_OVER[4]);
printExeMsg(IDO_MSA_GAME_OVER[5]);
@@ -1123,20 +1123,20 @@
}
void Mickey::flipSwitch() {
- if (game.fHasXtal || game.nXtals) {
- if (!game.fStoryShown)
+ if (_game.fHasXtal || _game.nXtals) {
+ if (!_game.fStoryShown)
printStory();
// Initialize planet data
- if (!game.fPlanetsInitialized) {
+ if (!_game.fPlanetsInitialized) {
int iHint = 0;
int iPlanet = 0;
- memset(game.iPlanetXtal, 0, sizeof(game.iPlanetXtal));
- memset(game.iClue, 0, sizeof(game.iClue));
+ memset(_game.iPlanetXtal, 0, sizeof(_game.iPlanetXtal));
+ memset(_game.iClue, 0, sizeof(_game.iClue));
- game.iPlanetXtal[0] = IDI_MSA_PLANET_EARTH;
- game.iPlanetXtal[8] = IDI_MSA_PLANET_URANUS;
+ _game.iPlanetXtal[0] = IDI_MSA_PLANET_EARTH;
+ _game.iPlanetXtal[8] = IDI_MSA_PLANET_URANUS;
for (int i = 1; i < 8; i++) {
do {
@@ -1144,16 +1144,16 @@
iPlanet = _vm->rnd(IDI_MSA_MAX_PLANET - 2);
} while (planetIsAlreadyAssigned(iPlanet));
- game.iPlanetXtal[i] = iPlanet;
+ _game.iPlanetXtal[i] = iPlanet;
iHint = _vm->rnd(5) - 1; // clues are 0-4
- game.iClue[i] = IDO_MSA_NEXT_PIECE[iPlanet][iHint];
+ _game.iClue[i] = IDO_MSA_NEXT_PIECE[iPlanet][iHint];
}
- game.fPlanetsInitialized = true;
+ _game.fPlanetsInitialized = true;
}
// activate screen animation
- game.fAnimXL30 = true;
+ _game.fAnimXL30 = true;
_vm->clearTextArea();
//_vm->_gfx->doUpdate();
@@ -1161,31 +1161,31 @@
playSound(IDI_MSA_SND_XL30);
printExeMsg(IDO_MSA_XL30_SPEAKING);
- if (game.fHasXtal) {
- game.fHasXtal = false;
+ if (_game.fHasXtal) {
+ _game.fHasXtal = false;
printExeMsg(IDO_MSA_CRYSTAL_PIECE_FOUND);
}
- if (game.nXtals == IDI_MSA_MAX_PLANET) {
+ if (_game.nXtals == IDI_MSA_MAX_PLANET) {
printExeMsg(IDO_MSA_GAME_OVER[0]);
printExeMsg(IDO_MSA_GAME_OVER[1]);
printExeMsg(IDO_MSA_GAME_OVER[2]);
#if 0
// DEBUG
- strcpy(game.szAddr, (char *)IDS_MSA_ADDR_PLANET[IDI_MSA_PLANET_EARTH]);
- game.nButtons = strlen(game.szAddr);
+ strcpy(_game.szAddr, (char *)IDS_MSA_ADDR_PLANET[IDI_MSA_PLANET_EARTH]);
+ _game.nButtons = strlen(_game.szAddr);
#endif
} else {
- printExeStr(game.iClue[game.nXtals]);
+ printExeStr(_game.iClue[_game.nXtals]);
#if 0
// DEBUG
- _vm->drawStr(24, 12, IDA_DEFAULT, (char *)IDS_MSA_NAME_PLANET_2[game.iPlanetXtal[game.nXtals]]);
- _vm->drawStr(24, 22, IDA_DEFAULT, (char *)IDS_MSA_ADDR_PLANET[game.iPlanetXtal[game.nXtals]]);
- strcpy(game.szAddr, (char *)IDS_MSA_ADDR_PLANET[game.iPlanetXtal[game.nXtals]]);
- game.nButtons = strlen(game.szAddr);
+ _vm->drawStr(24, 12, IDA_DEFAULT, (char *)IDS_MSA_NAME_PLANET_2[_game.iPlanetXtal[_game.nXtals]]);
+ _vm->drawStr(24, 22, IDA_DEFAULT, (char *)IDS_MSA_ADDR_PLANET[_game.iPlanetXtal[_game.nXtals]]);
+ strcpy(_game.szAddr, (char *)IDS_MSA_ADDR_PLANET[_game.iPlanetXtal[_game.nXtals]]);
+ _game.nButtons = strlen(_game.szAddr);
_vm->_gfx->doUpdate();
_vm->_system->updateScreen(); // TODO: this should go in the game's main loop
#endif
@@ -1201,7 +1201,7 @@
int iRow = IDI_MSA_ROW_INV_ITEMS;
char szCrystals[12] = {0};
- sprintf(szCrystals, IDS_MSA_CRYSTALS, IDS_MSA_CRYSTAL_NO[game.nXtals]);
+ sprintf(szCrystals, IDS_MSA_CRYSTALS, IDS_MSA_CRYSTAL_NO[_game.nXtals]);
CursorMan.showMouse(false);
@@ -1210,8 +1210,8 @@
_vm->drawStr(IDI_MSA_ROW_INV_CRYSTALS, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, szCrystals);
for (int iItem = 0; iItem < IDI_MSA_MAX_ITEM; iItem++) {
- if (game.fItem[game.iItem[iItem]] && (game.iItem[iItem] != IDI_MSA_OBJECT_NONE)) {
- _vm->drawStr(iRow++, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, (const char *)IDS_MSA_NAME_ITEM[game.iItem[iItem]]);
+ if (_game.fItem[_game.iItem[iItem]] && (_game.iItem[iItem] != IDI_MSA_OBJECT_NONE)) {
+ _vm->drawStr(iRow++, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, (const char *)IDS_MSA_NAME_ITEM[_game.iItem[iItem]]);
}
}
@@ -1230,7 +1230,7 @@
//waitAnyKey(); // Not in the original, but needed so that the logo is visible
// draw title picture
- game.iRoom = IDI_MSA_PIC_TITLE;
+ _game.iRoom = IDI_MSA_PIC_TITLE;
drawRoom();
// show copyright and play theme
@@ -1238,19 +1238,19 @@
playSound(IDI_MSA_SND_THEME);
// load game
- game.fIntro = true;
+ _game.fIntro = true;
if (chooseY_N(IDO_MSA_LOAD_GAME[0], true)) {
if (loadGame()) {
- game.iPlanet = IDI_MSA_PLANET_EARTH;
- game.fIntro = false;
- game.iRoom = IDI_MSA_PIC_SHIP_CORRIDOR;
+ _game.iPlanet = IDI_MSA_PLANET_EARTH;
+ _game.fIntro = false;
+ _game.iRoom = IDI_MSA_PIC_SHIP_CORRIDOR;
return;
}
}
// play spaceship landing scene
- game.iPlanet = IDI_MSA_PLANET_EARTH;
- game.iRoom = IDI_MSA_PIC_EARTH_ROAD_4;
+ _game.iPlanet = IDI_MSA_PLANET_EARTH;
+ _game.iRoom = IDI_MSA_PIC_EARTH_ROAD_4;
drawRoom();
printRoomDesc();
@@ -1274,7 +1274,7 @@
_vm->_system->updateScreen(); // TODO: this should go in the game's main loop
drawRoom();
- printDesc(game.iRoom);
+ printDesc(_game.iRoom);
_vm->_gfx->doUpdate();
_vm->_system->updateScreen(); // TODO: this should go in the game's main loop
}
@@ -1283,17 +1283,17 @@
}
void Mickey::getItem(ENUM_MSA_ITEM iItem) {
- game.fItem[iItem] = true;
- game.iItem[game.nItems++] = iItem;
- game.oRmTxt[game.iRoom] = 0;
+ _game.fItem[iItem] = true;
+ _game.iItem[_game.nItems++] = iItem;
+ _game.oRmTxt[_game.iRoom] = 0;
playSound(IDI_MSA_SND_TAKE);
drawRoom();
}
void Mickey::getXtal(int iStr) {
- game.oRmTxt[game.iRoom] = 0;
- game.fHasXtal = true;
- game.nXtals++;
+ _game.oRmTxt[_game.iRoom] = 0;
+ _game.fHasXtal = true;
+ _game.nXtals++;
playSound(IDI_MSA_SND_CRYSTAL);
drawRoom();
printDatMessage(iStr);
@@ -1305,7 +1305,7 @@
// BASIC
case IDI_MSA_ACTION_GOTO_ROOM:
- game.iRoom = arg;
+ _game.iRoom = arg;
return true;
case IDI_MSA_ACTION_SHOW_INT_STR:
printExeMsg(IDO_MSA_ERROR[arg]);
@@ -1329,208 +1329,208 @@
// EARTH
case IDI_MSA_ACTION_GET_ROPE:
- if (game.iRmMenu[game.iRoom] == 2) {
- game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
- game.iRmMenu[game.iRoom] = 3;
+ if (_game.iRmMenu[_game.iRoom] == 2) {
+ _game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
+ _game.iRmMenu[_game.iRoom] = 3;
getItem(IDI_MSA_ITEM_ROPE);
printExeMsg(IDO_MSA_ERROR[7]);
} else {
- game.iRmMenu[game.iRoom] = 1;
+ _game.iRmMenu[_game.iRoom] = 1;
printDatMessage(11);
}
break;
case IDI_MSA_ACTION_UNTIE_ROPE:
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_EARTH_TIRE_SWING_1;
- game.iRmObj[game.iRoom] = 0;
- game.iRmMenu[game.iRoom] = 2;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_EARTH_TIRE_SWING_1;
+ _game.iRmObj[_game.iRoom] = 0;
+ _game.iRmMenu[_game.iRoom] = 2;
drawRoom();
printDatMessage(12);
break;
case IDI_MSA_ACTION_GET_BONE:
- game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
- game.iRmMenu[game.iRoom] = 1;
+ _game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
+ _game.iRmMenu[_game.iRoom] = 1;
getItem(IDI_MSA_ITEM_BONE);
printDatMessage(arg);
break;
case IDI_MSA_ACTION_GET_XTAL_EARTH:
- game.iRmMenu[game.iRoom] = 1;
+ _game.iRmMenu[_game.iRoom] = 1;
getXtal(arg);
break;
case IDI_MSA_ACTION_LOOK_DESK:
- game.iRmMenu[game.iRoom] = 1;
- game.iRmObj[game.iRoom] = 2;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmObj[_game.iRoom] = 2;
drawRoom();
printDatMessage(arg);
break;
case IDI_MSA_ACTION_WRITE_LETTER:
- game.iRmMenu[game.iRoom] = 3;
- game.iRmMenu[IDI_MSA_PIC_EARTH_MAILBOX] = 1;
- game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
+ _game.iRmMenu[_game.iRoom] = 3;
+ _game.iRmMenu[IDI_MSA_PIC_EARTH_MAILBOX] = 1;
+ _game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
getItem(IDI_MSA_ITEM_LETTER);
printDatMessage(arg);
break;
case IDI_MSA_ACTION_MAIL_LETTER:
- game.fItemUsed[IDI_MSA_ITEM_LETTER] = true;
- game.fItem[IDI_MSA_ITEM_LETTER] = false;
- game.iRmMenu[game.iRoom] = 0;
+ _game.fItemUsed[IDI_MSA_ITEM_LETTER] = true;
+ _game.fItem[IDI_MSA_ITEM_LETTER] = false;
+ _game.iRmMenu[_game.iRoom] = 0;
printDatMessage(arg);
break;
case IDI_MSA_ACTION_OPEN_MAILBOX:
- if (game.fItemUsed[IDI_MSA_ITEM_LETTER]) {
+ if (_game.fItemUsed[IDI_MSA_ITEM_LETTER]) {
printDatMessage(110);
} else {
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_OPEN_CUPBOARD:
- if (game.iRmMenu[game.iRoom]) {
- if (game.iRmObj[game.iRoom] == IDI_MSA_OBJECT_NONE) {
+ if (_game.iRmMenu[_game.iRoom]) {
+ if (_game.iRmObj[_game.iRoom] == IDI_MSA_OBJECT_NONE) {
printDatMessage(78);
} else {
printDatMessage(arg);
}
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_EARTH_KITCHEN_1;
- game.iRmObj[game.iRoom] = 3;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_EARTH_KITCHEN_1;
+ _game.iRmObj[_game.iRoom] = 3;
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_FLASHLIGHT:
if (!mickeyHasItem(IDI_MSA_ITEM_FLASHLIGHT)) {
- game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
+ _game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
getItem(IDI_MSA_ITEM_FLASHLIGHT);
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_OPEN_CABINET:
- if (game.iRmMenu[game.iRoom]) {
+ if (_game.iRmMenu[_game.iRoom]) {
printDatMessage(109);
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_EARTH_GARAGE_1;
- game.iRmObj[game.iRoom] = 15;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_EARTH_GARAGE_1;
+ _game.iRmObj[_game.iRoom] = 15;
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_CROWBAR:
if (!mickeyHasItem(IDI_MSA_ITEM_CROWBAR)) {
- game.iRmObj[game.iRoom]--;
+ _game.iRmObj[_game.iRoom]--;
getItem(IDI_MSA_ITEM_CROWBAR);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_WRENCH:
if (!mickeyHasItem(IDI_MSA_ITEM_WRENCH)) {
- game.iRmObj[game.iRoom] -= 2;
+ _game.iRmObj[_game.iRoom] -= 2;
getItem(IDI_MSA_ITEM_WRENCH);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_OPEN_CLOSET:
- if (game.iRmMenu[game.iRoom]) {
+ if (_game.iRmMenu[_game.iRoom]) {
printDatMessage(99);
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_EARTH_BEDROOM_1;
- game.iRmObj[game.iRoom] = 7;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_EARTH_BEDROOM_1;
+ _game.iRmObj[_game.iRoom] = 7;
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_MATTRESS:
if (!mickeyHasItem(IDI_MSA_ITEM_MATTRESS)) {
- game.iRmObj[game.iRoom]--;
+ _game.iRmObj[_game.iRoom]--;
getItem(IDI_MSA_ITEM_MATTRESS);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_SCARF:
if (!mickeyHasItem(IDI_MSA_ITEM_SCARF)) {
- game.iRmObj[game.iRoom] -= 2;
+ _game.iRmObj[_game.iRoom] -= 2;
getItem(IDI_MSA_ITEM_SCARF);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_SUNGLASSES:
if (!mickeyHasItem(IDI_MSA_ITEM_SUNGLASSES)) {
- game.iRmObj[game.iRoom]--;
+ _game.iRmObj[_game.iRoom]--;
getItem(IDI_MSA_ITEM_SUNGLASSES);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_SCALE:
if (!mickeyHasItem(IDI_MSA_ITEM_SCALE)) {
- game.iRmMenu[IDI_MSA_PIC_VENUS_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_NEPTUNE_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_MERCURY_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_SATURN_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_PLUTO_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_JUPITER_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_MARS_WEIGH] = 1;
- game.iRmMenu[IDI_MSA_PIC_URANUS_WEIGH] = 1;
- game.iRmObj[game.iRoom] -= 2;
+ _game.iRmMenu[IDI_MSA_PIC_VENUS_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_NEPTUNE_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_MERCURY_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_SATURN_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_PLUTO_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_JUPITER_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_MARS_WEIGH] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_URANUS_WEIGH] = 1;
+ _game.iRmObj[_game.iRoom] -= 2;
getItem(IDI_MSA_ITEM_SCALE);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GOTO_SPACESHIP:
- game.iRoom = IDI_MSA_PIC_SHIP_AIRLOCK;
- if (game.iPlanet != IDI_MSA_PLANET_EARTH)
+ _game.iRoom = IDI_MSA_PIC_SHIP_AIRLOCK;
+ if (_game.iPlanet != IDI_MSA_PLANET_EARTH)
insertDisk(0);
return true;
// VENUS
case IDI_MSA_ACTION_DOWN_CHASM:
- if (game.fItem[IDI_MSA_ITEM_ROPE]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_ROPE]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
break;
case IDI_MSA_ACTION_DOWN_ROPE:
- if (game.fItemUsed[IDI_MSA_ITEM_ROPE]) {
- game.iRoom = IDI_MSA_PIC_VENUS_PROBE;
+ if (_game.fItemUsed[IDI_MSA_ITEM_ROPE]) {
+ _game.iRoom = IDI_MSA_PIC_VENUS_PROBE;
return true;
} else {
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_USE_ROPE:
- if (game.fItemUsed[IDI_MSA_ITEM_ROPE]) {
+ if (_game.fItemUsed[IDI_MSA_ITEM_ROPE]) {
printDatMessage(22);
} else {
- game.fItemUsed[IDI_MSA_ITEM_ROPE] = true;
- game.fItem[IDI_MSA_ITEM_ROPE] = false;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_VENUS_CHASM_1;
+ _game.fItemUsed[IDI_MSA_ITEM_ROPE] = true;
+ _game.fItem[IDI_MSA_ITEM_ROPE] = false;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_VENUS_CHASM_1;
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_OPEN_HATCH:
- if (game.fItemUsed[IDI_MSA_ITEM_WRENCH]) {
- if ((game.iRmMenu[game.iRoom] == 3) || (game.iRmPic[game.iRoom] == IDI_MSA_PIC_VENUS_PROBE_1))
+ if (_game.fItemUsed[IDI_MSA_ITEM_WRENCH]) {
+ if ((_game.iRmMenu[_game.iRoom] == 3) || (_game.iRmPic[_game.iRoom] == IDI_MSA_PIC_VENUS_PROBE_1))
printDatMessage(39);
else {
- game.iRmMenu[game.iRoom] = 2;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_VENUS_PROBE_1;
+ _game.iRmMenu[_game.iRoom] = 2;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_VENUS_PROBE_1;
drawRoom();
printDatMessage(24);
}
} else {
- if (game.fItem[IDI_MSA_ITEM_WRENCH]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_WRENCH]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_USE_WRENCH:
- game.fItemUsed[IDI_MSA_ITEM_WRENCH] = true;
+ _game.fItemUsed[IDI_MSA_ITEM_WRENCH] = true;
printDatString(arg);
- if (game.iRmPic[game.iRoom] == IDI_MSA_PIC_VENUS_PROBE_1) {
+ if (_game.iRmPic[_game.iRoom] == IDI_MSA_PIC_VENUS_PROBE_1) {
_vm->clearRow(22);
}
//_vm->_gfx->doUpdate();
@@ -1538,160 +1538,160 @@
waitAnyKey();
break;
case IDI_MSA_ACTION_GET_XTAL_VENUS:
- game.iRmMenu[game.iRoom] = 3;
+ _game.iRmMenu[_game.iRoom] = 3;
getXtal(arg);
break;
// TRITON (NEPTUNE)
case IDI_MSA_ACTION_LOOK_CASTLE:
- if (!game.iRmMenu[game.iRoom]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (!_game.iRmMenu[_game.iRoom]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
break;
case IDI_MSA_ACTION_ENTER_OPENING:
- if (game.fItemUsed[IDI_MSA_ITEM_CROWBAR]) {
- game.iRoom = IDI_MSA_PIC_NEPTUNE_CASTLE_4;
+ if (_game.fItemUsed[IDI_MSA_ITEM_CROWBAR]) {
+ _game.iRoom = IDI_MSA_PIC_NEPTUNE_CASTLE_4;
return true;
} else {
- if (game.fItem[IDI_MSA_ITEM_CROWBAR]) {
- game.iRmMenu[game.iRoom] = 2;
+ if (_game.fItem[IDI_MSA_ITEM_CROWBAR]) {
+ _game.iRmMenu[_game.iRoom] = 2;
}
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_USE_CROWBAR:
- game.fItemUsed[IDI_MSA_ITEM_CROWBAR] = true;
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_NEPTUNE_ENTRANCE_1;
+ _game.fItemUsed[IDI_MSA_ITEM_CROWBAR] = true;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_NEPTUNE_ENTRANCE_1;
drawRoom();
printDatMessage(arg);
break;
case IDI_MSA_ACTION_GET_XTAL_NEPTUNE:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(71);
} else {
- if (game.fItem[IDI_MSA_ITEM_SCARF]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_SCARF]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_TALK_LEADER:
- game.iRoom = IDI_MSA_PIC_NEPTUNE_ENTRYWAY;
+ _game.iRoom = IDI_MSA_PIC_NEPTUNE_ENTRYWAY;
printDatMessage(arg);
return true;
case IDI_MSA_ACTION_GIVE_SCARF:
- game.iRmObj[game.iRoom] = 18;
+ _game.iRmObj[_game.iRoom] = 18;
getXtal(arg);
- game.fItem[IDI_MSA_ITEM_SCARF] = false;
- game.iRmMenu[game.iRoom] = 0;
- game.iRmMenu[IDI_MSA_PIC_EARTH_BEDROOM] = 2;
- game.iRoom = IDI_MSA_PIC_NEPTUNE_ENTRYWAY;
+ _game.fItem[IDI_MSA_ITEM_SCARF] = false;
+ _game.iRmMenu[_game.iRoom] = 0;
+ _game.iRmMenu[IDI_MSA_PIC_EARTH_BEDROOM] = 2;
+ _game.iRoom = IDI_MSA_PIC_NEPTUNE_ENTRYWAY;
return true;
// MERCURY
case IDI_MSA_ACTION_GET_XTAL_MERCURY:
- if (game.fHasXtal) {
- game.iRmMenu[game.iRoom] = 2;
+ if (_game.fHasXtal) {
+ _game.iRmMenu[_game.iRoom] = 2;
printDatMessage(32);
} else {
- if (game.fItem[IDI_MSA_ITEM_SUNGLASSES]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_SUNGLASSES]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GIVE_SUNGLASSES:
- game.iRmObj[game.iRoom] = 17;
- game.iRmMenu[game.iRoom] = 2;
- game.fItem[IDI_MSA_ITEM_SUNGLASSES] = false;
+ _game.iRmObj[_game.iRoom] = 17;
+ _game.iRmMenu[_game.iRoom] = 2;
+ _game.fItem[IDI_MSA_ITEM_SUNGLASSES] = false;
getXtal(arg);
break;
// TITAN (SATURN)
case IDI_MSA_ACTION_CROSS_LAKE:
- if (game.fItem[IDI_MSA_ITEM_MATTRESS]) {
- game.iRmMenu[IDI_MSA_PIC_SATURN_LAKE_0] = 1;
- game.iRmMenu[IDI_MSA_PIC_SATURN_LAKE_1] = 1;
- game.iRmMenu[IDI_MSA_PIC_SATURN_LAKE_2] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_MATTRESS]) {
+ _game.iRmMenu[IDI_MSA_PIC_SATURN_LAKE_0] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_SATURN_LAKE_1] = 1;
+ _game.iRmMenu[IDI_MSA_PIC_SATURN_LAKE_2] = 1;
}
printDatMessage(arg);
break;
case IDI_MSA_ACTION_USE_MATTRESS:
- game.iRoom = IDI_MSA_PIC_SATURN_ISLAND;
+ _game.iRoom = IDI_MSA_PIC_SATURN_ISLAND;
printDatMessage(arg);
return true;
case IDI_MSA_ACTION_GET_XTAL_SATURN:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(29);
} else {
getXtal(arg);
}
break;
case IDI_MSA_ACTION_LEAVE_ISLAND:
- game.iRoom = IDI_MSA_PIC_SATURN_LAKE_1;
+ _game.iRoom = IDI_MSA_PIC_SATURN_LAKE_1;
printDatMessage(arg);
return true;
// PLUTO
case IDI_MSA_ACTION_GET_XTAL_PLUTO:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(19);
} else {
- if (game.fItem[IDI_MSA_ITEM_BONE]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_BONE]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GIVE_BONE:
- game.fItem[IDI_MSA_ITEM_BONE] = false;
- game.iRmMenu[game.iRoom] = 0;
- game.iRmObj[game.iRoom] = 16;
+ _game.fItem[IDI_MSA_ITEM_BONE] = false;
+ _game.iRmMenu[_game.iRoom] = 0;
+ _game.iRmObj[_game.iRoom] = 16;
getXtal(arg);
break;
// IO (JUPITER)
case IDI_MSA_ACTION_GET_ROCK_0:
- if (game.fItem[IDI_MSA_ITEM_ROCK]) {
+ if (_game.fItem[IDI_MSA_ITEM_ROCK]) {
printDatMessage(38);
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
getItem(IDI_MSA_ITEM_ROCK);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_ROCK_1:
- if (game.fItem[IDI_MSA_ITEM_ROCK]) {
+ if (_game.fItem[IDI_MSA_ITEM_ROCK]) {
printDatMessage(38);
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmObj[game.iRoom] = IDI_MSA_OBJECT_NONE;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
getItem(IDI_MSA_ITEM_ROCK);
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_XTAL_JUPITER:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(15);
} else {
- switch (game.nRocks) {
+ switch (_game.nRocks) {
case 0:
- if (game.fItem[IDI_MSA_ITEM_ROCK]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_ROCK]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
break;
case 1:
- if (game.fItem[IDI_MSA_ITEM_ROCK]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_ROCK]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(34);
break;
@@ -1702,40 +1702,40 @@
}
break;
case IDI_MSA_ACTION_THROW_ROCK:
- game.fItem[IDI_MSA_ITEM_ROCK] = false;
- game.nItems--;
- game.iRmObj[game.iRoom]++;
- game.iRmMenu[game.iRoom] = 0;
+ _game.fItem[IDI_MSA_ITEM_ROCK] = false;
+ _game.nItems--;
+ _game.iRmObj[_game.iRoom]++;
+ _game.iRmMenu[_game.iRoom] = 0;
drawRoom();
- if (game.nRocks) {
+ if (_game.nRocks) {
printDatMessage(37);
} else {
printDatMessage(arg);
}
- game.nRocks++;
+ _game.nRocks++;
break;
// MARS
case IDI_MSA_ACTION_GO_TUBE:
- if (game.fItem[IDI_MSA_ITEM_FLASHLIGHT]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_FLASHLIGHT]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
break;
case IDI_MSA_ACTION_USE_FLASHLIGHT:
- game.iRoom = IDI_MSA_PIC_MARS_TUBE_1;
+ _game.iRoom = IDI_MSA_PIC_MARS_TUBE_1;
printDatMessage(15);
return true;
case IDI_MSA_ACTION_PLUTO_DIG:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(21);
} else {
getXtal(arg);
}
break;
case IDI_MSA_ACTION_GET_XTAL_MARS:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(23);
} else {
printDatMessage(arg);
@@ -1745,60 +1745,60 @@
// OBERON (URANUS)
case IDI_MSA_ACTION_ENTER_TEMPLE:
- game.iRoom = IDI_MSA_PIC_URANUS_TEMPLE;
+ _game.iRoom = IDI_MSA_PIC_URANUS_TEMPLE;
return true;
case IDI_MSA_ACTION_USE_CRYSTAL:
- if (game.iRmMenu[game.iRoom]) {
+ if (_game.iRmMenu[_game.iRoom]) {
printDatMessage(25);
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_URANUS_TEMPLE_1;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_URANUS_TEMPLE_1;
drawRoom();
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_URANUS_TEMPLE;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_URANUS_TEMPLE;
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_OPEN_DOOR:
- if (game.fTempleDoorOpen) {
+ if (_game.fTempleDoorOpen) {
printDatMessage(36);
} else {
- game.fTempleDoorOpen = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_URANUS_TEMPLE_2;
+ _game.fTempleDoorOpen = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_URANUS_TEMPLE_2;
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_ENTER_DOOR:
- if (game.fTempleDoorOpen) {
- game.iRoom = IDI_MSA_PIC_URANUS_STEPS;
+ if (_game.fTempleDoorOpen) {
+ _game.iRoom = IDI_MSA_PIC_URANUS_STEPS;
return true;
} else {
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_GET_XTAL_URANUS:
- if (game.fHasXtal) {
+ if (_game.fHasXtal) {
printDatMessage(34);
} else {
- if (game.fItem[IDI_MSA_ITEM_CROWBAR]) {
- game.iRmMenu[game.iRoom] = 1;
+ if (_game.fItem[IDI_MSA_ITEM_CROWBAR]) {
+ _game.iRmMenu[_game.iRoom] = 1;
}
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_USE_CROWBAR_1:
- game.iRmMenu[game.iRoom] = 0;
+ _game.iRmMenu[_game.iRoom] = 0;
getXtal(arg);
break;
// SPACESHIP
case IDI_MSA_ACTION_GO_NORTH:
- if (game.fShipDoorOpen) {
- if (game.fSuit) {
+ if (_game.fShipDoorOpen) {
+ if (_game.fSuit) {
printDatMessage(45);
} else {
- game.iRoom = IDI_MSA_PIC_SHIP_CORRIDOR;
+ _game.iRoom = IDI_MSA_PIC_SHIP_CORRIDOR;
return true;
}
} else {
@@ -1806,17 +1806,17 @@
}
break;
case IDI_MSA_ACTION_GO_PLANET:
- if (!game.fShipDoorOpen) {
- if ((game.nXtals == IDI_MSA_MAX_PLANET) && (game.iPlanet == IDI_MSA_PLANET_EARTH))
+ if (!_game.fShipDoorOpen) {
+ if ((_game.nXtals == IDI_MSA_MAX_PLANET) && (_game.iPlanet == IDI_MSA_PLANET_EARTH))
gameOver();
- if ((game.iPlanet == game.iPlanetXtal[game.nXtals]) || (game.iPlanet == IDI_MSA_PLANET_EARTH)) {
- game.fHasXtal = false;
- game.iRoom = IDI_MSA_HOME_PLANET[game.iPlanet];
- if (game.iPlanet != IDI_MSA_PLANET_EARTH)
+ if ((_game.iPlanet == _game.iPlanetXtal[_game.nXtals]) || (_game.iPlanet == IDI_MSA_PLANET_EARTH)) {
+ _game.fHasXtal = false;
+ _game.iRoom = IDI_MSA_HOME_PLANET[_game.iPlanet];
+ if (_game.iPlanet != IDI_MSA_PLANET_EARTH)
insertDisk(1);
return true;
} else {
- game.iRoom = IDI_MSA_SHIP_PLANET[game.iPlanet];
+ _game.iRoom = IDI_MSA_SHIP_PLANET[_game.iPlanet];
return true;
}
} else {
@@ -1824,38 +1824,38 @@
}
break;
case IDI_MSA_ACTION_PRESS_BUTTON:
- if (game.fShipDoorOpen) { // inner door open
- if (game.iPlanet && !game.fSuit) {
+ if (_game.fShipDoorOpen) { // inner door open
+ if (_game.iPlanet && !_game.fSuit) {
printDatMessage(arg);
} else {
- game.fShipDoorOpen = false;
- game.iRmPic[game.iRoom]--;
+ _game.fShipDoorOpen = false;
+ _game.iRmPic[_game.iRoom]--;
drawRoom();
printDatMessage(2);
}
} else {
- game.fShipDoorOpen = true;
- game.iRmPic[game.iRoom]++;
+ _game.fShipDoorOpen = true;
+ _game.iRmPic[_game.iRoom]++;
drawRoom();
printDatMessage(14);
}
break;
case IDI_MSA_ACTION_WEAR_SPACESUIT:
- if (game.fSuit) {
- if (game.fShipDoorOpen) {
- game.fSuit = false;
- game.iRmMenu[game.iRoom] = 0;
- game.iRmPic[game.iRoom] -= 2;
+ if (_game.fSuit) {
+ if (_game.fShipDoorOpen) {
+ _game.fSuit = false;
+ _game.iRmMenu[_game.iRoom] = 0;
+ _game.iRmPic[_game.iRoom] -= 2;
drawRoom();
printDatMessage(13);
} else {
printDatMessage(3);
}
} else {
- if (game.iPlanet) {
- game.fSuit = true;
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] += 2;
+ if (_game.iPlanet) {
+ _game.fSuit = true;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] += 2;
drawRoom();
printDatMessage(arg);
} else {
@@ -1866,15 +1866,15 @@
case IDI_MSA_ACTION_READ_GAUGE:
printDatString(arg);
_vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_C, IDA_DEFAULT,
- (const char *)IDS_MSA_TEMP_C[game.iPlanet]);
+ (const char *)IDS_MSA_TEMP_C[_game.iPlanet]);
_vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_F, IDA_DEFAULT,
- (const char *)IDS_MSA_TEMP_F[game.iPlanet]);
+ (const char *)IDS_MSA_TEMP_F[_game.iPlanet]);
//_vm->_gfx->doUpdate();
//_vm->_system->updateScreen(); // TODO: this should go in the game's main loop
waitAnyKey();
break;
case IDI_MSA_ACTION_PRESS_ORANGE:
- if (game.fFlying) {
+ if (_game.fFlying) {
printDatMessage(4);
} else {
playSound(IDI_MSA_SND_PRESS_ORANGE);
@@ -1883,7 +1883,7 @@
}
break;
case IDI_MSA_ACTION_PRESS_BLUE:
- if (game.fFlying) {
+ if (_game.fFlying) {
printDatMessage(4);
} else {
playSound(IDI_MSA_SND_PRESS_BLUE);
@@ -1895,14 +1895,14 @@
flipSwitch();
break;
case IDI_MSA_ACTION_PUSH_THROTTLE:
- if (game.fFlying) {
- game.fFlying = false;
- game.nButtons = 0;
- memset(game.szAddr, 0, sizeof(game.szAddr));
+ if (_game.fFlying) {
+ _game.fFlying = false;
+ _game.nButtons = 0;
+ memset(_game.szAddr, 0, sizeof(_game.szAddr));
drawRoom();
printDatString(22);
_vm->drawStr(IDI_MSA_ROW_PLANET, IDI_MSA_COL_PLANET, IDA_DEFAULT,
- (const char *)IDS_MSA_PLANETS[game.iPlanet]);
+ (const char *)IDS_MSA_PLANETS[_game.iPlanet]);
//_vm->_gfx->doUpdate();
//_vm->_system->updateScreen(); // TODO: this should go in the game's main loop
waitAnyKeyAnim();
@@ -1912,52 +1912,52 @@
}
break;
case IDI_MSA_ACTION_PULL_THROTTLE:
- if (game.fFlying) {
+ if (_game.fFlying) {
printDatMessage(18);
} else {
if (getPlanet() != -1) {
- game.fFlying = true;
- game.iPlanet = getPlanet();
+ _game.fFlying = true;
+ _game.iPlanet = getPlanet();
drawRoom();
printDatMessage(16);
} else {
- game.nButtons = 0;
- memset(game.szAddr, 0, sizeof(game.szAddr));
+ _game.nButtons = 0;
+ memset(_game.szAddr, 0, sizeof(_game.szAddr));
printDatMessage(17);
}
}
break;
case IDI_MSA_ACTION_LEAVE_ROOM:
- if (game.fFlying) {
+ if (_game.fFlying) {
printDatMessage(24);
} else {
- game.iRoom = arg;
+ _game.iRoom = arg;
return true;
}
break;
case IDI_MSA_ACTION_OPEN_CABINET_1:
- if (game.iRmMenu[game.iRoom]) {
+ if (_game.iRmMenu[_game.iRoom]) {
printExeMsg(IDO_MSA_THE_CABINET_IS_ALREADY_OPEN);
} else {
- game.iRmMenu[game.iRoom] = 1;
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_SHIP_KITCHEN_1;
+ _game.iRmMenu[_game.iRoom] = 1;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_SHIP_KITCHEN_1;
drawRoom();
printDatMessage(arg);
}
break;
case IDI_MSA_ACTION_READ_MAP:
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_STAR_MAP;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_STAR_MAP;
drawRoom();
printDatMessage(46);
printDatMessage(47);
printDatMessage(48);
- game.iRmPic[game.iRoom] = IDI_MSA_PIC_SHIP_BEDROOM;
+ _game.iRmPic[_game.iRoom] = IDI_MSA_PIC_SHIP_BEDROOM;
drawRoom();
break;
case IDI_MSA_ACTION_GO_WEST:
- game.nButtons = 0;
- memset(game.szAddr, 0, sizeof(game.szAddr));
- game.iRoom = arg;
+ _game.nButtons = 0;
+ memset(_game.szAddr, 0, sizeof(_game.szAddr));
+ _game.iRoom = arg;
return true;
}
@@ -2045,49 +2045,49 @@
uint8 buffer[512];
// clear game struct
- memset(&game, 0, sizeof(game));
- memset(&game.iItem, IDI_MSA_OBJECT_NONE, sizeof(game.iItem));
+ memset(&_game, 0, sizeof(_game));
+ memset(&_game.iItem, IDI_MSA_OBJECT_NONE, sizeof(_game.iItem));
// read room extended desc flags
//readExe(IDO_MSA_ROOM_TEXT, buffer, sizeof(buffer));
- //memcpy(game.fRmTxt, buffer, sizeof(game.fRmTxt));
+ //memcpy(_game.fRmTxt, buffer, sizeof(_game.fRmTxt));
// read room extended desc offsets
readExe(IDO_MSA_ROOM_TEXT_OFFSETS, buffer, sizeof(buffer));
- memcpy(game.oRmTxt, buffer, sizeof(game.oRmTxt));
+ memcpy(_game.oRmTxt, buffer, sizeof(_game.oRmTxt));
for (int i = 0; i < IDI_MSA_MAX_ROOM; i++)
- game.oRmTxt[i] = buffer[i*2] + 256 * buffer[i*2+1];
+ _game.oRmTxt[i] = buffer[i*2] + 256 * buffer[i*2+1];
// read room object indices
//readExe(IDO_MSA_ROOM_OBJECT, buffer, sizeof(buffer));
- //memcpy(game.iRmObj, buffer, sizeof(game.iRmObj));
+ //memcpy(_game.iRmObj, buffer, sizeof(_game.iRmObj));
// read room picture indices
//readExe(IDO_MSA_ROOM_PICTURE, buffer, sizeof(buffer));
- //memcpy(game.iRmPic, buffer, sizeof(game.iRmPic));
+ //memcpy(_game.iRmPic, buffer, sizeof(_game.iRmPic));
// read room menu patch indices
readExe(IDO_MSA_ROOM_MENU_FIX, buffer, sizeof(buffer));
- memcpy(game.nRmMenu, buffer, sizeof(game.nRmMenu));
+ memcpy(_game.nRmMenu, buffer, sizeof(_game.nRmMenu));
// set room picture and room object indices
for (int i = 0; i < IDI_MSA_MAX_ROOM; i++) {
- game.iRmPic[i] = i;
- game.iRmObj[i] = -1;
+ _game.iRmPic[i] = i;
+ _game.iRmObj[i] = -1;
}
- game.iRmPic[IDI_MSA_PIC_SHIP_AIRLOCK] = IDI_MSA_PIC_SHIP_AIRLOCK_0;
- game.iRmObj[IDI_MSA_PIC_EARTH_BATHROOM] = 11;
- game.iRmObj[IDI_MSA_PIC_JUPITER_LAVA] = 21;
- game.iRmObj[IDI_MSA_PIC_JUPITER_ROCK_0] = 20;
- game.iRmObj[IDI_MSA_PIC_JUPITER_ROCK_1] = 19;
- game.iRmObj[IDI_MSA_PIC_EARTH_IN_DOGHOUSE] = 1;
+ _game.iRmPic[IDI_MSA_PIC_SHIP_AIRLOCK] = IDI_MSA_PIC_SHIP_AIRLOCK_0;
+ _game.iRmObj[IDI_MSA_PIC_EARTH_BATHROOM] = 11;
+ _game.iRmObj[IDI_MSA_PIC_JUPITER_LAVA] = 21;
+ _game.iRmObj[IDI_MSA_PIC_JUPITER_ROCK_0] = 20;
+ _game.iRmObj[IDI_MSA_PIC_JUPITER_ROCK_1] = 19;
+ _game.iRmObj[IDI_MSA_PIC_EARTH_IN_DOGHOUSE] = 1;
#if 0
// DEBUG
- game.iPlanet = IDI_MSA_PLANET_EARTH;
- game.iRoom = IDI_MSA_PIC_SHIP_CONTROLS;
- game.fHasXtal = true;
- game.nXtals = 9;
- game.fItemUsed[IDI_MSA_ITEM_LETTER] = true;
+ _game.iPlanet = IDI_MSA_PLANET_EARTH;
+ _game.iRoom = IDI_MSA_PIC_SHIP_CONTROLS;
+ _game.fHasXtal = true;
+ _game.nXtals = 9;
+ _game.fItemUsed[IDI_MSA_ITEM_LETTER] = true;
#endif
}
@@ -2108,14 +2108,14 @@
for (;;) {
drawRoom();
- if (game.fIntro) {
- game.fIntro = false;
+ if (_game.fIntro) {
+ _game.fIntro = false;
} else {
printRoomDesc();
}
- if (game.iRoom == IDI_MSA_PIC_NEPTUNE_GUARD) {
- game.iRoom = IDI_MSA_PIC_NEPTUNE_LEADER;
+ if (_game.iRoom == IDI_MSA_PIC_NEPTUNE_GUARD) {
+ _game.iRoom = IDI_MSA_PIC_NEPTUNE_LEADER;
done = true;
} else {
done = false;
@@ -2123,10 +2123,10 @@
while (!done) {
// Check air supply
- if (game.fSuit) {
- game.nAir -= 1;
+ if (_game.fSuit) {
+ _game.nAir -= 1;
for (int i = 0; i < 4; i++) {
- if (game.nAir == IDI_MSA_AIR_SUPPLY[i]) {
+ if (_game.nAir == IDI_MSA_AIR_SUPPLY[i]) {
playSound(IDI_MSA_SND_XL30);
printExeMsg(IDO_MSA_XL30_SPEAKING);
printExeMsg(IDO_MSA_AIR_SUPPLY[i]);
@@ -2136,15 +2136,15 @@
}
}
} else {
- game.nAir = IDI_MSA_MAX_AIR_SUPPLY;
+ _game.nAir = IDI_MSA_MAX_AIR_SUPPLY;
}
// Read menu
- getDatFileName(game.iRoom, szFile);
+ getDatFileName(_game.iRoom, szFile);
readDatHdr(szFile, &hdr);
if (!infile.open(szFile))
return;
- infile.seek(hdr.ofsRoom[game.iRoom - 1] + IDI_MSA_OFS_DAT, SEEK_SET);
+ infile.seek(hdr.ofsRoom[_game.iRoom - 1] + IDI_MSA_OFS_DAT, SEEK_SET);
infile.read((uint8 *)buffer, sizeof(MSA_MENU));
infile.close();
@@ -2156,7 +2156,7 @@
done = parse(menu.cmd[iSel0].data[iSel1], menu.arg[iSel0].data[iSel1]);
}
- game.nFrame = 0;
+ _game.nFrame = 0;
}
delete [] buffer;
Modified: scummvm/trunk/engines/agi/preagi_mickey.h
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.h 2007-09-23 16:48:33 UTC (rev 29057)
+++ scummvm/trunk/engines/agi/preagi_mickey.h 2007-09-23 16:52:53 UTC (rev 29058)
@@ -739,8 +739,8 @@
void run();
protected:
PreAgiEngine *_vm;
- MSA_GAME game;
- bool clickToMove;
+ MSA_GAME _game;
+ bool _clickToMove;
int getDat(int);
void readExe(int, uint8*, long);
@@ -792,14 +792,14 @@
bool planetIsAlreadyAssigned(int planet) {
for (int j = 0; j < IDI_MSA_MAX_PLANET; j++) {
- if (game.iPlanetXtal[j] == planet)
+ if (_game.iPlanetXtal[j] == planet)
return true;
}
return false;
}
bool mickeyHasItem(int item) {
- if (game.fItem[item]) {
+ if (_game.fItem[item]) {
printDatMessage(IDI_MSA_MSG_MICKEY_ALREADY_HAS_ITEM);
return true;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list