only one RandomSource for the engine

svn-id: r11004

6 files changed, 8 insertions, 6 deletions

diff --git a/queen/display.cpp b/queen/display.cpp
index 0f4012851e..fa29ec0cb7 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -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 @@ void Display::palCustomScroll(uint16 roomNum) {
 			j += jdir;
 			if(j <= 0 || j >= 14) {
 				jdir = -jdir;
-				if (_randomizer.getRandomNumber(1)) {
+				if (Logic::randomizer.getRandomNumber(1)) {
 					if (ABS(jdir) == 1) {
 						jdir *= 2;
 					}
diff --git a/queen/display.h b/queen/display.h
index 0e0d7f5773..23d2030d63 100644
--- a/queen/display.h
+++ b/queen/display.h
@@ -138,8 +138,6 @@ private:
 	uint16 _horizontalScroll;
 	uint16 _bdWidth, _bdHeight;
 
-	Common::RandomSource _randomizer;
-
 	bool _gotTick;
 
 	Dynalum _dynalum;
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 5929b76fd6..dac6854ef6 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -219,6 +219,9 @@ void Command_::readAllCommandsFrom(byte *&ptr) {
 
 
 
+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) {
diff --git a/queen/logic.h b/queen/logic.h
index 606ce99a03..c0044afa87 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -285,6 +285,7 @@ public:
 		GAME_STATE_COUNT   = 211
 	};
 
+	static Common::RandomSource randomizer;
 
 protected:
 
diff --git a/queen/talk.cpp b/queen/talk.cpp
index 50b552d564..e2b1061533 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -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 @@ void Talk::speakSegment(
 			int head;
 
 			if (parameters->rf > 0)
-				head = bf + _randomizer.getRandomNumber(parameters->rf);
+				head = bf + Logic::randomizer.getRandomNumber(parameters->rf);
 			else
 				head = bf;
 
diff --git a/queen/talk.h b/queen/talk.h
index 1e3299d552..dea2ba3d46 100644
--- a/queen/talk.h
+++ b/queen/talk.h
@@ -107,8 +107,6 @@ class Talk {
 		signed char ff;
 	};
 
-	Common::RandomSource _randomizer;
-
 	Graphics  *_graphics;
 	Input     *_input;
 	Logic     *_logic;