[Scummvm-git-logs] scummvm master -> 70c0c845a68c726d1510e036385db78a61382914
Strangerke
noreply at scummvm.org
Sat May 31 05:53:26 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
70c0c845a6 M4: RIDDLE: small cleanup in gui
Commit: 70c0c845a68c726d1510e036385db78a61382914
https://github.com/scummvm/scummvm/commit/70c0c845a68c726d1510e036385db78a61382914
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-05-31T06:53:19+01:00
Commit Message:
M4: RIDDLE: small cleanup in gui
Changed paths:
engines/m4/riddle/gui/game_menu.cpp
engines/m4/riddle/gui/interface.cpp
engines/m4/riddle/gui/inventory.cpp
diff --git a/engines/m4/riddle/gui/game_menu.cpp b/engines/m4/riddle/gui/game_menu.cpp
index a414a16041f..fcbf3f6cc4a 100644
--- a/engines/m4/riddle/gui/game_menu.cpp
+++ b/engines/m4/riddle/gui/game_menu.cpp
@@ -440,8 +440,6 @@ void SaveLoadMenu::show(RGB8 *myPalette, bool saveMenu) {
}
void SaveLoadMenu::destroyMenu(bool saveMenu) {
- int32 i;
-
if (!_GM(slMenu)) {
return;
}
@@ -456,7 +454,7 @@ void SaveLoadMenu::destroyMenu(bool saveMenu) {
}
} else {
// Else there may be up to 10 somewhere in the list to be unloaded
- for (i = 0; i < MAX_SLOTS; i++) {
+ for (int32 i = 0; i < MAX_SLOTS; i++) {
unloadThumbnail(i);
}
_GM(saveLoadThumbNail) = nullptr;
@@ -471,10 +469,8 @@ void SaveLoadMenu::destroyMenu(bool saveMenu) {
}
bool SaveLoadMenu::load_Handler(M4::GUI::menuItemButton *myItem, int32 eventType, int32 event, int32 x, int32 y, void **currItem) {
- bool handled;
-
// Handle the event just like any other button
- handled = menuItemButton::handler(myItem, eventType, event, x, y, currItem);
+ bool handled = menuItemButton::handler(myItem, eventType, event, x, y, currItem);
// If we've selected a slot, we want the thumbNail to remain on the menu permanently
if (_GM(slotSelected) >= 0) {
@@ -522,16 +518,13 @@ bool SaveLoadMenu::load_Handler(M4::GUI::menuItemButton *myItem, int32 eventType
}
void SaveLoadMenu::cbSave(void *, M4::GUI::guiMenu *myMenu) {
- menuItemTextField *myText;
- bool saveGameFailed;
-
// If (slotSelected < 0) this callback is being executed by pressing return prematurely
if (_GM(slotSelected) < 0) {
return;
}
// First make the textfield NORM
- myText = (menuItemTextField *)guiMenu::getItem(2000, myMenu);
+ menuItemTextField *myText = (menuItemTextField *)guiMenu::getItem(2000, myMenu);
if (myText)
return;
@@ -542,8 +535,8 @@ void SaveLoadMenu::cbSave(void *, M4::GUI::guiMenu *myMenu) {
Common::strcpy_s(_GM(slotTitles)[_GM(slotSelected) - 1], 80, myText->prompt);
// Save the game
- saveGameFailed = !g_engine->saveGameFromMenu(_GM(slotSelected),
- myText->prompt, _GM(_thumbnail));
+ bool saveGameFailed = !g_engine->saveGameFromMenu(_GM(slotSelected),
+ myText->prompt, _GM(_thumbnail));
// If the save game failed, bring up the err menu
if (saveGameFailed) {
@@ -565,8 +558,6 @@ void SaveLoadMenu::cbSave(void *, M4::GUI::guiMenu *myMenu) {
}
void SaveLoadMenu::cbLoad(void *, M4::GUI::guiMenu *) {
- KernelTriggerType oldMode;
-
// If (slotSelected < 0) this callback is being executed by pressing return prematurely
if (_GM(slotSelected) < 0) {
return;
@@ -587,7 +578,7 @@ void SaveLoadMenu::cbLoad(void *, M4::GUI::guiMenu *) {
// Start the restore process
_G(kernel).restore_slot = _GM(slotSelected);
- oldMode = _G(kernel).trigger_mode;
+ KernelTriggerType oldMode = _G(kernel).trigger_mode;
_G(kernel).trigger_mode = KT_DAEMON;
kernel_trigger_dispatch_now(TRIG_RESTORE_GAME);
@@ -595,13 +586,10 @@ void SaveLoadMenu::cbLoad(void *, M4::GUI::guiMenu *) {
}
void SaveLoadMenu::cbCancel(M4::GUI::menuItemButton *, M4::GUI::guiMenu *myMenu) {
- menuItem *myItem;
- int32 i, x, y, w, h;
-
// If a slot has been selected, cancel will re-enable all slots
if (_GM(slotSelected) >= 0) {
// Enable the prev buttons
- for (i = 1001; i <= 1010; i++) {
+ for (int32 i = 1001; i <= 1010; i++) {
if (_GM(currMenuIsSave) || _GM(slotInUse)[i - 1001 + _GM(firstSlotIndex)]) {
menuItemButton::enableButton(nullptr, i, myMenu);
guiMenu::itemRefresh(nullptr, i, myMenu);
@@ -609,11 +597,11 @@ void SaveLoadMenu::cbCancel(M4::GUI::menuItemButton *, M4::GUI::guiMenu *myMenu)
}
// Find the textfield and use it's coords to place the button
- myItem = guiMenu::getItem(2000, myMenu);
- x = myItem->x1;
- y = myItem->y1;
- w = myItem->x2 - myItem->x1 + 1;
- h = myItem->y2 - myItem->y1 + 1;
+ menuItem *myItem = guiMenu::getItem(2000, myMenu);
+ int32 x = myItem->x1;
+ int32 y = myItem->y1;
+ int32 w = myItem->x2 - myItem->x1 + 1;
+ int32 h = myItem->y2 - myItem->y1 + 1;
// Delete the textfield
guiMenu::itemDelete(myItem, 2000, myMenu);
@@ -670,9 +658,7 @@ void SaveLoadMenu::cbCancel(M4::GUI::menuItemButton *, M4::GUI::guiMenu *myMenu)
}
void SaveLoadMenu::cbSlot(M4::GUI::menuItemButton *myButton, M4::GUI::guiMenu *myMenu) {
- int32 i, x, y, w, h;
char prompt[80];
- int32 specialTag;
// Verify params
if (!myMenu || !myButton)
@@ -680,14 +666,14 @@ void SaveLoadMenu::cbSlot(M4::GUI::menuItemButton *myButton, M4::GUI::guiMenu *m
// Get the button
Common::strcpy_s(prompt, 80, myButton->prompt);
- specialTag = myButton->specialTag;
+ int32 specialTag = myButton->specialTag;
// Set the globals
_GM(slotSelected) = myButton->specialTag;
_GM(deleteSaveDesc) = true;
// Disable all other buttons
- for (i = 1001; i <= 1010; i++) {
+ for (int32 i = 1001; i <= 1010; i++) {
if (i != myButton->tag) {
menuItemButton::disableButton(nullptr, i, myMenu);
guiMenu::itemRefresh(nullptr, i, myMenu);
@@ -695,10 +681,10 @@ void SaveLoadMenu::cbSlot(M4::GUI::menuItemButton *myButton, M4::GUI::guiMenu *m
}
// Get the slot coords, and delete it
- x = myButton->x1;
- y = myButton->y1;
- w = myButton->x2 - myButton->x1 + 1;
- h = myButton->y2 - myButton->y1 + 1;
+ int32 x = myButton->x1;
+ int32 y = myButton->y1;
+ int32 w = myButton->x2 - myButton->x1 + 1;
+ int32 h = myButton->y2 - myButton->y1 + 1;
guiMenu::itemDelete(myButton, -1, myMenu);
if (_GM(currMenuIsSave)) {
@@ -730,13 +716,11 @@ void SaveLoadMenu::cbSlot(M4::GUI::menuItemButton *myButton, M4::GUI::guiMenu *m
}
void SaveLoadMenu::cbVSlider(M4::GUI::menuItemVSlider *myItem, M4::GUI::guiMenu *myMenu) {
- bool redraw;
-
if (!myMenu || !myItem)
return;
if ((myItem->itemFlags & menuItemVSlider::VS_COMPONENT) != menuItemVSlider::VS_THUMB) {
- redraw = (DrawFunction)false;
+ bool redraw = (DrawFunction)false;
switch (myItem->itemFlags & menuItemVSlider::VS_COMPONENT) {
case menuItemVSlider::VS_UP:
if (_GM(firstSlotIndex) > 0) {
@@ -810,8 +794,6 @@ enum error_menu_sprites {
#define EM_RETURN_H 26
void ErrorMenu::show(RGB8 *myPalette) {
- Buffer *myBuff;
-
if (!_G(menuSystemInitialized)) {
guiMenu::initialize(myPalette);
}
@@ -828,7 +810,7 @@ void ErrorMenu::show(RGB8 *myPalette) {
}
// Get the menu buffer
- myBuff = _GM(errMenu)->menuBuffer->get_buffer();
+ Buffer *myBuff = _GM(errMenu)->menuBuffer->get_buffer();
if (!myBuff) {
return;
}
diff --git a/engines/m4/riddle/gui/interface.cpp b/engines/m4/riddle/gui/interface.cpp
index d89dbaf2be0..9cd7f8bfa76 100644
--- a/engines/m4/riddle/gui/interface.cpp
+++ b/engines/m4/riddle/gui/interface.cpp
@@ -57,9 +57,9 @@ bool Interface::init(int arrow, int wait, int look, int grab, int use) {
_G(gameInterfaceBuff) = new GrBuff(_x2 - _x1, _y2 - _y1);
setup();
return true;
- } else {
- return false;
}
+
+ return false;
}
Interface::~Interface() {
diff --git a/engines/m4/riddle/gui/inventory.cpp b/engines/m4/riddle/gui/inventory.cpp
index 1d8a414a27a..8b2682de5c2 100644
--- a/engines/m4/riddle/gui/inventory.cpp
+++ b/engines/m4/riddle/gui/inventory.cpp
@@ -19,7 +19,6 @@
*
*/
-#include "m4/riddle/gui/inventory.h"
#include "m4/riddle/gui/inventory.h"
#include "m4/riddle/vars.h"
#include "m4/core/errors.h"
@@ -78,8 +77,7 @@ void Inventory::addToInterfaceBox(InterfaceBox *box) {
bool Inventory::add(const Common::String &name, const Common::String &verb, int32 invSprite, int32 cursor) {
// Don't add something twice
- int iter;
- for (iter = 0; iter < _num_cells; iter++) {
+ for (int iter = 0; iter < _num_cells; iter++) {
if (name.equals(_items[iter]._name))
return true;
}
@@ -125,8 +123,7 @@ void Inventory::toggleHidden() {
}
bool Inventory::remove(const Common::String &name) {
- int iter;
- for (iter = 0; iter < _num_cells; iter++) {
+ for (int iter = 0; iter < _num_cells; iter++) {
// Found the thing?
if (name.equals(_items[iter]._name)) {
// Eat up its slot by moving everything down
@@ -189,8 +186,6 @@ void Inventory::draw(GrBuff *myBuffer) {
if (!_must_redraw1 && !_must_redraw2 && !_must_redraw_all)
return;
- int cell_iter;
-
Buffer *myBuff = myBuffer->get_buffer();
if (_must_redraw_all || _hidden) {
@@ -202,7 +197,7 @@ void Inventory::draw(GrBuff *myBuffer) {
_right_arrow_visible = false;
const int X_BORDER = 2, Y_BORDER = 2;
- for (cell_iter = 0; (cell_iter + _scroll < _num_cells) && (cell_iter < MAX_INVENTORY); cell_iter++) {
+ for (int cell_iter = 0; (cell_iter + _scroll < _num_cells) && (cell_iter < MAX_INVENTORY); cell_iter++) {
int16 left =_x1 + X_BORDER + cell_pos_x(cell_iter);
int16 top = _y1 + Y_BORDER + cell_pos_y(cell_iter);
int16 leftOffset = left + _cell_w;
More information about the Scummvm-git-logs
mailing list