TOLTECS: - Work on the menu system (use strings from resources instead of hardcoded ones)

- ...and load the system strings from the resource on startup
- Only redraw menu screen when required
- Change parameters for some text functions from byte* to const byte*
- Rename some mouse vars

1 files changed, 36 insertions, 2 deletions

diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index bcd2c3d234..851e28c263 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -60,6 +60,34 @@ class Sound;
 
 // TODO/FIXME: The includes of the Toltecs engine need serious clean-up
 
+enum SysString {
+	kStrLoadingPleaseWait,
+	kStrWhatCanIDoForYou,
+	kStrLoad,
+	kStrSave,
+	kStrTextOn,
+	kStrTextOff,
+	kStrVoicesOn,
+	kStrVoicesOff,
+	kStrVolume,
+	kStrPlay,
+	kStrQuit,
+	kStrLoadGame,
+	kStrSaveGame,
+	kStrAdjustVolume,
+	kStrMaster,
+	kStrVoices,
+	kStrMusic,
+	kStrSoundFx,
+	kStrBackground,
+	kStrCancel,
+	kStrDone,
+	kStrAreYouSure,
+	kStrYes,
+	kStrNo,
+	kSysStrCount
+};
+
 class ToltecsEngine : public ::Engine {
 	Common::KeyState _keyPressed;
 
@@ -80,6 +108,8 @@ public:
 	Common::Language getLanguage() const;
 	const Common::String& getTargetName() const { return _targetName; }
 
+	void setupSysStrings();
+
 	void loadScene(uint resIndex);
 
 	void updateScreen();
@@ -115,6 +145,8 @@ public:
 	SegmentMap *_segmap;
 	Sound *_sound;
 
+	Common::String _sysStrings[kSysStrCount];
+
 	uint _sceneResIndex;
 	int16 _sceneWidth, _sceneHeight;
 	
@@ -133,12 +165,14 @@ public:
 
 	Common::KeyState _keyState;
 	int16 _mouseX, _mouseY;
-	int16 _mouseCounter;
-	bool _mouseButtonPressedFlag;
+	int16 _mouseDblClickTicks;
+	bool _mouseWaitForRelease;
 	byte _mouseButton;
 	int16 _mouseDisabled;
 	bool _leftButtonDown, _rightButtonDown;
 
+	const char *getSysString(int index) const { return _sysStrings[index].c_str(); }
+
 	/* Save/load */
 
 	enum kReadSaveHeaderError {