SUPERNOVA2: Add gui commands to game manager

3 files changed, 16 insertions, 14 deletions

diff --git a/engines/supernova2/ms2_def.h b/engines/supernova2/ms2_def.h
index a221814f0c..e686500e1e 100644
--- a/engines/supernova2/ms2_def.h
+++ b/engines/supernova2/ms2_def.h
@@ -126,11 +126,11 @@ enum ObjectId {
 
 enum StringId {
 	kNoString = -1,
-kString0, kString1, kString2, kString3, kString4,
-kString5, kString6, kString7, kString8, kString9,
-kString10, kString11, kString12, kString13, kString14,
-kString15, kString16, kString17, kString18, kString19,
-kString20, kString21, kString22, kString23, kString24,
+kStringCommandGo, kStringCommandLook, kStringCommandTake, kStringCommandOpen, kStringCommandClose,
+kStringCommandPress, kStringCommandPull, kStringCommandUse, kStringCommandTalk, kStringCommandGive,
+kString10, kStringStatusCommandGo, kStringStatusCommandLook, kStringStatusCommandTake, kStringStatusCommandOpen,
+kStringStatusCommandClose, kStringStatusCommandPress, kStringStatusCommandPull, kStringStatusCommandUse, kStringStatusCommandTalk,
+kStringStatusCommandGive, kString21, kString22, kString23, kString24,
 kString25, kString26, kString27, kStringTextSpeed, kString29,
 kString30, kString31, kString32, kString33, kString34,
 kString35, kString36, kString37, kString38, kString39,
diff --git a/engines/supernova2/state.cpp b/engines/supernova2/state.cpp
index 2d44b2a479..ef05df99c4 100644
--- a/engines/supernova2/state.cpp
+++ b/engines/supernova2/state.cpp
@@ -32,15 +32,15 @@
 namespace Supernova2 {
 
 
-//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
-//};
+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
+};
 
 void Inventory::add(Object &obj) {
 	if (_numObjects < kMaxCarry) {
diff --git a/engines/supernova2/state.h b/engines/supernova2/state.h
index a8e3b368f3..56860d936a 100644
--- a/engines/supernova2/state.h
+++ b/engines/supernova2/state.h
@@ -70,6 +70,8 @@ public:
 	//void processInput();
 	void executeRoom();
 
+	static StringId guiCommands[];
+	static StringId guiStatusCommands[];
 	Supernova2Engine *_vm;
 	Common::KeyState _key;
 	Common::EventType _mouseClickType;