aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/agi/preagi_mickey.cpp26
-rw-r--r--engines/agi/preagi_mickey.h40
2 files changed, 15 insertions, 51 deletions
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index 51a9e95163..da56db0493 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -163,6 +163,8 @@ void Mickey::printLine(const char *buffer) {
// Show the string on screen
_vm->_gfx->doUpdate();
_vm->_system->updateScreen();
+
+ waitAnyKey(true);
}
void Mickey::printExeStr(int ofs) {
@@ -944,7 +946,7 @@ bool Mickey::loadGame() {
// load game
sprintf(szFile, "%s.s%02d", _vm->getTargetName().c_str(), sel);
if (!(infile = _vm->getSaveFileMan()->openForLoading(szFile))) {
- printExeStr(IDO_MSA_CHECK_DISK_DRIVE);
+ printLine("PLEASE CHECK THE DISK DRIVE");
if (_vm->getSelection(kSelAnyKey) == 0)
return false;
} else {
@@ -1060,7 +1062,7 @@ void Mickey::saveGame() {
// save game
sprintf(szFile, "%s.s%02d", _vm->getTargetName().c_str(), sel);
if (!(outfile = _vm->getSaveFileMan()->openForSaving(szFile))) {
- printExeStr(IDO_MSA_CHECK_DISK_DRIVE);
+ printLine("PLEASE CHECK THE DISK DRIVE");
if (_vm->getSelection(kSelAnyKey) == 0)
return;
} else {
@@ -1137,7 +1139,7 @@ void Mickey::saveGame() {
}
void Mickey::showPlanetInfo() {
- for (int i = 0; i < IDI_MSA_MAX_PLANET_INFO; i++) {
+ for (int i = 0; i < 4; i++) {
printExeStr(IDO_MSA_PLANET_INFO[_game.iPlanet][i]);
waitAnyKey();
}
@@ -1211,8 +1213,8 @@ void Mickey::pressOB(int iButton) {
}
// print pressed buttons
- printExeStr(IDO_MSA_MICKEY_HAS_PRESSED);
- _vm->drawStr(IDI_MSA_ROW_BUTTONS, IDI_MSA_COL_BUTTONS, IDA_DEFAULT, szButtons);
+ printLine("MICKEY HAS PRESSED: ");
+ _vm->drawStr(20, 22, IDA_DEFAULT, szButtons);
waitAnyKey();
}
@@ -1441,7 +1443,6 @@ bool Mickey::parse(int cmd, int arg) {
return true;
case IDI_MSA_ACTION_SHOW_INT_STR:
printLine(IDS_MSA_ERRORS[arg]);
- waitAnyKey(true);
break;
case IDI_MSA_ACTION_SHOW_DAT_STR:
printDatMessage(arg);
@@ -1456,7 +1457,7 @@ bool Mickey::parse(int cmd, int arg) {
saveGame();
break;
case IDI_MSA_ACTION_LOOK_MICKEY:
- printExeMsg(IDO_MSA_YOU_CAN_SEE_MICKEY_ALREADY);
+ printLine("YOU CAN SEE MICKEY ALREADY");
break;
// EARTH
@@ -1466,8 +1467,7 @@ bool Mickey::parse(int cmd, int arg) {
_game.iRmObj[_game.iRoom] = IDI_MSA_OBJECT_NONE;
_game.iRmMenu[_game.iRoom] = 3;
getItem(IDI_MSA_ITEM_ROPE);
- printLine(IDS_MSA_ERRORS[7]);
- waitAnyKey(true);
+ printLine("MICKEY TAKES THE ROPE");
} else {
_game.iRmMenu[_game.iRoom] = 1;
printDatMessage(11);
@@ -1988,9 +1988,9 @@ bool Mickey::parse(int cmd, int arg) {
break;
case IDI_MSA_ACTION_READ_GAUGE:
printDatString(arg);
- _vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_C, IDA_DEFAULT,
+ _vm->drawStr(21, 15, IDA_DEFAULT,
(const char *)IDS_MSA_TEMP_C[_game.iPlanet]);
- _vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_F, IDA_DEFAULT,
+ _vm->drawStr(21, 23, IDA_DEFAULT,
(const char *)IDS_MSA_TEMP_F[_game.iPlanet]);
waitAnyKey();
break;
@@ -2056,7 +2056,7 @@ bool Mickey::parse(int cmd, int arg) {
break;
case IDI_MSA_ACTION_OPEN_CABINET_1:
if (_game.iRmMenu[_game.iRoom]) {
- printExeMsg(IDO_MSA_THE_CABINET_IS_ALREADY_OPEN);
+ printLine("THE CABINET IS ALREADY OPEN");
} else {
_game.iRmMenu[_game.iRoom] = 1;
_game.iRmPic[_game.iRoom] = IDI_MSA_PIC_SHIP_KITCHEN_1;
@@ -2225,7 +2225,7 @@ void Mickey::run() {
}
}
} else {
- _game.nAir = IDI_MSA_MAX_AIR_SUPPLY;
+ _game.nAir = 50; // max air supply
}
done = checkMenu();
diff --git a/engines/agi/preagi_mickey.h b/engines/agi/preagi_mickey.h
index ec23159fee..fd8f14b2d2 100644
--- a/engines/agi/preagi_mickey.h
+++ b/engines/agi/preagi_mickey.h
@@ -62,8 +62,7 @@ const char IDS_MSA_ERRORS[][40] = {
"MICKEY WOULDN'T WANT TO DO THAT!",
"WHICH DIRECTION?",
"THAT DOESN'T MAKE SENSE!",
- "MICKEY WOULDN'T WANT TO DO THAT!",
- "MICKEY TAKES THE ROPE"
+ "MICKEY WOULDN'T WANT TO DO THAT!"
};
// patch Mickey.exe offset 0x21E to value 0x01 to enable debug mode
@@ -76,17 +75,11 @@ const char IDS_MSA_INSERT_DISK[][40] = {
#define IDI_MSA_MAX_PLANET 9
#define IDI_MSA_MAX_DAT 10
-#define IDI_MSA_MAX_OBJ 32
-#define IDI_MSA_MAX_PIC 240
#define IDI_MSA_MAX_PIC_ROOM 224
-#define IDI_MSA_MAX_SOUND 8
#define IDI_MSA_MAX_ROOM 160
#define IDI_MSA_MAX_BUTTON 6
#define IDI_MSA_MAX_ITEM 11
-#define IDI_MSA_MAX_HINT 20
-#define IDI_MSA_MAX_PLANET_INFO 4
-#define IDI_MSA_MAX_AIR_SUPPLY 50
#define IDI_MSA_ANIM_DELAY 25
@@ -101,30 +94,13 @@ const char IDS_MSA_INSERT_DISK[][40] = {
#define IDI_MSA_ROW_INV_ITEMS 5
#define IDI_MSA_ROW_TEMPERATURE 21
#define IDI_MSA_ROW_PLANET 22
-#define IDI_MSA_ROW_BUTTONS 20
#define IDI_MSA_ROW_INSERT_DISK 23
#define IDI_MSA_COL_INV_TITLE 4
#define IDI_MSA_COL_INV_ITEMS 15
-#define IDI_MSA_COL_TEMPERATURE_C 15
-#define IDI_MSA_COL_TEMPERATURE_F 23
#define IDI_MSA_COL_PLANET 28
-#define IDI_MSA_COL_BUTTONS 22
#define IDI_MSA_COL_INSERT_DISK 1
-// messages
-
-#define IDI_MSA_MSG_STAR_MAP_0 46
-#define IDI_MSA_MSG_STAR_MAP_1 47
-#define IDI_MSA_MSG_STAR_MAP_2 48
-#define IDI_MSA_MSG_SPACESUIT_WEAR 11
-#define IDI_MSA_MSG_SPACESUIT_REMOVE 13
-#define IDI_MSA_MSG_SPACESUIT_0 3
-#define IDI_MSA_MSG_SPACESUIT_CANT_WEAR_ON_EARTH 12
-#define IDI_MSA_MSG_SHIP_LAUNCH 16
-#define IDI_MSA_MSG_SHIP_LAND 22
-#define IDI_MSA_MSG_MICKEY_ALREADY_HAS_ITEM 90
-
// screen
#define IDI_MSA_PIC_WIDTH 140
@@ -606,7 +582,6 @@ const int IDO_MSA_LOAD_GAME[] = {
const int IDO_MSA_AIR_SUPPLY[] = {
0x7D10, 0x7D31, 0x7D51, 0x7D9B
// be aware, low, dangerously low, out of air
- // 30, 20, 10, 0
};
const int IDI_MSA_AIR_SUPPLY[] = { 30, 20, 10, 0 };
@@ -645,26 +620,15 @@ const int IDO_MSA_NEXT_PIECE[IDI_MSA_MAX_PLANET][5] = {
#define IDO_MSA_INTRO 0x4679
#define IDO_MSA_GAME_STORY 0x6E9C
-#define IDO_MSA_CHECK_DISK_DRIVE 0x7885
-#define IDO_MSA_YOU_CAN_SEE_MICKEY_ALREADY 0x46D1
-#define IDO_MSA_THE_CABINET_IS_ALREADY_OPEN 0x46EF
-
#define IDO_MSA_PRESS_1_TO_9 0x7530
#define IDO_MSA_PRESS_YES_OR_NO 0x480D
#define IDO_MSA_TOO_MANY_BUTTONS_PRESSED 0x5DF7
-#define IDO_MSA_MICKEY_HAS_PRESSED 0x5D90
-
#define IDO_MSA_XL30_SPEAKING 0x4725
#define IDO_MSA_CRYSTAL_PIECE_FOUND 0x600C
-#define IDO_MSA_ROOM_TEXT 0x4B80
#define IDO_MSA_ROOM_TEXT_OFFSETS 0x8B01
-#define IDO_MSA_ROOM_OBJECT 0x475C
-#define IDO_MSA_ROOM_PICTURE 0x4AE4
#define IDO_MSA_ROOM_OBJECT_XY_OFFSETS 0x8EA8
-#define IDO_MSA_PIC_SHIP_LIGHT 0x8F38
-#define IDO_MSA_XTAL_ROOM_XY 0x97F8
#define IDO_MSA_ROOM_MENU_FIX 0x4a27
// offsets to offset arrays
@@ -790,7 +754,7 @@ protected:
bool mickeyHasItem(int item) {
if (_game.fItem[item]) {
- printDatMessage(IDI_MSA_MSG_MICKEY_ALREADY_HAS_ITEM);
+ printDatMessage(90); // Mickey already has item
return true;
} else {
return false;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 03:47:35 +0000