[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.309,1.310 scummvm.cpp,2.420,2.421 script_v5.cpp,1.196,1.197

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv25712/scumm

Modified Files:
	scumm.h scummvm.cpp script_v5.cpp 
Log Message:
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- scumm.h	3 Oct 2003 18:33:55 -0000	1.309
+++ scumm.h	4 Oct 2003 11:50:21 -0000	1.310
@@ -362,7 +362,7 @@
 
 public:
 	/* Random number generation */
-	RandomSource _rnd;
+	Common::RandomSource _rnd;
 
 	/* Core variable definitions */
 	byte _gameId;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.420
retrieving revision 2.421
diff -u -d -r2.420 -r2.421
--- scummvm.cpp	4 Oct 2003 01:12:30 -0000	2.420
+++ scummvm.cpp	4 Oct 2003 11:50:21 -0000	2.421
@@ -296,7 +296,6 @@
 	_confirmExitDialog = NULL;
 	_debuggerDialog = NULL;
 	_fastMode = 0;
-	memset(&_rnd, 0, sizeof(RandomSource));
 	_gameId = 0;
 	memset(&gdi, 0, sizeof(Gdi));
 	_actors = NULL;

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- script_v5.cpp	3 Oct 2003 18:33:55 -0000	1.196
+++ script_v5.cpp	4 Oct 2003 11:50:21 -0000	1.197
@@ -907,7 +907,7 @@
 void ScummEngine_v5::loadVars() {
 	int a, b;
 
-	hexdump(_scriptPointer, 64);
+//	Common::hexdump(_scriptPointer, 64);
 	while ((_opcode = fetchScriptByte()) != 0) {
 		switch (_opcode & 0x1F) {
 		case 0x01: // read a range of variables