[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.1.1.1,1.2 imuse.cpp,1.8,1.9 script.cpp,1.3,1.4 scumm.h,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sat Sep 7 18:09:04 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv12143/scumm

Modified Files:
	boxes.cpp imuse.cpp script.cpp scumm.h 
Log Message:
rewrote config class; cleanup; code restructuring

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- boxes.cpp	21 Aug 2002 16:07:26 -0000	1.1.1.1
+++ boxes.cpp	8 Sep 2002 01:08:12 -0000	1.2
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
+#include "common/util.h"
 
 #include <math.h>
 

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imuse.cpp	29 Aug 2002 23:45:15 -0000	1.8
+++ imuse.cpp	8 Sep 2002 01:08:12 -0000	1.9
@@ -26,6 +26,7 @@
 #include "scumm/imuse.h"
 #include "scumm/saveload.h"
 #include "scumm/sound.h"
+#include "common/util.h"
 
 /*
  * Some constants

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- script.cpp	1 Sep 2002 15:01:39 -0000	1.3
+++ script.cpp	8 Sep 2002 01:08:12 -0000	1.4
@@ -24,6 +24,7 @@
 #include "scumm.h"
 #include "actor.h"
 #include "resource.h"
+#include "common/util.h"
 
 /* Script status type (slot.status) */
 enum {
@@ -69,7 +70,8 @@
 	s->where = scriptType;
 	s->unk1 = a;
 	s->unk2 = b;
-	s->freezeCount = 0;
+	s->freezeCount = 0;
+
 	s->delayFrameCount = 0;
 
 	initializeLocals(slot, lvarptr);
@@ -620,8 +622,10 @@
 		vm.slot[slot].offs = _EXCD_offs;
 		vm.slot[slot].unk1 = 0;
 		vm.slot[slot].unk2 = 0;
-		vm.slot[slot].freezeCount = 0;
-		vm.slot[slot].delayFrameCount = 0;
+		vm.slot[slot].freezeCount = 0;
+
+		vm.slot[slot].delayFrameCount = 0;
+
 		runScriptNested(slot);
 	}
 	if (_vars[VAR_EXIT_SCRIPT2])

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- scumm.h	31 Aug 2002 21:23:28 -0000	1.11
+++ scumm.h	8 Sep 2002 01:08:12 -0000	1.12
@@ -23,15 +23,9 @@
 #ifndef SCUMM_H
 #define SCUMM_H
 
-#include "engine.h"
-#include "bundle.h"
-#include "timer.h"
-
-#define SCUMMVM_VERSION "0.2.2 CVS"
-#define SCUMMVM_CVS "2002-08-21"
-
-#define SWAP(a,b) do{int tmp=a; a=b; b=tmp; } while(0)
-#define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
+#include "common/engine.h"
+#include "common/timer.h"
+#include "scumm/bundle.h"
 
 class GameDetector;
 class Gui;





More information about the Scummvm-git-logs mailing list