[Scummvm-git-logs] scummvm master -> a0e9dedfa1123676450999d3728afc06446dbc63
Strangerke
Strangerke at scummvm.org
Tue Sep 13 23:10:23 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a0e9dedfa1 DM: Rename enum values in EventMan
Commit: a0e9dedfa1123676450999d3728afc06446dbc63
https://github.com/scummvm/scummvm/commit/a0e9dedfa1123676450999d3728afc06446dbc63
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-09-13T23:00:03+02:00
Commit Message:
DM: Rename enum values in EventMan
Changed paths:
engines/dm/dm.cpp
engines/dm/eventman.cpp
engines/dm/eventman.h
engines/dm/inventory.cpp
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index d45673e..65ddaac 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -540,7 +540,7 @@ void DMEngine::processEntrance() {
_eventMan->processCommandQueue();
_displayMan->updateScreen();
} while (_newGameFl == k99_modeWaitingOnEntrance);
- } while (_newGameFl == k202_CommandEntranceDrawCredits);
+ } while (_newGameFl == kDMCommandEntranceDrawCredits);
//Strangerke: CHECKME: Earlier versions were using G0566_puc_Graphic534_Sound01Switch
_sound->play(k01_soundSWITCH, 112, 0x40, 0x40);
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index b821acf..c5569f6 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -48,255 +48,255 @@ namespace DM {
void EventManager::initArrays() {
KeyboardInput primaryKeyboardInputInterface[7] = { // @ G0458_as_Graphic561_PrimaryKeyboardInput_Interface
/* { Command, Code } */
- KeyboardInput(k7_CommandToggleInventoryChampion_0, Common::KEYCODE_F1, 0), /* F1 (<CSI>1~) Atari ST: Code = 0x3B00 */
- KeyboardInput(k8_CommandToggleInventoryChampion_1, Common::KEYCODE_F2, 0), /* F2 (<CSI>2~) Atari ST: Code = 0x3C00 */
- KeyboardInput(k9_CommandToggleInventoryChampion_2, Common::KEYCODE_F3, 0), /* F3 (<CSI>3~) Atari ST: Code = 0x3D00 */
- KeyboardInput(k10_CommandToggleInventoryChampion_3, Common::KEYCODE_F4, 0), /* F4 (<CSI>4~) Atari ST: Code = 0x3E00 */
- KeyboardInput(k140_CommandSaveGame, Common::KEYCODE_s, Common::KBD_CTRL), /* CTRL-S Atari ST: Code = 0x0013 */
- KeyboardInput(k147_CommandFreezeGame, Common::KEYCODE_ESCAPE, 0), /* Esc (0x1B) Atari ST: Code = 0x001B */
- KeyboardInput(k0_CommandNone, Common::KEYCODE_INVALID, 0)
+ KeyboardInput(kDMCommandToggleInventoryChampion0, Common::KEYCODE_F1, 0), /* F1 (<CSI>1~) Atari ST: Code = 0x3B00 */
+ KeyboardInput(kDMCommandToggleInventoryChampion1, Common::KEYCODE_F2, 0), /* F2 (<CSI>2~) Atari ST: Code = 0x3C00 */
+ KeyboardInput(kDMCommandToggleInventoryChampion2, Common::KEYCODE_F3, 0), /* F3 (<CSI>3~) Atari ST: Code = 0x3D00 */
+ KeyboardInput(kDMCommandToggleInventoryChampion3, Common::KEYCODE_F4, 0), /* F4 (<CSI>4~) Atari ST: Code = 0x3E00 */
+ KeyboardInput(kDMCommandSaveGame, Common::KEYCODE_s, Common::KBD_CTRL), /* CTRL-S Atari ST: Code = 0x0013 */
+ KeyboardInput(kDMCommandFreezeGame, Common::KEYCODE_ESCAPE, 0), /* Esc (0x1B) Atari ST: Code = 0x001B */
+ KeyboardInput(kDMCommandNone, Common::KEYCODE_INVALID, 0)
};
KeyboardInput secondaryKeyboardInputMovement[19] = { // @ G0459_as_Graphic561_SecondaryKeyboardInput_Movement
/* { Command, Code } */
- KeyboardInput(k1_CommandTurnLeft, Common::KEYCODE_KP4, 0), /* Numeric pad 4 Atari ST: Code = 0x5200 */
- KeyboardInput(k3_CommandMoveForward, Common::KEYCODE_KP5, 0), /* Numeric pad 5 Atari ST: Code = 0x4800 */
- KeyboardInput(k2_CommandTurnRight, Common::KEYCODE_KP6, 0), /* Numeric pad 6 Atari ST: Code = 0x4700 */
- KeyboardInput(k6_CommandMoveLeft, Common::KEYCODE_KP1, 0), /* Numeric pad 1 Atari ST: Code = 0x4B00 */
- KeyboardInput(k5_CommandMoveBackward, Common::KEYCODE_KP2, 0), /* Numeric pad 2 Atari ST: Code = 0x5000 */
- KeyboardInput(k4_CommandMoveRight, Common::KEYCODE_KP3, 0), /* Numeric pad 3 Atari ST: Code = 0x4D00. Remaining entries below not present */
- KeyboardInput(k3_CommandMoveForward, Common::KEYCODE_w, 0), /* Up Arrow (<CSI>A) */ /*Differs for testing convenience*/
- KeyboardInput(k3_CommandMoveForward, Common::KEYCODE_w, Common::KBD_SHIFT), /* Shift Up Arrow (<CSI>T) */ /*Differs for testing convenience*/
- KeyboardInput(k6_CommandMoveLeft, Common::KEYCODE_a, 0), /* Backward Arrow (<CSI>D) */ /*Differs for testing convenience*/
- KeyboardInput(k6_CommandMoveLeft, Common::KEYCODE_a, Common::KBD_SHIFT), /* Shift Forward Arrow (<CSI> A) */ /*Differs for testing convenience*/
- KeyboardInput(k4_CommandMoveRight, Common::KEYCODE_d, 0), /* Forward Arrow (<CSI>C) */ /*Differs for testing convenience*/
- KeyboardInput(k4_CommandMoveRight, Common::KEYCODE_d, Common::KBD_SHIFT), /* Shift Backward Arrow (<CSI> @) */ /*Differs for testing convenience*/
- KeyboardInput(k5_CommandMoveBackward, Common::KEYCODE_s, 0), /* Down arrow (<CSI>B) */ /*Differs for testing convenience*/
- KeyboardInput(k5_CommandMoveBackward, Common::KEYCODE_s, Common::KBD_SHIFT), /* Shift Down arrow (<CSI>S) */ /*Differs for testing convenience*/
- KeyboardInput(k1_CommandTurnLeft, Common::KEYCODE_q, 0), /* Del (0x7F) */ /*Differs for testing convenience*/
- KeyboardInput(k1_CommandTurnLeft, Common::KEYCODE_q, Common::KBD_SHIFT), /* Shift Del (0x7F) */ /*Differs for testing convenience*/
- KeyboardInput(k2_CommandTurnRight, Common::KEYCODE_e, 0), /* Help (<CSI>?~) */ /*Differs for testing convenience*/
- KeyboardInput(k2_CommandTurnRight, Common::KEYCODE_e, Common::KBD_SHIFT), /* Shift Help (<CSI>?~) */ /*Differs for testing convenience*/
- KeyboardInput(k0_CommandNone, Common::KEYCODE_INVALID, 0)
+ KeyboardInput(kDMCommandTurnLeft, Common::KEYCODE_KP4, 0), /* Numeric pad 4 Atari ST: Code = 0x5200 */
+ KeyboardInput(kDMCommandMoveForward, Common::KEYCODE_KP5, 0), /* Numeric pad 5 Atari ST: Code = 0x4800 */
+ KeyboardInput(kDMCommandTurnRight, Common::KEYCODE_KP6, 0), /* Numeric pad 6 Atari ST: Code = 0x4700 */
+ KeyboardInput(kDMCommandMoveLeft, Common::KEYCODE_KP1, 0), /* Numeric pad 1 Atari ST: Code = 0x4B00 */
+ KeyboardInput(kDMCommandMoveBackward, Common::KEYCODE_KP2, 0), /* Numeric pad 2 Atari ST: Code = 0x5000 */
+ KeyboardInput(kDMCommandMoveRight, Common::KEYCODE_KP3, 0), /* Numeric pad 3 Atari ST: Code = 0x4D00. Remaining entries below not present */
+ KeyboardInput(kDMCommandMoveForward, Common::KEYCODE_w, 0), /* Up Arrow (<CSI>A) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveForward, Common::KEYCODE_w, Common::KBD_SHIFT), /* Shift Up Arrow (<CSI>T) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveLeft, Common::KEYCODE_a, 0), /* Backward Arrow (<CSI>D) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveLeft, Common::KEYCODE_a, Common::KBD_SHIFT), /* Shift Forward Arrow (<CSI> A) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveRight, Common::KEYCODE_d, 0), /* Forward Arrow (<CSI>C) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveRight, Common::KEYCODE_d, Common::KBD_SHIFT), /* Shift Backward Arrow (<CSI> @) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveBackward, Common::KEYCODE_s, 0), /* Down arrow (<CSI>B) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandMoveBackward, Common::KEYCODE_s, Common::KBD_SHIFT), /* Shift Down arrow (<CSI>S) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandTurnLeft, Common::KEYCODE_q, 0), /* Del (0x7F) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandTurnLeft, Common::KEYCODE_q, Common::KBD_SHIFT), /* Shift Del (0x7F) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandTurnRight, Common::KEYCODE_e, 0), /* Help (<CSI>?~) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandTurnRight, Common::KEYCODE_e, Common::KBD_SHIFT), /* Shift Help (<CSI>?~) */ /*Differs for testing convenience*/
+ KeyboardInput(kDMCommandNone, Common::KEYCODE_INVALID, 0)
};
KeyboardInput primaryKeyboardInputPartySleeping[3] = { // @ G0460_as_Graphic561_PrimaryKeyboardInput_PartySleeping
/* { Command, Code } */
- KeyboardInput(k146_CommandWakeUp, Common::KEYCODE_RETURN, 0), /* Return */
- KeyboardInput(k147_CommandFreezeGame, Common::KEYCODE_ESCAPE, 0), /* Esc */
- KeyboardInput(k0_CommandNone, Common::KEYCODE_INVALID, 0)
+ KeyboardInput(kDMCommandWakeUp, Common::KEYCODE_RETURN, 0), /* Return */
+ KeyboardInput(kDMCommandFreezeGame, Common::KEYCODE_ESCAPE, 0), /* Esc */
+ KeyboardInput(kDMCommandNone, Common::KEYCODE_INVALID, 0)
};
KeyboardInput primaryKeyboardInputFrozenGame[2] = { // @ G0461_as_Graphic561_PrimaryKeyboardInput_FrozenGame
/* { Command, Code } */
- KeyboardInput(k148_CommandUnfreezeGame, Common::KEYCODE_ESCAPE, 0), /* Esc */
- KeyboardInput(k0_CommandNone, Common::KEYCODE_INVALID, 0)
+ KeyboardInput(kDMCommandUnfreezeGame, Common::KEYCODE_ESCAPE, 0), /* Esc */
+ KeyboardInput(kDMCommandNone, Common::KEYCODE_INVALID, 0)
};
MouseInput primaryMouseInputEntrance[4] = { // @ G0445_as_Graphic561_PrimaryMouseInput_Entrance[4]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k200_CommandEntranceEnterDungeon, 244, 298, 45, 58, k1_LeftMouseButton),
+ MouseInput(kDMCommandEntranceEnterDungeon, 244, 298, 45, 58, kDMMouseButtonLeft),
// Strangerke - C201_COMMAND_ENTRANCE_RESUME isn't present in the demo
- MouseInput(k201_CommandEntranceResume, 244, 298, 76, 93, k1_LeftMouseButton),
- MouseInput(k202_CommandEntranceDrawCredits, 248, 293, 187, 199, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandEntranceResume, 244, 298, 76, 93, kDMMouseButtonLeft),
+ MouseInput(kDMCommandEntranceDrawCredits, 248, 293, 187, 199, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputRestartGame[2] = { // @ G0446_as_Graphic561_PrimaryMouseInput_RestartGame[2]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k215_CommandRestartGame, 103, 217, 145, 159, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandRestartGame, 103, 217, 145, 159, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputInterface[20] = { // @ G0447_as_Graphic561_PrimaryMouseInput_Interface[20]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k12_CommandClickInChampion_0_StatusBox, 0, 42, 0, 28, k1_LeftMouseButton),
- MouseInput(k13_CommandClickInChampion_1_StatusBox, 69, 111, 0, 28, k1_LeftMouseButton),
- MouseInput(k14_CommandClickInChampion_2_StatusBox, 138, 180, 0, 28, k1_LeftMouseButton),
- MouseInput(k15_CommandClickInChampion_3_StatusBox, 207, 249, 0, 28, k1_LeftMouseButton),
- MouseInput(k125_CommandClickOnChamptionIcon_Top_Left, 274, 299, 0, 13, k1_LeftMouseButton),
- MouseInput(k126_CommandClickOnChamptionIcon_Top_Right, 301, 319, 0, 13, k1_LeftMouseButton),
- MouseInput(k127_CommandClickOnChamptionIcon_Lower_Right, 301, 319, 15, 28, k1_LeftMouseButton),
- MouseInput(k128_CommandClickOnChamptionIcon_Lower_Left, 274, 299, 15, 28, k1_LeftMouseButton),
- MouseInput(k7_CommandToggleInventoryChampion_0, 43, 66, 0, 28, k1_LeftMouseButton), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 44. swapped with 4 next entries */
- MouseInput(k8_CommandToggleInventoryChampion_1, 112, 135, 0, 28, k1_LeftMouseButton), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 113. swapped with 4 next entries */
- MouseInput(k9_CommandToggleInventoryChampion_2, 181, 204, 0, 28, k1_LeftMouseButton), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 182. swapped with 4 next entries */
- MouseInput(k10_CommandToggleInventoryChampion_3, 250, 273, 0, 28, k1_LeftMouseButton), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 251. swapped with 4 next entries */
- MouseInput(k7_CommandToggleInventoryChampion_0, 0, 66, 0, 28, k2_RightMouseButton), /* Atari ST: swapped with 4 previous entries */
- MouseInput(k8_CommandToggleInventoryChampion_1, 69, 135, 0, 28, k2_RightMouseButton), /* Atari ST: swapped with 4 previous entries */
- MouseInput(k9_CommandToggleInventoryChampion_2, 138, 204, 0, 28, k2_RightMouseButton), /* Atari ST: swapped with 4 previous entries */
- MouseInput(k10_CommandToggleInventoryChampion_3, 207, 273, 0, 28, k2_RightMouseButton), /* Atari ST: swapped with 4 previous entries */
- MouseInput(k100_CommandClickInSpellArea, 233, 319, 42, 73, k1_LeftMouseButton),
- MouseInput(k111_CommandClickInActionArea, 233, 319, 77, 121, k1_LeftMouseButton),
- MouseInput(k147_CommandFreezeGame, 0, 1, 198, 199, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickInChampion0StatusBox, 0, 42, 0, 28, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInChampion1StatusBox, 69, 111, 0, 28, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInChampion2StatusBox, 138, 180, 0, 28, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInChampion3StatusBox, 207, 249, 0, 28, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnChamptionIconTopLeft, 274, 299, 0, 13, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnChamptionIconTopRight, 301, 319, 0, 13, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnChamptionIconLowerRight, 301, 319, 15, 28, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnChamptionIconLowerLeft, 274, 299, 15, 28, kDMMouseButtonLeft),
+ MouseInput(kDMCommandToggleInventoryChampion0, 43, 66, 0, 28, kDMMouseButtonLeft), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 44. swapped with 4 next entries */
+ MouseInput(kDMCommandToggleInventoryChampion1, 112, 135, 0, 28, kDMMouseButtonLeft), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 113. swapped with 4 next entries */
+ MouseInput(kDMCommandToggleInventoryChampion2, 181, 204, 0, 28, kDMMouseButtonLeft), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 182. swapped with 4 next entries */
+ MouseInput(kDMCommandToggleInventoryChampion3, 250, 273, 0, 28, kDMMouseButtonLeft), /* Atari ST: Only present in CSB 2.x and with Box.X1 = 251. swapped with 4 next entries */
+ MouseInput(kDMCommandToggleInventoryChampion0, 0, 66, 0, 28, kDMMouseButtonRight), /* Atari ST: swapped with 4 previous entries */
+ MouseInput(kDMCommandToggleInventoryChampion1, 69, 135, 0, 28, kDMMouseButtonRight), /* Atari ST: swapped with 4 previous entries */
+ MouseInput(kDMCommandToggleInventoryChampion2, 138, 204, 0, 28, kDMMouseButtonRight), /* Atari ST: swapped with 4 previous entries */
+ MouseInput(kDMCommandToggleInventoryChampion3, 207, 273, 0, 28, kDMMouseButtonRight), /* Atari ST: swapped with 4 previous entries */
+ MouseInput(kDMCommandClickInSpellArea, 233, 319, 42, 73, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionArea, 233, 319, 77, 121, kDMMouseButtonLeft),
+ MouseInput(kDMCommandFreezeGame, 0, 1, 198, 199, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput secondaryMouseInputMovement[9] = { // @ G0448_as_Graphic561_SecondaryMouseInput_Movement[9]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k1_CommandTurnLeft, 234, 261, 125, 145, k1_LeftMouseButton),
- MouseInput(k3_CommandMoveForward, 263, 289, 125, 145, k1_LeftMouseButton),
- MouseInput(k2_CommandTurnRight, 291, 318, 125, 145, k1_LeftMouseButton),
- MouseInput(k6_CommandMoveLeft, 234, 261, 147, 167, k1_LeftMouseButton),
- MouseInput(k5_CommandMoveBackward, 263, 289, 147, 167, k1_LeftMouseButton),
- MouseInput(k4_CommandMoveRight, 291, 318, 147, 167, k1_LeftMouseButton),
- MouseInput(k80_CommandClickInDungeonView, 0, 223, 33, 168, k1_LeftMouseButton),
- MouseInput(k83_CommandToggleInventoryLeader, 0, 319, 33, 199, k2_RightMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandTurnLeft, 234, 261, 125, 145, kDMMouseButtonLeft),
+ MouseInput(kDMCommandMoveForward, 263, 289, 125, 145, kDMMouseButtonLeft),
+ MouseInput(kDMCommandTurnRight, 291, 318, 125, 145, kDMMouseButtonLeft),
+ MouseInput(kDMCommandMoveLeft, 234, 261, 147, 167, kDMMouseButtonLeft),
+ MouseInput(kDMCommandMoveBackward, 263, 289, 147, 167, kDMMouseButtonLeft),
+ MouseInput(kDMCommandMoveRight, 291, 318, 147, 167, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInDungeonView, 0, 223, 33, 168, kDMMouseButtonLeft),
+ MouseInput(kDMCommandToggleInventoryLeader, 0, 319, 33, 199, kDMMouseButtonRight),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput secondaryMouseInputChampionInventory[38] = { // @ G0449_as_Graphic561_SecondaryMouseInput_ChampionInventory[38]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k11_CommandCloseInventory, 0, 319, 0, 199, k2_RightMouseButton),
- MouseInput(k140_CommandSaveGame, 174, 182, 36, 44, k1_LeftMouseButton),
- MouseInput(k145_CommandSleep, 188, 204, 36, 44, k1_LeftMouseButton),
- MouseInput(k11_CommandCloseInventory, 210, 218, 36, 44, k1_LeftMouseButton),
- MouseInput(k28_CommandClickOnSlotBoxInventoryReadyHand , 6, 21, 86, 101, k1_LeftMouseButton),
- MouseInput(k29_CommandClickOnSlotBoxInventoryActionHand, 62, 77, 86, 101, k1_LeftMouseButton),
- MouseInput(k30_CommandClickOnSlotBoxInventoryHead, 34, 49, 59, 74, k1_LeftMouseButton),
- MouseInput(k31_CommandClickOnSlotBoxInventoryTorso, 34, 49, 79, 94, k1_LeftMouseButton),
- MouseInput(k32_CommandClickOnSlotBoxInventoryLegs, 34, 49, 99, 114, k1_LeftMouseButton),
- MouseInput(k33_CommandClickOnSlotBoxInventoryFeet, 34, 49, 119, 134, k1_LeftMouseButton),
- MouseInput(k34_CommandClickOnSlotBoxInventoryPouch_2, 6, 21, 123, 138, k1_LeftMouseButton),
- MouseInput(k70_CommandClickOnMouth, 56, 71, 46, 61, k1_LeftMouseButton),
- MouseInput(k71_CommandClickOnEye, 12, 27, 46, 61, k1_LeftMouseButton),
- MouseInput(k35_CommandClickOnSlotBoxInventoryQuiverLine_2_1, 79, 94, 106, 121, k1_LeftMouseButton),
- MouseInput(k36_CommandClickOnSlotBoxInventoryQuiverLine_1_2, 62, 77, 123, 138, k1_LeftMouseButton),
- MouseInput(k37_CommandClickOnSlotBoxInventoryQuiverLine_2_2, 79, 94, 123, 138, k1_LeftMouseButton),
- MouseInput(k38_CommandClickOnSlotBoxInventoryNeck, 6, 21, 66, 81, k1_LeftMouseButton),
- MouseInput(k39_CommandClickOnSlotBoxInventoryPouch_1, 6, 21, 106, 121, k1_LeftMouseButton),
- MouseInput(k40_CommandClickOnSlotBoxInventoryQuiverLine_1_1, 62, 77, 106, 121, k1_LeftMouseButton),
- MouseInput(k41_CommandClickOnSlotBoxInventoryBackpackLine_1_1, 66, 81, 66, 81, k1_LeftMouseButton),
- MouseInput(k42_CommandClickOnSlotBoxInventoryBackpackLine_2_2, 83, 98, 49, 64, k1_LeftMouseButton),
- MouseInput(k43_CommandClickOnSlotBoxInventoryBackpackLine_2_3, 100, 115, 49, 64, k1_LeftMouseButton),
- MouseInput(k44_CommandClickOnSlotBoxInventoryBackpackLine_2_4, 117, 132, 49, 64, k1_LeftMouseButton),
- MouseInput(k45_CommandClickOnSlotBoxInventoryBackpackLine_2_5, 134, 149, 49, 64, k1_LeftMouseButton),
- MouseInput(k46_CommandClickOnSlotBoxInventoryBackpackLine_2_6, 151, 166, 49, 64, k1_LeftMouseButton),
- MouseInput(k47_CommandClickOnSlotBoxInventoryBackpackLine_2_7, 168, 183, 49, 64, k1_LeftMouseButton),
- MouseInput(k48_CommandClickOnSlotBoxInventoryBackpackLine_2_8, 185, 200, 49, 64, k1_LeftMouseButton),
- MouseInput(k49_CommandClickOnSlotBoxInventoryBackpackLine_2_9, 202, 217, 49, 64, k1_LeftMouseButton),
- MouseInput(k50_CommandClickOnSlotBoxInventoryBackpackLine_1_2, 83, 98, 66, 81, k1_LeftMouseButton),
- MouseInput(k51_CommandClickOnSlotBoxInventoryBackpackLine_1_3, 100, 115, 66, 81, k1_LeftMouseButton),
- MouseInput(k52_CommandClickOnSlotBoxInventoryBackpackLine_1_4, 117, 132, 66, 81, k1_LeftMouseButton),
- MouseInput(k53_CommandClickOnSlotBoxInventoryBackpackLine_1_5, 134, 149, 66, 81, k1_LeftMouseButton),
- MouseInput(k54_CommandClickOnSlotBoxInventoryBackpackLine_1_6, 151, 166, 66, 81, k1_LeftMouseButton),
- MouseInput(k55_CommandClickOnSlotBoxInventoryBackpackLine_1_7, 168, 183, 66, 81, k1_LeftMouseButton),
- MouseInput(k56_CommandClickOnSlotBoxInventoryBackpackLine_1_8, 185, 200, 66, 81, k1_LeftMouseButton),
- MouseInput(k57_CommandClickOnSlotBoxInventoryBackpackLine_1_9, 202, 217, 66, 81, k1_LeftMouseButton),
- MouseInput(k81_CommandClickInPanel, 96, 223, 83, 167, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandCloseInventory, 0, 319, 0, 199, kDMMouseButtonRight),
+ MouseInput(kDMCommandSaveGame, 174, 182, 36, 44, kDMMouseButtonLeft),
+ MouseInput(kDMCommandSleep, 188, 204, 36, 44, kDMMouseButtonLeft),
+ MouseInput(kDMCommandCloseInventory, 210, 218, 36, 44, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryReadyHand , 6, 21, 86, 101, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryActionHand, 62, 77, 86, 101, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryHead, 34, 49, 59, 74, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryTorso, 34, 49, 79, 94, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryLegs, 34, 49, 99, 114, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryFeet, 34, 49, 119, 134, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryPouch2, 6, 21, 123, 138, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnMouth, 56, 71, 46, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnEye, 12, 27, 46, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryQuiverLine2_1, 79, 94, 106, 121, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryQuiverLine1_2, 62, 77, 123, 138, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryQuiverLine2_2, 79, 94, 123, 138, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryNeck, 6, 21, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryPouch1, 6, 21, 106, 121, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryQuiverLine1_1, 62, 77, 106, 121, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_1, 66, 81, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_2, 83, 98, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_3, 100, 115, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_4, 117, 132, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_5, 134, 149, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_6, 151, 166, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_7, 168, 183, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_8, 185, 200, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine2_9, 202, 217, 49, 64, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_2, 83, 98, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_3, 100, 115, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_4, 117, 132, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_5, 134, 149, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_6, 151, 166, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_7, 168, 183, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_8, 185, 200, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxInventoryBackpackLine1_9, 202, 217, 66, 81, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInPanel, 96, 223, 83, 167, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputPartySleeping[3] = { // @ G0450_as_Graphic561_PrimaryMouseInput_PartySleeping[3]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k146_CommandWakeUp, 0, 223, 33, 168, k1_LeftMouseButton),
- MouseInput(k146_CommandWakeUp, 0, 223, 33, 168, k2_RightMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandWakeUp, 0, 223, 33, 168, kDMMouseButtonLeft),
+ MouseInput(kDMCommandWakeUp, 0, 223, 33, 168, kDMMouseButtonRight),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputFrozenGame[3] = { // @ G0451_as_Graphic561_PrimaryMouseInput_FrozenGame[3]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k148_CommandUnfreezeGame, 0, 319, 0, 199, k1_LeftMouseButton),
- MouseInput(k148_CommandUnfreezeGame, 0, 319, 0, 199, k2_RightMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandUnfreezeGame, 0, 319, 0, 199, kDMMouseButtonLeft),
+ MouseInput(kDMCommandUnfreezeGame, 0, 319, 0, 199, kDMMouseButtonRight),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput mouseInputActionAreaNames[5] = { // @ G0452_as_Graphic561_MouseInput_ActionAreaNames[5]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k112_CommandClickInActionAreaPass, 285, 318, 77, 83, k1_LeftMouseButton),
- MouseInput(k113_CommandClickInActionAreaAction_0, 234, 318, 86, 96, k1_LeftMouseButton),
- MouseInput(k114_CommandClickInActionAreaAction_1, 234, 318, 98, 108, k1_LeftMouseButton),
- MouseInput(k115_CommandClickInActionAreaAction_2, 234, 318, 110, 120, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickInActionAreaPass, 285, 318, 77, 83, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionAreaAction0, 234, 318, 86, 96, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionAreaAction1, 234, 318, 98, 108, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionAreaAction2, 234, 318, 110, 120, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput mouseInputActionAreaIcons[5] = { // @ G0453_as_Graphic561_MouseInput_ActionAreaIcons[5]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k116_CommandClickInActionAreaChampion_0_Action, 233, 252, 86, 120, k1_LeftMouseButton),
- MouseInput(k117_CommandClickInActionAreaChampion_1_Action, 255, 274, 86, 120, k1_LeftMouseButton),
- MouseInput(k118_CommandClickInActionAreaChampion_2_Action, 277, 296, 86, 120, k1_LeftMouseButton),
- MouseInput(k119_CommandClickInActionAreaChampion_3_Action, 299, 318, 86, 120, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickInActionAreaChampion0Action, 233, 252, 86, 120, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionAreaChampion1Action, 255, 274, 86, 120, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionAreaChampion2Action, 277, 296, 86, 120, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInActionAreaChampion3Action, 299, 318, 86, 120, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput mouseInputSpellArea[9] = { // @ G0454_as_Graphic561_MouseInput_SpellArea[9]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k101_CommandClickInSpellAreaSymbol_1, 235, 247, 51, 61, k1_LeftMouseButton),
- MouseInput(k102_CommandClickInSpellAreaSymbol_2, 249, 261, 51, 61, k1_LeftMouseButton),
- MouseInput(k103_CommandClickInSpellAreaSymbol_3, 263, 275, 51, 61, k1_LeftMouseButton),
- MouseInput(k104_CommandClickInSpellAreaSymbol_4, 277, 289, 51, 61, k1_LeftMouseButton),
- MouseInput(k105_CommandClickInSpellAreaSymbol_5, 291, 303, 51, 61, k1_LeftMouseButton),
- MouseInput(k106_CommandClickInSpellAreaSymbol_6, 305, 317, 51, 61, k1_LeftMouseButton),
- MouseInput(k108_CommandClickInSpeallAreaCastSpell, 234, 303, 63, 73, k1_LeftMouseButton),
- MouseInput(k107_CommandClickInSpellAreaRecantSymbol, 305, 318, 63, 73, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickInSpellAreaSymbol1, 235, 247, 51, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpellAreaSymbol2, 249, 261, 51, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpellAreaSymbol3, 263, 275, 51, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpellAreaSymbol4, 277, 289, 51, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpellAreaSymbol5, 291, 303, 51, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpellAreaSymbol6, 305, 317, 51, 61, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpeallAreaCastSpell, 234, 303, 63, 73, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickInSpellAreaRecantSymbol, 305, 318, 63, 73, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput mouseInputChampionNamesHands[13] = { // @ G0455_as_Graphic561_MouseInput_ChampionNamesHands[13]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k16_CommandSetLeaderChampion_0, 0, 42, 0, 6, k1_LeftMouseButton),
- MouseInput(k17_CommandSetLeaderChampion_1, 69, 111, 0, 6, k1_LeftMouseButton),
- MouseInput(k18_CommandSetLeaderChampion_2, 138, 180, 0, 6, k1_LeftMouseButton),
- MouseInput(k19_CommandSetLeaderChampion_3, 207, 249, 0, 6, k1_LeftMouseButton),
- MouseInput(k20_CommandClickOnSlotBoxChampion_0_StatusBoxReadyHand, 4, 19, 10, 25, k1_LeftMouseButton),
- MouseInput(k21_CommandClickOnSlotBoxChampion_0_StatusBoxActionHand, 24, 39, 10, 25, k1_LeftMouseButton),
- MouseInput(k22_CommandClickOnSlotBoxChampion_1_StatusBoxReadyHand, 73, 88, 10, 25, k1_LeftMouseButton),
- MouseInput(k23_CommandClickOnSlotBoxChampion_1_StatusBoxActionHand, 93, 108, 10, 25, k1_LeftMouseButton),
- MouseInput(k24_CommandClickOnSlotBoxChampion_2_StatusBoxReadyHand, 142, 157, 10, 25, k1_LeftMouseButton),
- MouseInput(k25_CommandClickOnSlotBoxChampion_2_StatusBoxActionHand, 162, 177, 10, 25, k1_LeftMouseButton),
- MouseInput(k26_CommandClickOnSlotBoxChampion_3_StatusBoxReadyHand, 211, 226, 10, 25, k1_LeftMouseButton),
- MouseInput(k27_CommandClickOnSlotBoxChampion_3_StatusBoxActionHand, 231, 246, 10, 25, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandSetLeaderChampion0, 0, 42, 0, 6, kDMMouseButtonLeft),
+ MouseInput(kDMCommandSetLeaderChampion1, 69, 111, 0, 6, kDMMouseButtonLeft),
+ MouseInput(kDMCommandSetLeaderChampion2, 138, 180, 0, 6, kDMMouseButtonLeft),
+ MouseInput(kDMCommandSetLeaderChampion3, 207, 249, 0, 6, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion0StatusBoxReadyHand, 4, 19, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion0StatusBoxActionHand, 24, 39, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion1StatusBoxReadyHand, 73, 88, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion1StatusBoxActionHand, 93, 108, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion2StatusBoxReadyHand, 142, 157, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion2StatusBoxActionHand, 162, 177, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion3StatusBoxReadyHand, 211, 226, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChampion3StatusBoxActionHand, 231, 246, 10, 25, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput mouseInputPanelChest[9] = { // @ G0456_as_Graphic561_MouseInput_PanelChest[9]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k58_CommandClickOnSlotBoxChest_1, 117, 132, 92, 107, k1_LeftMouseButton),
- MouseInput(k59_CommandClickOnSlotBoxChest_2, 106, 121, 109, 124, k1_LeftMouseButton),
- MouseInput(k60_CommandClickOnSlotBoxChest_3, 111, 126, 126, 141, k1_LeftMouseButton),
- MouseInput(k61_CommandClickOnSlotBoxChest_4, 128, 143, 131, 146, k1_LeftMouseButton),
- MouseInput(k62_CommandClickOnSlotBoxChest_5, 145, 160, 134, 149, k1_LeftMouseButton),
- MouseInput(k63_CommandClickOnSlotBoxChest_6, 162, 177, 136, 151, k1_LeftMouseButton),
- MouseInput(k64_CommandClickOnSlotBoxChest_7, 179, 194, 137, 152, k1_LeftMouseButton),
- MouseInput(k65_CommandClickOnSlotBoxChest_8, 196, 211, 138, 153, k1_LeftMouseButton),
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnSlotBoxChest1, 117, 132, 92, 107, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest2, 106, 121, 109, 124, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest3, 111, 126, 126, 141, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest4, 128, 143, 131, 146, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest5, 145, 160, 134, 149, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest6, 162, 177, 136, 151, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest7, 179, 194, 137, 152, kDMMouseButtonLeft),
+ MouseInput(kDMCommandClickOnSlotBoxChest8, 196, 211, 138, 153, kDMMouseButtonLeft),
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput mouseInputPanelResurrectReincarnateCancel[4] = { // @ G0457_as_Graphic561_MouseInput_PanelResurrectReincarnateCancel[4]
/* { Command, Box.X1, Box.X2, Box.Y1, Box.Y2, Button } */
- MouseInput(k160_CommandClickInPanelResurrect, 108, 158, 90, 138, k1_LeftMouseButton), /* Atari ST: Box = 104, 158, 86, 142 */
- MouseInput(k161_CommandClickInPanelReincarnate, 161, 211, 90, 138, k1_LeftMouseButton), /* Atari ST: Box = 163, 217, 86, 142 */
- MouseInput(k162_CommandClickInPanelCancel, 108, 211, 141, 153, k1_LeftMouseButton), /* Atari ST: Box = 104, 217, 146, 156 */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickInPanelResurrect, 108, 158, 90, 138, kDMMouseButtonLeft), /* Atari ST: Box = 104, 158, 86, 142 */
+ MouseInput(kDMCommandClickInPanelReincarnate, 161, 211, 90, 138, kDMMouseButtonLeft), /* Atari ST: Box = 163, 217, 86, 142 */
+ MouseInput(kDMCommandClickInPanelCancel, 108, 211, 141, 153, kDMMouseButtonLeft), /* Atari ST: Box = 104, 217, 146, 156 */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputViewportDialog1Choice[2] = { // @ G0471_as_Graphic561_PrimaryMouseInput_ViewportDialog1Choice[2]
- MouseInput(k210_CommandClickOnDialogChoice_1, 16, 207, 138, 152, k1_LeftMouseButton), /* Bottom button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 16, 207, 138, 152, kDMMouseButtonLeft), /* Bottom button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputViewportDialog2Choices[3] = { // @ G0472_as_Graphic561_PrimaryMouseInput_ViewportDialog2Choices[3]
- MouseInput(k210_CommandClickOnDialogChoice_1, 16, 207, 101, 115, k1_LeftMouseButton), /* Top button */
- MouseInput(k211_CommandClickOnDialogChoice_2, 16, 207, 138, 152, k1_LeftMouseButton), /* Bottom button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 16, 207, 101, 115, kDMMouseButtonLeft), /* Top button */
+ MouseInput(kDMCommandClickOnDialogChoice2, 16, 207, 138, 152, kDMMouseButtonLeft), /* Bottom button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputViewportDialog3Choices[4] = { // @ G0473_as_Graphic561_PrimaryMouseInput_ViewportDialog3Choices[4]
- MouseInput(k210_CommandClickOnDialogChoice_1, 16, 207, 101, 115, k1_LeftMouseButton), /* Top button */
- MouseInput(k211_CommandClickOnDialogChoice_2, 16, 101, 138, 152, k1_LeftMouseButton), /* Lower left button */
- MouseInput(k212_CommandClickOnDialogChoice_3, 123, 207, 138, 152, k1_LeftMouseButton), /* Lower right button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 16, 207, 101, 115, kDMMouseButtonLeft), /* Top button */
+ MouseInput(kDMCommandClickOnDialogChoice2, 16, 101, 138, 152, kDMMouseButtonLeft), /* Lower left button */
+ MouseInput(kDMCommandClickOnDialogChoice3, 123, 207, 138, 152, kDMMouseButtonLeft), /* Lower right button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputViewportDialog4Choices[5] = { // @ G0474_as_Graphic561_PrimaryMouseInput_ViewportDialog4Choices[5]
- MouseInput(k210_CommandClickOnDialogChoice_1, 16, 101, 101, 115, k1_LeftMouseButton), /* Top left button */
- MouseInput(k211_CommandClickOnDialogChoice_2, 123, 207, 101, 115, k1_LeftMouseButton), /* Top right button */
- MouseInput(k212_CommandClickOnDialogChoice_3, 16, 101, 138, 152, k1_LeftMouseButton), /* Lower left button */
- MouseInput(k213_CommandClickOnDialogChoice_4, 123, 207, 138, 152, k1_LeftMouseButton), /* Lower right button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 16, 101, 101, 115, kDMMouseButtonLeft), /* Top left button */
+ MouseInput(kDMCommandClickOnDialogChoice2, 123, 207, 101, 115, kDMMouseButtonLeft), /* Top right button */
+ MouseInput(kDMCommandClickOnDialogChoice3, 16, 101, 138, 152, kDMMouseButtonLeft), /* Lower left button */
+ MouseInput(kDMCommandClickOnDialogChoice4, 123, 207, 138, 152, kDMMouseButtonLeft), /* Lower right button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputScreenDialog1Choice[2] = { // @ G0475_as_Graphic561_PrimaryMouseInput_ScreenDialog1Choice[2]
- MouseInput(k210_CommandClickOnDialogChoice_1, 63, 254, 138, 152, k1_LeftMouseButton), /* Bottom button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 63, 254, 138, 152, kDMMouseButtonLeft), /* Bottom button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputScreenDialog2Choices[3] = { // @ G0476_as_Graphic561_PrimaryMouseInput_ScreenDialog2Choices[3]
- MouseInput(k210_CommandClickOnDialogChoice_1, 63, 254, 101, 115, k1_LeftMouseButton), /* Top button */
- MouseInput(k211_CommandClickOnDialogChoice_2, 63, 254, 138, 152, k1_LeftMouseButton), /* Bottom button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 63, 254, 101, 115, kDMMouseButtonLeft), /* Top button */
+ MouseInput(kDMCommandClickOnDialogChoice2, 63, 254, 138, 152, kDMMouseButtonLeft), /* Bottom button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputScreenDialog3Choices[4] = { // @ G0477_as_Graphic561_PrimaryMouseInput_ScreenDialog3Choices[4]
- MouseInput(k210_CommandClickOnDialogChoice_1, 63, 254, 101, 115, k1_LeftMouseButton), /* Top button */
- MouseInput(k211_CommandClickOnDialogChoice_2, 63, 148, 138, 152, k1_LeftMouseButton), /* Lower left button */
- MouseInput(k212_CommandClickOnDialogChoice_3, 170, 254, 138, 152, k1_LeftMouseButton), /* Lower right button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 63, 254, 101, 115, kDMMouseButtonLeft), /* Top button */
+ MouseInput(kDMCommandClickOnDialogChoice2, 63, 148, 138, 152, kDMMouseButtonLeft), /* Lower left button */
+ MouseInput(kDMCommandClickOnDialogChoice3, 170, 254, 138, 152, kDMMouseButtonLeft), /* Lower right button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput primaryMouseInputScreenDialog4Choices[5] = { // @ G0478_as_Graphic561_PrimaryMouseInput_ScreenDialog4Choices[5]
- MouseInput(k210_CommandClickOnDialogChoice_1, 63, 148, 101, 115, k1_LeftMouseButton), /* Top left button */
- MouseInput(k211_CommandClickOnDialogChoice_2, 170, 254, 101, 115, k1_LeftMouseButton), /* Top right button */
- MouseInput(k212_CommandClickOnDialogChoice_3, 63, 148, 138, 152, k1_LeftMouseButton), /* Lower left button */
- MouseInput(k213_CommandClickOnDialogChoice_4, 170, 254, 138, 152, k1_LeftMouseButton), /* Lower right button */
- MouseInput(k0_CommandNone, 0, 0, 0, 0, k0_NoneMouseButton)
+ MouseInput(kDMCommandClickOnDialogChoice1, 63, 148, 101, 115, kDMMouseButtonLeft), /* Top left button */
+ MouseInput(kDMCommandClickOnDialogChoice2, 170, 254, 101, 115, kDMMouseButtonLeft), /* Top right button */
+ MouseInput(kDMCommandClickOnDialogChoice3, 63, 148, 138, 152, kDMMouseButtonLeft), /* Lower left button */
+ MouseInput(kDMCommandClickOnDialogChoice4, 170, 254, 138, 152, kDMMouseButtonLeft), /* Lower right button */
+ MouseInput(kDMCommandNone, 0, 0, 0, 0, kDMMouseButtonNone)
};
MouseInput *primaryMouseInputDialogSets[2][4] = { // @ G0480_aaps_PrimaryMouseInput_DialogSets
@@ -383,7 +383,7 @@ EventManager::EventManager(DMEngine *vm) : _vm(vm) {
_refreshMousePointerInMainLoop = false;
_highlightBoxEnabled = false;
_useChampionIconOrdinalAsMousePointerBitmap = 0;
- _pendingClickButton = k0_NoneMouseButton;
+ _pendingClickButton = kDMMouseButtonNone;
_useObjectAsMousePointerBitmap = false;
_useHandAsMousePointerBitmap = false;
_preventBuildPointerScreenArea = false;
@@ -593,7 +593,7 @@ void EventManager::hideMouse() {
}
bool EventManager::isMouseButtonDown(MouseButton button) {
- return (button != k0_NoneMouseButton) ? (_mouseButtonStatus & button) : (_mouseButtonStatus == 0);
+ return (button != kDMMouseButtonNone) ? (_mouseButtonStatus & button) : (_mouseButtonStatus == 0);
}
void EventManager::setMousePos(Common::Point pos) {
@@ -620,7 +620,7 @@ Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Eve
if (_primaryKeyboardInput) {
KeyboardInput *input = _primaryKeyboardInput;
- while (input->_commandToIssue != k0_CommandNone) {
+ while (input->_commandToIssue != kDMCommandNone) {
if ((input->_key == event.kbd.keycode) && (input->_modifiers == (event.kbd.flags & input->_modifiers))) {
processPendingClick(); // possible fix to BUG0_73
_commandQueue.push(Command(Common::Point(-1, -1), input->_commandToIssue));
@@ -632,7 +632,7 @@ Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Eve
if (_secondaryKeyboardInput) {
KeyboardInput *input = _secondaryKeyboardInput;
- while (input->_commandToIssue != k0_CommandNone) {
+ while (input->_commandToIssue != kDMCommandNone) {
if ((input->_key == event.kbd.keycode) && (input->_modifiers == (event.kbd.flags & input->_modifiers))) {
processPendingClick(); // possible fix to BUG0_73
_commandQueue.push(Command(Common::Point(-1, -1), input->_commandToIssue));
@@ -649,7 +649,7 @@ Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Eve
break;
case Common::EVENT_LBUTTONDOWN:
case Common::EVENT_RBUTTONDOWN: {
- MouseButton button = (event.type == Common::EVENT_LBUTTONDOWN) ? k1_LeftMouseButton : k2_RightMouseButton;
+ MouseButton button = (event.type == Common::EVENT_LBUTTONDOWN) ? kDMMouseButtonLeft : kDMMouseButtonRight;
_mouseButtonStatus |= button;
if (grabMouseClick) {
*grabMouseClick = event;
@@ -662,7 +662,7 @@ Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Eve
}
case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP: {
- MouseButton button = (event.type == Common::EVENT_LBUTTONDOWN) ? k1_LeftMouseButton : k2_RightMouseButton;
+ MouseButton button = (event.type == Common::EVENT_LBUTTONDOWN) ? kDMMouseButtonLeft : kDMMouseButtonRight;
_mouseButtonStatus &= ~button;
resetPressingEyeOrMouth();
break;
@@ -691,10 +691,10 @@ void EventManager::processClick(Common::Point mousePos, MouseButton button) {
CommandType commandType;
commandType = getCommandTypeFromMouseInput(_primaryMouseInput, mousePos, button);
- if (commandType == k0_CommandNone)
+ if (commandType == kDMCommandNone)
commandType = getCommandTypeFromMouseInput(_secondaryMouseInput, mousePos, button);
- if (commandType != k0_CommandNone)
+ if (commandType != kDMCommandNone)
_commandQueue.push(Command(mousePos, commandType));
_isCommandQueueLocked = false;
@@ -702,10 +702,10 @@ void EventManager::processClick(Common::Point mousePos, MouseButton button) {
CommandType EventManager::getCommandTypeFromMouseInput(MouseInput *input, Common::Point mousePos, MouseButton button) {
if (!input)
- return k0_CommandNone;
+ return kDMCommandNone;
- CommandType commandType = k0_CommandNone;
- while ((commandType = input->_commandTypeToIssue) != k0_CommandNone) {
+ CommandType commandType = kDMCommandNone;
+ while ((commandType = input->_commandTypeToIssue) != kDMCommandNone) {
if (input->_hitbox.isPointInside(mousePos) && input->_button == button)
break;
input++;
@@ -728,7 +728,7 @@ void EventManager::processCommandQueue() {
Command cmd = _commandQueue.pop();
CommandType cmdType = cmd._type;
- if ((cmdType >= k3_CommandMoveForward) && (cmdType <= k6_CommandMoveLeft) && (_vm->_disabledMovementTicks || (_vm->_projectileDisableMovementTicks && (_vm->_lastProjectileDisabledMovementDirection == (_vm->normalizeModulo4(_vm->_dungeonMan->_partyDir + cmdType - k3_CommandMoveForward)))))) { /* If movement is disabled */
+ if ((cmdType >= kDMCommandMoveForward) && (cmdType <= kDMCommandMoveLeft) && (_vm->_disabledMovementTicks || (_vm->_projectileDisableMovementTicks && (_vm->_lastProjectileDisabledMovementDirection == (_vm->normalizeModulo4(_vm->_dungeonMan->_partyDir + cmdType - kDMCommandMoveForward)))))) { /* If movement is disabled */
_isCommandQueueLocked = false;
processPendingClick();
return;
@@ -738,39 +738,39 @@ void EventManager::processCommandQueue() {
int16 commandY = cmd._pos.y;
_isCommandQueueLocked = false;
processPendingClick();
- if ((cmdType == k2_CommandTurnRight) || (cmdType == k1_CommandTurnLeft)) {
+ if ((cmdType == kDMCommandTurnRight) || (cmdType == kDMCommandTurnLeft)) {
commandTurnParty(cmdType);
return;
}
- if ((cmdType >= k3_CommandMoveForward) && (cmdType <= k6_CommandMoveLeft)) {
+ if ((cmdType >= kDMCommandMoveForward) && (cmdType <= kDMCommandMoveLeft)) {
commandMoveParty(cmdType);
return;
}
- if ((cmdType >= k12_CommandClickInChampion_0_StatusBox) && (cmdType <= k15_CommandClickInChampion_3_StatusBox)) {
- int16 championIdx = cmdType - k12_CommandClickInChampion_0_StatusBox;
+ if ((cmdType >= kDMCommandClickInChampion0StatusBox) && (cmdType <= kDMCommandClickInChampion3StatusBox)) {
+ int16 championIdx = cmdType - kDMCommandClickInChampion0StatusBox;
if ((championIdx < _vm->_championMan->_partyChampionCount) && !_vm->_championMan->_candidateChampionOrdinal)
commandProcessTypes12to27_clickInChampionStatusBox(championIdx, commandX, commandY);
return;
}
- if ((cmdType >= k125_CommandClickOnChamptionIcon_Top_Left) && (cmdType <= k128_CommandClickOnChamptionIcon_Lower_Left)) {
- mouseProcessCommands125To128_clickOnChampionIcon(cmdType - k125_CommandClickOnChamptionIcon_Top_Left);
+ if ((cmdType >= kDMCommandClickOnChamptionIconTopLeft) && (cmdType <= kDMCommandClickOnChamptionIconLowerLeft)) {
+ mouseProcessCommands125To128_clickOnChampionIcon(cmdType - kDMCommandClickOnChamptionIconTopLeft);
return;
}
- if ((cmdType >= k28_CommandClickOnSlotBoxInventoryReadyHand) && (cmdType < (k65_CommandClickOnSlotBoxChest_8 + 1))) {
+ if ((cmdType >= kDMCommandClickOnSlotBoxInventoryReadyHand) && (cmdType < (kDMCommandClickOnSlotBoxChest8 + 1))) {
if (_vm->_championMan->_leaderIndex != kDMChampionNone)
- _vm->_championMan->clickOnSlotBox(cmdType - k20_CommandClickOnSlotBoxChampion_0_StatusBoxReadyHand);
+ _vm->_championMan->clickOnSlotBox(cmdType - kDMCommandClickOnSlotBoxChampion0StatusBoxReadyHand);
return;
}
- if ((cmdType >= k7_CommandToggleInventoryChampion_0) && (cmdType <= k11_CommandCloseInventory)) {
- if (cmdType == k11_CommandCloseInventory) {
+ if ((cmdType >= kDMCommandToggleInventoryChampion0) && (cmdType <= kDMCommandCloseInventory)) {
+ if (cmdType == kDMCommandCloseInventory) {
delete _vm->_saveThumbnail;
_vm->_saveThumbnail = nullptr;
} else if (!_vm->_saveThumbnail) {
@@ -778,49 +778,49 @@ void EventManager::processCommandQueue() {
Graphics::saveThumbnail(*_vm->_saveThumbnail);
}
- int16 championIndex = cmdType - k7_CommandToggleInventoryChampion_0;
+ int16 championIndex = cmdType - kDMCommandToggleInventoryChampion0;
if (((championIndex == kDMChampionCloseInventory) || (championIndex < _vm->_championMan->_partyChampionCount)) && !_vm->_championMan->_candidateChampionOrdinal)
_vm->_inventoryMan->toggleInventory((ChampionIndex)championIndex);
return;
}
- if (cmdType == k83_CommandToggleInventoryLeader) {
+ if (cmdType == kDMCommandToggleInventoryLeader) {
if (_vm->_championMan->_leaderIndex != kDMChampionNone)
_vm->_inventoryMan->toggleInventory(_vm->_championMan->_leaderIndex);
return;
}
- if (cmdType == k100_CommandClickInSpellArea) {
+ if (cmdType == kDMCommandClickInSpellArea) {
if ((!_vm->_championMan->_candidateChampionOrdinal) && (_vm->_championMan->_magicCasterChampionIndex != kDMChampionNone))
commandProcessType100_clickInSpellArea(commandX, commandY);
return;
}
- if (cmdType == k111_CommandClickInActionArea) {
+ if (cmdType == kDMCommandClickInActionArea) {
if (!_vm->_championMan->_candidateChampionOrdinal)
commandProcessType111To115_ClickInActionArea(commandX, commandY);
return;
}
- if (cmdType == k70_CommandClickOnMouth) {
+ if (cmdType == kDMCommandClickOnMouth) {
_vm->_inventoryMan->clickOnMouth();
return;
}
- if (cmdType == k71_CommandClickOnEye) {
+ if (cmdType == kDMCommandClickOnEye) {
_vm->_inventoryMan->clickOnEye();
return;
}
- if (cmdType == k80_CommandClickInDungeonView) {
+ if (cmdType == kDMCommandClickInDungeonView) {
commandProcessType80ClickInDungeonView(commandX, commandY);
return;
}
- if (cmdType == k81_CommandClickInPanel) {
+ if (cmdType == kDMCommandClickInPanel) {
commandProcess81ClickInPanel(commandX, commandY);
return;
}
@@ -828,7 +828,7 @@ void EventManager::processCommandQueue() {
if (_vm->_pressingEye || _vm->_pressingMouth)
return;
- if (cmdType == k145_CommandSleep) {
+ if (cmdType == kDMCommandSleep) {
if (!_vm->_championMan->_candidateChampionOrdinal) {
if (_vm->_inventoryMan->_inventoryChampionOrdinal)
_vm->_inventoryMan->toggleInventory(kDMChampionCloseInventory);
@@ -847,19 +847,19 @@ void EventManager::processCommandQueue() {
return;
}
- if (cmdType == k146_CommandWakeUp) {
+ if (cmdType == kDMCommandWakeUp) {
_vm->_championMan->wakeUp();
return;
}
- if (cmdType == k140_CommandSaveGame) {
+ if (cmdType == kDMCommandSaveGame) {
if ((_vm->_championMan->_partyChampionCount > 0) && !_vm->_championMan->_candidateChampionOrdinal)
_vm->saveGame();
return;
}
- if (cmdType == k147_CommandFreezeGame) {
+ if (cmdType == kDMCommandFreezeGame) {
_vm->_gameTimeTicking = false;
_vm->_menuMan->drawDisabledMenu();
_vm->_displayMan->fillBitmap(_vm->_displayMan->_bitmapViewport, k0_ColorBlack, 112, 136);
@@ -892,7 +892,7 @@ void EventManager::processCommandQueue() {
return;
}
- if (cmdType == k148_CommandUnfreezeGame) {
+ if (cmdType == kDMCommandUnfreezeGame) {
_vm->_gameTimeTicking = true;
_vm->_menuMan->drawEnabledMenus();
_primaryMouseInput = primaryMouseInputBackup;
@@ -903,33 +903,33 @@ void EventManager::processCommandQueue() {
return;
}
- if (cmdType == k200_CommandEntranceEnterDungeon) {
+ if (cmdType == kDMCommandEntranceEnterDungeon) {
_vm->_newGameFl = k1_modeLoadDungeon;
return;
}
- if (cmdType == k201_CommandEntranceResume) {
+ if (cmdType == kDMCommandEntranceResume) {
_vm->_newGameFl = k0_modeLoadSavedGame;
return;
}
- if (cmdType == k202_CommandEntranceDrawCredits) {
+ if (cmdType == kDMCommandEntranceDrawCredits) {
_vm->entranceDrawCredits();
return;
}
- if ((cmdType >= k210_CommandClickOnDialogChoice_1) && (cmdType <= k213_CommandClickOnDialogChoice_4)) {
- _vm->_dialog->_selectedDialogChoice = cmdType - (k210_CommandClickOnDialogChoice_1 - 1);
+ if ((cmdType >= kDMCommandClickOnDialogChoice1) && (cmdType <= kDMCommandClickOnDialogChoice4)) {
+ _vm->_dialog->_selectedDialogChoice = cmdType - (kDMCommandClickOnDialogChoice1 - 1);
return;
}
- if (cmdType == k215_CommandRestartGame)
+ if (cmdType == kDMCommandRestartGame)
_vm->_restartGameRequest = true;
}
void EventManager::commandTurnParty(CommandType cmdType) {
_vm->_stopWaitingForPlayerInput = true;
- if (cmdType == k1_CommandTurnLeft)
+ if (cmdType == kDMCommandTurnLeft)
commandHighlightBoxEnable(234, 261, 125, 145);
else
commandHighlightBoxEnable(291, 318, 125, 145);
@@ -941,7 +941,7 @@ void EventManager::commandTurnParty(CommandType cmdType) {
}
_vm->_moveSens->processThingAdditionOrRemoval(_vm->_dungeonMan->_partyMapX, _vm->_dungeonMan->_partyMapY, Thing::_party, true, false);
- _vm->_championMan->setPartyDirection(_vm->normalizeModulo4(_vm->_dungeonMan->_partyDir + ((cmdType == k2_CommandTurnRight) ? 1 : 3)));
+ _vm->_championMan->setPartyDirection(_vm->normalizeModulo4(_vm->_dungeonMan->_partyDir + ((cmdType == kDMCommandTurnRight) ? 1 : 3)));
_vm->_moveSens->processThingAdditionOrRemoval(_vm->_dungeonMan->_partyMapX, _vm->_dungeonMan->_partyMapY, Thing::_party, true, true);
}
@@ -974,7 +974,7 @@ void EventManager::commandMoveParty(CommandType cmdType) {
_vm->_championMan->decrementStamina(idx, ((championsPtr->_load * 3) / _vm->_championMan->getMaximumLoad(championsPtr)) + 1); /* BUG0_50 When a champion is brought back to life at a Vi Altar, his current stamina is lower than what it was before dying. Each time the party moves the current stamina of all champions is decreased, including for dead champions, by an amount that depends on the current load of the champion. For a dead champion the load before he died is used */
championsPtr++;
}
- uint16 movementArrowIdx = cmdType - k3_CommandMoveForward;
+ uint16 movementArrowIdx = cmdType - kDMCommandMoveForward;
Box *highlightBox = &boxMovementArrows[movementArrowIdx];
commandHighlightBoxEnable(highlightBox->_x1, highlightBox->_x2, highlightBox->_y1, highlightBox->_y2);
int16 partyMapX = _vm->_dungeonMan->_partyMapX;
@@ -1247,7 +1247,7 @@ void EventManager::commandProcessCommands160To162ClickInResurrectReincarnatePane
uint16 championIndex = champMan._partyChampionCount - 1;
Champion *champ = &champMan._champions[championIndex];
- if (commandType == k162_CommandClickInPanelCancel) {
+ if (commandType == kDMCommandClickInPanelCancel) {
invMan.toggleInventory(kDMChampionCloseInventory);
champMan._candidateChampionOrdinal = _vm->indexToOrdinal(kDMChampionNone);
if (champMan._partyChampionCount == 1) {
@@ -1286,7 +1286,7 @@ void EventManager::commandProcessCommands160To162ClickInResurrectReincarnatePane
thing = dunMan.getNextThing(thing);
}
- if (commandType == k161_CommandClickInPanelReincarnate) {
+ if (commandType == kDMCommandClickInPanelReincarnate) {
champMan.renameChampion(champ);
if (_vm->_engineShouldQuit)
return;
@@ -1313,13 +1313,13 @@ void EventManager::commandProcessCommands160To162ClickInResurrectReincarnatePane
switch (_vm->getGameLanguage()) { // localized
default:
case Common::EN_ANY:
- _vm->_textMan->printMessage(champColor, (commandType == k160_CommandClickInPanelResurrect) ? " RESURRECTED." : " REINCARNATED.");
+ _vm->_textMan->printMessage(champColor, (commandType == kDMCommandClickInPanelResurrect) ? " RESURRECTED." : " REINCARNATED.");
break;
case Common::DE_DEU:
- _vm->_textMan->printMessage(champColor, (commandType == k160_CommandClickInPanelResurrect) ? " VOM TODE ERWECKT." : " REINKARNIERT.");
+ _vm->_textMan->printMessage(champColor, (commandType == kDMCommandClickInPanelResurrect) ? " VOM TODE ERWECKT." : " REINKARNIERT.");
break;
case Common::FR_FRA:
- _vm->_textMan->printMessage(champColor, (commandType == k160_CommandClickInPanelResurrect) ? " RESSUSCITE." : " REINCARNE.");
+ _vm->_textMan->printMessage(champColor, (commandType == kDMCommandClickInPanelResurrect) ? " RESSUSCITE." : " REINCARNE.");
break;
}
@@ -1337,15 +1337,15 @@ void EventManager::commandProcess81ClickInPanel(int16 x, int16 y) {
case k4_PanelContentChest:
if (champMan._leaderIndex == kDMChampionNone) // if no leader
return;
- commandType = getCommandTypeFromMouseInput(_mouseInputPanelChest, Common::Point(x, y), k1_LeftMouseButton);
- if (commandType != k0_CommandNone)
- _vm->_championMan->clickOnSlotBox(commandType - k20_CommandClickOnSlotBoxChampion_0_StatusBoxReadyHand);
+ commandType = getCommandTypeFromMouseInput(_mouseInputPanelChest, Common::Point(x, y), kDMMouseButtonLeft);
+ if (commandType != kDMCommandNone)
+ _vm->_championMan->clickOnSlotBox(commandType - kDMCommandClickOnSlotBoxChampion0StatusBoxReadyHand);
break;
case k5_PanelContentResurrectReincarnate:
if (!champMan._leaderEmptyHanded)
break;
- commandType = getCommandTypeFromMouseInput(_mouseInputPanelResurrectReincarnateCancel, Common::Point(x, y), k1_LeftMouseButton);
- if (commandType != k0_CommandNone)
+ commandType = getCommandTypeFromMouseInput(_mouseInputPanelResurrectReincarnateCancel, Common::Point(x, y), kDMMouseButtonLeft);
+ if (commandType != kDMCommandNone)
commandProcessCommands160To162ClickInResurrectReincarnatePanel(commandType);
break;
default:
@@ -1453,11 +1453,11 @@ void EventManager::commandProcessTypes12to27_clickInChampionStatusBox(uint16 cha
if (_vm->indexToOrdinal(champIndex) == _vm->_inventoryMan->_inventoryChampionOrdinal) {
commandSetLeader((ChampionIndex)champIndex);
} else {
- uint16 commandType = getCommandTypeFromMouseInput(_mouseInputChampionNamesHands, Common::Point(posX, posY), k1_LeftMouseButton);
- if ((commandType >= k16_CommandSetLeaderChampion_0) && (commandType <= k19_CommandSetLeaderChampion_3))
- commandSetLeader((ChampionIndex)(commandType - k16_CommandSetLeaderChampion_0));
- else if ((commandType >= k20_CommandClickOnSlotBoxChampion_0_StatusBoxReadyHand) && (commandType <= k27_CommandClickOnSlotBoxChampion_3_StatusBoxActionHand))
- _vm->_championMan->clickOnSlotBox(commandType - k20_CommandClickOnSlotBoxChampion_0_StatusBoxReadyHand);
+ uint16 commandType = getCommandTypeFromMouseInput(_mouseInputChampionNamesHands, Common::Point(posX, posY), kDMMouseButtonLeft);
+ if ((commandType >= kDMCommandSetLeaderChampion0) && (commandType <= kDMCommandSetLeaderChampion3))
+ commandSetLeader((ChampionIndex)(commandType - kDMCommandSetLeaderChampion0));
+ else if ((commandType >= kDMCommandClickOnSlotBoxChampion0StatusBoxReadyHand) && (commandType <= kDMCommandClickOnSlotBoxChampion3StatusBoxActionHand))
+ _vm->_championMan->clickOnSlotBox(commandType - kDMCommandClickOnSlotBoxChampion0StatusBoxReadyHand);
}
}
@@ -1559,8 +1559,8 @@ void EventManager::commandProcessType100_clickInSpellArea(uint16 posX, uint16 po
return;
}
- CommandType newCommand = getCommandTypeFromMouseInput(_mouseInputSpellArea, Common::Point(posX, posY), k1_LeftMouseButton);
- if (newCommand != k0_CommandNone)
+ CommandType newCommand = getCommandTypeFromMouseInput(_mouseInputSpellArea, Common::Point(posX, posY), kDMMouseButtonLeft);
+ if (newCommand != kDMCommandNone)
commandProcessTypes101To108_clickInSpellSymbolsArea(newCommand);
}
@@ -1576,7 +1576,7 @@ void EventManager::commandProcessTypes101To108_clickInSpellSymbolsArea(CommandTy
Box(305, 318, 63, 73) /* Delete */
};
- if (cmdType == k108_CommandClickInSpeallAreaCastSpell) {
+ if (cmdType == kDMCommandClickInSpeallAreaCastSpell) {
if (_vm->_championMan->_champions[_vm->_championMan->_magicCasterChampionIndex]._symbols[0] == '\0')
return;
@@ -1585,7 +1585,7 @@ void EventManager::commandProcessTypes101To108_clickInSpellSymbolsArea(CommandTy
return;
}
- uint16 symbolIndex = cmdType - k101_CommandClickInSpellAreaSymbol_1;
+ uint16 symbolIndex = cmdType - kDMCommandClickInSpellAreaSymbol1;
Box *highlightBox = &spellSymbolsAndDelete[symbolIndex];
commandHighlightBoxEnable(highlightBox->_x1, highlightBox->_x2, highlightBox->_y1, highlightBox->_y2);
_vm->delay(1);
@@ -1599,26 +1599,26 @@ void EventManager::commandProcessTypes101To108_clickInSpellSymbolsArea(CommandTy
void EventManager::commandProcessType111To115_ClickInActionArea(int16 posX, int16 posY) {
if (_vm->_championMan->_actingChampionOrdinal) {
- uint16 mouseCommand = getCommandTypeFromMouseInput(_mouseInputActionAreaNames, Common::Point(posX, posY), k1_LeftMouseButton);
- if (mouseCommand != k0_CommandNone) {
- if (mouseCommand == k112_CommandClickInActionAreaPass) {
+ uint16 mouseCommand = getCommandTypeFromMouseInput(_mouseInputActionAreaNames, Common::Point(posX, posY), kDMMouseButtonLeft);
+ if (mouseCommand != kDMCommandNone) {
+ if (mouseCommand == kDMCommandClickInActionAreaPass) {
commandHighlightBoxEnable(285, 319, 77, 83);
_vm->_menuMan->didClickTriggerAction(-1);
- } else if ((mouseCommand - k112_CommandClickInActionAreaPass) <= _vm->_menuMan->_actionCount) {
- if (mouseCommand == k113_CommandClickInActionAreaAction_0)
+ } else if ((mouseCommand - kDMCommandClickInActionAreaPass) <= _vm->_menuMan->_actionCount) {
+ if (mouseCommand == kDMCommandClickInActionAreaAction0)
commandHighlightBoxEnable(234, 318, 86, 96);
- else if (mouseCommand == k114_CommandClickInActionAreaAction_1)
+ else if (mouseCommand == kDMCommandClickInActionAreaAction1)
commandHighlightBoxEnable(234, 318, 98, 108);
else
commandHighlightBoxEnable(234, 318, 110, 120);
- _vm->_stopWaitingForPlayerInput = _vm->_menuMan->didClickTriggerAction(mouseCommand - k113_CommandClickInActionAreaAction_0);
+ _vm->_stopWaitingForPlayerInput = _vm->_menuMan->didClickTriggerAction(mouseCommand - kDMCommandClickInActionAreaAction0);
}
}
} else if (_vm->_menuMan->_actionAreaContainsIcons) {
- uint16 mouseCommand = getCommandTypeFromMouseInput(_mouseInputActionAreaIcons, Common::Point(posX, posY), k1_LeftMouseButton);
- if (mouseCommand != k0_CommandNone) {
- mouseCommand -= k116_CommandClickInActionAreaChampion_0_Action;
+ uint16 mouseCommand = getCommandTypeFromMouseInput(_mouseInputActionAreaIcons, Common::Point(posX, posY), kDMMouseButtonLeft);
+ if (mouseCommand != kDMCommandNone) {
+ mouseCommand -= kDMCommandClickInActionAreaChampion0Action;
if (mouseCommand < _vm->_championMan->_partyChampionCount)
_vm->_menuMan->processCommands116To119_setActingChampion(mouseCommand);
}
diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h
index 34984f1..ac0ed74 100644
--- a/engines/dm/eventman.h
+++ b/engines/dm/eventman.h
@@ -39,122 +39,122 @@
namespace DM {
enum MouseButton {
- k0_NoneMouseButton = 0, // present only because of typesafety
- k1_LeftMouseButton = 1,
- k2_RightMouseButton = 2
+ kDMMouseButtonNone = 0, // present only because of typesafety
+ kDMMouseButtonLeft = 1,
+ kDMMouseButtonRight = 2
};
enum CommandType {
- k0_CommandNone = 0, // @ C000_COMMAND_NONE
- k1_CommandTurnLeft = 1, // @ C001_COMMAND_TURN_LEFT
- k2_CommandTurnRight = 2, // @ C002_COMMAND_TURN_RIGHT
- k3_CommandMoveForward = 3, // @ C003_COMMAND_MOVE_FORWARD
- k4_CommandMoveRight = 4, // @ C004_COMMAND_MOVE_RIGHT
- k5_CommandMoveBackward = 5, // @ C005_COMMAND_MOVE_BACKWARD
- k6_CommandMoveLeft = 6, // @ C006_COMMAND_MOVE_LEFT
- k7_CommandToggleInventoryChampion_0 = 7, // @ C007_COMMAND_TOGGLE_INVENTORY_CHAMPION_0
- k8_CommandToggleInventoryChampion_1 = 8, // @ C008_COMMAND_TOGGLE_INVENTORY_CHAMPION_1
- k9_CommandToggleInventoryChampion_2 = 9, // @ C009_COMMAND_TOGGLE_INVENTORY_CHAMPION_2
- k10_CommandToggleInventoryChampion_3 = 10, // @ C010_COMMAND_TOGGLE_INVENTORY_CHAMPION_3
- k11_CommandCloseInventory = 11, // @ C011_COMMAND_CLOSE_INVENTORY
- k12_CommandClickInChampion_0_StatusBox = 12, // @ C012_COMMAND_CLICK_IN_CHAMPION_0_STATUS_BOX
- k13_CommandClickInChampion_1_StatusBox = 13, // @ C013_COMMAND_CLICK_IN_CHAMPION_1_STATUS_BOX
- k14_CommandClickInChampion_2_StatusBox = 14, // @ C014_COMMAND_CLICK_IN_CHAMPION_2_STATUS_BOX
- k15_CommandClickInChampion_3_StatusBox = 15, // @ C015_COMMAND_CLICK_IN_CHAMPION_3_STATUS_BOX
- k16_CommandSetLeaderChampion_0 = 16, // @ C016_COMMAND_SET_LEADER_CHAMPION_0
- k17_CommandSetLeaderChampion_1 = 17, // @ C017_COMMAND_SET_LEADER_CHAMPION_1
- k18_CommandSetLeaderChampion_2 = 18, // @ C018_COMMAND_SET_LEADER_CHAMPION_2
- k19_CommandSetLeaderChampion_3 = 19, // @ C019_COMMAND_SET_LEADER_CHAMPION_3
- k20_CommandClickOnSlotBoxChampion_0_StatusBoxReadyHand = 20, // @ C020_COMMAND_CLICK_ON_SLOT_BOX_00_CHAMPION_0_STATUS_BOX_READY_HAND
- k21_CommandClickOnSlotBoxChampion_0_StatusBoxActionHand = 21, // @ C021_COMMAND_CLICK_ON_SLOT_BOX_01_CHAMPION_0_STATUS_BOX_ACTION_HAND
- k22_CommandClickOnSlotBoxChampion_1_StatusBoxReadyHand = 22, // @ C022_COMMAND_CLICK_ON_SLOT_BOX_02_CHAMPION_1_STATUS_BOX_READY_HAND
- k23_CommandClickOnSlotBoxChampion_1_StatusBoxActionHand = 23, // @ C023_COMMAND_CLICK_ON_SLOT_BOX_03_CHAMPION_1_STATUS_BOX_ACTION_HAND
- k24_CommandClickOnSlotBoxChampion_2_StatusBoxReadyHand = 24, // @ C024_COMMAND_CLICK_ON_SLOT_BOX_04_CHAMPION_2_STATUS_BOX_READY_HAND
- k25_CommandClickOnSlotBoxChampion_2_StatusBoxActionHand = 25, // @ C025_COMMAND_CLICK_ON_SLOT_BOX_05_CHAMPION_2_STATUS_BOX_ACTION_HAND
- k26_CommandClickOnSlotBoxChampion_3_StatusBoxReadyHand = 26, // @ C026_COMMAND_CLICK_ON_SLOT_BOX_06_CHAMPION_3_STATUS_BOX_READY_HAND
- k27_CommandClickOnSlotBoxChampion_3_StatusBoxActionHand = 27, // @ C027_COMMAND_CLICK_ON_SLOT_BOX_07_CHAMPION_3_STATUS_BOX_ACTION_HAND
- k28_CommandClickOnSlotBoxInventoryReadyHand = 28, // @ C028_COMMAND_CLICK_ON_SLOT_BOX_08_INVENTORY_READY_HAND
- k29_CommandClickOnSlotBoxInventoryActionHand = 29, // @ C029_COMMAND_CLICK_ON_SLOT_BOX_09_INVENTORY_ACTION_HAND
- k30_CommandClickOnSlotBoxInventoryHead = 30, // @ C030_COMMAND_CLICK_ON_SLOT_BOX_10_INVENTORY_HEAD
- k31_CommandClickOnSlotBoxInventoryTorso = 31, // @ C031_COMMAND_CLICK_ON_SLOT_BOX_11_INVENTORY_TORSO
- k32_CommandClickOnSlotBoxInventoryLegs = 32, // @ C032_COMMAND_CLICK_ON_SLOT_BOX_12_INVENTORY_LEGS
- k33_CommandClickOnSlotBoxInventoryFeet = 33, // @ C033_COMMAND_CLICK_ON_SLOT_BOX_13_INVENTORY_FEET
- k34_CommandClickOnSlotBoxInventoryPouch_2 = 34, // @ C034_COMMAND_CLICK_ON_SLOT_BOX_14_INVENTORY_POUCH_2
- k35_CommandClickOnSlotBoxInventoryQuiverLine_2_1 = 35, // @ C035_COMMAND_CLICK_ON_SLOT_BOX_15_INVENTORY_QUIVER_LINE2_1
- k36_CommandClickOnSlotBoxInventoryQuiverLine_1_2 = 36, // @ C036_COMMAND_CLICK_ON_SLOT_BOX_16_INVENTORY_QUIVER_LINE1_2
- k37_CommandClickOnSlotBoxInventoryQuiverLine_2_2 = 37, // @ C037_COMMAND_CLICK_ON_SLOT_BOX_17_INVENTORY_QUIVER_LINE2_2
- k38_CommandClickOnSlotBoxInventoryNeck = 38, // @ C038_COMMAND_CLICK_ON_SLOT_BOX_18_INVENTORY_NECK
- k39_CommandClickOnSlotBoxInventoryPouch_1 = 39, // @ C039_COMMAND_CLICK_ON_SLOT_BOX_19_INVENTORY_POUCH_1
- k40_CommandClickOnSlotBoxInventoryQuiverLine_1_1 = 40, // @ C040_COMMAND_CLICK_ON_SLOT_BOX_20_INVENTORY_QUIVER_LINE1_1
- k41_CommandClickOnSlotBoxInventoryBackpackLine_1_1 = 41, // @ C041_COMMAND_CLICK_ON_SLOT_BOX_21_INVENTORY_BACKPACK_LINE1_1
- k42_CommandClickOnSlotBoxInventoryBackpackLine_2_2 = 42, // @ C042_COMMAND_CLICK_ON_SLOT_BOX_22_INVENTORY_BACKPACK_LINE2_2
- k43_CommandClickOnSlotBoxInventoryBackpackLine_2_3 = 43, // @ C043_COMMAND_CLICK_ON_SLOT_BOX_23_INVENTORY_BACKPACK_LINE2_3
- k44_CommandClickOnSlotBoxInventoryBackpackLine_2_4 = 44, // @ C044_COMMAND_CLICK_ON_SLOT_BOX_24_INVENTORY_BACKPACK_LINE2_4
- k45_CommandClickOnSlotBoxInventoryBackpackLine_2_5 = 45, // @ C045_COMMAND_CLICK_ON_SLOT_BOX_25_INVENTORY_BACKPACK_LINE2_5
- k46_CommandClickOnSlotBoxInventoryBackpackLine_2_6 = 46, // @ C046_COMMAND_CLICK_ON_SLOT_BOX_26_INVENTORY_BACKPACK_LINE2_6
- k47_CommandClickOnSlotBoxInventoryBackpackLine_2_7 = 47, // @ C047_COMMAND_CLICK_ON_SLOT_BOX_27_INVENTORY_BACKPACK_LINE2_7
- k48_CommandClickOnSlotBoxInventoryBackpackLine_2_8 = 48, // @ C048_COMMAND_CLICK_ON_SLOT_BOX_28_INVENTORY_BACKPACK_LINE2_8
- k49_CommandClickOnSlotBoxInventoryBackpackLine_2_9 = 49, // @ C049_COMMAND_CLICK_ON_SLOT_BOX_29_INVENTORY_BACKPACK_LINE2_9
- k50_CommandClickOnSlotBoxInventoryBackpackLine_1_2 = 50, // @ C050_COMMAND_CLICK_ON_SLOT_BOX_30_INVENTORY_BACKPACK_LINE1_2
- k51_CommandClickOnSlotBoxInventoryBackpackLine_1_3 = 51, // @ C051_COMMAND_CLICK_ON_SLOT_BOX_31_INVENTORY_BACKPACK_LINE1_3
- k52_CommandClickOnSlotBoxInventoryBackpackLine_1_4 = 52, // @ C052_COMMAND_CLICK_ON_SLOT_BOX_32_INVENTORY_BACKPACK_LINE1_4
- k53_CommandClickOnSlotBoxInventoryBackpackLine_1_5 = 53, // @ C053_COMMAND_CLICK_ON_SLOT_BOX_33_INVENTORY_BACKPACK_LINE1_5
- k54_CommandClickOnSlotBoxInventoryBackpackLine_1_6 = 54, // @ C054_COMMAND_CLICK_ON_SLOT_BOX_34_INVENTORY_BACKPACK_LINE1_6
- k55_CommandClickOnSlotBoxInventoryBackpackLine_1_7 = 55, // @ C055_COMMAND_CLICK_ON_SLOT_BOX_35_INVENTORY_BACKPACK_LINE1_7
- k56_CommandClickOnSlotBoxInventoryBackpackLine_1_8 = 56, // @ C056_COMMAND_CLICK_ON_SLOT_BOX_36_INVENTORY_BACKPACK_LINE1_8
- k57_CommandClickOnSlotBoxInventoryBackpackLine_1_9 = 57, // @ C057_COMMAND_CLICK_ON_SLOT_BOX_37_INVENTORY_BACKPACK_LINE1_9
- k58_CommandClickOnSlotBoxChest_1 = 58, // @ C058_COMMAND_CLICK_ON_SLOT_BOX_38_CHEST_1
- k59_CommandClickOnSlotBoxChest_2 = 59, // @ C059_COMMAND_CLICK_ON_SLOT_BOX_39_CHEST_2
- k60_CommandClickOnSlotBoxChest_3 = 60, // @ C060_COMMAND_CLICK_ON_SLOT_BOX_40_CHEST_3
- k61_CommandClickOnSlotBoxChest_4 = 61, // @ C061_COMMAND_CLICK_ON_SLOT_BOX_41_CHEST_4
- k62_CommandClickOnSlotBoxChest_5 = 62, // @ C062_COMMAND_CLICK_ON_SLOT_BOX_42_CHEST_5
- k63_CommandClickOnSlotBoxChest_6 = 63, // @ C063_COMMAND_CLICK_ON_SLOT_BOX_43_CHEST_6
- k64_CommandClickOnSlotBoxChest_7 = 64, // @ C064_COMMAND_CLICK_ON_SLOT_BOX_44_CHEST_7
- k65_CommandClickOnSlotBoxChest_8 = 65, // @ C065_COMMAND_CLICK_ON_SLOT_BOX_45_CHEST_8
- k70_CommandClickOnMouth = 70, // @ C070_COMMAND_CLICK_ON_MOUTH
- k71_CommandClickOnEye = 71, // @ C071_COMMAND_CLICK_ON_EYE
- k80_CommandClickInDungeonView = 80, // @ C080_COMMAND_CLICK_IN_DUNGEON_VIEW
- k81_CommandClickInPanel = 81, // @ C081_COMMAND_CLICK_IN_PANEL
- k83_CommandToggleInventoryLeader = 83, // @ C083_COMMAND_TOGGLE_INVENTORY_LEADER
- k100_CommandClickInSpellArea = 100, // @ C100_COMMAND_CLICK_IN_SPELL_AREA
- k101_CommandClickInSpellAreaSymbol_1 = 101, // @ C101_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_1
- k102_CommandClickInSpellAreaSymbol_2 = 102, // @ C102_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_2
- k103_CommandClickInSpellAreaSymbol_3 = 103, // @ C103_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_3
- k104_CommandClickInSpellAreaSymbol_4 = 104, // @ C104_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_4
- k105_CommandClickInSpellAreaSymbol_5 = 105, // @ C105_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_5
- k106_CommandClickInSpellAreaSymbol_6 = 106, // @ C106_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_6
- k107_CommandClickInSpellAreaRecantSymbol = 107, // @ C107_COMMAND_CLICK_IN_SPELL_AREA_RECANT_SYMBOL
- k108_CommandClickInSpeallAreaCastSpell = 108, // @ C108_COMMAND_CLICK_IN_SPELL_AREA_CAST_SPELL
- k111_CommandClickInActionArea = 111, // @ C111_COMMAND_CLICK_IN_ACTION_AREA
- k112_CommandClickInActionAreaPass = 112, // @ C112_COMMAND_CLICK_IN_ACTION_AREA_PASS
- k113_CommandClickInActionAreaAction_0 = 113, // @ C113_COMMAND_CLICK_IN_ACTION_AREA_ACTION_0
- k114_CommandClickInActionAreaAction_1 = 114, // @ C114_COMMAND_CLICK_IN_ACTION_AREA_ACTION_1
- k115_CommandClickInActionAreaAction_2 = 115, // @ C115_COMMAND_CLICK_IN_ACTION_AREA_ACTION_2
- k116_CommandClickInActionAreaChampion_0_Action = 116, // @ C116_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_0_ACTION
- k117_CommandClickInActionAreaChampion_1_Action = 117, // @ C117_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_1_ACTION
- k118_CommandClickInActionAreaChampion_2_Action = 118, // @ C118_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_2_ACTION
- k119_CommandClickInActionAreaChampion_3_Action = 119, // @ C119_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_3_ACTION
- k125_CommandClickOnChamptionIcon_Top_Left = 125, // @ C125_COMMAND_CLICK_ON_CHAMPION_ICON_TOP_LEFT
- k126_CommandClickOnChamptionIcon_Top_Right = 126, // @ C126_COMMAND_CLICK_ON_CHAMPION_ICON_TOP_RIGHT
- k127_CommandClickOnChamptionIcon_Lower_Right = 127, // @ C127_COMMAND_CLICK_ON_CHAMPION_ICON_LOWER_RIGHT
- k128_CommandClickOnChamptionIcon_Lower_Left = 128, // @ C128_COMMAND_CLICK_ON_CHAMPION_ICON_LOWER_LEFT
- k140_CommandSaveGame = 140, // @ C140_COMMAND_SAVE_GAME
- k145_CommandSleep = 145, // @ C145_COMMAND_SLEEP
- k146_CommandWakeUp = 146, // @ C146_COMMAND_WAKE_UP
- k147_CommandFreezeGame = 147, // @ C147_COMMAND_FREEZE_GAME
- k148_CommandUnfreezeGame = 148, // @ C148_COMMAND_UNFREEZE_GAME
- k160_CommandClickInPanelResurrect = 160, // @ C160_COMMAND_CLICK_IN_PANEL_RESURRECT
- k161_CommandClickInPanelReincarnate = 161, // @ C161_COMMAND_CLICK_IN_PANEL_REINCARNATE
- k162_CommandClickInPanelCancel = 162, // @ C162_COMMAND_CLICK_IN_PANEL_CANCEL
- k200_CommandEntranceEnterDungeon = 200, // @ C200_COMMAND_ENTRANCE_ENTER_DUNGEON
- k201_CommandEntranceResume = 201, // @ C201_COMMAND_ENTRANCE_RESUME /* Versions 1.x and 2.x command */
- k202_CommandEntranceDrawCredits = 202, // @ C202_COMMAND_ENTRANCE_DRAW_CREDITS /* Versions 1.x and 2.x command */
- k210_CommandClickOnDialogChoice_1 = 210, // @ C210_COMMAND_CLICK_ON_DIALOG_CHOICE_1
- k211_CommandClickOnDialogChoice_2 = 211, // @ C211_COMMAND_CLICK_ON_DIALOG_CHOICE_2
- k212_CommandClickOnDialogChoice_3 = 212, // @ C212_COMMAND_CLICK_ON_DIALOG_CHOICE_3
- k213_CommandClickOnDialogChoice_4 = 213, // @ C213_COMMAND_CLICK_ON_DIALOG_CHOICE_4
- k215_CommandRestartGame = 215 // @ C215_COMMAND_RESTART_GAME
-}; // @ NONE
+ kDMCommandNone = 0, // @ C000_COMMAND_NONE
+ kDMCommandTurnLeft = 1, // @ C001_COMMAND_TURN_LEFT
+ kDMCommandTurnRight = 2, // @ C002_COMMAND_TURN_RIGHT
+ kDMCommandMoveForward = 3, // @ C003_COMMAND_MOVE_FORWARD
+ kDMCommandMoveRight = 4, // @ C004_COMMAND_MOVE_RIGHT
+ kDMCommandMoveBackward = 5, // @ C005_COMMAND_MOVE_BACKWARD
+ kDMCommandMoveLeft = 6, // @ C006_COMMAND_MOVE_LEFT
+ kDMCommandToggleInventoryChampion0 = 7, // @ C007_COMMAND_TOGGLE_INVENTORY_CHAMPION_0
+ kDMCommandToggleInventoryChampion1 = 8, // @ C008_COMMAND_TOGGLE_INVENTORY_CHAMPION_1
+ kDMCommandToggleInventoryChampion2 = 9, // @ C009_COMMAND_TOGGLE_INVENTORY_CHAMPION_2
+ kDMCommandToggleInventoryChampion3 = 10, // @ C010_COMMAND_TOGGLE_INVENTORY_CHAMPION_3
+ kDMCommandCloseInventory = 11, // @ C011_COMMAND_CLOSE_INVENTORY
+ kDMCommandClickInChampion0StatusBox = 12, // @ C012_COMMAND_CLICK_IN_CHAMPION_0_STATUS_BOX
+ kDMCommandClickInChampion1StatusBox = 13, // @ C013_COMMAND_CLICK_IN_CHAMPION_1_STATUS_BOX
+ kDMCommandClickInChampion2StatusBox = 14, // @ C014_COMMAND_CLICK_IN_CHAMPION_2_STATUS_BOX
+ kDMCommandClickInChampion3StatusBox = 15, // @ C015_COMMAND_CLICK_IN_CHAMPION_3_STATUS_BOX
+ kDMCommandSetLeaderChampion0 = 16, // @ C016_COMMAND_SET_LEADER_CHAMPION_0
+ kDMCommandSetLeaderChampion1 = 17, // @ C017_COMMAND_SET_LEADER_CHAMPION_1
+ kDMCommandSetLeaderChampion2 = 18, // @ C018_COMMAND_SET_LEADER_CHAMPION_2
+ kDMCommandSetLeaderChampion3 = 19, // @ C019_COMMAND_SET_LEADER_CHAMPION_3
+ kDMCommandClickOnSlotBoxChampion0StatusBoxReadyHand = 20, // @ C020_COMMAND_CLICK_ON_SLOT_BOX_00_CHAMPION_0_STATUS_BOX_READY_HAND
+ kDMCommandClickOnSlotBoxChampion0StatusBoxActionHand = 21, // @ C021_COMMAND_CLICK_ON_SLOT_BOX_01_CHAMPION_0_STATUS_BOX_ACTION_HAND
+ kDMCommandClickOnSlotBoxChampion1StatusBoxReadyHand = 22, // @ C022_COMMAND_CLICK_ON_SLOT_BOX_02_CHAMPION_1_STATUS_BOX_READY_HAND
+ kDMCommandClickOnSlotBoxChampion1StatusBoxActionHand = 23, // @ C023_COMMAND_CLICK_ON_SLOT_BOX_03_CHAMPION_1_STATUS_BOX_ACTION_HAND
+ kDMCommandClickOnSlotBoxChampion2StatusBoxReadyHand = 24, // @ C024_COMMAND_CLICK_ON_SLOT_BOX_04_CHAMPION_2_STATUS_BOX_READY_HAND
+ kDMCommandClickOnSlotBoxChampion2StatusBoxActionHand = 25, // @ C025_COMMAND_CLICK_ON_SLOT_BOX_05_CHAMPION_2_STATUS_BOX_ACTION_HAND
+ kDMCommandClickOnSlotBoxChampion3StatusBoxReadyHand = 26, // @ C026_COMMAND_CLICK_ON_SLOT_BOX_06_CHAMPION_3_STATUS_BOX_READY_HAND
+ kDMCommandClickOnSlotBoxChampion3StatusBoxActionHand = 27, // @ C027_COMMAND_CLICK_ON_SLOT_BOX_07_CHAMPION_3_STATUS_BOX_ACTION_HAND
+ kDMCommandClickOnSlotBoxInventoryReadyHand = 28, // @ C028_COMMAND_CLICK_ON_SLOT_BOX_08_INVENTORY_READY_HAND
+ kDMCommandClickOnSlotBoxInventoryActionHand = 29, // @ C029_COMMAND_CLICK_ON_SLOT_BOX_09_INVENTORY_ACTION_HAND
+ kDMCommandClickOnSlotBoxInventoryHead = 30, // @ C030_COMMAND_CLICK_ON_SLOT_BOX_10_INVENTORY_HEAD
+ kDMCommandClickOnSlotBoxInventoryTorso = 31, // @ C031_COMMAND_CLICK_ON_SLOT_BOX_11_INVENTORY_TORSO
+ kDMCommandClickOnSlotBoxInventoryLegs = 32, // @ C032_COMMAND_CLICK_ON_SLOT_BOX_12_INVENTORY_LEGS
+ kDMCommandClickOnSlotBoxInventoryFeet = 33, // @ C033_COMMAND_CLICK_ON_SLOT_BOX_13_INVENTORY_FEET
+ kDMCommandClickOnSlotBoxInventoryPouch2 = 34, // @ C034_COMMAND_CLICK_ON_SLOT_BOX_14_INVENTORY_POUCH_2
+ kDMCommandClickOnSlotBoxInventoryQuiverLine2_1 = 35, // @ C035_COMMAND_CLICK_ON_SLOT_BOX_15_INVENTORY_QUIVER_LINE2_1
+ kDMCommandClickOnSlotBoxInventoryQuiverLine1_2 = 36, // @ C036_COMMAND_CLICK_ON_SLOT_BOX_16_INVENTORY_QUIVER_LINE1_2
+ kDMCommandClickOnSlotBoxInventoryQuiverLine2_2 = 37, // @ C037_COMMAND_CLICK_ON_SLOT_BOX_17_INVENTORY_QUIVER_LINE2_2
+ kDMCommandClickOnSlotBoxInventoryNeck = 38, // @ C038_COMMAND_CLICK_ON_SLOT_BOX_18_INVENTORY_NECK
+ kDMCommandClickOnSlotBoxInventoryPouch1 = 39, // @ C039_COMMAND_CLICK_ON_SLOT_BOX_19_INVENTORY_POUCH_1
+ kDMCommandClickOnSlotBoxInventoryQuiverLine1_1 = 40, // @ C040_COMMAND_CLICK_ON_SLOT_BOX_20_INVENTORY_QUIVER_LINE1_1
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_1 = 41, // @ C041_COMMAND_CLICK_ON_SLOT_BOX_21_INVENTORY_BACKPACK_LINE1_1
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_2 = 42, // @ C042_COMMAND_CLICK_ON_SLOT_BOX_22_INVENTORY_BACKPACK_LINE2_2
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_3 = 43, // @ C043_COMMAND_CLICK_ON_SLOT_BOX_23_INVENTORY_BACKPACK_LINE2_3
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_4 = 44, // @ C044_COMMAND_CLICK_ON_SLOT_BOX_24_INVENTORY_BACKPACK_LINE2_4
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_5 = 45, // @ C045_COMMAND_CLICK_ON_SLOT_BOX_25_INVENTORY_BACKPACK_LINE2_5
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_6 = 46, // @ C046_COMMAND_CLICK_ON_SLOT_BOX_26_INVENTORY_BACKPACK_LINE2_6
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_7 = 47, // @ C047_COMMAND_CLICK_ON_SLOT_BOX_27_INVENTORY_BACKPACK_LINE2_7
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_8 = 48, // @ C048_COMMAND_CLICK_ON_SLOT_BOX_28_INVENTORY_BACKPACK_LINE2_8
+ kDMCommandClickOnSlotBoxInventoryBackpackLine2_9 = 49, // @ C049_COMMAND_CLICK_ON_SLOT_BOX_29_INVENTORY_BACKPACK_LINE2_9
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_2 = 50, // @ C050_COMMAND_CLICK_ON_SLOT_BOX_30_INVENTORY_BACKPACK_LINE1_2
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_3 = 51, // @ C051_COMMAND_CLICK_ON_SLOT_BOX_31_INVENTORY_BACKPACK_LINE1_3
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_4 = 52, // @ C052_COMMAND_CLICK_ON_SLOT_BOX_32_INVENTORY_BACKPACK_LINE1_4
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_5 = 53, // @ C053_COMMAND_CLICK_ON_SLOT_BOX_33_INVENTORY_BACKPACK_LINE1_5
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_6 = 54, // @ C054_COMMAND_CLICK_ON_SLOT_BOX_34_INVENTORY_BACKPACK_LINE1_6
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_7 = 55, // @ C055_COMMAND_CLICK_ON_SLOT_BOX_35_INVENTORY_BACKPACK_LINE1_7
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_8 = 56, // @ C056_COMMAND_CLICK_ON_SLOT_BOX_36_INVENTORY_BACKPACK_LINE1_8
+ kDMCommandClickOnSlotBoxInventoryBackpackLine1_9 = 57, // @ C057_COMMAND_CLICK_ON_SLOT_BOX_37_INVENTORY_BACKPACK_LINE1_9
+ kDMCommandClickOnSlotBoxChest1 = 58, // @ C058_COMMAND_CLICK_ON_SLOT_BOX_38_CHEST_1
+ kDMCommandClickOnSlotBoxChest2 = 59, // @ C059_COMMAND_CLICK_ON_SLOT_BOX_39_CHEST_2
+ kDMCommandClickOnSlotBoxChest3 = 60, // @ C060_COMMAND_CLICK_ON_SLOT_BOX_40_CHEST_3
+ kDMCommandClickOnSlotBoxChest4 = 61, // @ C061_COMMAND_CLICK_ON_SLOT_BOX_41_CHEST_4
+ kDMCommandClickOnSlotBoxChest5 = 62, // @ C062_COMMAND_CLICK_ON_SLOT_BOX_42_CHEST_5
+ kDMCommandClickOnSlotBoxChest6 = 63, // @ C063_COMMAND_CLICK_ON_SLOT_BOX_43_CHEST_6
+ kDMCommandClickOnSlotBoxChest7 = 64, // @ C064_COMMAND_CLICK_ON_SLOT_BOX_44_CHEST_7
+ kDMCommandClickOnSlotBoxChest8 = 65, // @ C065_COMMAND_CLICK_ON_SLOT_BOX_45_CHEST_8
+ kDMCommandClickOnMouth = 70, // @ C070_COMMAND_CLICK_ON_MOUTH
+ kDMCommandClickOnEye = 71, // @ C071_COMMAND_CLICK_ON_EYE
+ kDMCommandClickInDungeonView = 80, // @ C080_COMMAND_CLICK_IN_DUNGEON_VIEW
+ kDMCommandClickInPanel = 81, // @ C081_COMMAND_CLICK_IN_PANEL
+ kDMCommandToggleInventoryLeader = 83, // @ C083_COMMAND_TOGGLE_INVENTORY_LEADER
+ kDMCommandClickInSpellArea = 100, // @ C100_COMMAND_CLICK_IN_SPELL_AREA
+ kDMCommandClickInSpellAreaSymbol1 = 101, // @ C101_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_1
+ kDMCommandClickInSpellAreaSymbol2 = 102, // @ C102_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_2
+ kDMCommandClickInSpellAreaSymbol3 = 103, // @ C103_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_3
+ kDMCommandClickInSpellAreaSymbol4 = 104, // @ C104_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_4
+ kDMCommandClickInSpellAreaSymbol5 = 105, // @ C105_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_5
+ kDMCommandClickInSpellAreaSymbol6 = 106, // @ C106_COMMAND_CLICK_IN_SPELL_AREA_SYMBOL_6
+ kDMCommandClickInSpellAreaRecantSymbol = 107, // @ C107_COMMAND_CLICK_IN_SPELL_AREA_RECANT_SYMBOL
+ kDMCommandClickInSpeallAreaCastSpell = 108, // @ C108_COMMAND_CLICK_IN_SPELL_AREA_CAST_SPELL
+ kDMCommandClickInActionArea = 111, // @ C111_COMMAND_CLICK_IN_ACTION_AREA
+ kDMCommandClickInActionAreaPass = 112, // @ C112_COMMAND_CLICK_IN_ACTION_AREA_PASS
+ kDMCommandClickInActionAreaAction0 = 113, // @ C113_COMMAND_CLICK_IN_ACTION_AREA_ACTION_0
+ kDMCommandClickInActionAreaAction1 = 114, // @ C114_COMMAND_CLICK_IN_ACTION_AREA_ACTION_1
+ kDMCommandClickInActionAreaAction2 = 115, // @ C115_COMMAND_CLICK_IN_ACTION_AREA_ACTION_2
+ kDMCommandClickInActionAreaChampion0Action = 116, // @ C116_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_0_ACTION
+ kDMCommandClickInActionAreaChampion1Action = 117, // @ C117_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_1_ACTION
+ kDMCommandClickInActionAreaChampion2Action = 118, // @ C118_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_2_ACTION
+ kDMCommandClickInActionAreaChampion3Action = 119, // @ C119_COMMAND_CLICK_IN_ACTION_AREA_CHAMPION_3_ACTION
+ kDMCommandClickOnChamptionIconTopLeft = 125, // @ C125_COMMAND_CLICK_ON_CHAMPION_ICON_TOP_LEFT
+ kDMCommandClickOnChamptionIconTopRight = 126, // @ C126_COMMAND_CLICK_ON_CHAMPION_ICON_TOP_RIGHT
+ kDMCommandClickOnChamptionIconLowerRight = 127, // @ C127_COMMAND_CLICK_ON_CHAMPION_ICON_LOWER_RIGHT
+ kDMCommandClickOnChamptionIconLowerLeft = 128, // @ C128_COMMAND_CLICK_ON_CHAMPION_ICON_LOWER_LEFT
+ kDMCommandSaveGame = 140, // @ C140_COMMAND_SAVE_GAME
+ kDMCommandSleep = 145, // @ C145_COMMAND_SLEEP
+ kDMCommandWakeUp = 146, // @ C146_COMMAND_WAKE_UP
+ kDMCommandFreezeGame = 147, // @ C147_COMMAND_FREEZE_GAME
+ kDMCommandUnfreezeGame = 148, // @ C148_COMMAND_UNFREEZE_GAME
+ kDMCommandClickInPanelResurrect = 160, // @ C160_COMMAND_CLICK_IN_PANEL_RESURRECT
+ kDMCommandClickInPanelReincarnate = 161, // @ C161_COMMAND_CLICK_IN_PANEL_REINCARNATE
+ kDMCommandClickInPanelCancel = 162, // @ C162_COMMAND_CLICK_IN_PANEL_CANCEL
+ kDMCommandEntranceEnterDungeon = 200, // @ C200_COMMAND_ENTRANCE_ENTER_DUNGEON
+ kDMCommandEntranceResume = 201, // @ C201_COMMAND_ENTRANCE_RESUME /* Versions 1.x and 2.x command */
+ kDMCommandEntranceDrawCredits = 202, // @ C202_COMMAND_ENTRANCE_DRAW_CREDITS /* Versions 1.x and 2.x command */
+ kDMCommandClickOnDialogChoice1 = 210, // @ C210_COMMAND_CLICK_ON_DIALOG_CHOICE_1
+ kDMCommandClickOnDialogChoice2 = 211, // @ C211_COMMAND_CLICK_ON_DIALOG_CHOICE_2
+ kDMCommandClickOnDialogChoice3 = 212, // @ C212_COMMAND_CLICK_ON_DIALOG_CHOICE_3
+ kDMCommandClickOnDialogChoice4 = 213, // @ C213_COMMAND_CLICK_ON_DIALOG_CHOICE_4
+ kDMCommandRestartGame = 215 // @ C215_COMMAND_RESTART_GAME
+};
class Command {
public:
@@ -174,7 +174,7 @@ public:
MouseInput(CommandType type, uint16 x1, uint16 x2, uint16 y1, uint16 y2, MouseButton mouseButton)
: _commandTypeToIssue(type), _hitbox(x1, x2 + 1, y1, y2 + 1), _button(mouseButton) {}
MouseInput()
- : _commandTypeToIssue(k0_CommandNone), _hitbox(0, 1, 0, 1), _button(k0_NoneMouseButton) {}
+ : _commandTypeToIssue(kDMCommandNone), _hitbox(0, 1, 0, 1), _button(kDMMouseButtonNone) {}
}; // @ MOUSE_INPUT
class KeyboardInput {
@@ -184,7 +184,7 @@ public:
byte _modifiers;
KeyboardInput(CommandType command, Common::KeyCode keycode, byte modifierFlags) : _commandToIssue(command), _key(keycode), _modifiers(modifierFlags) {}
- KeyboardInput() : _commandToIssue(k0_CommandNone), _key(Common::KEYCODE_ESCAPE), _modifiers(0) {}
+ KeyboardInput() : _commandToIssue(kDMCommandNone), _key(Common::KEYCODE_ESCAPE), _modifiers(0) {}
}; // @ KEYBOARD_INPUT
class DMEngine;
diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp
index 6b39a15..3fe3493 100644
--- a/engines/dm/inventory.cpp
+++ b/engines/dm/inventory.cpp
@@ -882,7 +882,7 @@ void InventoryMan::clickOnMouth() {
_vm->_eventMan->_ignoreMouseMovements = true;
_vm->_pressingMouth = true;
- if (!_vm->_eventMan->isMouseButtonDown(k1_LeftMouseButton)) {
+ if (!_vm->_eventMan->isMouseButtonDown(kDMMouseButtonLeft)) {
_vm->_eventMan->_ignoreMouseMovements = false;
_vm->_pressingMouth = false;
_vm->_stopPressingMouth = false;
@@ -1049,7 +1049,7 @@ void InventoryMan::adjustStatisticCurrentValue(Champion *champ, uint16 statIndex
void InventoryMan::clickOnEye() {
_vm->_eventMan->_ignoreMouseMovements = true;
_vm->_pressingEye = true;
- if (!_vm->_eventMan->isMouseButtonDown(k1_LeftMouseButton)) {
+ if (!_vm->_eventMan->isMouseButtonDown(kDMMouseButtonLeft)) {
_vm->_eventMan->_ignoreMouseMovements = false;
_vm->_pressingEye = false;
_vm->_stopPressingEye = false;
More information about the Scummvm-git-logs
mailing list