diff options
author | Bendegúz Nagy | 2016-08-09 08:27:21 +0200 |
---|---|---|
committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
commit | 233f93fefebd3150a2da41703b53d8223b9c36c7 (patch) | |
tree | 7de08320434bee3bf65d3ca634be5893cf405fa9 /engines/dm | |
parent | 774ae8e821f8bb91b297ecde39d0496666c1a6e0 (diff) | |
download | scummvm-rg350-233f93fefebd3150a2da41703b53d8223b9c36c7.tar.gz scummvm-rg350-233f93fefebd3150a2da41703b53d8223b9c36c7.tar.bz2 scummvm-rg350-233f93fefebd3150a2da41703b53d8223b9c36c7.zip |
DM: Swap some warnings to stub methods
Stub methods: f362_commandHighlightBoxEnable, f442_SARTEND_processCommand202_entranceDrawCredits, f437_STARTEND_drawTittle
Diffstat (limited to 'engines/dm')
-rw-r--r-- | engines/dm/dm.cpp | 4 | ||||
-rw-r--r-- | engines/dm/dm.h | 2 | ||||
-rw-r--r-- | engines/dm/eventman.cpp | 19 | ||||
-rw-r--r-- | engines/dm/eventman.h | 1 |
4 files changed, 15 insertions, 11 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index 0381f34067..9ae9249489 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -240,7 +240,7 @@ void DMEngine::f463_initializeGame() { _displayMan->f94_loadFloorSet(k0_FloorSetStone); _displayMan->f95_loadWallSet(k0_WallSetStone); f503_loadSounds(); - warning(false, "MISSING CODE: F0437_STARTEND_DrawTitle"); + f437_STARTEND_drawTittle(); _textMan->f54_textInitialize(); _objectMan->loadObjectNames(); _eventMan->initMouse(); @@ -262,7 +262,7 @@ void DMEngine::f463_initializeGame() { } void DMEngine::f448_initMemoryManager() { - warning(false, "STUB FUNCTION"); + warning(false, "STUB METHOD: f448_initMemoryManager"); for (uint16 i = 0; i < 16; ++i) _displayMan->_g347_paletteTopAndBottomScreen[i] = g21_PalDungeonView[0][i]; } diff --git a/engines/dm/dm.h b/engines/dm/dm.h index 1c187020f1..529a768c22 100644 --- a/engines/dm/dm.h +++ b/engines/dm/dm.h @@ -259,6 +259,8 @@ public: void f65_playPendingSound(); // @ F0065_SOUND_PlayPendingSound_CPSD bool f505_soundGetVolume(int16 mapX, int16 mapY, uint8 *leftVolume, uint8 *rightVolume); // @ F0505_SOUND_GetVolume void f438_STARTEND_OpenEntranceDoors() { warning(true, "STUB: f438_STARTEND_OpenEntranceDoors"); } // @ F0438_STARTEND_OpenEntranceDoors + void f437_STARTEND_drawTittle() { warning(false, "STUB METHOD: f437_STARTEND_drawTittle"); }// @ F0437_STARTEND_DrawTitle + void f442_SARTEND_processCommand202_entranceDrawCredits() { warning(false, "STUB METHOD: f442_SARTEND_processCommand202_entranceDrawCredits"); }// @ F0442_STARTEND_ProcessCommand202_EntranceDrawCredits private: int16 _g528_saveFormat; // @ G0528_i_Format diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp index 00e11ef02d..f4e506179e 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -810,7 +810,7 @@ void EventManager::f380_processCommandQueue() { return; } if (cmdType == k202_CommandEntranceDrawCredits) { - warning(false, "MISSING CODE: F0442_STARTEND_ProcessCommand202_EntranceDrawCredits()"); + _vm->f442_SARTEND_processCommand202_entranceDrawCredits(); return; } if ((cmdType >= k210_CommandClickOnDialogChoice_1) && (cmdType <= k213_CommandClickOnDialogChoice_4)) { @@ -827,8 +827,9 @@ void EventManager::f365_commandTurnParty(CommandType cmdType) { _vm->_g321_stopWaitingForPlayerInput = true; if (cmdType == k1_CommandTurnLeft) { - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(234, 261, 125, 145); } else { + f362_commandHighlightBoxEnable(291, 318, 125, 145); } if (Square(L1114_ui_Square = _vm->_dungeonMan->f151_getSquare(_vm->_dungeonMan->_g306_partyMapX, _vm->_dungeonMan->_g307_partyMapY).toByte()).getType() == k3_ElementTypeStairs) { f364_commandTakeStairs(getFlag(L1114_ui_Square, k0x0004_StairsUp)); @@ -883,7 +884,7 @@ void EventManager::f366_commandMoveParty(CommandType cmdType) { } AL1118_ui_MovementArrowIndex = cmdType - k3_CommandMoveForward; L1120_ps_Box = &g463_BoxMovementArrows[AL1118_ui_MovementArrowIndex]; - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(L1120_ps_Box->_x1, L1120_ps_Box->_x2, L1120_ps_Box->_y1, L1120_ps_Box->_y2); L1123_B_StairsSquare = (Square(AL1115_ui_Square = _vm->_dungeonMan->f151_getSquare(L1121_i_MapX = _vm->_dungeonMan->_g306_partyMapX, L1122_i_MapY = _vm->_dungeonMan->_g307_partyMapY).toByte()).getType() == k3_ElementTypeStairs); if (L1123_B_StairsSquare && (AL1118_ui_MovementArrowIndex == 2)) { /* If moving backward while in stairs */ f364_commandTakeStairs(getFlag(AL1115_ui_Square, k0x0004_StairsUp)); @@ -1494,13 +1495,13 @@ void EventManager::f369_commandProcessTypes101To108_clickInSpellSymbolsArea(Comm if (_vm->_championMan->_gK71_champions[_vm->_championMan->_g514_magicCasterChampionIndex]._symbols[0] == '\0') { return; } - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(234, 303, 63, 73); _vm->_g321_stopWaitingForPlayerInput = _vm->_menuMan->f408_getClickOnSpellCastResult(); return; } L1130_ui_SymbolIndex = cmdType - k101_CommandClickInSpellAreaSymbol_1; L1131_ps_Box = &G0464_as_Graphic561_Box_SpellSymbolsAndDelete[L1130_ui_SymbolIndex]; - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(L1131_ps_Box->_x1, L1131_ps_Box->_x2, L1131_ps_Box->_y1, L1131_ps_Box->_y2); _vm->f22_delay(1); warning(false, "MISSING CODE: F0363_COMMAND_HighlightBoxDisable"); if (L1130_ui_SymbolIndex < 6) { @@ -1518,17 +1519,17 @@ void EventManager::f371_commandProcessType111To115_ClickInActionArea(int16 posX, L1134_ui_Command = f358_getCommandTypeFromMouseInput(g452_MouseInput_ActionAreaNames, Common::Point(posX, posY), k1_LeftMouseButton); if (L1134_ui_Command != k0_CommandNone) { if (L1134_ui_Command == k112_CommandClickInActionAreaPass) { - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(285, 319, 77, 83); _vm->_menuMan->f391_didClickTriggerAction(-1); } else { if ((L1134_ui_Command - k112_CommandClickInActionAreaPass) <= _vm->_menuMan->_g507_actionCount) { if (L1134_ui_Command == k113_CommandClickInActionAreaAction_0) { - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(234, 318, 86, 96); } else { if (L1134_ui_Command == k114_CommandClickInActionAreaAction_1) { - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(234, 318, 98, 108); } else { - warning(false, "MISSING CODE: F0362_COMMAND_HighlightBoxEnable"); + f362_commandHighlightBoxEnable(234, 318, 110, 120); } } _vm->_g321_stopWaitingForPlayerInput = _vm->_menuMan->f391_didClickTriggerAction(L1134_ui_Command - k113_CommandClickInActionAreaAction_0); diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h index 891b0e4a4d..ee49313d52 100644 --- a/engines/dm/eventman.h +++ b/engines/dm/eventman.h @@ -319,6 +319,7 @@ public: void f371_commandProcessType111To115_ClickInActionArea(int16 posX, int16 posY); // @ F0371_COMMAND_ProcessType111To115_ClickInActionArea_CPSE void f544_resetPressingEyeOrMouth(); // @ F0544_INPUT_ResetPressingEyeOrMouth void f541_waitForMouseOrKeyActivity(); // @ F0541_INPUT_WaitForMouseOrKeyboardActivity + void f362_commandHighlightBoxEnable(int16 x1, int16 x2, int16 y1, int16 y2) { warning(false, "STUB METHOD: f362_commandHighlightBoxEnable"); }// @ F0362_COMMAND_HighlightBoxEnable }; } |