aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBendegúz Nagy2016-08-09 08:40:29 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commitfd775be377bf2fa4914cb621bd2dcf1cbe6ede58 (patch)
treeaba088783fefd597de052d5eb9cceeb49f32954b
parent3f1fee6dcb9d13dda82683e39cc642419d73d08a (diff)
downloadscummvm-rg350-fd775be377bf2fa4914cb621bd2dcf1cbe6ede58.tar.gz
scummvm-rg350-fd775be377bf2fa4914cb621bd2dcf1cbe6ede58.tar.bz2
scummvm-rg350-fd775be377bf2fa4914cb621bd2dcf1cbe6ede58.zip
DM: Swap warnings to stub method f363_highlightBoxDisable
-rw-r--r--engines/dm/dm.cpp10
-rw-r--r--engines/dm/eventman.cpp2
-rw-r--r--engines/dm/eventman.h3
-rw-r--r--engines/dm/menus.cpp4
4 files changed, 10 insertions, 9 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index 9ae9249489..33bd033c5b 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -395,7 +395,7 @@ void DMEngine::f2_gameloop() {
_eventMan->f77_hideMouse();
}
}
- // F0363_COMMAND_HighlightBoxDisable();
+ _eventMan->f363_highlightBoxDisable();
f65_playPendingSound();
_championMan->f320_applyAndDrawPendingDamageAndWounds();
if (_championMan->_g303_partyDead)
@@ -440,9 +440,9 @@ void DMEngine::f2_gameloop() {
if (_engineShouldQuit)
return;
_displayMan->updateScreen();
- // if (!_g321_stopWaitingForPlayerInput) {
- // F0363_COMMAND_HighlightBoxDisable();
- // }
+ if (!_g321_stopWaitingForPlayerInput) {
+ _eventMan->f363_highlightBoxDisable();
+ }
_system->delayMillis(2);
if (++vblankCounter >= _g318_waitForInputMaxVerticalBlankCount * 5)
@@ -537,7 +537,7 @@ void DMEngine::f444_endGame(bool doNotDrawCreditsOnly) {
f064_SOUND_RequestPlay_CPSD(k06_soundSCREAM, _dungeonMan->_g306_partyMapX, _dungeonMan->_g307_partyMapY, k0_soundModePlayImmediately);
f22_delay(240);
}
-
+
if (_displayMan->_g322_paletteSwitchingEnabled) {
uint16 oldPalTopAndBottomScreen[16];
for (uint16 i = 0; i < 16; ++i)
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index efa541f446..b0d60532a5 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -1504,7 +1504,7 @@ void EventManager::f369_commandProcessTypes101To108_clickInSpellSymbolsArea(Comm
L1131_ps_Box = &G0464_as_Graphic561_Box_SpellSymbolsAndDelete[L1130_ui_SymbolIndex];
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");
+ f363_highlightBoxDisable();
if (L1130_ui_SymbolIndex < 6) {
_vm->_menuMan->f399_addChampionSymbol(L1130_ui_SymbolIndex);
} else {
diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h
index ee49313d52..11958e10aa 100644
--- a/engines/dm/eventman.h
+++ b/engines/dm/eventman.h
@@ -258,7 +258,7 @@ class EventManager {
void f365_commandTurnParty(CommandType cmdType); // @ F0365_COMMAND_ProcessTypes1To2_TurnParty
void f366_commandMoveParty(CommandType cmdType); // @ F0366_COMMAND_ProcessTypes3To6_MoveParty
bool f375_processType80_clickDungeonView_isLeaderHandObjThrown(int16 posX, int16 posY); // @ F0375_COMMAND_ProcessType80_ClickInDungeonView_IsLeaderHandObjectThrown
- void setMousePointerFromSpriteData(byte* mouseSprite);
+ void setMousePointerFromSpriteData(byte* mouseSprite);
public:
explicit EventManager(DMEngine *vm);
@@ -320,6 +320,7 @@ public:
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
+ void f363_highlightBoxDisable() { warning(false, "STUB METHOD: f363_highlightBoxDisable"); } // @ F0363_COMMAND_HighlightBoxDisable
};
}
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index 7ac96ebea5..f3446c361c 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -176,7 +176,7 @@ T0386006:
void MenuMan::f456_drawDisabledMenu() {
if (!_vm->_championMan->_g300_partyIsSleeping) {
- warning(false, "MISSING CODE: F0363_COMMAND_HighlightBoxDisable");
+ _vm->_eventMan->f363_highlightBoxDisable();
_vm->_displayMan->_g578_useByteBoxCoordinates = false;
if (_vm->_inventoryMan->_g432_inventoryChampionOrdinal) {
if (_vm->_inventoryMan->_g424_panelContent == k4_PanelContentChest) {
@@ -459,7 +459,7 @@ int16 MenuMan::f408_getClickOnSpellCastResult() {
L1260_ps_Champion = &_vm->_championMan->_gK71_champions[_vm->_championMan->_g514_magicCasterChampionIndex];
_vm->_eventMan->f78_showMouse();
- warning(false, "MISSING CODE: F0363_COMMAND_HighlightBoxDisable");
+ _vm->_eventMan->f363_highlightBoxDisable();
if ((L1259_i_SpellCastResult = f412_getChampionSpellCastResult(_vm->_championMan->_g514_magicCasterChampionIndex)) != k3_spellCastFailureNeedsFlask) {
L1260_ps_Champion->_symbols[0] = '\0';
f397_drawAvailableSymbols(L1260_ps_Champion->_symbolStep = 0);