rewrote config class; cleanup; code restructuring

svn-id: r4903

4 files changed, 9 insertions, 9 deletions

diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp
index f8d68dca98..b0cc3efb27 100644
--- a/scumm/boxes.cpp
+++ b/scumm/boxes.cpp
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
+#include "common/util.h"
 
 #include <math.h>
 
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 8bbf7a9208..7e9bdd8b28 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -26,6 +26,7 @@
 #include "scumm/imuse.h"
 #include "scumm/saveload.h"
 #include "scumm/sound.h"
+#include "common/util.h"
 
 /*
  * Some constants
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 7440e783a0..e28fa2395e 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -24,6 +24,7 @@
 #include "scumm.h"
 #include "actor.h"
 #include "resource.h"
+#include "common/util.h"
 
 /* Script status type (slot.status) */
 enum {
@@ -70,6 +71,7 @@ void Scumm::runScript(int script, int a, int b, int16 *lvarptr)
 	s->unk1 = a;
 	s->unk2 = b;
 	s->freezeCount = 0;
+
 	s->delayFrameCount = 0;
 
 	initializeLocals(slot, lvarptr);
@@ -621,7 +623,9 @@ void Scumm::runExitScript()
 		vm.slot[slot].unk1 = 0;
 		vm.slot[slot].unk2 = 0;
 		vm.slot[slot].freezeCount = 0;
+
 		vm.slot[slot].delayFrameCount = 0;
+
 		runScriptNested(slot);
 	}
 	if (_vars[VAR_EXIT_SCRIPT2])
diff --git a/scumm/scumm.h b/scumm/scumm.h
index bcd3b6588d..d882cef6a2 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -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;