Moved a large number of global variables in the Cruise Engine into a Singleton class and modified all references to these variables to access them via an instance of this Singleton class

svn-id: r51935

1 files changed, 6 insertions, 6 deletions

diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 3d07abf441..a25a54c562 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -446,8 +446,8 @@ int16 Op_KillMenu() {
 	}
 
 	// Free the message list
-//	if (linkedMsgList) freeMsgList(linkedMsgList);
-	linkedMsgList = NULL;
+//	if (CVars.linkedMsgList) freeMsgList(CVars.linkedMsgList);
+	CVars.linkedMsgList = NULL;
 	linkedRelation = NULL;
 
 	return 0;
@@ -1268,10 +1268,10 @@ int16 Op_regenerateBackgroundIncrust() {
 int16 Op_SetStringColors() {
 	// TODO: here ignore if low color mode
 
-	subColor = (uint8) popVar();
-	itemColor = (uint8) popVar();
-	selectColor = (uint8) popVar();
-	titleColor = (uint8) popVar();
+	CVars.subColor = (uint8) popVar();
+	CVars.itemColor = (uint8) popVar();
+	CVars.selectColor = (uint8) popVar();
+	CVars.titleColor = (uint8) popVar();
 
 	return 0;
 }