Fri Oct 3 18:21:09 CEST 2003

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv7933

Modified Files:
	anims.cpp anims.h build_display.cpp build_display.h 
	console.cpp console.h controls.cpp controls.h credits.h 
	debug.cpp debug.h events.cpp events.h function.cpp function.h 
	header.h icons.cpp icons.h interpreter.cpp interpreter.h 
	layers.cpp layers.h logic.cpp logic.h maketext.cpp maketext.h 
	mem_view.cpp memory.cpp memory.h mouse.cpp mouse.h object.h 
	protocol.cpp protocol.h resman.cpp resman.h router.cpp 
	router.h save_rest.cpp save_rest.h scroll.cpp scroll.h 
	sound.cpp sound.h speech.cpp speech.h startup.cpp startup.h 
	sword2.cpp sword2.h sync.cpp sync.h tony_gsdk.cpp tony_gsdk.h 
	walker.cpp walker.h 
Log Message:
added namespace Sword2

Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24

--- anims.cpp	3 Oct 2003 06:54:44 -0000	1.23
+++ anims.cpp	4 Oct 2003 00:52:25 -0000	1.24
@@ -46,6 +46,8 @@
 #include "sync.h"
 #include "sound.h"		// for Speech stuff.
 
+namespace Sword2 {
+
 // stores resource id of wav to use as lead-out from smacker
 uint32 smackerLeadOut = 0;
 
@@ -793,3 +795,5 @@
 	// continue script
 	return IR_CONT;
 }
+
+} // End of namespace Sword2

Index: anims.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- anims.h	19 Sep 2003 06:41:41 -0000	1.2
+++ anims.h	4 Oct 2003 00:52:25 -0000	1.3
@@ -22,6 +22,8 @@
 
 #include "driver/driver96.h"
 
+namespace Sword2 {
+
 int32 FN_anim(int32 *params);
 int32 FN_reverse_anim(int32 *params);
 int32 FN_mega_table_anim(int32 *params);
@@ -31,5 +33,7 @@
 int32 FN_back_sprite(int32 *params);
 int32 FN_sort_sprite(int32 *params);
 int32 FN_fore_sprite(int32 *params);
+
+} // End of namespace Sword2
 
 #endif

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- build_display.cpp	30 Sep 2003 14:37:42 -0000	1.28
+++ build_display.cpp	4 Oct 2003 00:52:25 -0000	1.29
@@ -35,6 +35,8 @@
 #include "protocol.h"
 #include "resman.h"
 
+namespace Sword2 {
+
 // ---------------------------------------------------------------------------
 
 buildit	bgp0_list[MAX_bgp0_sprites];
@@ -1163,3 +1165,5 @@
 
 	return IR_CONT;
 }
+
+} // End of namespace Sword2

Index: build_display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build_display.h	26 Sep 2003 10:07:18 -0000	1.4
+++ build_display.h	4 Oct 2003 00:52:25 -0000	1.5
@@ -22,6 +22,8 @@
 
 #include "driver/driver96.h"
 
+namespace Sword2 {
+
 // structure filled out by each object to register its graphic printing
 // requrements
 
@@ -97,5 +99,7 @@
 // needed by debug.cpp for displaying as part of top-screen info
 
 extern uint32 fps;
+
+} // End of namespace Sword2
 
 #endif

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/console.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- console.cpp	30 Sep 2003 14:37:42 -0000	1.14
+++ console.cpp	4 Oct 2003 00:52:25 -0000	1.15
@@ -20,7 +20,9 @@
 #include "stdafx.h"
 #include "driver/driver96.h"
 
+namespace Sword2 {
 uint32	console_status = 0;	//0 off		// LEFT IN RELEASE VERSION
+} // End of namespace Sword2
 
 #ifdef _SWORD2_DEBUG
 
@@ -51,6 +53,8 @@
 #include "sword2.h"
 #include "time.h"
 
+namespace Sword2 {
+
 uint32 Parse_user_input(void);
 void Clear_console_line(void);
 void Con_help(void);
@@ -1058,13 +1062,19 @@
 	}
 }
 
+} // End of namespace Sword2
+
 #else
 
+namespace Sword2 {
+
 void Print_to_console(const char *format, ...) {}
 void Temp_print_to_console(const char *format, ...) {}
 void Clear_console_line(void) {}
 void Scroll_console(void) {}
 void Init_console(void) {}
 void StartConsole(void) {}
+
+} // End of namespace Sword2
 
 #endif

Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/console.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- console.h	27 Sep 2003 11:02:56 -0000	1.5
+++ console.h	4 Oct 2003 00:52:25 -0000	1.6
@@ -23,6 +23,8 @@
 #include "driver/driver96.h"
 #include "memory.h"
 
+namespace Sword2 {
+
 #ifdef _SWORD2_DEBUG
 
 void Init_console(void);
@@ -61,5 +63,7 @@
 #endif
 
 extern	uint32	console_status;
+
+} // End of namespace Sword2
 
 #endif

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- controls.cpp	3 Oct 2003 06:54:44 -0000	1.24
+++ controls.cpp	4 Oct 2003 00:52:25 -0000	1.25
@@ -36,6 +36,8 @@
 #include "sound.h"
 #include "sword2.h"
 
+namespace Sword2 {
+
 #define	MAX_STRING_LEN		64	// 20 was too low; better to be safe ;)
 #define CHARACTER_OVERLAP	 2	// overlap characters by 3 pixels
 
@@ -1558,3 +1560,5 @@
 
 	_currentGraphicsLevel = newLevel;
 }
+
+} // End of namespace Sword2

Index: controls.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- controls.h	3 Oct 2003 06:54:44 -0000	1.4
+++ controls.h	4 Oct 2003 00:52:25 -0000	1.5
@@ -20,6 +20,8 @@
 #ifndef	_CONTROL_S
 #define	_CONTROL_S
 
+namespace Sword2 {
+
 class Sword2Gui {
 public:
 	int _baseSlot;
@@ -43,5 +45,7 @@
 };
 
 extern Sword2Gui gui;
+
+} // End of namespace Sword2
 
 #endif

Index: credits.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/credits.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- credits.h	23 Sep 2003 06:27:57 -0000	1.3
+++ credits.h	4 Oct 2003 00:52:25 -0000	1.4
@@ -22,9 +22,13 @@
 
 #include "driver/driver96.h"
 
+namespace Sword2 {
+
 // int32 __declspec( dllexport ) Credits(_drvDrawStatus *pDrawStatus, _drvSoundStatus *pSoundStatus, const char *cdPath, BOOL smoke, BOOL *pAppFocus, _drvKeyStatus *pKeyStatus);
 //int32 Credits(_drvDrawStatus *pDrawStatus, _drvSoundStatus *pSoundStatus, const char *cdPath, BOOL smoke, BOOL *pAppFocus, _drvKeyStatus *pKeyStatus);
 
 int32 FN_play_credits(int32 *params);
+
+} // End of namespace Sword2
 
 #endif

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- debug.cpp	30 Sep 2003 09:27:26 -0000	1.12
+++ debug.cpp	4 Oct 2003 00:52:25 -0000	1.13
@@ -44,6 +44,8 @@
 #include "speech.h"			// for 'officialTextNumber' and
 					// 'speechScriptWaiting'
 
+namespace Sword2 {
+
 uint8 displayDebugText = 0;		// "INFO"		0=off; 1=on
 uint8 displayWalkGrid = 0;		// "WALKGRID"
 uint8 displayMouseMarker = 0;		// "MOUSE"
@@ -422,8 +424,12 @@
 	Scroll_console();
 }
 
+} // End of namespace Sword2
+
 #else
 
+namespace Sword2 {
 void Draw_debug_graphics(void) {}
+} // End of namespace Sword2
 
 #endif

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debug.h	27 Sep 2003 11:02:56 -0000	1.5
+++ debug.h	4 Oct 2003 00:52:25 -0000	1.6
@@ -26,6 +26,8 @@
 #include "driver.h"
 #include "object.h"
 
+namespace Sword2 {
+
 #define MAX_DEBUG_TEXT_BLOCKS	50
 
 extern uint8 displayDebugText;	// 0=off; 1=on
@@ -62,10 +64,16 @@
 
 void Print_current_info(void);
 
+} // End of namespace Sword2
+
 #else	// ie. not _SWORD2_DEBUG
 
+namespace Sword2 {
+
 void Build_debug_text(void);
 void Draw_debug_graphics(void);
+
+} // End of namespace Sword2
 
 #endif
 

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/events.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- events.cpp	30 Sep 2003 06:40:01 -0000	1.7
+++ events.cpp	4 Oct 2003 00:52:25 -0000	1.8
@@ -28,6 +28,8 @@
 #include "object.h"
 #include "sync.h"
 
+namespace Sword2 {
+
 _event_unit event_list[MAX_events];
 
 void Init_event_system(void) {
@@ -347,3 +349,5 @@
 		}
 	}
 }
+
+} // End of namespace Sword2

Index: events.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/events.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- events.h	26 Sep 2003 10:07:18 -0000	1.2
+++ events.h	4 Oct 2003 00:52:25 -0000	1.3
@@ -22,10 +22,12 @@
 
 #include "object.h"
 
-typedef	struct {
+namespace Sword2 {
+
+struct _event_unit {
 	uint32 id;
 	uint32 interact_id;
-} _event_unit;
+};
 
 #define	MAX_events 10
 
@@ -40,5 +42,7 @@
 uint32 Check_event_waiting(void);
 void Kill_all_ids_events(uint32 id);
 uint32 CountEvents(void);
+
+} // End of namespace Sword2
 
 #endif

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/function.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- function.cpp	1 Oct 2003 06:36:25 -0000	1.21
+++ function.cpp	4 Oct 2003 00:52:25 -0000	1.22
@@ -33,6 +33,8 @@
 #include "sound.h"
 #include "sword2.h"		// for CloseGame()
 
+namespace Sword2 {
+
 Object_graphic engine_graph;	// global for engine
 Object_mega engine_mega;	// global for engine
 
@@ -469,3 +471,5 @@
 
 	return IR_CONT;
 }
+
+} // End of namespace Sword2

Index: function.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/function.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- function.h	17 Sep 2003 13:03:13 -0000	1.2
+++ function.h	4 Oct 2003 00:52:25 -0000	1.3
@@ -22,7 +22,11 @@
 
 #include "object.h"
 
+namespace Sword2 {
+
 extern Object_graphic engine_graph;	// global for engine
 extern Object_mega engine_mega;		// global for engine
+
+} // End of namespace Sword2
 
 #endif

Index: header.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/header.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- header.h	3 Oct 2003 13:53:45 -0000	1.3
+++ header.h	4 Oct 2003 00:52:25 -0000	1.4
@@ -22,6 +22,8 @@
 
 #include "common/scummsys.h"
 
+namespace Sword2 {
+
 //----------------------------------------------------------
 // SYSTEM FILE & FRAME HEADERS
 //----------------------------------------------------------
@@ -298,5 +300,7 @@
 #if !defined(__GNUC__)
 	#pragma END_PACK_STRUCTS
 #endif
+
+} // End of namespace Sword2
 
 #endif

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/icons.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- icons.cpp	30 Sep 2003 09:27:26 -0000	1.10
+++ icons.cpp	4 Oct 2003 00:52:25 -0000	1.11
@@ -23,6 +23,8 @@
 #include "interpreter.h"
 #include "mouse.h"
 
+namespace Sword2 {
+
 // tempory list
 menu_object temp_list[TOTAL_engine_pockets];
 uint32 total_temp = 0;
@@ -248,3 +250,5 @@
 
 	ShowMenu(RDMENU_TOP);
 }
+
+} // End of namespace Sword2

Index: icons.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/icons.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- icons.h	26 Sep 2003 10:07:18 -0000	1.3
+++ icons.h	4 Oct 2003 00:52:25 -0000	1.4
@@ -22,6 +22,8 @@
 
 #include "object.h"
 
+namespace Sword2 {
+
 #define MENU_MASTER_OBJECT	44
 #define TOTAL_subjects		(375 - 256 + 1)	// the speech subject bar
 #define TOTAL_engine_pockets	(15 + 10)	// +10 for overflow
@@ -38,5 +40,7 @@
 
 void Build_top_menu(void);
 void Build_system_menu(void);
+
+} // End of namespace Sword2
 
 #endif

Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/interpreter.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- interpreter.cpp	27 Sep 2003 11:02:56 -0000	1.14
+++ interpreter.cpp	4 Oct 2003 00:52:25 -0000	1.15
@@ -23,6 +23,8 @@
 #include "driver/driver96.h"
 #include "interpreter.h"
 
+namespace Sword2 {
+
 // This file serves two purposes. It is compiled as part of the test functions
 // of Linc, and also as part of the game
 
@@ -710,3 +712,5 @@
 
 	return 1;
 }
+
+} // End of namespace Sword2

Index: interpreter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/interpreter.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- interpreter.h	27 Sep 2003 11:02:56 -0000	1.8
+++ interpreter.h	4 Oct 2003 00:52:25 -0000	1.9
@@ -23,6 +23,8 @@
 #include "debug.h"
 #include "header.h"
 
+namespace Sword2 {
+
 // Interpreter return codes
 
 #define IR_STOP				0
@@ -89,5 +91,7 @@
 #define	OP_GTTHANE			35	// >=
 #define	OP_LSTHANE			36	// <=
 #define	OP_OROR				37	// || or OR
+
+} // End of namespace Sword2
 
 #endif

Index: layers.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/layers.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- layers.cpp	30 Sep 2003 09:27:26 -0000	1.9
+++ layers.cpp	4 Oct 2003 00:52:25 -0000	1.10
@@ -34,6 +34,8 @@
 #include "resman.h"
 #include "sound.h"	// for Clear_fx_queue() called from FN_init_background()
 
+namespace Sword2 {
+
 // this_screen describes the current back buffer and its in-game scroll
 // positions, etc.
 
@@ -240,3 +242,5 @@
 		res_man.close(this_screen.background_layer_id);
 	}
 }
+
+} // End of namespace Sword2

Index: layers.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/layers.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- layers.h	26 Sep 2003 10:07:18 -0000	1.3
+++ layers.h	4 Oct 2003 00:52:25 -0000	1.4
@@ -22,6 +22,8 @@
 
 #include "memory.h"
 
+namespace Sword2 {
+
 typedef	struct {
 	uint16 scroll_offset_x;		// Position x
 	uint16 scroll_offset_y;		// Position y
@@ -53,5 +55,7 @@
 // called from control panel (as well as inside FN_init_background)
 
 void SetUpBackgroundLayers(void);
+
+} // End of namespace Sword2
 
 #endif

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/logic.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- logic.cpp	30 Sep 2003 09:27:26 -0000	1.17
+++ logic.cpp	4 Oct 2003 00:52:25 -0000	1.18
@@ -27,6 +27,8 @@
 #include "sound.h"
 #include "sync.h"
 
+namespace Sword2 {
+
 logic LLogic;
 
 #define LEVEL (_curObjectHub->logic_level)
@@ -448,3 +450,5 @@
 void logic::resetKillList(void) {
 	kills = 0;
 }
+
+} // End of namespace Sword2

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/logic.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- logic.h	30 Sep 2003 06:40:01 -0000	1.4
+++ logic.h	4 Oct 2003 00:52:25 -0000	1.5
@@ -25,6 +25,8 @@
 #include "defs.h"
 #include "header.h"
 
+namespace Sword2 {
+
 #define	TREE_SIZE 3
 
 class logic {
@@ -66,5 +68,7 @@
 extern logic LLogic;
 
 int32 FN_add_to_kill_list(int32 *params);
+
+} // End of namespace Sword2
 
 #endif

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/maketext.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- maketext.cpp	30 Sep 2003 14:37:42 -0000	1.17
+++ maketext.cpp	4 Oct 2003 00:52:25 -0000	1.18
@@ -64,6 +64,8 @@
 #include "resman.h"
 #include "sword2.h"
 
+namespace Sword2 {
+
 extern uint32 sequenceTextLines;	// see anims.cpp
 
 // info for each line of words in the output text sprite
@@ -686,3 +688,5 @@
 		break;
 	}
 }
+
+} // End of namespace Sword2

Index: maketext.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/maketext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maketext.h	19 Sep 2003 06:42:03 -0000	1.2
+++ maketext.h	4 Oct 2003 00:52:25 -0000	1.3
@@ -59,6 +59,8 @@
 
 #include "memory.h"
 
+namespace Sword2 {
+
 // only for debug text, since it doesn't keep text inside the screen margin!
 #define	NO_JUSTIFICATION		0
 // these all force text inside the screen edge margin when necessary
@@ -91,5 +93,7 @@
 extern uint32 speech_font_id;
 extern uint32 controls_font_id;
 extern uint32 red_font_id;
+
+} // End of namespace Sword2
 
 #endif

Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mem_view.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mem_view.cpp	3 Oct 2003 06:54:44 -0000	1.13
+++ mem_view.cpp	4 Oct 2003 00:52:25 -0000	1.14
@@ -24,6 +24,8 @@
 #include "memory.h"
 #include "resman.h"
 
+namespace Sword2 {
+
 // has to be global because a local in Fetch_mem_owner is destroyed on exit
 char buf[50];
 
@@ -183,3 +185,5 @@
 		mem_locked, mem_floating, mem_free, blocksUsed, MAX_mem_blocks,
 		percent, (res_man.fetchUsage() / 1024));
 }
+
+} // End of namespace Sword2

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/memory.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- memory.cpp	3 Oct 2003 06:54:44 -0000	1.11
+++ memory.cpp	4 Oct 2003 00:52:25 -0000	1.12
@@ -43,6 +43,8 @@
 #include "memory.h"
 #include "resman.h"
 
+namespace Sword2 {
+
 Sword2MemoryManager memory;
 
 #define MEMORY_POOL (1024 * 12000)
@@ -547,3 +549,5 @@
 
 	return 1;
 }
+
+} // End of namespace Sword2

Index: memory.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/memory.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- memory.h	3 Oct 2003 06:54:44 -0000	1.5
+++ memory.h	4 Oct 2003 00:52:25 -0000	1.6
@@ -22,6 +22,8 @@
 
 #include "common/scummsys.h"
 
+namespace Sword2 {
+
 typedef	struct {
 	uint32 state;
 	uint32 age;	// *not used*
@@ -101,5 +103,7 @@
 };
 
 extern Sword2MemoryManager memory;
+
+} // End of namespace Sword2
 
 #endif

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mouse.cpp	3 Oct 2003 06:54:44 -0000	1.21
+++ mouse.cpp	4 Oct 2003 00:52:26 -0000	1.22
@@ -35,6 +35,8 @@
 #include "sound.h"
 #include "sword2.h"
 
+namespace Sword2 {
+
 // pointer resource id's
 
 #define CROSHAIR	18
@@ -1388,3 +1390,5 @@
 		player_activity_delay++;
 	}
 }
+
+} // End of namespace Sword2

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mouse.h	3 Oct 2003 06:54:44 -0000	1.3
+++ mouse.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -24,6 +24,8 @@
 
 #include "object.h"
 
+namespace Sword2 {
+
 #define	TOTAL_mouse_list	50
 
 #define	MOUSE_normal		0
@@ -98,5 +100,7 @@
 int32 FN_add_human(int32 *params);
 
 void ClearPointerText(void);
+
+} // End of namespace Sword2
 
 #endif

Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/object.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- object.h	20 Sep 2003 12:43:52 -0000	1.2
+++ object.h	4 Oct 2003 00:52:26 -0000	1.3
@@ -22,6 +22,8 @@
 
 #include "driver/driver96.h"
 
+namespace Sword2 {
+
 // these structures represent the broken up compact components
 // these here declared to the system must be the same as those declared to
 // LINC (or it wont work)
@@ -121,5 +123,7 @@
 	int32 dx[8 * (12 + 1)];		// walk step distances in x direction
 	int32 dy[8 * (12 + 1)];		// walk step distances in y direction
 } Object_walkdata;
+
+} // End of namespace Sword2
 
 #endif

Index: protocol.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/protocol.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- protocol.cpp	30 Sep 2003 09:27:26 -0000	1.12
+++ protocol.cpp	4 Oct 2003 00:52:26 -0000	1.13
@@ -27,6 +27,8 @@
 #include "protocol.h"
 #include "resman.h"
 
+namespace Sword2 {
+
 // Returns a pointer to the first palette entry, given the pointer to the
 // start of the screen file.
 
@@ -216,3 +218,5 @@
 
 	return header->name;
 }
+
+} // End of namespace Sword2

Index: protocol.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/protocol.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- protocol.h	26 Sep 2003 10:07:18 -0000	1.3
+++ protocol.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -25,6 +25,8 @@
 #include "driver/driver96.h"
 #include "header.h"
 
+namespace Sword2 {
+
 uint8 *FetchPalette(uint8 *screenFile);
 _screenHeader *FetchScreenHeader(uint8 *screenFile);
 _layerHeader *FetchLayerHeader(uint8 *screenFile, uint16 layerNo);
@@ -40,5 +42,7 @@
 uint8 CheckTextLine(uint8 *file, uint32	text_line);
 uint8 *FetchPaletteMatchTable(uint8 *screenFile);
 uint8 *FetchObjectName(int32 resourceId);
+
+} // End of namespace Sword2
 
 #endif

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- resman.cpp	3 Oct 2003 13:53:45 -0000	1.49
+++ resman.cpp	4 Oct 2003 00:52:26 -0000	1.50
@@ -43,6 +43,8 @@
 #include "sword2.h"	// for CloseGame()
 #include "router.h"
 
+namespace Sword2 {
+
 // ---------------------------------------------------------------------------
 // welcome to the easy resource manager - written in simple code for easy
 // maintenance
@@ -1435,3 +1437,5 @@
 	memory.freeMemory(text_spr);
 	RemoveMsg();
 }
+
+} // End of namespace Sword2

Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resman.h	3 Oct 2003 06:54:44 -0000	1.7
+++ resman.h	4 Oct 2003 00:52:26 -0000	1.8
@@ -22,6 +22,8 @@
 
 #include "memory.h"
 
+namespace Sword2 {
+
 #define	MAX_res_files	20
 
 class Sword2ResourceManager {
@@ -104,5 +106,7 @@
 };							
 
 extern Sword2ResourceManager res_man;	//declare the object global
+
+} // End of namespace Sword2
 
 #endif

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- router.cpp	1 Oct 2003 10:00:35 -0000	1.19
+++ router.cpp	4 Oct 2003 00:52:26 -0000	1.20
@@ -89,6 +89,8 @@
 #include "resman.h"
 #include "router.h"
 
+namespace Sword2 {
+
 #define MAX_FRAMES_PER_CYCLE	16
 #define NO_DIRECTIONS		8
 #define MAX_FRAMES_PER_CHAR	(MAX_FRAMES_PER_CYCLE * NO_DIRECTIONS)
@@ -2848,3 +2850,5 @@
 	if (entry < MAX_WALKGRIDS)
 		walkGridList[entry] = 0;
 }
+
+} // End of namespace Sword2

Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/router.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- router.h	3 Oct 2003 13:53:45 -0000	1.4
+++ router.h	4 Oct 2003 00:52:26 -0000	1.5
@@ -23,6 +23,8 @@
 #include "memory.h"
 #include "object.h"
 
+namespace Sword2 {
+
 #if !defined(__GNUC__)
 	#pragma START_PACK_STRUCTS
 #endif
@@ -74,5 +76,7 @@
 void AddWalkGrid(int32 gridResource);
 void RemoveWalkGrid(int32 gridResource);
 void ClearWalkGridList(void);
+
+} // End of namespace Sword2
 
 #endif

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- save_rest.cpp	30 Sep 2003 14:37:42 -0000	1.22
+++ save_rest.cpp	4 Oct 2003 00:52:26 -0000	1.23
@@ -47,6 +47,8 @@
 #include "sword2.h"
 #include "walker.h"
 
+namespace Sword2 {
+
 // max length of a savegame filename, including full path
 #define	MAX_FILENAME_LEN 128
 
@@ -653,3 +655,5 @@
 
 	return total;
 }
+
+} // End of namespace Sword2

Index: save_rest.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- save_rest.h	20 Sep 2003 17:48:53 -0000	1.3
+++ save_rest.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -22,6 +22,8 @@
 
 #include "memory.h"
 
+namespace Sword2 {
+
 #define	SAVE_DESCRIPTION_LEN	64
 
 uint32 SaveGame(uint16 slotNo, uint8 *description);
@@ -53,5 +55,7 @@
 						// Something screwed up during
 						// the fwrite() - could be
 						// hard-drive full..?
+
+} // End of namespace Sword2
 
 #endif

Index: scroll.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/scroll.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scroll.cpp	27 Sep 2003 11:02:57 -0000	1.5
+++ scroll.cpp	4 Oct 2003 00:52:26 -0000	1.6
@@ -26,6 +26,8 @@
 #include "layers.h"
 #include "scroll.h"
 
+namespace Sword2 {
+
 // max no of pixel allowed to scroll per cycle
 #define MAX_SCROLL_DISTANCE 8
 
@@ -174,3 +176,5 @@
 	scroll_fraction = 32;
 	return IR_CONT;
 }
+
+} // End of namespace Sword2

Index: scroll.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/scroll.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scroll.h	20 Sep 2003 12:42:26 -0000	1.2
+++ scroll.h	4 Oct 2003 00:52:26 -0000	1.3
@@ -22,6 +22,10 @@
 #ifndef	_SCROLL
 #define	_SCROLL
 
+namespace Sword2 {
+
 void Set_scrolling(void);
+
+} // End of namespace Sword2
 
 #endif

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sound.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sound.cpp	2 Oct 2003 07:01:11 -0000	1.21
+++ sound.cpp	4 Oct 2003 00:52:26 -0000	1.22
@@ -38,6 +38,8 @@
 #include "sound.h"
 #include "sword2.h"
 
+namespace Sword2 {
+
 typedef struct {
 	uint32 resource;	// resource id of sample
 	uint32 fetchId;		// Id of resource in PSX CD queue. :)
@@ -426,3 +428,5 @@
 	g_sound->unpauseSpeech();
 	g_sound->unpauseFx();
 }
+
+} // End of namespace Sword2

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sound.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.h	20 Sep 2003 12:42:39 -0000	1.3
+++ sound.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -32,6 +32,8 @@
 
 #include "common/scummsys.h"
 
+namespace Sword2 {
+
 // fx types
 
 #define FX_SPOT		0
@@ -58,5 +60,7 @@
 
 // used to store id of tunes that loop, for save & restore
 extern uint32 looping_music_id;
+
+} // End of namespace Sword2
 
 #endif

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- speech.cpp	3 Oct 2003 06:54:44 -0000	1.27
+++ speech.cpp	4 Oct 2003 00:52:26 -0000	1.28
@@ -41,6 +41,8 @@
 #include "sword2.h"
 #include "walker.h"
 
+namespace Sword2 {
+
 #define	INS_talk		1
 #define	INS_anim		2
 #define	INS_reverse_anim	3
@@ -1628,3 +1630,5 @@
 		return 1;
 	}
 }
+
+} // End of namespace Sword2

Index: speech.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- speech.h	20 Sep 2003 12:42:56 -0000	1.2
+++ speech.h	4 Oct 2003 00:52:26 -0000	1.3
@@ -22,6 +22,8 @@
 
 #include "header.h"
 
+namespace Sword2 {
+
 #define	MAX_SUBJECT_LIST 30	// is that enough?
 
 // array of these for subject menu build up
@@ -41,5 +43,7 @@
 extern	int choosing;
 
 extern	uint32 unpause_zone;
+
+} // End of namespace Sword2
 
 #endif

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/startup.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- startup.cpp	1 Oct 2003 06:36:25 -0000	1.17
+++ startup.cpp	4 Oct 2003 00:52:26 -0000	1.18
@@ -39,6 +39,8 @@
 #include "sync.h"
 #include "tony_gsdk.h"
 
+namespace Sword2 {
+
 uint32 total_startups = 0;
 uint32 total_screen_managers = 0;
 uint32 res;
@@ -309,3 +311,5 @@
 
 	return 1;
 }
+
+} // End of namespace Sword2

Index: startup.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/startup.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- startup.h	20 Sep 2003 17:00:14 -0000	1.2
+++ startup.h	4 Oct 2003 00:52:26 -0000	1.3
@@ -20,6 +20,8 @@
 #ifndef	_STARTUP
 #define	_STARTUP
 
+namespace Sword2 {
+
 #define	MAX_starts	100
 #define	MAX_description	100
 
@@ -39,5 +41,7 @@
 uint32 Init_start_menu(void);
 uint32 Con_print_start_menu(void);
 uint32 Con_start(uint8 *input);
+
+} // End of namespace Sword2
 
 #endif

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sword2.cpp	3 Oct 2003 06:54:44 -0000	1.46
+++ sword2.cpp	4 Oct 2003 00:52:26 -0000	1.47
@@ -51,6 +51,26 @@
 
 extern uint16 _debugLevel;
 
+static const TargetSettings sword2_settings[] = {
+	/* Broken Sword 2 */
+	{"sword2", "Broken Sword II", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
+	{"sword2alt", "Broken Sword II (alt)", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
+	{"sword2demo", "Broken Sword II (Demo)", GID_SWORD2_DEMO, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
+	{NULL, NULL, 0, 0, MDT_NONE, 0, NULL}
+};
+
+const TargetSettings *Engine_SWORD2_targetList() {
+	return sword2_settings;
+}
+
+Engine *Engine_SWORD2_create(GameDetector *detector, OSystem *syst) {
+	return new Sword2::Sword2State(detector, syst);
+}
+
+REGISTER_PLUGIN("Broken Sword II", Engine_SWORD2_targetList, Engine_SWORD2_create);
+
+namespace Sword2 {
+
 uint8 quitGame = 0;
 
 // version & owner details
@@ -77,27 +97,9 @@
 uint8 graphics_level_fudged = 0;
 uint8 stepOneCycle = 0;			// for use while game paused
 
-static const TargetSettings sword2_settings[] = {
-	/* Broken Sword 2 */
-	{"sword2", "Broken Sword II", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
-	{"sword2alt", "Broken Sword II (alt)", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
-	{"sword2demo", "Broken Sword II (Demo)", GID_SWORD2_DEMO, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
-	{NULL, NULL, 0, 0, MDT_NONE, 0, NULL}
-};
-
 Sword2State *g_sword2 = NULL;
 Sword2Sound *g_sound = NULL;
 
-const TargetSettings *Engine_SWORD2_targetList() {
-	return sword2_settings;
-}
-
-Engine *Engine_SWORD2_create(GameDetector *detector, OSystem *syst) {
-	return new Sword2State(detector, syst);
-}
-
-REGISTER_PLUGIN("Broken Sword II", Engine_SWORD2_targetList, Engine_SWORD2_create);
-
 Sword2State::Sword2State(GameDetector *detector, OSystem *syst)
 	: Engine(detector, syst) {
 	
@@ -547,3 +549,5 @@
 	if (!mouse_status || choosing)
 		Set_mouse(NORMAL_MOUSE_ID);
 }
+
+} // End of namespace Sword2

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sword2.h	20 Sep 2003 18:33:24 -0000	1.13
+++ sword2.h	4 Oct 2003 00:52:26 -0000	1.14
@@ -22,6 +22,13 @@
 
 #include "driver/d_sound.h"
 
+enum BSGameId {
+	GID_SWORD2 = GID_SWORD2_FIRST,
+	GID_SWORD2_DEMO
+};
+
+namespace Sword2 {
+
 // Bodge for PCF76 version so that their demo CD can be labelled "PCF76"
 // rather than "RBSII1"
 
@@ -43,11 +50,6 @@
 extern uint8 version_string[];		// for displaying from the console
 extern uint8 unencoded_name[];
 
-enum BSGameId {
-	GID_SWORD2 = GID_SWORD2_FIRST,
-	GID_SWORD2_DEMO
-};
-
 // TODO move stuff into class
 
 class Sword2State : public Engine {
@@ -74,5 +76,7 @@
 
 extern Sword2State *g_sword2;
 extern Sword2Sound *g_sound;
+
+} // End of namespace Sword2
 
 #endif

Index: sync.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sync.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sync.cpp	27 Sep 2003 11:02:57 -0000	1.6
+++ sync.cpp	4 Oct 2003 00:52:26 -0000	1.7
@@ -23,6 +23,8 @@
 #include "interpreter.h"
 #include "sync.h"
 
+namespace Sword2 {
+
 typedef	struct {
 	uint32 id;
 	uint32 sync;
@@ -125,3 +127,5 @@
 	// back again next cycle
 	return IR_REPEAT;
 }
+
+} // End of namespace Sword2

Index: sync.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sync.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sync.h	26 Sep 2003 10:07:18 -0000	1.3
+++ sync.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -22,8 +22,12 @@
 
 #include "object.h"
 
+namespace Sword2 {
+
 void Init_sync_system(void);
 void Clear_syncs(uint32	id);
 uint32 Get_sync(void);
+
+} // End of namespace Sword2
 
 #endif

Index: tony_gsdk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/tony_gsdk.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tony_gsdk.cpp	30 Sep 2003 14:37:42 -0000	1.11
+++ tony_gsdk.cpp	4 Oct 2003 00:52:26 -0000	1.12
@@ -27,6 +27,8 @@
 #include "sword2.h"
 #include "common/file.h"
 
+namespace Sword2 {
+
 uint32 Read_file(const char *name, mem **membloc, uint32 uid) {
 	// read the file in and place into an allocated MEM_float block
 
@@ -56,3 +58,5 @@
 	//ok, done it - return bytes read
 	return size;
 }
+
+} // End of namespace Sword2

Index: tony_gsdk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/tony_gsdk.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tony_gsdk.h	17 Sep 2003 14:33:47 -0000	1.3
+++ tony_gsdk.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -22,6 +22,10 @@
 
 #include "memory.h"
 
+namespace Sword2 {
+
 uint32 Read_file(const char *name, mem **membloc, uint32 uid);
+
+} // End of namespace Sword2
 
 #endif

Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/walker.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- walker.cpp	30 Sep 2003 09:27:27 -0000	1.9
+++ walker.cpp	4 Oct 2003 00:52:26 -0000	1.10
@@ -45,6 +45,8 @@
 #include "router.h"
 #include "sync.h"
 
+namespace Sword2 {
+
 int16 standby_x;		// see FN_set_standby_coords
 int16 standby_y;
 uint8 standby_dir;
@@ -798,3 +800,5 @@
 
 	return IR_CONT;
 }
+
+} // End of namespace Sword2

Index: walker.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/walker.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- walker.h	20 Sep 2003 12:43:11 -0000	1.2
+++ walker.h	4 Oct 2003 00:52:26 -0000	1.3
@@ -20,11 +20,15 @@
 #ifndef	_WALKER
 #define	_WALKER
 
+namespace Sword2 {
+
 int32 FN_face_mega(int32 *params);
 int32 FN_turn(int32 *params);
 int32 FN_walk(int32 *params);
 int32 FN_walk_to_anim(int32 *params);
 int32 FN_stand_after_anim(int32 *params);
 int32 FN_stand(int32 *params);
+
+} // End of namespace Sword2
 
 #endif



