[Scummvm-cvs-logs] CVS: scummvm/gob cdrom.cpp,1.1,1.2 game.cpp,1.16,1.17 inter.cpp,1.15,1.16

[Eugene Sandulenko]

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

Modified Files:
	cdrom.cpp game.cpp inter.cpp 
Log Message:
o Switch track on each new scene.
o Slight improvement on track time calculation.
o Stub for gob2.


Index: cdrom.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/cdrom.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cdrom.cpp	13 Apr 2005 18:27:27 -0000	1.1
+++ cdrom.cpp	15 Apr 2005 00:07:14 -0000	1.2
@@ -183,7 +183,7 @@
 	cd_play(start, end);
 
 	cd_startTime = util_getTimeKey();
-	cd_trackStop = cd_startTime + (end - start + 1 + 150) * 40 / 3 + 500;
+	cd_trackStop = cd_startTime + (end - start + 1 + 150) * 40 / 3;
 }
 
 void cd_play(uint32 from, uint32 to) {

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- game.cpp	13 Apr 2005 20:53:36 -0000	1.16
+++ game.cpp	15 Apr 2005 00:07:14 -0000	1.17
@@ -32,6 +32,7 @@
 #include "gob/mult.h"
 #include "gob/util.h"
 #include "gob/goblin.h"
+#include "gob/cdrom.h"
 
 namespace Gob {
 
@@ -1750,6 +1751,7 @@
 				draw_fontToSprite[i].height = -1;
 			}
 
+			cd_stopPlaying();
 			draw_animateCursor(4);
 			inter_initControlVars();
 			mult_initAll();

Index: inter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- inter.cpp	14 Apr 2005 21:53:37 -0000	1.15
+++ inter.cpp	15 Apr 2005 00:07:14 -0000	1.16
@@ -368,6 +368,10 @@
 		scen_interUpdateAnim();
 		break;
 
+	case 19:
+		warning("Gob2 mult stub");
+		break;
+
 	case 20:
 		mult_interInitMult();
 		break;