From 0f9995851bccea18084cf05b7ef156d78ebdb8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bendeg=C3=BAz=20Nagy?= Date: Tue, 9 Aug 2016 08:47:59 +0200 Subject: [PATCH] DM: Add stub method f6_highlightScreenBox --- engines/dm/eventman.h | 3 ++- engines/dm/menus.cpp | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h index 11958e10aab..520648505e1 100644 --- a/engines/dm/eventman.h +++ b/engines/dm/eventman.h @@ -164,7 +164,7 @@ public: Common::Point _pos; CommandType _type; - Command(Common::Point position, CommandType commandType): _pos(position), _type(commandType) {} + Command(Common::Point position, CommandType commandType) : _pos(position), _type(commandType) {} }; // @ COMMAND @@ -321,6 +321,7 @@ public: 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 + void f6_highlightScreenBox(int16 x1, int16 x2, int16 y1, int16 y2) { warning(false, "STUB METHOD: f6_highlightScreenBox"); } // @ F0006_MAIN_HighlightScreenBox }; } diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index f3446c361ce..509623d6d91 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -309,21 +309,21 @@ void MenuMan::f393_drawSpellAreaControls(ChampionIndex champIndex) { int16 champCount = champMan._g305_partyChampionCount; switch (champIndex) { case k0_ChampionFirst: - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(233, 277, 42, 49); textMan.f53_printToLogicalScreen(235, 48, k0_ColorBlack, k4_ColorCyan, champ._name); if (champCount) { if (champCurrHealth[1]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(280, 291, 42, 48);; } labelChamp2: if (champCount > 2) { if (champCurrHealth[2]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(294, 305, 42, 48); } labelChamp3: if (champCount > 3) { if (champCurrHealth[3]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(308, 319, 42, 48); } } } @@ -331,32 +331,32 @@ labelChamp3: break; case k1_ChampionSecond: if (champCurrHealth[0]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48); } - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(247, 291, 42, 49); textMan.f53_printToLogicalScreen(249, 48, k0_ColorBlack, k4_ColorCyan, champ._name); goto labelChamp2; case k2_ChampionThird: if (champCurrHealth[0]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48); } if (champCurrHealth[1]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(247, 258, 42, 48); } - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(261, 305, 42, 49); textMan.f53_printToLogicalScreen(263, 48, k0_ColorBlack, k4_ColorCyan, champ._name); goto labelChamp3; case k3_ChampionFourth: if (champCurrHealth[0]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48); } if (champCurrHealth[1]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(247, 258, 42, 48); } if (champCurrHealth[2]) { - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(261, 272, 42, 48); } - warning(false, "MISSING CODE: F0006_MAIN_HighlightScreenBox"); + _vm->_eventMan->f6_highlightScreenBox(275, 319, 42, 49); textMan.f53_printToLogicalScreen(277, 48, k0_ColorBlack, k4_ColorCyan, champ._name); break; }