[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.182,1.183 actor.h,1.44,1.45 akos.cpp,1.86,1.87 akos.h,1.25,1.26 base-costume.cpp,2.8,2.9 base-costume.h,1.14,1.15 bomp.cpp,2.12,2.13 bomp.h,2.4,2.5 boxes.cpp,1.66,1.67 boxes.h,1.7,1.8 bundle.cpp,1.46,1.47 bundle.h,1.21,1.22 camera.cpp,2.12,2.13 charset.cpp,2.65,2.66 charset.h,2.21,2.22 costume.cpp,1.115,1.116 costume.h,1.24,1.25 debugger.cpp,1.91,1.92 debugger.h,1.27,1.28 dialogs.cpp,1.73,1.74 dialogs.h,1.24,1.25 gfx.cpp,2.216,2.217 gfx.h,1.47,1.48 help.cpp,1.9,1.10 help.h,1.4,1.5 imuse.cpp,2.103,2.104 imuse.h,1.48,1.49 imuse_digi.cpp,1.49,1.50 imuse_digi.h,1.15,1.16 imuse_internal.h,2.28,2.29 imuse_player.cpp,2.34,2.35 instrument.cpp,2.26,2.27 instrument.h,2.10,2.11 intern.h,2.114,2.115 midiparser_eup.cpp,1.4,1.5 midiparser_ro.cpp,1.3,1.4 music.h,2.9,2.10 nut_renderer.cpp,1.33,1.34 nut_renderer.h,1.14,1.15 object.cpp,1.143,1.144 object.h,1.6,1.7 player_mod.cpp,2.7,2.8 player_mod.h,2.6,2.7 player_v1.cpp,1.11,1.12 player_v1.h,1.9,1.10 player_v2.cpp,2.36,2.37 player_v2.h,2.18,2.19 player_v2a.cpp,2.9,2.10 player_v2a.h,2.3,2.4 player_v3a.cpp,1.13,1.14 player_v3a.h,1.11,1.12 resource.cpp,1.163,1.164 resource.h,1.6,1.7 resource_v2.cpp,1.35,1.36 resource_v3.cpp,1.22,1.23 resource_v4.cpp,1.7,1.8 saveload.cpp,1.111,1.112 saveload.h,1.25,1.26 script.cpp,1.135,1.136 script.h,2.2,2.3 script_v2.cpp,2.204,2.205 script_v5.cpp,1.195,1.196 script_v6.cpp,1.201,1.202 script_v8.cpp,2.198,2.199 scumm.h,1.308,1.309 scummvm.cpp,2.416,2.417 sound.cpp,1.260,1.261 sound.h,1.49,1.50 string.cpp,1.161,1.162 usage_bits.cpp,1.8,1.9 usage_bits.h,1.2,1.3 vars.cpp,1.60,1.61 verbs.cpp,1.80,1.81 verbs.h,1.7,1.8

Max Horn fingolfin at users.sourceforge.net
Fri Oct 3 11:35:04 CEST 2003 

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

Modified Files:
	actor.cpp actor.h akos.cpp akos.h base-costume.cpp 
	base-costume.h bomp.cpp bomp.h boxes.cpp boxes.h bundle.cpp 
	bundle.h camera.cpp charset.cpp charset.h costume.cpp 
	costume.h debugger.cpp debugger.h dialogs.cpp dialogs.h 
	gfx.cpp gfx.h help.cpp help.h imuse.cpp imuse.h imuse_digi.cpp 
	imuse_digi.h imuse_internal.h imuse_player.cpp instrument.cpp 
	instrument.h intern.h midiparser_eup.cpp midiparser_ro.cpp 
	music.h nut_renderer.cpp nut_renderer.h object.cpp object.h 
	player_mod.cpp player_mod.h player_v1.cpp player_v1.h 
	player_v2.cpp player_v2.h player_v2a.cpp player_v2a.h 
	player_v3a.cpp player_v3a.h resource.cpp resource.h 
	resource_v2.cpp resource_v3.cpp resource_v4.cpp saveload.cpp 
	saveload.h script.cpp script.h script_v2.cpp script_v5.cpp 
	script_v6.cpp script_v8.cpp scumm.h scummvm.cpp sound.cpp 
	sound.h string.cpp usage_bits.cpp usage_bits.h vars.cpp 
	verbs.cpp verbs.h 
Log Message:
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- actor.cpp	2 Oct 2003 22:42:02 -0000	1.182
+++ actor.cpp	3 Oct 2003 18:33:53 -0000	1.183
@@ -21,16 +21,18 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "akos.h"
-#include "boxes.h"
-#include "charset.h"
-#include "costume.h"
-#include "resource.h"
-#include "saveload.h"
-#include "sound.h"
-#include "usage_bits.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/akos.h"
+#include "scumm/boxes.h"
+#include "scumm/charset.h"
+#include "scumm/costume.h"
+#include "scumm/resource.h"
+#include "scumm/saveload.h"
+#include "scumm/sound.h"
+#include "scumm/usage_bits.h"
+
+namespace Scumm {
 
 byte Actor::kInvalidBox = 0;
 ScummEngine *Actor::_vm = 0;
@@ -1735,3 +1737,5 @@
 	
 	return actorEntries;
 }
+
+} // End of namespace Scumm

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- actor.h	2 Oct 2003 22:42:02 -0000	1.44
+++ actor.h	3 Oct 2003 18:33:53 -0000	1.45
@@ -25,8 +25,9 @@
 #define ACTOR_H
 
 #include "common/scummsys.h"
+#include "scumm/scumm.h"
 
-#include "scumm.h"
+namespace Scumm {
 
 enum MoveFlags {
 	MF_NEW_LEG = 1,
@@ -207,5 +208,7 @@
 	bool findPathTowards(byte box, byte box2, byte box3, Common::Point &foundPath);
 	void findPathTowardsOld(byte box, byte box2, byte box3, Common::Point &p2, Common::Point &p3);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- akos.cpp	2 Oct 2003 22:42:02 -0000	1.86
+++ akos.cpp	3 Oct 2003 18:33:53 -0000	1.87
@@ -21,12 +21,14 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "akos.h"
-#include "bomp.h"
-#include "imuse.h"
-#include "sound.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/akos.h"
+#include "scumm/bomp.h"
+#include "scumm/imuse.h"
+#include "scumm/sound.h"
+
+namespace Scumm {
 
 #if !defined(__GNUC__)
 #pragma START_PACK_STRUCTS
@@ -51,7 +53,6 @@
 #endif
 
 
-
 enum AkosOpcodes {
 	AKC_Return = 0xC001,
 	AKC_SetVar = 0xC010,
@@ -1377,3 +1378,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: akos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- akos.h	2 Oct 2003 22:42:02 -0000	1.25
+++ akos.h	3 Oct 2003 18:33:53 -0000	1.26
@@ -23,7 +23,9 @@
 #ifndef AKOS_H
 #define AKOS_H
 
-#include "base-costume.h"
+#include "scumm/base-costume.h"
+
+namespace Scumm {
 
 #ifdef __PALM_OS__
 extern const byte *defaultScaleTable;
@@ -97,5 +99,7 @@
 	void akos16Decompress(byte *dest, int32 pitch, const byte *src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency);
 	void akos16DecompressMask(byte *dest, int32 pitch, const byte *src, int32 t_width, int32 t_height, int32 dir, int32 numskip_before, int32 numskip_after, byte transparency, byte *maskptr, int32 bitpos_start);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: base-costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.cpp,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- base-costume.cpp	13 Jul 2003 10:35:05 -0000	2.8
+++ base-costume.cpp	3 Oct 2003 18:33:53 -0000	2.9
@@ -21,8 +21,9 @@
  */
 
 #include "stdafx.h"
-#include "base-costume.h"
+#include "scumm/base-costume.h"
 
+namespace Scumm {
 
 byte BaseCostumeRenderer::drawCostume(const CostumeData &cost) {
 	int i;
@@ -59,3 +60,5 @@
 		} while (--v1.replen);
 	} while (1);
 }
+
+} // End of namespace Scumm

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- base-costume.h	2 Oct 2003 22:42:02 -0000	1.14
+++ base-costume.h	3 Oct 2003 18:33:53 -0000	1.15
@@ -24,7 +24,9 @@
 #define BASE_COSTUME_H
 
 #include "common/scummsys.h"
-#include "actor.h"		// for CostumeData
+#include "scumm/actor.h"		// for CostumeData
+
+namespace Scumm {
 
 #if !defined(__GNUC__)
 #pragma START_PACK_STRUCTS
@@ -129,5 +131,7 @@
 
 	void codec1_ignorePakCols(int num);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: bomp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- bomp.cpp	2 Oct 2003 22:42:02 -0000	2.12
+++ bomp.cpp	3 Oct 2003 18:33:53 -0000	2.13
@@ -20,10 +20,12 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "akos.h"
-#include "bomp.h"
+#include "scumm/scumm.h"
+#include "scumm/akos.h"
+#include "scumm/bomp.h"
+
 
+namespace Scumm {
 
 static void bompScaleFuncX(byte *line_buffer, byte *scaling_x_ptr, byte skip, int32 size);
 
@@ -386,3 +388,4 @@
 	return ret_value;
 }
 
+} // End of namespace Scumm

Index: bomp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- bomp.h	18 Aug 2003 15:13:14 -0000	2.4
+++ bomp.h	3 Oct 2003 18:33:53 -0000	2.5
@@ -22,6 +22,8 @@
 #ifndef BOMP_H
 #define BOMP_H
 
+namespace Scumm {
+
 int32 setupBompScale(byte *scaling, int32 size, byte scale);
 
 void bompApplyMask(byte *line_buffer, byte *mask, byte maskbit, int32 size, byte transparency);
@@ -30,5 +32,7 @@
 void decompressBomp(byte *dst, const byte *src, int w, int h);
 void bompDecodeLine(byte *dst, const byte *src, int size);
 void bompDecodeLineReverse(byte *dst, const byte *src, int size);
+
+} // End of namespace Scumm
 
 #endif

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- boxes.cpp	2 Oct 2003 22:42:02 -0000	1.66
+++ boxes.cpp	3 Oct 2003 18:33:53 -0000	1.67
@@ -21,11 +21,13 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "boxes.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/boxes.h"
 #include "common/util.h"
 
+namespace Scumm {
+
 #if !defined(__GNUC__)
 	#pragma START_PACK_STRUCTS
 #endif
@@ -1278,3 +1280,4 @@
 	}
 }
 
+} // End of namespace Scumm

Index: boxes.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- boxes.h	2 Oct 2003 17:43:02 -0000	1.7
+++ boxes.h	3 Oct 2003 18:33:53 -0000	1.8
@@ -25,6 +25,8 @@
 
 #include "common/rect.h"
 
+namespace Scumm {
+
 #define SIZEOF_BOX_V2 8
 #define SIZEOF_BOX_V3 18
 #define SIZEOF_BOX 20
@@ -44,5 +46,7 @@
 	Common::Point ll;
 	Common::Point lr;
 };
+
+} // End of namespace Scumm
 
 #endif

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- bundle.cpp	18 Aug 2003 10:56:21 -0000	1.46
+++ bundle.cpp	3 Oct 2003 18:33:53 -0000	1.47
@@ -23,6 +23,8 @@
 #include "scumm/scumm.h"
 #include "scumm/bundle.h"
 
+namespace Scumm {
+
 #ifdef __PALM_OS__
 static const int16 *imcTable;
 #else
@@ -956,3 +958,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- bundle.h	1 Aug 2003 12:18:40 -0000	1.21
+++ bundle.h	3 Oct 2003 18:33:53 -0000	1.22
@@ -24,6 +24,8 @@
 #include "common/scummsys.h"
 #include "common/file.h"
 
+namespace Scumm {
+
 class Bundle {
 
 private:
@@ -75,5 +77,7 @@
 	int32 decompressMusicSampleByName(const char *name, int32 number, byte *comp_final);
 	int32 getNumberOfMusicSamplesByName(const char *name);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- camera.cpp	2 Oct 2003 22:42:02 -0000	2.12
+++ camera.cpp	3 Oct 2003 18:33:53 -0000	2.13
@@ -20,10 +20,12 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "intern.h"
-#include "actor.h"
-#include "charset.h"
+#include "scumm/scumm.h"
+#include "scumm/intern.h"
+#include "scumm/actor.h"
+#include "scumm/charset.h"
+
+namespace Scumm {
 
 void ScummEngine::setCameraAtEx(int at) {
 	if (!(_features & GF_NEW_CAMERA)) {
@@ -382,3 +384,4 @@
 	}
 }
 
+} // End of namespace Scumm

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.65
retrieving revision 2.66
diff -u -d -r2.65 -r2.66
--- charset.cpp	2 Oct 2003 22:42:02 -0000	2.65
+++ charset.cpp	3 Oct 2003 18:33:53 -0000	2.66
@@ -19,11 +19,13 @@
  */
 
 #include "stdafx.h"
-#include "charset.h"
-#include "scumm.h"
-#include "nut_renderer.h"
+#include "scumm/charset.h"
+#include "scumm/scumm.h"
+#include "scumm/nut_renderer.h"
 #include "base/gameDetector.h"
 
+namespace Scumm {
+
 CharsetRenderer::CharsetRenderer(ScummEngine *vm) {
 
 	_nextLeft = 0;
@@ -1321,3 +1323,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- charset.h	2 Oct 2003 22:42:02 -0000	2.21
+++ charset.h	3 Oct 2003 18:33:53 -0000	2.22
@@ -24,6 +24,8 @@
 #include "common/rect.h"
 #include "common/scummsys.h"
 
+namespace Scumm {
+
 class ScummEngine;
 class NutRenderer;
 struct VirtScreen;
@@ -142,5 +144,8 @@
 	
 	int getFontHeight();
 };
+
+} // End of namespace Scumm
+
 
 #endif

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- costume.cpp	2 Oct 2003 22:42:02 -0000	1.115
+++ costume.cpp	3 Oct 2003 18:33:53 -0000	1.116
@@ -21,11 +21,13 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "costume.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/costume.h"
 #include "scumm/sound.h"
 
+namespace Scumm {
+
 const byte revBitMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
 
 #ifdef __PALM_OS__
@@ -868,3 +870,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- costume.h	2 Oct 2003 22:42:02 -0000	1.24
+++ costume.h	3 Oct 2003 18:33:54 -0000	1.25
@@ -21,7 +21,9 @@
 #ifndef COSTUME_H
 #define COSTUME_H
 
-#include "base-costume.h"
+#include "scumm/base-costume.h"
+
+namespace Scumm {
 
 class LoadedCostume {
 protected:
@@ -77,5 +79,7 @@
 
 	byte mainRoutine(int xmoveCur, int ymoveCur);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- debugger.cpp	2 Oct 2003 22:42:02 -0000	1.91
+++ debugger.cpp	3 Oct 2003 18:33:54 -0000	1.92
@@ -45,6 +45,8 @@
 
 extern uint16 _debugLevel;
 
+namespace Scumm {
+
 ScummDebugger::ScummDebugger() {
 	_s = 0;
 	_frame_countdown = 0;
@@ -1125,3 +1127,4 @@
 	return true;
 }
 
+} // End of namespace Scumm

Index: debugger.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- debugger.h	2 Oct 2003 22:42:02 -0000	1.27
+++ debugger.h	3 Oct 2003 18:33:54 -0000	1.28
@@ -21,6 +21,8 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
+namespace Scumm {
+
 // Choose between text console or ScummConsole
 #define USE_CONSOLE	1
 
@@ -107,5 +109,7 @@
 	bool TabComplete(const char *input, char*& completion);
 
 };
+
+} // End of namespace Scumm
 
 #endif

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- dialogs.cpp	2 Oct 2003 22:42:02 -0000	1.73
+++ dialogs.cpp	3 Oct 2003 18:33:54 -0000	1.74
@@ -19,17 +19,17 @@
  */
 
 #include "stdafx.h"
-#include "dialogs.h"
-#include "sound.h"
-#include "scumm.h"
-#include "imuse.h"
-#include "player_v2.h"
-#include "verbs.h"
+#include "scumm/dialogs.h"
+#include "scumm/sound.h"
+#include "scumm/scumm.h"
+#include "scumm/imuse.h"
+#include "scumm/player_v2.h"
+#include "scumm/verbs.h"
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
 #ifndef DISABLE_HELP
-#include "help.h"
+#include "scumm/help.h"
 #endif
 
 #include "gui/newgui.h"
@@ -44,6 +44,8 @@
 extern void load_key_mapping();
 #endif
 
+namespace Scumm {
+
 struct ResString {
 	int num;
 	char string[80];
@@ -803,3 +805,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dialogs.h	2 Oct 2003 22:42:02 -0000	1.24
+++ dialogs.h	3 Oct 2003 18:33:54 -0000	1.25
@@ -26,10 +26,13 @@
 #include "gui/dialog.h"
 
 #ifndef DISABLE_HELP
-#include "help.h"
+#include "scumm/help.h"
 #endif
 
 class ListWidget;
+
+namespace Scumm {
+
 class ScummEngine;
 
 class ScummDialog : public Dialog {
@@ -191,5 +194,7 @@
 };
 
 #endif
+
+} // End of namespace Scumm
 
 #endif

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.216
retrieving revision 2.217
diff -u -d -r2.216 -r2.217
--- gfx.cpp	2 Oct 2003 22:42:02 -0000	2.216
+++ gfx.cpp	3 Oct 2003 18:33:54 -0000	2.217
@@ -20,13 +20,15 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "bomp.h"
-#include "charset.h"
-#include "resource.h"
-#include "usage_bits.h"
-#include "util.h"
+#include "common/util.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/bomp.h"
+#include "scumm/charset.h"
+#include "scumm/resource.h"
+#include "scumm/usage_bits.h"
+
+namespace Scumm {
 
 enum {
 	kScrolltime = 500,  // ms scrolling is supposed to take
@@ -2741,7 +2743,7 @@
  * Cycle the colors in the given palette in the intervael [cycleStart, cycleEnd]
  * either one step forward or backward.
  */
-static void cyclePalette(byte *palette, int cycleStart, int cycleEnd, int size, bool forward) {
+static void doCyclePalette(byte *palette, int cycleStart, int cycleEnd, int size, bool forward) {
 	byte *start = palette + cycleStart * size;
 	byte *end = palette + cycleEnd * size;
 	int num = cycleEnd - cycleStart;
@@ -2769,7 +2771,7 @@
  * palette by searching through it and replacing all indices that are in the
  * cycle range by the new (cycled) index.
  */
-static void cycleIndirectPalette(byte *palette, int cycleStart, int cycleEnd, bool forward) {
+static void doCycleIndirectPalette(byte *palette, int cycleStart, int cycleEnd, bool forward) {
 	int num = cycleEnd - cycleStart + 1;
 	int i;
 	int offset = forward ? 1 : num - 1;
@@ -2811,19 +2813,19 @@
 			moveMemInPalRes(cycl->start, cycl->end, cycl->flags & 2);
 
 			if (!(_features & GF_SMALL_HEADER && _version > 2))
-				::cyclePalette(_currentPalette, cycl->start, cycl->end, 3, !(cycl->flags & 2));
+				doCyclePalette(_currentPalette, cycl->start, cycl->end, 3, !(cycl->flags & 2));
 
 			// Also cycle the other, indirect palettes
 			if (_proc_special_palette) {
-				::cycleIndirectPalette(_proc_special_palette, cycl->start, cycl->end, !(cycl->flags & 2));
+				doCycleIndirectPalette(_proc_special_palette, cycl->start, cycl->end, !(cycl->flags & 2));
 			}
 			
 			if (_shadowPalette) {
 				if (_version >= 7) {
 					for (j = 0; j < NUM_SHADOW_PALETTE; j++)
-						::cycleIndirectPalette(_shadowPalette + j * 256, cycl->start, cycl->end, !(cycl->flags & 2));
+						doCycleIndirectPalette(_shadowPalette + j * 256, cycl->start, cycl->end, !(cycl->flags & 2));
 				} else {
-					::cycleIndirectPalette(_shadowPalette, cycl->start, cycl->end, !(cycl->flags & 2));
+					doCycleIndirectPalette(_shadowPalette, cycl->start, cycl->end, !(cycl->flags & 2));
 				}
 			}
 		}
@@ -2838,8 +2840,8 @@
 	if (!_palManipCounter)
 		return;
 
-	::cyclePalette(_palManipPalette, start, end, 3, !direction);
-	::cyclePalette(_palManipIntermediatePal, start, end, 6, !direction);
+	doCyclePalette(_palManipPalette, start, end, 3, !direction);
+	doCyclePalette(_palManipIntermediatePal, start, end, 6, !direction);
 }
 
 void ScummEngine::palManipulateInit(int start, int end, int string_id, int time) {
@@ -3645,3 +3647,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gfx.h	2 Oct 2003 22:42:02 -0000	1.47
+++ gfx.h	3 Oct 2003 18:33:54 -0000	1.48
@@ -25,6 +25,8 @@
 
 #include "common/rect.h"
 
+namespace Scumm {
+
 class ScummEngine;
 
 enum {					/** Camera modes */
@@ -197,5 +199,7 @@
 //
 // #define V7_SMOOTH_SCROLLING_HACK
 
+
+} // End of namespace Scumm
 
 #endif

Index: help.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/help.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- help.cpp	6 Aug 2003 12:04:27 -0000	1.9
+++ help.cpp	3 Oct 2003 18:33:54 -0000	1.10
@@ -18,10 +18,12 @@
  */
 
 #include "stdafx.h"
-#include "help.h"
-#include "scumm.h"
+#include "scumm/help.h"
+#include "scumm/scumm.h"
 #include "common/str.h"
 
+namespace Scumm {
+
 int ScummHelp::numPages(byte gameId) {
 	switch (gameId) {
 	case GID_MANIAC:
@@ -330,3 +332,4 @@
 #undef ADD_TEXT
 #undef ADD_LINE
 
+} // End of namespace Scumm

Index: help.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/help.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- help.h	2 Oct 2003 17:43:02 -0000	1.4
+++ help.h	3 Oct 2003 18:33:54 -0000	1.5
@@ -22,6 +22,8 @@
 
 #include "common/str.h"
 
+namespace Scumm {
+
 #define HELP_NUM_LINES 15
 
 class ScummHelp {
@@ -33,6 +35,8 @@
 	static void updateStrings(byte gameId, byte version, int page,
 			String &title, String *&key, String *&dsc);
 };
+
+} // End of namespace Scumm
 
 #endif
 

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.103
retrieving revision 2.104
diff -u -d -r2.103 -r2.104
--- imuse.cpp	3 Oct 2003 00:59:27 -0000	2.103
+++ imuse.cpp	3 Oct 2003 18:33:54 -0000	2.104
@@ -34,6 +34,7 @@
 #include "sound/mididrv.h"
 
 
+namespace Scumm {
 
 ////////////////////////////////////////
 //
@@ -1782,3 +1783,5 @@
 	IMuseInternal *engine = IMuseInternal::create(syst, mixer, midi);
 	return new IMuse(syst, engine);
 }
+
+} // End of namespace Scumm

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- imuse.h	3 Oct 2003 00:59:27 -0000	1.48
+++ imuse.h	3 Oct 2003 18:33:54 -0000	1.49
@@ -27,12 +27,15 @@
 #include "common/system.h"
 #include "scumm/music.h"
 
-class IMuseInternal;
 class MidiDriver;
 class OSystem;
+class SoundMixer;
+
+namespace Scumm {
+
+class IMuseInternal;
 class ScummEngine;
 class Serializer;
-class SoundMixer;
 
 class IMuse : public MusicEngine {
 private:
@@ -79,5 +82,7 @@
 	// Factory methods
 	static IMuse *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- imuse_digi.cpp	2 Oct 2003 22:42:02 -0000	1.49
+++ imuse_digi.cpp	3 Oct 2003 18:33:54 -0000	1.50
@@ -20,12 +20,14 @@
 
 #include "stdafx.h"
 #include "common/timer.h"
-#include "imuse_digi.h"
-#include "scumm.h"
-#include "sound.h"
+#include "scumm/imuse_digi.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
 #include "sound/mixer.h"
 #include "sound/voc.h"
 
+namespace Scumm {
+
 ////////////////////////////////////////
 //
 // iMuse Digital Implementation
@@ -1194,3 +1196,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: imuse_digi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- imuse_digi.h	2 Oct 2003 22:42:02 -0000	1.15
+++ imuse_digi.h	3 Oct 2003 18:33:54 -0000	1.16
@@ -27,6 +27,8 @@
 #include "scumm/music.h"
 #include "sound/mixer.h"
 
+namespace Scumm {
+
 #define MAX_DIGITAL_CHANNELS 8
 #define MAX_IMUSE_JUMPS 1
 #define MAX_IMUSE_REGIONS 3
@@ -79,5 +81,7 @@
 	int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
 	int getSoundStatus(int sound) const;
 };
+
+} // End of namespace Scumm
 
 #endif

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- imuse_internal.h	3 Oct 2003 00:59:27 -0000	2.28
+++ imuse_internal.h	3 Oct 2003 18:33:54 -0000	2.29
@@ -26,6 +26,12 @@
 #include "scumm/instrument.h"
 #include "sound/mididrv.h"
 
+class MidiParser;
+class OSystem;
+class SoundMixer;
+
+namespace Scumm {
+
 // Unremark this statement to activate some of
 // the most common iMuse diagnostic messages.
 // #define IMUSE_DEBUG
@@ -42,10 +48,7 @@
 class  IMuseInternal;
 
 // Some entities also referenced
-class MidiParser;
 class ScummEngine;
-class OSystem;
-class SoundMixer;
 
 
 
@@ -469,5 +472,7 @@
 
 	static IMuseInternal *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- imuse_player.cpp	3 Oct 2003 00:59:27 -0000	2.34
+++ imuse_player.cpp	3 Oct 2003 18:33:54 -0000	2.35
@@ -31,6 +31,7 @@
 #include "sound/midiparser.h"
 
 
+namespace Scumm {
 
 ////////////////////////////////////////
 //
@@ -1198,3 +1199,5 @@
 		                  sizeof(ParameterFader), parameterFaderEntries);
 	return 0;
 }
+
+} // End of namespace Scumm

Index: instrument.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.cpp,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- instrument.cpp	12 Aug 2003 06:58:11 -0000	2.26
+++ instrument.cpp	3 Oct 2003 18:33:54 -0000	2.27
@@ -25,6 +25,8 @@
 #include "scumm/instrument.h"
 #include "sound/mididrv.h"
 
+namespace Scumm {
+
 static bool _native_mt32 = false;
 
 static const byte mt32_to_gm[128] = {
@@ -466,3 +468,5 @@
 	}
 	return 255;
 }
+
+} // End of namespace Scumm

Index: instrument.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.h,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- instrument.h	4 Jul 2003 13:16:48 -0000	2.10
+++ instrument.h	3 Oct 2003 18:33:54 -0000	2.11
@@ -25,8 +25,11 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
-class Serializer;
 class MidiChannel;
+
+namespace Scumm {
+
+class Serializer;
 class Instrument;
 
 class InstrumentInternal {
@@ -67,5 +70,7 @@
 	void saveOrLoad (Serializer *s);
 	void send (MidiChannel *mc) { if (_instrument) _instrument->send (mc); }
 };
+
+} // End of namespace Scumm
 
 #endif

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.114
retrieving revision 2.115
diff -u -d -r2.114 -r2.115
--- intern.h	2 Oct 2003 22:42:02 -0000	2.114
+++ intern.h	3 Oct 2003 18:33:54 -0000	2.115
@@ -23,7 +23,11 @@
 #ifndef INTERN_H
 #define INTERN_H
 
-#include "scumm.h"
+#include "scumm/scumm.h"
+
+
+namespace Scumm {
+
 class NutRenderer; // V8 Font Renderer
 
 class ScummEngine_v5 : public ScummEngine {
@@ -606,5 +610,6 @@
 
 };
 
+} // End of namespace Scumm
 
 #endif

Index: midiparser_eup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/midiparser_eup.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- midiparser_eup.cpp	30 Sep 2003 16:27:59 -0000	1.4
+++ midiparser_eup.cpp	3 Oct 2003 18:33:54 -0000	1.5
@@ -25,6 +25,8 @@
 #include "common/util.h"
 
 
+namespace Scumm {
+
 //////////////////////////////////////////////////
 //
 // The FM Towns Euphony version of MidiParser
@@ -189,3 +191,5 @@
 }
 
 MidiParser *MidiParser_createEUP() { return new MidiParser_EUP; }
+
+} // End of namespace Scumm

Index: midiparser_ro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/midiparser_ro.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- midiparser_ro.cpp	16 Aug 2003 17:08:22 -0000	1.3
+++ midiparser_ro.cpp	3 Oct 2003 18:33:54 -0000	1.4
@@ -25,6 +25,8 @@
 #include "common/util.h"
 
 
+namespace Scumm {
+
 //////////////////////////////////////////////////
 //
 // The Standard MIDI File version of MidiParser
@@ -137,3 +139,5 @@
 }
 
 MidiParser *MidiParser_createRO() { return new MidiParser_RO; }
+
+} // End of namespace Scumm

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/music.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- music.h	3 Oct 2003 13:49:06 -0000	2.9
+++ music.h	3 Oct 2003 18:33:54 -0000	2.10
@@ -26,6 +26,8 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
+namespace Scumm {
+
 /**
  * Pure virtual base class for the various music/sound engines used in Scumm
  * games. In particular, the iMuse code provides a subclass of this. There are
@@ -84,5 +86,7 @@
 	 */
 	virtual void terminate() {}
 };
+
+} // End of namespace Scumm
 
 #endif

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- nut_renderer.cpp	2 Oct 2003 22:42:02 -0000	1.33
+++ nut_renderer.cpp	3 Oct 2003 18:33:54 -0000	1.34
@@ -19,10 +19,12 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "nut_renderer.h"
-#include "bomp.h"
+#include "scumm/scumm.h"
+#include "scumm/nut_renderer.h"
+#include "scumm/bomp.h"
+
 
+namespace Scumm {
 
 NutRenderer::NutRenderer(ScummEngine *vm) :
 	_vm(vm),
@@ -345,3 +347,5 @@
 			mask += _vm->gdi._numStrips;
 	}
 }
+
+} // End of namespace Scumm

Index: nut_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- nut_renderer.h	2 Oct 2003 22:42:02 -0000	1.14
+++ nut_renderer.h	3 Oct 2003 18:33:54 -0000	1.15
@@ -23,6 +23,8 @@
 
 #include "common/file.h"
 
+namespace Scumm {
+
 class ScummEngine;
 
 class NutRenderer {
@@ -58,5 +60,6 @@
 	int getCharHeight(byte c);
 };
 
+} // End of namespace Scumm
 
 #endif

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- object.cpp	2 Oct 2003 22:42:02 -0000	1.143
+++ object.cpp	3 Oct 2003 18:33:54 -0000	1.144
@@ -21,12 +21,14 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "bomp.h"
-#include "object.h"
-#include "resource.h"
-#include "usage_bits.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/bomp.h"
+#include "scumm/object.h"
+#include "scumm/resource.h"
+#include "scumm/usage_bits.h"
+
+namespace Scumm {
 
 #if !defined(__GNUC__)
 	#pragma START_PACK_STRUCTS
@@ -1661,3 +1663,5 @@
 
 	od->fl_object_index = slot;
 }
+
+} // End of namespace Scumm

Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- object.h	11 Sep 2003 10:32:14 -0000	1.6
+++ object.h	3 Oct 2003 18:33:54 -0000	1.7
@@ -21,6 +21,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
+namespace Scumm {
+
 struct ObjectData {
 	uint32 OBIMoffset;
 	uint32 OBCDoffset;
@@ -164,6 +166,8 @@
 	foImageHeader = 2,
 	foCheckAlreadyLoaded = 4
 };
+
+} // End of namespace Scumm
 
 
 #endif

Index: player_mod.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.cpp,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- player_mod.cpp	2 Oct 2003 22:42:02 -0000	2.7
+++ player_mod.cpp	3 Oct 2003 18:33:54 -0000	2.8
@@ -20,7 +20,9 @@
  *
  */
 
-#include "player_mod.h"
+#include "scumm/player_mod.h"
+
+namespace Scumm {
 
 ////////////////////////////////////////
 //
@@ -186,3 +188,5 @@
 		dpos += dlen;
 	}
 }
+
+} // End of namespace Scumm

Index: player_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.h,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -d -r2.6 -r2.7
--- player_mod.h	2 Oct 2003 22:42:02 -0000	2.6
+++ player_mod.h	3 Oct 2003 18:33:54 -0000	2.7
@@ -23,11 +23,13 @@
 #ifndef PLAYER_MOD_H
 #define PLAYER_MOD_H
 
-#include "scumm.h"
+#include "scumm/scumm.h"
 #include "sound/mixer.h"
 #include "sound/audiostream.h"
 #include "sound/rate.h"
 
+namespace Scumm {
+
 #define	MOD_MAXCHANS	16
 
 class Player_MOD {
@@ -74,5 +76,7 @@
 	ModUpdateProc *_playproc;
 	void *_playparam;
 };
+
+} // End of namespace Scumm
 
 #endif

Index: player_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v1.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- player_v1.cpp	2 Oct 2003 22:42:02 -0000	1.11
+++ player_v1.cpp	3 Oct 2003 18:33:54 -0000	1.12
@@ -22,8 +22,10 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
-#include "player_v1.h"
-#include "scumm.h"
+#include "scumm/player_v1.h"
+#include "scumm/scumm.h"
+
+namespace Scumm {
 
 #define TIMER_BASE_FREQ 1193000
 #define FIXP_SHIFT  16
@@ -605,3 +607,5 @@
 	if (_level || hasdata)
 		lowPassFilter(data, len);
 }
+
+} // End of namespace Scumm

Index: player_v1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v1.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- player_v1.h	3 Oct 2003 13:44:11 -0000	1.9
+++ player_v1.h	3 Oct 2003 18:33:54 -0000	1.10
@@ -23,7 +23,9 @@
 #ifndef PLAYER_V1_H
 #define PLAYER_V1_H
 
-#include "player_v2.h"
+#include "scumm/player_v2.h"
+
+namespace Scumm {
 
 #define FB_WNOISE 0x12000       /* feedback for white noise */
 #define FB_PNOISE 0x08000       /* feedback for periodic noise */
@@ -91,5 +93,7 @@
 	uint  _start_2;
 	int   _delta_2;
 };
+
+} // End of namespace Scumm
 
 #endif

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -d -r2.36 -r2.37
--- player_v2.cpp	2 Oct 2003 22:42:02 -0000	2.36
+++ player_v2.cpp	3 Oct 2003 18:33:54 -0000	2.37
@@ -22,11 +22,13 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
-#include "player_v2.h"
-#include "scumm.h"
+#include "scumm/player_v2.h"
+#include "scumm/scumm.h"
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
+namespace Scumm {
+
 #define FREQ_HZ 236 // Don't change!
 
 #define SPK_DECAY   0xfa00              /* Depends on sample rate */
@@ -1019,3 +1021,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- player_v2.h	3 Oct 2003 13:44:11 -0000	2.18
+++ player_v2.h	3 Oct 2003 18:33:54 -0000	2.19
@@ -27,6 +27,12 @@
 #include "common/system.h"
 #include "scumm/music.h"
 
+class SoundMixer;
+
+namespace Scumm {
+
+class ScummEngine;
+
 #if !defined(__GNUC__)
 	#pragma START_PACK_STRUCTS
 #endif	
@@ -66,11 +72,6 @@
 	uint16 array[sizeof(channel_data)/2];
 };
 
-
-class ScummEngine;
-class SoundMixer;
-
-
 class Player_V2 : public MusicEngine {
 public:
 	Player_V2(ScummEngine *scumm);
@@ -144,5 +145,7 @@
 	void execute_cmd(ChannelInfo *channel);
 	void next_freqs(ChannelInfo *channel);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: player_v2a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- player_v2a.cpp	2 Oct 2003 22:42:02 -0000	2.9
+++ player_v2a.cpp	3 Oct 2003 18:33:54 -0000	2.10
@@ -22,8 +22,10 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
-#include "player_v2a.h"
-#include "scumm.h"
+#include "scumm/player_v2a.h"
+#include "scumm/scumm.h"
+
+namespace Scumm {
 
 #define BASE_FREQUENCY 3579545
 
@@ -1216,3 +1218,5 @@
 	}
 	return 0;
 }
+
+} // End of namespace Scumm

Index: player_v2a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.h,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- player_v2a.h	3 Oct 2003 13:44:12 -0000	2.3
+++ player_v2a.h	3 Oct 2003 18:33:54 -0000	2.4
@@ -28,11 +28,13 @@
 #include "scumm/music.h"
 #include "scumm/player_mod.h"
 
+class SoundMixer;
+
+namespace Scumm {
+
 #define	V2A_MAXSLOTS 8
 
 class ScummEngine;
-class SoundMixer;
-
 class V2A_Sound;
 
 class Player_V2A : public MusicEngine {
@@ -62,5 +64,7 @@
 	static void update_proc(void *param);
 	void updateSound();
 };
+
+} // End of namespace Scumm
 
 #endif

Index: player_v3a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- player_v3a.cpp	2 Oct 2003 22:42:02 -0000	1.13
+++ player_v3a.cpp	3 Oct 2003 18:33:54 -0000	1.14
@@ -22,8 +22,10 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
-#include "player_v3a.h"
-#include "scumm.h"
+#include "scumm/player_v3a.h"
+#include "scumm/scumm.h"
+
+namespace Scumm {
 
 static const uint16 note_freqs[4][12] = {
 	{0x06B0,0x0650,0x05F4,0x05A0,0x054C,0x0500,0x04B8,0x0474,0x0434,0x03F8,0x03C0,0x0388},
@@ -334,3 +336,5 @@
 		return 1;
 	return 0;
 }
+
+} // End of namespace Scumm

Index: player_v3a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- player_v3a.h	3 Oct 2003 13:44:12 -0000	1.11
+++ player_v3a.h	3 Oct 2003 18:33:55 -0000	1.12
@@ -28,11 +28,14 @@
 #include "scumm/music.h"
 #include "scumm/player_mod.h"
 
+class SoundMixer;
+
+namespace Scumm {
+
 #define	V3A_MAXMUS	8
 #define	V3A_MAXSFX	8
 
 class ScummEngine;
-class SoundMixer;
 
 class Player_V3A : public MusicEngine {
 public:
@@ -86,5 +89,7 @@
 	static void update_proc(void *param);
 	void playMusic();
 };
+
+} // End of namespace Scumm
 
 #endif

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- resource.cpp	2 Oct 2003 22:42:02 -0000	1.163
+++ resource.cpp	3 Oct 2003 18:33:55 -0000	1.164
@@ -34,6 +34,8 @@
 #include "scumm/verbs.h"
 #include "sound/mididrv.h" // Need MD_ enum values
 
+namespace Scumm {
+
 static uint16 newTag2Old(uint32 oldTag);
 static const char *resTypeFromId(int id);
 
@@ -2373,3 +2375,5 @@
 		return buf;
 	}
 }
+
+} // End of namespace Scumm

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- resource.h	11 Sep 2003 10:32:14 -0000	1.6
+++ resource.h	3 Oct 2003 18:33:55 -0000	1.7
@@ -21,6 +21,8 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
+namespace Scumm {
+
 #if !defined(__GNUC__)
 	#pragma START_PACK_STRUCTS
 #endif	
@@ -72,5 +74,6 @@
 	const byte *findNext(uint32 tag);
 };
 
+} // End of namespace Scumm
 
 #endif

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- resource_v2.cpp	3 Oct 2003 01:07:35 -0000	1.35
+++ resource_v2.cpp	3 Oct 2003 18:33:55 -0000	1.36
@@ -20,13 +20,15 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "intern.h"
-#include "player_v2.h"
-#include "player_v1.h"
-#include "resource.h"
+#include "scumm/scumm.h"
+#include "scumm/intern.h"
+#include "scumm/player_v2.h"
+#include "scumm/player_v1.h"
+#include "scumm/resource.h"
 #include "sound/mididrv.h"
 
+namespace Scumm {
+
 void ScummEngine_v2::readClassicIndexFile() {
 	int i;
 
@@ -202,3 +204,5 @@
 void ScummEngine_v2::loadCharset(int num) {
 	// Stub, V2 font resources are hardcoded into the engine.
 }
+
+} // End of namespace Scumm

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- resource_v3.cpp	2 Oct 2003 22:42:02 -0000	1.22
+++ resource_v3.cpp	3 Oct 2003 18:33:55 -0000	1.23
@@ -21,10 +21,11 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "intern.h"
-#include "resource.h"
+#include "scumm/scumm.h"
+#include "scumm/intern.h"
+#include "scumm/resource.h"
 
+namespace Scumm {
 
 void ScummEngine_v3::readIndexFile() {
 	if (_features & GF_OLD_BUNDLE) {
@@ -226,3 +227,5 @@
 		_objectStateTable[i] = tmp >> OF_STATE_SHL;
 	}
 }
+
+} // End of namespace Scumm

Index: resource_v4.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v4.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resource_v4.cpp	2 Oct 2003 22:42:02 -0000	1.7
+++ resource_v4.cpp	3 Oct 2003 18:33:55 -0000	1.8
@@ -21,8 +21,10 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "intern.h"
+#include "scumm/scumm.h"
+#include "scumm/intern.h"
+
+namespace Scumm {
 
 void ScummEngine_v4::loadCharset(int no) {
 	uint32 size;
@@ -38,3 +40,5 @@
 	_fileHandle.read(createResource(6, no, size), size);
 	closeRoom();
 }
+
+} // End of namespace Scumm

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- saveload.cpp	2 Oct 2003 22:42:02 -0000	1.111
+++ saveload.cpp	3 Oct 2003 18:33:55 -0000	1.112
@@ -38,6 +38,8 @@
 #include "sound/mixer.h"
 
 
+namespace Scumm {
+
 struct SaveGameHeader {
 	uint32 type;
 	uint32 size;
@@ -957,3 +959,5 @@
 		sle++;
 	}
 }
+
+} // End of namespace Scumm

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- saveload.h	19 Sep 2003 19:11:32 -0000	1.25
+++ saveload.h	3 Oct 2003 18:33:55 -0000	1.26
@@ -24,6 +24,10 @@
 
 #include "common/scummsys.h"
 
+class SaveFile;
+
+namespace Scumm {
+
 // Support for "old" savegames (made with 2501 CVS build)
 // Can be useful for other ports too :)
 
@@ -88,8 +92,6 @@
 typedef int SerializerSaveReference(void *me, byte type, void *ref);
 typedef void *SerializerLoadReference(void *me, byte type, int ref);
 
-class SaveFile;
-
 class Serializer {
 public:
 	Serializer(SaveFile *stream, bool saveOrLoad, uint32 savegameVersion)
@@ -131,5 +133,7 @@
 	void saveEntries(void *d, const SaveLoadEntry *sle);
 	void loadEntries(void *d, const SaveLoadEntry *sle);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- script.cpp	2 Oct 2003 22:42:02 -0000	1.135
+++ script.cpp	3 Oct 2003 18:33:55 -0000	1.136
@@ -29,6 +29,8 @@
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 
+namespace Scumm {
+
 /* Start executing script 'script' with the given parameters */
 void ScummEngine::runScript(int script, bool freezeResistant, bool recursive, int *lvarptr) {
 	ScriptSlot *s;
@@ -1162,3 +1164,5 @@
 	if (_version > 3)
 		VAR(VAR_OVERRIDE) = 0;
 }
+
+} // End of namespace Scumm

Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.h,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- script.h	18 Sep 2003 02:07:17 -0000	2.2
+++ script.h	3 Oct 2003 18:33:55 -0000	2.3
@@ -25,6 +25,7 @@
 
 #include "base/engine.h"
 
+namespace Scumm {
 
 /* System Wide Constants */
 enum {
@@ -70,5 +71,6 @@
 	byte numNestedScripts;
 };
 
+} // End of namespace Scumm
 
 #endif

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.204
retrieving revision 2.205
diff -u -d -r2.204 -r2.205
--- script_v2.cpp	2 Oct 2003 22:42:02 -0000	2.204
+++ script_v2.cpp	3 Oct 2003 18:33:55 -0000	2.205
@@ -29,6 +29,8 @@
 #include "scumm/sound.h"
 #include "scumm/verbs.h"
 
+namespace Scumm {
+
 #define OPCODE(x)	{ &ScummEngine_v2::x, #x }
 
 void ScummEngine_v2::setupOpcodes() {
@@ -1578,3 +1580,5 @@
 	VAR(VAR_SENTENCE_OBJECT2) = 0;
 	VAR(VAR_SENTENCE_PREPOSITION) = 0;
 }
+
+} // End of namespace Scumm

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- script_v5.cpp	2 Oct 2003 22:42:02 -0000	1.195
+++ script_v5.cpp	3 Oct 2003 18:33:55 -0000	1.196
@@ -29,6 +29,8 @@
 #include "scumm/sound.h"
 #include "scumm/verbs.h"
 
+namespace Scumm {
+
 #define OPCODE(x)	{ &ScummEngine_v5::x, #x }
 
 void ScummEngine_v5::setupOpcodes() {
@@ -2929,3 +2931,5 @@
 	clearDrawObjectQueue();
 	runInventoryScript(1);
 }
+
+} // End of namespace Scumm

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- script_v6.cpp	2 Oct 2003 22:42:02 -0000	1.201
+++ script_v6.cpp	3 Oct 2003 18:33:55 -0000	1.202
@@ -40,6 +40,8 @@
 #include "scumm/dialogs.h"		// FIXME: This is just for the FT-INSANE warning. 
 				// Remove when INSANE is implemented
 
+namespace Scumm {
+
 #define OPCODE(x)	{ &ScummEngine_v6::x, #x }
 
 void ScummEngine_v6::setupOpcodes() {
@@ -3243,3 +3245,5 @@
 		error("decodeParseString: default case 0x%x", b);
 	}
 }
+
+} // End of namespace Scumm

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.198
retrieving revision 2.199
diff -u -d -r2.198 -r2.199
--- script_v8.cpp	2 Oct 2003 22:42:02 -0000	2.198
+++ script_v8.cpp	3 Oct 2003 18:33:55 -0000	2.199
@@ -33,6 +33,8 @@
 #include "sound/mixer.h"
 
 
+namespace Scumm {
+
 #define OPCODE(x)	{ &ScummEngine_v8::x, #x }
 
 void ScummEngine_v8::setupOpcodes() {
@@ -1607,3 +1609,5 @@
 
 	putState(obj, state);
 }
+
+} // End of namespace Scumm

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- scumm.h	3 Oct 2003 01:07:35 -0000	1.308
+++ scumm.h	3 Oct 2003 18:33:55 -0000	1.309
@@ -32,16 +32,19 @@
 #include "scumm/gfx.h"
 #include "scumm/script.h"
 
-class Actor;
-class BaseCostumeRenderer;
-class CharsetRenderer;
 class ConsoleDialog;
 class Dialog;
 class GameDetector;
+class NewGui;
+
+namespace Scumm {
+
+class Actor;
+class BaseCostumeRenderer;
+class CharsetRenderer;
 class IMuse;
 class IMuseDigital;
 class MusicEngine;
-class NewGui;
 class ScummEngine;
 class ScummDebugger;
 class Serializer;
@@ -1212,5 +1215,6 @@
 
 void checkRange(int max, int min, int no, const char *str);
 
+} // End of namespace Scumm
 
 #endif

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.416
retrieving revision 2.417
diff -u -d -r2.416 -r2.417
--- scummvm.cpp	3 Oct 2003 13:43:07 -0000	2.416
+++ scummvm.cpp	3 Oct 2003 18:33:55 -0000	2.417
@@ -63,6 +63,12 @@
 extern bool isSmartphone(void);
 #endif
 
+extern NewGui *g_gui;
+extern uint16 _debugLevel;
+extern uint16 _demo_mode;
+
+namespace Scumm {
+
 enum MouseButtonStatus {
 	msDown = 1,
 	msClicked = 2
@@ -72,10 +78,6 @@
 ScummEngine *g_scumm = 0;
 ScummDebugger *g_debugger;
 
-extern NewGui *g_gui;
-extern uint16 _debugLevel;
-extern uint16 _demo_mode;
-
 static const TargetSettings scumm_settings[] = {
 	/* Scumm Version 1 */
 	/* Scumm Version 2 */
@@ -266,61 +268,6 @@
 	{NULL, NULL, 0, 0, MDT_NONE, 0, NULL}
 };
 
-const TargetSettings *Engine_SCUMM_targetList() {
-	return scumm_settings;
-}
-
-Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
-	Engine *engine;
-
-	if (detector->_amiga)
-		detector->_game.features |= GF_AMIGA;
-
-	switch (detector->_platform) {
-	case 1:
-		if (!(detector->_game.features & GF_AMIGA))
-			detector->_game.features |= GF_AMIGA;
-		break;
-	case 2:
-		detector->_game.features |= GF_ATARI_ST;
-		break;
-	case 3:
-		detector->_game.features |= GF_MACINTOSH;
-		break;
-	}
-
-	switch (detector->_game.version) {
-	case 1:
-	case 2:
-		engine = new ScummEngine_v2(detector, syst);
-		break;
-	case 3:
-		engine = new ScummEngine_v3(detector, syst);
-		break;
-	case 4:
-		engine = new ScummEngine_v4(detector, syst);
-		break;
-	case 5:
-		engine = new ScummEngine_v5(detector, syst);
-		break;
-	case 6:
-		engine = new ScummEngine_v6(detector, syst);
-		break;
-	case 7:
-		engine = new ScummEngine_v7(detector, syst);
-		break;
-	case 8:
-		engine = new ScummEngine_v8(detector, syst);
-		break;
-	default:
-		error("Engine_SCUMM_create(): Unknown version of game engine");
-	}
-
-	return engine;
-}
-
-REGISTER_PLUGIN("Scumm Engine", Engine_SCUMM_targetList, Engine_SCUMM_create);
-
 ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst)
 	: Engine(detector, syst), _pauseDialog(0), _optionsDialog(0), _saveLoadDialog(0) {
 	OSystem::Property prop;
@@ -2690,3 +2637,62 @@
 
 	return toSimpleDir(1, temp) * 45;
 }
+
+} // End of namespace Scumm
+
+using namespace Scumm;
+
+const TargetSettings *Engine_SCUMM_targetList() {
+	return scumm_settings;
+}
+
+Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
+	Engine *engine;
+
+	if (detector->_amiga)
+		detector->_game.features |= GF_AMIGA;
+
+	switch (detector->_platform) {
+	case 1:
+		if (!(detector->_game.features & GF_AMIGA))
+			detector->_game.features |= GF_AMIGA;
+		break;
+	case 2:
+		detector->_game.features |= GF_ATARI_ST;
+		break;
+	case 3:
+		detector->_game.features |= GF_MACINTOSH;
+		break;
+	}
+
+	switch (detector->_game.version) {
+	case 1:
+	case 2:
+		engine = new ScummEngine_v2(detector, syst);
+		break;
+	case 3:
+		engine = new ScummEngine_v3(detector, syst);
+		break;
+	case 4:
+		engine = new ScummEngine_v4(detector, syst);
+		break;
+	case 5:
+		engine = new ScummEngine_v5(detector, syst);
+		break;
+	case 6:
+		engine = new ScummEngine_v6(detector, syst);
+		break;
+	case 7:
+		engine = new ScummEngine_v7(detector, syst);
+		break;
+	case 8:
+		engine = new ScummEngine_v8(detector, syst);
+		break;
+	default:
+		error("Engine_SCUMM_create(): Unknown version of game engine");
+	}
+
+	return engine;
+}
+
+REGISTER_PLUGIN("Scumm Engine", Engine_SCUMM_targetList, Engine_SCUMM_create);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- sound.cpp	2 Oct 2003 22:42:03 -0000	1.260
+++ sound.cpp	3 Oct 2003 18:33:56 -0000	1.261
@@ -21,12 +21,12 @@
  */
 
 #include "stdafx.h"
-#include "actor.h"
-#include "bundle.h"
-#include "imuse.h"
-#include "imuse_digi.h"
-#include "scumm.h"
-#include "sound.h"
+#include "scumm/actor.h"
+#include "scumm/bundle.h"
+#include "scumm/imuse.h"
+#include "scumm/imuse_digi.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
 
 #include "common/config-file.h"
 #include "common/timer.h"
@@ -38,6 +38,8 @@
 #include "sound/voc.h"
 
 
+namespace Scumm {
+
 enum {
 	SOUND_HEADER_SIZE = 26,
 	SOUND_HEADER_BIG_SIZE = 26 + 8
@@ -1701,3 +1703,5 @@
 }
 
 #endif
+
+} // End of namespace Scumm

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- sound.h	2 Oct 2003 22:42:03 -0000	1.49
+++ sound.h	3 Oct 2003 18:33:56 -0000	1.50
@@ -24,9 +24,12 @@
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
+class File;
+
+namespace Scumm {
+
 class Bundle;
 class DigitalTrackInfo;
-class File;
 class ScummEngine;
 
 struct MP3OffsetTable;
@@ -155,6 +158,8 @@
 
 	int getCachedTrack(int track);
 };
+
+} // End of namespace Scumm
 
 #endif
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- string.cpp	2 Oct 2003 22:42:03 -0000	1.161
+++ string.cpp	3 Oct 2003 18:33:56 -0000	1.162
@@ -21,13 +21,15 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "actor.h"
-#include "charset.h"
-#include "dialogs.h"
-#include "verbs.h"
+#include "scumm/scumm.h"
+#include "scumm/actor.h"
+#include "scumm/charset.h"
+#include "scumm/dialogs.h"
+#include "scumm/verbs.h"
 #include "scumm/sound.h"
 
+namespace Scumm {
+
 void ScummEngine::setStringVars(int slot) {
 	StringTab *st = &_string[slot];
 	st->xpos = st->t_xpos;
@@ -947,3 +949,4 @@
 	}
 }
 
+} // End of namespace Scumm

Index: usage_bits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/usage_bits.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- usage_bits.cpp	2 Oct 2003 22:42:03 -0000	1.8
+++ usage_bits.cpp	3 Oct 2003 18:33:56 -0000	1.9
@@ -17,8 +17,10 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "usage_bits.h"
+#include "scumm/scumm.h"
+#include "scumm/usage_bits.h"
+
+namespace Scumm {
 
 void ScummEngine::upgradeGfxUsageBits() {
 	int i;
@@ -80,3 +82,5 @@
 
 	return false;
 }
+
+} // End of namespace Scumm

Index: usage_bits.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/usage_bits.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- usage_bits.h	6 Mar 2003 21:46:31 -0000	1.2
+++ usage_bits.h	3 Oct 2003 18:33:56 -0000	1.3
@@ -19,9 +19,13 @@
 #ifndef USAGE_BITS_H
 #define USAGE_BITS_H
 
+namespace Scumm {
+
 enum {
 	USAGE_BIT_DIRTY = 96,
 	USAGE_BIT_RESTORED = 95
 };
+
+} // End of namespace Scumm
 
 #endif

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- vars.cpp	2 Oct 2003 22:42:03 -0000	1.60
+++ vars.cpp	3 Oct 2003 18:33:56 -0000	1.61
@@ -22,8 +22,10 @@
 
 
 #include "stdafx.h"
-#include "scumm.h"
-#include "intern.h"
+#include "scumm/scumm.h"
+#include "scumm/intern.h"
+
+namespace Scumm {
 
 void ScummEngine::setupScummVars() {
 	VAR_KEYPRESS = 0;
@@ -324,3 +326,5 @@
 	
 	VAR_CHARINC = 221;
 }
+
+} // End of namespace Scumm

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- verbs.cpp	2 Oct 2003 22:42:03 -0000	1.80
+++ verbs.cpp	3 Oct 2003 18:33:56 -0000	1.81
@@ -21,11 +21,13 @@
  */
 
 #include "stdafx.h"
-#include "charset.h"
-#include "object.h"
-#include "resource.h"
-#include "scumm.h"
-#include "verbs.h"
+#include "scumm/charset.h"
+#include "scumm/object.h"
+#include "scumm/resource.h"
+#include "scumm/scumm.h"
+#include "scumm/verbs.h"
+
+namespace Scumm {
 
 enum {
 	kInventoryUpArrow = 4,
@@ -578,3 +580,5 @@
 		memcpy(getResourceAddress(rtVerb, verb), obimptr, size);
 	}
 }
+
+} // End of namespace Scumm

Index: verbs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- verbs.h	2 Oct 2003 17:43:02 -0000	1.7
+++ verbs.h	3 Oct 2003 18:33:56 -0000	1.8
@@ -24,6 +24,8 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 
+namespace Scumm {
+
 enum {
 	kTextVerbType = 0,
 	kImageVerbType = 1
@@ -42,5 +44,7 @@
 	uint8 prep;
 	uint16 imgindex;
 };
+
+} // End of namespace Scumm
 
 #endif

More information about the Scummvm-git-logs mailing list