[Scummvm-cvs-logs] CVS: scummvm/bs2 sword2.cpp,1.8,1.9 sword2.h,1.4,1.5

Jonathan Gray khalek at users.sourceforge.net
Thu Jul 31 07:52:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv1271

Modified Files:
	sword2.cpp sword2.h 
Log Message:
slightly changed version of erik's implmentation of FadeServer

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sword2.cpp	30 Jul 2003 19:25:30 -0000	1.8
+++ sword2.cpp	31 Jul 2003 14:51:02 -0000	1.9
@@ -24,7 +24,9 @@
 
 #include "stdafx.h"
 #include "driver/driver96.h"
+#include "driver/palette.h"
 #include "common/gameDetector.h"
+#include "common/timer.h"
 #include "build_display.h"
 #include "console.h"
 #include "controls.h"
@@ -268,6 +270,11 @@
 		return;
 	}
 
+	_paletteMutex = _syst->create_mutex();
+	_timer->installProcedure(&FadeServer, 40000 / 25);
+
+
+	
 	Zdebug("CALLING: InitialiseDisplay");
 	// rv = InitialiseDisplay(640, 480, 8, RD_FULLSCREEN);
 	_syst->init_size(640, 480);

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sword2.h	30 Jul 2003 19:25:30 -0000	1.4
+++ sword2.h	31 Jul 2003 14:51:02 -0000	1.5
@@ -62,6 +62,7 @@
 		uint32 _features;
 		byte _gameId;
 		Sword2Sound *_sound;
+		OSystem::MutexRef _paletteMutex; // put in a gfx class?
 	private:
 		bool _quit;
 };





More information about the Scummvm-git-logs mailing list