[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.92,1.93 logic.h,1.27,1.28 sky.cpp,1.57,1.58 sky.h,1.32,1.33

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv4335/sky

Modified Files:
	logic.cpp logic.h sky.cpp sky.h 
Log Message:
add fnRandom()

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- logic.cpp	6 Jun 2003 17:59:22 -0000	1.92
+++ logic.cpp	6 Jun 2003 20:54:50 -0000	1.93
@@ -1964,7 +1964,7 @@
 }
 
 bool SkyLogic::fnRandom(uint32 a, uint32 b, uint32 c) {
-	warning("Stub: fnRandom");
+	_scriptVariables[RND] = _rnd.getRandomNumber(65536) & a; 
 	return true;
 }
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- logic.h	6 Jun 2003 16:40:43 -0000	1.27
+++ logic.h	6 Jun 2003 20:54:51 -0000	1.28
@@ -62,6 +62,7 @@
 	MENU_LENGTH = 100,
 	SCROLL_OFFSET = 101,
 	MENU = 102,
+	RND = 115,
 	CUR_SECTION = 143,
 	REICH_DOOR_FLAG = 470
 };
@@ -235,6 +236,8 @@
 
 	uint32 _currentSection;
 	uint32 _saveCurrentSection;
+
+	RandomSource _rnd;
 	
 	SkyScreen *_skyScreen;
 	SkyDisk *_skyDisk;

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sky.cpp	6 Jun 2003 18:08:16 -0000	1.57
+++ sky.cpp	6 Jun 2003 20:54:52 -0000	1.58
@@ -266,7 +266,6 @@
 	uint32 start = _system->get_msecs();
 	uint32 cur = start;
 	_key_pressed = 0;	//reset
-	_rnd.getRandomNumber(2);
 
 	do {
 		while (_system->poll_event(&event)) {

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sky.h	6 Jun 2003 01:14:17 -0000	1.32
+++ sky.h	6 Jun 2003 20:54:52 -0000	1.33
@@ -138,8 +138,6 @@
 	void shutdown();
 
 	void showQuitMsg(void);
-
-	RandomSource _rnd;
 };
 
 #endif