[Scummvm-git-logs] scummvm master -> 7266129fad12efac357ec14b916863abed0256ea
sev-
sev at scummvm.org
Fri Oct 4 17:19:25 CEST 2019
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
15b44e9a10 GRAPHICS: MACGUI: Remove extra debug output
28ac30b4fc GRAPHICS: MACGUI: Properly process action menu ids from PE exe
02ff887ae0 GRAPHICS: MACGUI: Enhande printMenu output
4f3d41c77d GRAPHICS: Properly process && in PE exe menus
c0c8dc0351 GRAPHICS: MACGUI: Fix action id processing from the PE exe menus
7266129fad PINK: Use proper menu action ids. The PDA now works!
Commit: 15b44e9a1000d3f785fe7c459b9175bd4b496516
https://github.com/scummvm/scummvm/commit/15b44e9a1000d3f785fe7c459b9175bd4b496516
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T16:12:43+02:00
Commit Message:
GRAPHICS: MACGUI: Remove extra debug output
Changed paths:
graphics/macgui/macmenu.cpp
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 51ab94f..62889c2 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -312,8 +312,6 @@ void MacMenu::addStaticMenus(const MacMenuData *data) {
addMenuItem(submenu, m->title, m->action, 0, m->shortcut, m->enabled);
}
- printMenu();
-
calcDimensions();
}
Commit: 28ac30b4fcd58a75f423e3c62a09b2294ad4b360
https://github.com/scummvm/scummvm/commit/28ac30b4fcd58a75f423e3c62a09b2294ad4b360
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T16:47:42+02:00
Commit Message:
GRAPHICS: MACGUI: Properly process action menu ids from PE exe
Changed paths:
graphics/macgui/macmenu.cpp
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 62889c2..58ae0f8 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -215,7 +215,6 @@ MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager
int depth = 0;
int curMenuItemId = 0;
- int action = 0;
bool lastPopUp = false;
while (depth >= 0) {
uint16 flags = menuData->readUint16LE();
@@ -224,8 +223,7 @@ MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager
menu->addMenuItem(nullptr, readUnicodeString(menuData));
} else {
Common::U32String name = readUnicodeString(menuData);
- menu->addMenuItem(menus.top(), name, action, 0, 0, !(flags & kGrayed));
- action++;
+ menu->addMenuItem(menus.top(), name, -1, 0, 0, !(flags & kGrayed));
}
MacMenuSubMenu *submenu = menu->addSubMenu(menus.size() ? menus.top() : nullptr);
@@ -236,7 +234,7 @@ MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager
depth++;
} else {
- menuData->readUint16LE(); // menu id
+ int action = menuData->readUint16LE();
Common::U32String name = readUnicodeString(menuData);
if (depth > 0) {
menu->addMenuItem(menus.top(), name, action, 0, 0, !(flags & kGrayed));
Commit: 02ff887ae08cbf2d1e09ad17854ec8c4290ecf4c
https://github.com/scummvm/scummvm/commit/02ff887ae08cbf2d1e09ad17854ec8c4290ecf4c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T16:48:26+02:00
Commit Message:
GRAPHICS: MACGUI: Enhande printMenu output
Changed paths:
graphics/macgui/macmenu.cpp
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 58ae0f8..59bc949 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -271,7 +271,7 @@ MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager
void MacMenu::printMenu(int level, MacMenuSubMenu *submenu) {
if (!level) {
for (uint i = 0; i < _items.size(); i++) {
- debug("0. %s", _items[i]->unicode ? convertFromU32String(_items[i]->unicodeText).c_str() : _items[i]->text.c_str());
+ debug("0. %s --> %d", _items[i]->unicode ? convertFromU32String(_items[i]->unicodeText).c_str() : _items[i]->text.c_str(), _items[i]->action);
if (_items[i]->submenu != nullptr)
printMenu(level + 1, _items[i]->submenu);
@@ -282,7 +282,7 @@ void MacMenu::printMenu(int level, MacMenuSubMenu *submenu) {
for (int j = 0; j < level; j++)
debugN(" ");
- debug("%s", submenu->items[i]->unicode ? convertFromU32String(submenu->items[i]->unicodeText).c_str() : submenu->items[i]->text.c_str());
+ debug("%s --> %d", submenu->items[i]->unicode ? convertFromU32String(submenu->items[i]->unicodeText).c_str() : submenu->items[i]->text.c_str(), submenu->items[i]->action);
if (submenu->items[i]->submenu != nullptr)
printMenu(level + 1, submenu->items[i]->submenu);
Commit: 4f3d41c77d345ed47ad0b7147c6f59e33288110e
https://github.com/scummvm/scummvm/commit/4f3d41c77d345ed47ad0b7147c6f59e33288110e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T16:49:00+02:00
Commit Message:
GRAPHICS: Properly process && in PE exe menus
Changed paths:
graphics/macgui/macmenu.cpp
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 59bc949..ea8f5c1 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -371,8 +371,12 @@ int MacMenu::addMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text,
for (uint i = 0; i < text.size(); i++)
if (text[i] == amp[0]) {
- shortcut = text[i + 1] & 0xff;
- shortcutPos = i;
+ if ((text[i + 1] & 0xff) != '&') {
+ shortcut = text[i + 1] & 0xff;
+ shortcutPos = i;
+ } else {
+ res += text[i];
+ }
} else {
res += text[i];
}
Commit: c0c8dc0351e11deb342c72899e5e2ec10e774039
https://github.com/scummvm/scummvm/commit/c0c8dc0351e11deb342c72899e5e2ec10e774039
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T17:18:27+02:00
Commit Message:
GRAPHICS: MACGUI: Fix action id processing from the PE exe menus
Changed paths:
graphics/macgui/macmenu.cpp
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index ea8f5c1..946161f 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -239,9 +239,6 @@ MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager
if (depth > 0) {
menu->addMenuItem(menus.top(), name, action, 0, 0, !(flags & kGrayed));
}
- if (!name.empty()) {
- action++;
- }
if (flags & kEndMenu) {
menus.pop();
depth--;
Commit: 7266129fad12efac357ec14b916863abed0256ea
https://github.com/scummvm/scummvm/commit/7266129fad12efac357ec14b916863abed0256ea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T17:18:54+02:00
Commit Message:
PINK: Use proper menu action ids. The PDA now works!
Changed paths:
engines/pink/gui.cpp
diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 12ce345..5267cbb 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -30,102 +30,102 @@
namespace Pink {
enum {
- kNewGameAction = 0,
- kLoadSave,
- kSaveAction,
- kSaveAsAction,
- kSongsAction,
- kSoundSettingsAction,
- kLastSavesAction,
- kPauseAction,
- kExitAction
+ kNewGameAction = 57600,
+ kLoadSave = 57601,
+ kSaveAction = 57603,
+ kSaveAsAction = 57604,
+ kSongsAction = 32865,
+ kSoundSettingsAction = 32772,
+ kLastSavesAction = 57616,
+ kPauseAction = 32854,
+ kExitAction = 57665
};
enum {
- kShowContent = 9,
- kShowGreece,
- kShowIndonesia,
- kShowIsrael,
- kShowKenya,
- kShowRussia
+ kShowContent = 32771,
+ kShowGreece = 32866,
+ kShowIndonesia = 32867,
+ kShowIsrael = 32868,
+ kShowKenya = 32869,
+ kShowRussia = 32870
};
enum {
- kShowPDAAction = 15,
+ kShowPDAAction = 32793,
- kShowAustraliaArt = 16,
- kShowAustraliaCloth,
- kShowAustraliaFood,
- kShowAustraliaHistory,
- kShowAustraliaNature,
- kShowAustraliaPeople,
- kShowAustraliaPlaces,
- kShowAustraliaReligion,
+ kShowAustraliaArt = 32796,
+ kShowAustraliaCloth = 32797,
+ kShowAustraliaFood = 32798,
+ kShowAustraliaHistory = 32799,
+ kShowAustraliaNature = 32800,
+ kShowAustraliaPeople = 32801,
+ kShowAustraliaPlaces = 32802,
+ kShowAustraliaReligion = 32803,
- kShowBhutanArt = 24,
- kShowBhutanCloth,
- kShowBhutanFood,
- kShowBhutanHistory,
- kShowBhutanNature,
- kShowBhutanPeople,
- kShowBhutanPlaces,
- kShowBhutanReligion,
+ kShowBhutanArt = 32804,
+ kShowBhutanCloth = 32805,
+ kShowBhutanFood = 32806,
+ kShowBhutanHistory = 32807,
+ kShowBhutanNature = 32808,
+ kShowBhutanPeople = 32809,
+ kShowBhutanPlaces = 32810,
+ kShowBhutanReligion = 32811,
- kShowChinaArt = 32,
- kShowChinaCloth,
- kShowChinaFood,
- kShowChinaHistory,
- kShowChinaNature,
- kShowChinaPeople,
- kShowChinaPlaces,
- kShowChinaReligion,
+ kShowChinaArt = 32812,
+ kShowChinaCloth = 32813,
+ kShowChinaFood = 32814,
+ kShowChinaHistory = 32815,
+ kShowChinaNature = 32816,
+ kShowChinaPeople = 32817,
+ kShowChinaPlaces = 32818,
+ kShowChinaReligion = 32819,
- kShowEnglandArt = 40,
- kShowEnglandCloth,
- kShowEnglandFood,
- kShowEnglandHistory,
- kShowEnglandNature,
- kShowEnglandPeople,
- kShowEnglandPlaces,
- kShowEnglandReligion,
+ kShowEnglandArt = 32820,
+ kShowEnglandCloth = 32821,
+ kShowEnglandFood = 32822,
+ kShowEnglandHistory = 32823,
+ kShowEnglandNature = 32824,
+ kShowEnglandPeople = 32825,
+ kShowEnglandPlaces = 32826,
+ kShowEnglandReligion = 32827,
- kShowEgyptArt = 48,
- kShowEgyptCloth,
- kShowEgyptFood,
- kShowEgyptHistory,
- kShowEgyptNature,
- kShowEgyptPeople,
- kShowEgyptPlaces,
- kShowEgyptReligion,
+ kShowEgyptArt = 32828,
+ kShowEgyptCloth = 32829,
+ kShowEgyptFood = 32830,
+ kShowEgyptHistory = 32831,
+ kShowEgyptNature = 32832,
+ kShowEgyptPeople = 32833,
+ kShowEgyptPlaces = 32834,
+ kShowEgyptReligion = 32835,
- kShowIndiaArt = 56,
- kShowIndiaCloth,
- kShowIndiaFood,
- kShowIndiaHistory,
- kShowIndiaNature,
- kShowIndiaPeople,
- kShowIndiaPlaces,
- kShowIndiaReligion
+ kShowIndiaArt = 32836,
+ kShowIndiaCloth = 32837,
+ kShowIndiaFood = 32838,
+ kShowIndiaHistory = 32839,
+ kShowIndiaNature = 32840,
+ kShowIndiaPeople = 32841,
+ kShowIndiaPlaces = 32842,
+ kShowIndiaReligion = 32843
};
enum {
- kShowGameWebPage = 64,
- kShowTechSupport,
- kShowWinnnerPage,
- kShowWanderlustInteractive,
- kShowMGM,
- kShowDiagnostics,
- kShowAbout
+ kShowGameWebPage = 32844,
+ kShowTechSupport = 32778,
+ kShowOnlineHints = 32777,
+ kShowWanderLustWebPage = 32775,
+ kShowHelp = 32846,
+ kShowHints = 32847,
+
+ kShowWinnnerPage = 32779,
+ kShowWanderlustInteractive = 32849,
+ kShowMGM = 32848,
+ kShowDiagnostics = 32850,
+ kShowAbout = 57664
};
static void menuCommandsCallback(int action, Common::U32String &, void *data) {
PinkEngine *engine = (PinkEngine *)data;
- bool isPeril = engine->isPeril();
- if (!isPeril && action > 14) {
- action += 49;
- } else if (isPeril && action >= 9) {
- action += 6;
- }
+
engine->executeMenuCommand(action);
}
@@ -331,6 +331,7 @@ void PinkEngine::executeMenuCommand(uint id) {
break;
default:
+ warning("Unprocessed command id %d", id);
break;
}
}
More information about the Scummvm-git-logs
mailing list