[Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.47,1.48 logic.cpp,1.64,1.65 talk.h,1.14,1.15 talk.cpp,1.25,1.26 display.h,1.11,1.12 display.cpp,1.16,1.17

Gregory Montoir cyx at users.sourceforge.net
Wed Oct 29 05:07:07 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv27506

Modified Files:
	logic.h logic.cpp talk.h talk.cpp display.h display.cpp 
Log Message:
only one RandomSource for the engine

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- logic.h	27 Oct 2003 15:00:25 -0000	1.47
+++ logic.h	29 Oct 2003 13:06:09 -0000	1.48
@@ -285,6 +285,7 @@
 		GAME_STATE_COUNT   = 211
 	};
 
+	static Common::RandomSource randomizer;
 
 protected:
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- logic.cpp	28 Oct 2003 12:42:35 -0000	1.64
+++ logic.cpp	29 Oct 2003 13:06:10 -0000	1.65
@@ -219,6 +219,9 @@
 
 
 
+Common::RandomSource Logic::randomizer;
+
+
 Logic::Logic(Resource *resource, Graphics *graphics, Display *theDisplay, Input *input, Sound *sound)
 	: _resource(resource), _graphics(graphics), _display(theDisplay), 
 	_input(input), _sound(sound) {

Index: talk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- talk.h	23 Oct 2003 18:50:47 -0000	1.14
+++ talk.h	29 Oct 2003 13:06:10 -0000	1.15
@@ -107,8 +107,6 @@
 		signed char ff;
 	};
 
-	Common::RandomSource _randomizer;
-
 	Graphics  *_graphics;
 	Input     *_input;
 	Logic     *_logic;

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- talk.cpp	28 Oct 2003 12:42:35 -0000	1.25
+++ talk.cpp	29 Oct 2003 13:06:10 -0000	1.26
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "queen/talk.h"
 #include "queen/graphics.h"
+#include "queen/logic.h"
 #include "queen/sound.h"
 
 namespace Queen {
@@ -850,7 +851,7 @@
 			int head;
 
 			if (parameters->rf > 0)
-				head = bf + _randomizer.getRandomNumber(parameters->rf);
+				head = bf + Logic::randomizer.getRandomNumber(parameters->rf);
 			else
 				head = bf;
 

Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- display.h	28 Oct 2003 19:55:12 -0000	1.11
+++ display.h	29 Oct 2003 13:06:10 -0000	1.12
@@ -138,8 +138,6 @@
 	uint16 _horizontalScroll;
 	uint16 _bdWidth, _bdHeight;
 
-	Common::RandomSource _randomizer;
-
 	bool _gotTick;
 
 	Dynalum _dynalum;

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- display.cpp	28 Oct 2003 19:55:12 -0000	1.16
+++ display.cpp	29 Oct 2003 13:06:10 -0000	1.17
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "queen/display.h"
 #include "queen/defs.h"
+#include "queen/logic.h" // For RandomSource
 #include "queen/resource.h"
 
 
@@ -414,7 +415,7 @@
 			j += jdir;
 			if(j <= 0 || j >= 14) {
 				jdir = -jdir;
-				if (_randomizer.getRandomNumber(1)) {
+				if (Logic::randomizer.getRandomNumber(1)) {
 					if (ABS(jdir) == 1) {
 						jdir *= 2;
 					}





More information about the Scummvm-git-logs mailing list