[Scummvm-cvs-logs] SF.net SVN: scummvm: [29250] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 29250
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29250&view=rev
Author:   dreammaster
Date:     2007-10-24 03:01:55 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
Changed text speed flag, and added saving of it to savegames

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/game.h
    scummvm/trunk/engines/lure/lure.cpp

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2007-10-24 09:39:32 UTC (rev 29249)
+++ scummvm/trunk/engines/lure/game.cpp	2007-10-24 10:01:55 UTC (rev 29250)
@@ -47,7 +47,7 @@
 Game::Game() {
 	int_game = this;
 	_debugger = new Debugger();
-	_slowSpeedFlag = true;
+	_fastTextFlag = false;
 	_preloadFlag = false;
 	_soundFlag = true;
 }
@@ -867,8 +867,8 @@
 	Menu &menu = Menu::getReference();
 	StringList &sl = Resources::getReference().stringList();
 
-	_slowSpeedFlag = !_slowSpeedFlag;
-	menu.getMenu(2).entries()[1] = sl.getString(_slowSpeedFlag ? S_SLOW_TEXT : S_FAST_TEXT);
+	_fastTextFlag = !_fastTextFlag;
+	menu.getMenu(2).entries()[1] = sl.getString(_fastTextFlag ? S_FAST_TEXT : S_SLOW_TEXT);
 }
 
 void Game::doSound() {
@@ -978,4 +978,17 @@
 	return result;
 }
 
+void Game::saveToStream(WriteStream *stream) {
+	stream->writeByte(_fastTextFlag);
+}
+
+void Game::loadFromStream(ReadStream *stream) {
+	Menu &menu = Menu::getReference();
+	StringList &sl = Resources::getReference().stringList();
+
+	_fastTextFlag = stream->readByte() != 0;
+	menu.getMenu(2).entries()[1] = sl.getString(_fastTextFlag ? S_FAST_TEXT : S_SLOW_TEXT);
+}
+
+
 } // end of namespace Lure

Modified: scummvm/trunk/engines/lure/game.h
===================================================================
--- scummvm/trunk/engines/lure/game.h	2007-10-24 09:39:32 UTC (rev 29249)
+++ scummvm/trunk/engines/lure/game.h	2007-10-24 10:01:55 UTC (rev 29250)
@@ -46,7 +46,7 @@
 class Game {
 private:
 	Debugger *_debugger;
-	bool _slowSpeedFlag, _soundFlag;
+	bool _fastTextFlag, _soundFlag;
 	uint8 _state;
 	uint16 _tellCommands[MAX_TELL_COMMANDS * 3 + 1];
 	int _numTellCommands;
@@ -69,6 +69,8 @@
 	virtual ~Game();
 
 	static Game &getReference();
+	void saveToStream(WriteStream *stream);
+	void loadFromStream(ReadStream *stream);
 
 	void tick();
 	void tickCheck();
@@ -76,6 +78,7 @@
 	void execute();
 	void setState(uint8 flags) { _state = flags; }
 	bool &preloadFlag() { return _preloadFlag; }
+	bool fastTextFlag() { return _fastTextFlag; }
 
 	// Menu item support methods
 	void doDebugMenu();

Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp	2007-10-24 09:39:32 UTC (rev 29249)
+++ scummvm/trunk/engines/lure/lure.cpp	2007-10-24 10:01:55 UTC (rev 29250)
@@ -165,6 +165,7 @@
 	f->writeByte(0); // End of string terminator
 
 	Resources::getReference().saveToStream(f);
+	Game::getReference().saveToStream(f);
 	Room::getReference().saveToStream(f);
 	Fights.saveToStream(f);
 
@@ -205,6 +206,7 @@
 
 	// Load in the data
 	Resources::getReference().loadFromStream(f);
+	Game::getReference().loadFromStream(f);
 	Room::getReference().loadFromStream(f);
 	Fights.loadFromStream(f);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.