aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph-Eugene Winzer2018-01-01 12:50:27 +0100
committerThierry Crozat2018-01-23 02:15:46 +0000
commitda3d145819ef93a0600c404c0600b4db2d17367d (patch)
treea1891dac01bc94fe12a9e1ed45e429130020ecad
parent6fe9af93f399085d4775421012114343e79a594e (diff)
downloadscummvm-rg350-da3d145819ef93a0600c404c0600b4db2d17367d.tar.gz
scummvm-rg350-da3d145819ef93a0600c404c0600b4db2d17367d.tar.bz2
scummvm-rg350-da3d145819ef93a0600c404c0600b4db2d17367d.zip
SUPERNOVA: Moves strings to GameManager class
-rw-r--r--engines/supernova/msn_def.h10
-rw-r--r--engines/supernova/state.cpp10
-rw-r--r--engines/supernova/state.h2
3 files changed, 12 insertions, 10 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index 26491373cf..2ed5cf59f8 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -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);
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index deeb043133..ff758f7fe6 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -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) {
diff --git a/engines/supernova/state.h b/engines/supernova/state.h
index e47c906aa5..674624d17d 100644
--- a/engines/supernova/state.h
+++ b/engines/supernova/state.h
@@ -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;