libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 04:01:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Fix MacMenu::getName() to implement STUB kTheMenu

Browse Source
This commit is contained in:
Pragyansh Chaturvedi (r41k0u) 2022-05-28 05:53:15 +05:30 committed by Eugene Sandulenko
parent f83934e05b
commit d5485c7595
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/director/lingo/lingo-the.cpp
View File

@ -609,7 +609,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
} else {
menuRef = g_director->_wm->getMenu()->getMenuItem(id.u.menu->menuIdNum - 1);
}
d.u.s = g_director->_wm->getMenu()->getName(menuRef);
d.u.s = new Common::String();
*d.u.s = g_director->_wm->getMenu()->getName(menuRef);
break;
case kTheMenuItem:
Graphics::MacMenuItem *menu, *menuItem;

4
graphics/macgui/macmenu.cpp
View File

@ -604,8 +604,8 @@ bool MacMenu::getEnabled(MacMenuItem *menuItem) {
return menuItem ? menuItem->enabled : false;
}
Common::String *MacMenu::getName(MacMenuItem *menuItem) {
return menuItem ? &menuItem->text : nullptr;
Common::String MacMenu::getName(MacMenuItem *menuItem) {
return menuItem ? menuItem->text : Common::String();
}
int MacMenu::getAction(MacMenuItem *menuItem) {

2
graphics/macgui/macmenu.h
View File

@ -112,7 +112,7 @@ public:
bool getEnabled(MacMenuItem *menuItem);
void setName(MacMenuItem *menuItem, const Common::String &name);
Common::String *getName(MacMenuItem *menuItem);
Common::String getName(MacMenuItem *menuItem);
void setAction(MacMenuItem *menuItem, int actionId);
int getAction(MacMenuItem *menuItem);

2
graphics/macgui/macwindowmanager.cpp
View File

@ -494,7 +494,7 @@ bool MacWindowManager::getMenuItemEnabled(MacMenuItem *menuItem) {
Common::String MacWindowManager::getMenuItemName(MacMenuItem *menuItem) {
if (_menu) {
return *_menu->getName(menuItem);
return _menu->getName(menuItem);
} else {
warning("MacWindowManager::getMenuItemName: wm doesn't have menu");
return Common::String();