thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPERNOVA: Moves strings to GameManager class

Browse source
This commit is contained in:
Joseph-Eugene Winzer 2018-01-01 12:50:27 +01:00 • committed by Thierry Crozat
parent 6fe9af93f3
commit da3d145819
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/supernova/msn_def.h
View file

@ -558,16 +558,6 @@ enum StringID {
kStringInventoryMoney
};
static StringID guiCommands[] = {
kStringCommandGo, kStringCommandLook, kStringCommandTake, kStringCommandOpen, kStringCommandClose,
kStringCommandPress, kStringCommandPull, kStringCommandUse, kStringCommandTalk, kStringCommandGive
};
static StringID guiStatusCommands[] = {
kStringStatusCommandGo, kStringStatusCommandLook, kStringStatusCommandTake, kStringStatusCommandOpen, kStringStatusCommandClose,
kStringStatusCommandPress, kStringStatusCommandPull, kStringStatusCommandUse, kStringStatusCommandTalk, kStringStatusCommandGive
};
ObjectType operator|(ObjectType a, ObjectType b);
ObjectType operator&(ObjectType a, ObjectType b);
ObjectType operator^(ObjectType a, ObjectType b);

10
engines/supernova/state.cpp
View file

@ -273,6 +273,16 @@ static Common::String timeToString(int msec) {
return Common::String(s);
}
StringID GameManager::guiCommands[] = {
kStringCommandGo, kStringCommandLook, kStringCommandTake, kStringCommandOpen, kStringCommandClose,
kStringCommandPress, kStringCommandPull, kStringCommandUse, kStringCommandTalk, kStringCommandGive
};
StringID GameManager::guiStatusCommands[] = {
kStringStatusCommandGo, kStringStatusCommandLook, kStringStatusCommandTake, kStringStatusCommandOpen, kStringStatusCommandClose,
kStringStatusCommandPress, kStringStatusCommandPull, kStringStatusCommandUse, kStringStatusCommandTalk, kStringStatusCommandGive
};
GameManager::GameManager(SupernovaEngine *vm)
: _inventory(_inventoryScroll)
, _vm(vm) {

2
engines/supernova/state.h
View file

@ -113,6 +113,8 @@ public:
bool serialize(Common::WriteStream *out);
bool deserialize(Common::ReadStream *in, int version);
static StringID guiCommands[];
static StringID guiStatusCommands[];
SupernovaEngine *_vm;
Common::KeyState _key;
Common::EventType _mouseClickType;