[Scummvm-cvs-logs] CVS: residual engine.cpp,1.74,1.75 engine.h,1.25,1.26 lua.cpp,1.127,1.128

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19543

Modified Files:
	engine.cpp engine.h lua.cpp 
Log Message:
added Get/SetTextSpeed opcodes

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- engine.cpp	8 Apr 2005 10:23:03 -0000	1.74
+++ engine.cpp	8 Apr 2005 11:47:47 -0000	1.75
@@ -45,6 +45,7 @@
 		_controlsEnabled[i] = false;
 	_speechMode = 3; // VOICE + TEXT
 	_menuMode = 0;
+	_textSpeed = 6;
 
 	textObjectDefaults.x = 0;
 	textObjectDefaults.y = 200;
@@ -437,3 +438,10 @@
 	_currScene->setSoundParameters(20, 127);
 	delete b;
 }
+void Engine::setTextSpeed(int speed) {
+	if (speed < 1)
+		_textSpeed = 1;
+	if (speed > 10)
+		_textSpeed = 10;
+	_textSpeed = speed;
+}

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- engine.h	7 Apr 2005 19:29:05 -0000	1.25
+++ engine.h	8 Apr 2005 11:47:47 -0000	1.26
@@ -103,6 +103,8 @@
 
 	float perSecond(float rate) const { return rate * _frameTime / 1000; }
 
+	int getTextSpeed() { return _textSpeed; }
+	void setTextSpeed(int speed);
 	void setMenuMode(int mode) { _menuMode = mode; }
 	int getMenuMode() { return _menuMode; }
 
@@ -186,6 +188,7 @@
 	Scene *_currScene;
 	int _mode, _menuMode;
 	int _speechMode;
+	int _textSpeed;
 
 	unsigned _frameStart, _frameTime, _movieTime;
 

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- lua.cpp	8 Apr 2005 11:16:56 -0000	1.127
+++ lua.cpp	8 Apr 2005 11:47:47 -0000	1.128
@@ -1501,8 +1501,12 @@
  * we're not currently using the value
  */
 static void GetTextSpeed() {
-	stubWarning("GetTextSpeed");
-	lua_pushnumber(2);
+	lua_pushnumber(g_engine->getTextSpeed());
+}
+
+static void SetTextSpeed() {
+	int speed = check_int(2);
+	g_engine->setTextSpeed(speed);
 }
 
 /* Make a text object, known to be used by the menu
@@ -1858,7 +1862,6 @@
 STUB_FUNC(JustLoaded)
 STUB_FUNC(AttachToResources)
 STUB_FUNC(DetachFromResources)
-STUB_FUNC(SetTextSpeed)
 STUB_FUNC(GetSaveGameData)
 STUB_FUNC(SubmitSaveGameData)
 STUB_FUNC(GetSaveGameImage)