[Scummvm-git-logs] scummvm master -> 03470bf83c4d7b3513a2d71600d584190cd91bbc
dreammaster
noreply at scummvm.org
Mon Aug 14 00:37:12 UTC 2023
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:
03470bf83c MM: MM1: Hopefully fix new deprecated InfoMessage warnings
Commit: 03470bf83c4d7b3513a2d71600d584190cd91bbc
https://github.com/scummvm/scummvm/commit/03470bf83c4d7b3513a2d71600d584190cd91bbc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-08-13T17:36:56-07:00
Commit Message:
MM: MM1: Hopefully fix new deprecated InfoMessage warnings
Changed paths:
engines/mm/mm1/game/combat.cpp
engines/mm/mm1/maps/map06.cpp
engines/mm/mm1/maps/map17.cpp
engines/mm/mm1/maps/map25.cpp
engines/mm/mm1/maps/map_desert.cpp
engines/mm/mm1/messages.cpp
engines/mm/mm1/messages.h
engines/mm/mm1/views/combat.cpp
engines/mm/mm1/views/game_messages.cpp
engines/mm/mm1/views/game_messages.h
engines/mm/mm1/views_enh/combat.cpp
engines/mm/mm1/views_enh/game_messages.cpp
engines/mm/mm1/views_enh/game_messages.h
engines/mm/mm1/views_enh/items_view.cpp
engines/mm/mm1/views_enh/locations/location.cpp
engines/mm/mm1/views_enh/who_will_try.cpp
diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 353036ed69a..b8ef8b6df46 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -996,7 +996,7 @@ void Combat::iterateMonsters1Inner() {
if (!isEnd) {
// Move to next iteration after display timeout
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->iterateMonsters1Inner();
};
}
@@ -1080,11 +1080,11 @@ void Combat::iterateMonsters2Inner() {
if (!isEnd) {
// Move to next iteration after display timeout
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->iterateMonsters2Inner();
};
} else {
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->characterDone();
};
}
@@ -1170,7 +1170,7 @@ void Combat::summonLightning() {
InfoMessage msg(0, 0, line1);
msg._delaySeconds = 3;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->summonLightning2();
};
displaySpellResult(msg);
@@ -1304,7 +1304,7 @@ void Combat::identifyMonster() {
_monsterP->_resistUndead & MAGIC_RESISTANCE);
msg._lines.push_back(Line(0, 3, line));
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->characterDone();
};
@@ -1328,7 +1328,7 @@ void Combat::fireball() {
InfoMessage msg(0, 0, line1);
msg._delaySeconds = 3;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->fireball2();
};
displaySpellResult(msg);
@@ -1432,7 +1432,7 @@ void Combat::fingerOfDeath() {
InfoMessage msg(0, 0, line1, 0, 2, line2);
msg._delaySeconds = 3;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->characterDone();
};
@@ -1463,7 +1463,7 @@ void Combat::disintegration() {
InfoMessage msg(0, 0, line1, 0, 2, line2);
msg._delaySeconds = 3;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_combat->characterDone();
};
diff --git a/engines/mm/mm1/maps/map06.cpp b/engines/mm/mm1/maps/map06.cpp
index f16708c868e..735eeb59972 100644
--- a/engines/mm/mm1/maps/map06.cpp
+++ b/engines/mm/mm1/maps/map06.cpp
@@ -208,7 +208,7 @@ void Map06::slide() {
SoundMessage msg(16, 1, STRING["maps.map06.slide"]);
msg._delaySeconds = 2;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_maps->_currentMap->updateGame();
};
diff --git a/engines/mm/mm1/maps/map17.cpp b/engines/mm/mm1/maps/map17.cpp
index b5a12dd7288..83474de4845 100644
--- a/engines/mm/mm1/maps/map17.cpp
+++ b/engines/mm/mm1/maps/map17.cpp
@@ -149,7 +149,7 @@ void Map17::askQuestion(uint partyIndex) {
msg2._lines.push_back(Line(0, 0, STRING["maps.map17.color"]));
msg2._lines.push_back(Line(0, 2, STRING["maps.map17.options"]));
msg2._lines.push_back(Line(16, 6, line));
- msg2._timeoutCallback = []() {
+ msg2._callback = []() {
Map17 &map17 = *static_cast<Map17 *>(g_maps->_currentMap);
map17.askQuestion(map17[VAL1] + 1);
};
diff --git a/engines/mm/mm1/maps/map25.cpp b/engines/mm/mm1/maps/map25.cpp
index 871744afc0b..fdb746da6d2 100644
--- a/engines/mm/mm1/maps/map25.cpp
+++ b/engines/mm/mm1/maps/map25.cpp
@@ -104,7 +104,7 @@ void Map25::special() {
SoundMessage msg(STRING["maps.map25.weeping"]);
if (getRandomNumber(100) >= 99) {
msg._delaySeconds = 3;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_encounters.execute();
};
}
diff --git a/engines/mm/mm1/maps/map_desert.cpp b/engines/mm/mm1/maps/map_desert.cpp
index f91c69a14cd..503b6865f3a 100644
--- a/engines/mm/mm1/maps/map_desert.cpp
+++ b/engines/mm/mm1/maps/map_desert.cpp
@@ -67,7 +67,7 @@ void MapDesert::desert() {
switch (_randomMode) {
case RND_BASIC:
if (getRandomNumber(100) == 100) {
- msg._timeoutCallback = []() {
+ msg._callback = []() {
g_globals->_encounters.execute();
};
msg._delaySeconds = 3;
diff --git a/engines/mm/mm1/messages.cpp b/engines/mm/mm1/messages.cpp
index f9ac91ab2aa..9b1f58852ca 100644
--- a/engines/mm/mm1/messages.cpp
+++ b/engines/mm/mm1/messages.cpp
@@ -62,20 +62,20 @@ InfoMessage::InfoMessage(int x1, int y1, const Common::String &str1,
InfoMessage::InfoMessage(const Common::String &str, YNCallback yCallback,
YNCallback nCallback) :
- Message(), _yCallback(yCallback), _nCallback(nCallback) {
+ Message(), _callback(yCallback), _nCallback(nCallback) {
_lines.push_back(str);
}
InfoMessage::InfoMessage(int x, int y, const Common::String &str,
YNCallback yCallback, YNCallback nCallback) :
- Message(), _yCallback(yCallback), _nCallback(nCallback) {
+ Message(), _callback(yCallback), _nCallback(nCallback) {
_lines.push_back(Line(x, y, str));
}
InfoMessage::InfoMessage(int x1, int y1, const Common::String &str1,
int x2, int y2, const Common::String &str2,
YNCallback yCallback, YNCallback nCallback) :
- Message(), _yCallback(yCallback), _nCallback(nCallback) {
+ Message(), _callback(yCallback), _nCallback(nCallback) {
_lines.push_back(Line(x1, y1, str1));
_lines.push_back(Line(x2, y2, str2));
}
@@ -99,7 +99,7 @@ InfoMessage::InfoMessage(int x1, int y1, const Common::String &str1,
InfoMessage &InfoMessage::operator=(const InfoMessage &src) {
_lines = src._lines;
- _yCallback = src._yCallback;
+ _callback = src._callback;
_nCallback = src._nCallback;
_keyCallback = src._keyCallback;
_largeMessage = src._largeMessage;
diff --git a/engines/mm/mm1/messages.h b/engines/mm/mm1/messages.h
index 8ac3b4b9021..ac5e8efa126 100644
--- a/engines/mm/mm1/messages.h
+++ b/engines/mm/mm1/messages.h
@@ -128,10 +128,9 @@ typedef void (*YNCallback)();
typedef void (*KeyCallback)(const Common::KeyState &keyState);
struct InfoMessage : public Message {
LineArray _lines;
- YNCallback _yCallback = nullptr;
- YNCallback _nCallback = nullptr;
+ YNCallback _callback = nullptr; // Callback for timeouts and Y of Y/N queries
+ YNCallback _nCallback = nullptr; // Callback for N in Y/N queries
KeyCallback _keyCallback = nullptr;
- YNCallback &_timeoutCallback = _yCallback;
bool _largeMessage = false;
bool _sound = false;
int _delaySeconds = 0;
diff --git a/engines/mm/mm1/views/combat.cpp b/engines/mm/mm1/views/combat.cpp
index 08dc6a53b67..56eeb93118a 100644
--- a/engines/mm/mm1/views/combat.cpp
+++ b/engines/mm/mm1/views/combat.cpp
@@ -220,8 +220,8 @@ void Combat::timeout() {
combatDone();
break;
case SPELL_RESULT:
- if (_spellResult._timeoutCallback)
- _spellResult._timeoutCallback();
+ if (_spellResult._callback)
+ _spellResult._callback();
else
// Character is done
block();
@@ -261,8 +261,8 @@ bool Combat::msgKeypress(const KeypressMessage &msg) {
}
} else if (_mode == SPELL_RESULT && !isDelayActive()) {
// Displaying a spell result that required waiting for keypress
- assert(_spellResult._timeoutCallback);
- _spellResult._timeoutCallback();
+ assert(_spellResult._callback);
+ _spellResult._callback();
} else if (isDelayActive()) {
// In all other modes, if a delay is active, any keypress
diff --git a/engines/mm/mm1/views/game_messages.cpp b/engines/mm/mm1/views/game_messages.cpp
index 56e523f0d42..58e98baa7eb 100644
--- a/engines/mm/mm1/views/game_messages.cpp
+++ b/engines/mm/mm1/views/game_messages.cpp
@@ -57,13 +57,13 @@ void GameMessages::draw() {
}
bool GameMessages::msgInfo(const InfoMessage &msg) {
- if (msg._yCallback || msg._keyCallback ||
+ if (msg._callback || msg._keyCallback ||
g_globals->_party.isPartyDead()) {
addView(this);
}
_lines = msg._lines;
- _yCallback = msg._yCallback;
+ _callback = msg._callback;
_nCallback = msg._nCallback;
_keyCallback = msg._keyCallback;
@@ -102,7 +102,7 @@ bool GameMessages::msgKeypress(const KeypressMessage &msg) {
_nCallback();
} else if (msg.keycode == Common::KEYCODE_y) {
close();
- _yCallback();
+ _callback();
}
return true;
@@ -137,9 +137,9 @@ bool GameMessages::msgAction(const ActionMessage &msg) {
case KEYBIND_SELECT:
if (_keyCallback) {
_keyCallback(Common::KeyState(Common::KEYCODE_RETURN));
- } else if (_yCallback) {
+ } else if (_callback) {
close();
- _yCallback();
+ _callback();
}
return true;
default:
@@ -154,10 +154,10 @@ bool GameMessages::msgAction(const ActionMessage &msg) {
}
void GameMessages::timeout() {
- if (_yCallback) {
+ if (_callback) {
// _ynCallback is also used for timeout callbacks
close();
- _yCallback();
+ _callback();
}
}
diff --git a/engines/mm/mm1/views/game_messages.h b/engines/mm/mm1/views/game_messages.h
index 202bbda60b5..95f9eced366 100644
--- a/engines/mm/mm1/views/game_messages.h
+++ b/engines/mm/mm1/views/game_messages.h
@@ -32,7 +32,7 @@ namespace Views {
class GameMessages : public TextView {
private:
Common::Array<Line> _lines;
- YNCallback _yCallback = nullptr;
+ YNCallback _callback = nullptr;
YNCallback _nCallback = nullptr;
KeyCallback _keyCallback = nullptr;
public:
diff --git a/engines/mm/mm1/views_enh/combat.cpp b/engines/mm/mm1/views_enh/combat.cpp
index 5545b229006..084fbde874d 100644
--- a/engines/mm/mm1/views_enh/combat.cpp
+++ b/engines/mm/mm1/views_enh/combat.cpp
@@ -243,8 +243,8 @@ void Combat::timeout() {
combatDone();
break;
case SPELL_RESULT:
- if (_spellResult._timeoutCallback)
- _spellResult._timeoutCallback();
+ if (_spellResult._callback)
+ _spellResult._callback();
else
// Character is done
block();
@@ -284,8 +284,8 @@ bool Combat::msgKeypress(const KeypressMessage &msg) {
}
} else if (_mode == SPELL_RESULT && !isDelayActive()) {
// Displaying a spell result that required waiting for keypress
- assert(_spellResult._timeoutCallback);
- _spellResult._timeoutCallback();
+ assert(_spellResult._callback);
+ _spellResult._callback();
} else if (isDelayActive()) {
// In all other modes, if a delay is active, any keypress
diff --git a/engines/mm/mm1/views_enh/game_messages.cpp b/engines/mm/mm1/views_enh/game_messages.cpp
index f728ab9cc55..6edf40366ae 100644
--- a/engines/mm/mm1/views_enh/game_messages.cpp
+++ b/engines/mm/mm1/views_enh/game_messages.cpp
@@ -52,14 +52,14 @@ GameMessages::GameMessages() : ScrollText("GameMessages") {
void GameMessages::draw() {
ScrollText::draw();
- if (_yCallback && !isDelayActive()) {
+ if (_callback && !isDelayActive()) {
_yesNo.resetSelectedButton();
_yesNo.draw();
}
}
bool GameMessages::msgFocus(const FocusMessage &msg) {
- MetaEngine::setKeybindingMode(_yCallback || _keyCallback ?
+ MetaEngine::setKeybindingMode(_callback || _keyCallback ?
KeybindingMode::KBMODE_MENUS :
KeybindingMode::KBMODE_NORMAL);
return true;
@@ -70,7 +70,7 @@ bool GameMessages::msgInfo(const InfoMessage &msg) {
g_events->redraw();
g_events->draw();
- _yCallback = msg._yCallback;
+ _callback = msg._callback;
_nCallback = msg._nCallback;
_keyCallback = msg._keyCallback;
_fontReduced = msg._fontReduced;
@@ -98,14 +98,14 @@ bool GameMessages::msgKeypress(const KeypressMessage &msg) {
if (_keyCallback) {
_keyCallback(msg);
- } else if (_yCallback) {
+ } else if (_callback) {
if (msg.keycode == Common::KEYCODE_n) {
close();
if (_nCallback)
_nCallback();
} else if (msg.keycode == Common::KEYCODE_y) {
close();
- _yCallback();
+ _callback();
}
} else {
// Displayed message, any keypress closes the window
@@ -120,7 +120,7 @@ bool GameMessages::msgKeypress(const KeypressMessage &msg) {
}
bool GameMessages::msgAction(const ActionMessage &msg) {
- if (_yCallback || _keyCallback) {
+ if (_callback || _keyCallback) {
switch (msg._action) {
case KEYBIND_ESCAPE:
if (_keyCallback) {
@@ -136,7 +136,7 @@ bool GameMessages::msgAction(const ActionMessage &msg) {
_keyCallback(Common::KeyState(Common::KEYCODE_RETURN));
} else {
close();
- _yCallback();
+ _callback();
}
return true;
default:
@@ -154,7 +154,7 @@ bool GameMessages::msgAction(const ActionMessage &msg) {
bool GameMessages::msgMouseDown(const MouseDownMessage &msg) {
// If yes/no prompting, also pass events to buttons view
- if (_yCallback)
+ if (_callback)
return send("MessagesYesNo", msg);
return msgAction(KeybindingAction(KEYBIND_SELECT));
@@ -162,7 +162,7 @@ bool GameMessages::msgMouseDown(const MouseDownMessage &msg) {
bool GameMessages::msgMouseUp(const MouseUpMessage &msg) {
// If yes/no prompting, also pass events to buttons view
- if (_yCallback)
+ if (_callback)
return send("MessagesYesNo", msg);
return false;
}
@@ -170,8 +170,8 @@ bool GameMessages::msgMouseUp(const MouseUpMessage &msg) {
void GameMessages::timeout() {
close();
- if (_timeoutCallback)
- _timeoutCallback();
+ if (_callback)
+ _callback();
}
} // namespace ViewsEnh
diff --git a/engines/mm/mm1/views_enh/game_messages.h b/engines/mm/mm1/views_enh/game_messages.h
index 4fb21fd18d5..9a1b6ced846 100644
--- a/engines/mm/mm1/views_enh/game_messages.h
+++ b/engines/mm/mm1/views_enh/game_messages.h
@@ -36,10 +36,9 @@ class GameMessages : public ScrollText {
bool msgKeypress(const KeypressMessage &msg) override;
};
private:
- YNCallback _yCallback = nullptr;
+ YNCallback _callback = nullptr;
YNCallback _nCallback = nullptr;
KeyCallback _keyCallback = nullptr;
- YNCallback &_timeoutCallback = _yCallback;
YesNo _yesNo;
public:
GameMessages();
diff --git a/engines/mm/mm1/views_enh/items_view.cpp b/engines/mm/mm1/views_enh/items_view.cpp
index dee06ba5df3..a3e9e56ab5c 100644
--- a/engines/mm/mm1/views_enh/items_view.cpp
+++ b/engines/mm/mm1/views_enh/items_view.cpp
@@ -167,7 +167,7 @@ void ItemsView::notEnoughGold() {
void ItemsView::displayMessage(const Common::String &msg) {
SoundMessage infoMsg(msg, ALIGN_MIDDLE);
infoMsg._delaySeconds = 3;
- infoMsg._timeoutCallback = []() {
+ infoMsg._callback = []() {
ItemsView *view = static_cast<ItemsView *>(g_events->focusedView());
view->timeout();
};
diff --git a/engines/mm/mm1/views_enh/locations/location.cpp b/engines/mm/mm1/views_enh/locations/location.cpp
index 8b1249e3a2d..b7fd31f1df3 100644
--- a/engines/mm/mm1/views_enh/locations/location.cpp
+++ b/engines/mm/mm1/views_enh/locations/location.cpp
@@ -58,7 +58,7 @@ void Location::leave() {
void Location::displayMessage(const Common::String &msg) {
InfoMessage infoMsg(0, 0, msg, ALIGN_MIDDLE);
infoMsg._delaySeconds = 3;
- infoMsg._timeoutCallback = []() {
+ infoMsg._callback = []() {
Location *loc = dynamic_cast<Location *>(g_events->focusedView());
assert(loc);
loc->messageShown();
diff --git a/engines/mm/mm1/views_enh/who_will_try.cpp b/engines/mm/mm1/views_enh/who_will_try.cpp
index 0ea9a3c352a..9c988b58cb9 100644
--- a/engines/mm/mm1/views_enh/who_will_try.cpp
+++ b/engines/mm/mm1/views_enh/who_will_try.cpp
@@ -92,7 +92,7 @@ void WhoWillTry::selectChar(uint charNum) {
if ((c._condition & (BAD_CONDITION | DEAD | STONE | ASLEEP)) != 0) {
InfoMessage msg(STRING["dialogs.misc.check_condition"], ALIGN_MIDDLE);
msg._delaySeconds = 3;
- msg._timeoutCallback = []() {
+ msg._callback = []() {
WhoWillTry *view = static_cast<WhoWillTry *>(g_events->findView("WhoWillTry"));
view->_callback(-1);
};
More information about the Scummvm-git-logs
mailing list