[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.22,1.23 autoroute.h,1.8,1.9 compact.cpp,1.23,1.24 compact.h,1.10,1.11 control.cpp,1.61,1.62 control.h,1.28,1.29 debug.cpp,1.7,1.8 debug.h,1.2,1.3 disk.cpp,1.52,1.53 disk.h,1.12,1.13 grid.cpp,1.13,1.14 grid.h,1.5,1.6 hufftext.cpp,1.3,1.4 intro.cpp,1.42,1.43 intro.h,1.2,1.3 logic.cpp,1.139,1.140 logic.h,1.34,1.35 mouse.cpp,1.27,1.28 mouse.h,1.21,1.22 rnc_deco.cpp,1.16,1.17 rnc_deco.h,1.3,1.4 screen.cpp,1.53,1.54 screen.h,1.16,1.17 sky.cpp,1.135,1.136 sky.h,1.55,1.56 skydefs.h,1.26,1.27 sound.cpp,1.43,1.44 sound.h,1.22,1.23 struc.h,1.12,1.13 talks.h,1.2,1.3 text.cpp,1.57,1.58 text.h,1.29,1.30

Max Horn fingolfin at users.sourceforge.net
Fri Jan 2 18:02:10 CET 2004 

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv11909

Modified Files:
	autoroute.cpp autoroute.h compact.cpp compact.h control.cpp 
	control.h debug.cpp debug.h disk.cpp disk.h grid.cpp grid.h 
	hufftext.cpp intro.cpp intro.h logic.cpp logic.h mouse.cpp 
	mouse.h rnc_deco.cpp rnc_deco.h screen.cpp screen.h sky.cpp 
	sky.h skydefs.h sound.cpp sound.h struc.h talks.h text.cpp 
	text.h 
Log Message:
Introduce namespace 'Sky'

Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- autoroute.cpp	3 Nov 2003 22:28:37 -0000	1.22
+++ autoroute.cpp	3 Jan 2004 01:58:57 -0000	1.23
@@ -27,6 +27,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define ROUTE_GRID_WIDTH ((GAME_SCREEN_WIDTH/8)+2)
 #define ROUTE_GRID_HEIGHT ((GAME_SCREEN_HEIGHT/8)+2)
 #define ROUTE_GRID_SIZE (ROUTE_GRID_WIDTH*ROUTE_GRID_HEIGHT*2)
@@ -266,3 +268,4 @@
 	return 0;
 }
 
+} // End of namespace Sky

Index: autoroute.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- autoroute.h	8 Nov 2003 20:27:26 -0000	1.8
+++ autoroute.h	3 Jan 2004 01:58:57 -0000	1.9
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 struct Compact;
 class SkyGrid;
 
@@ -47,6 +49,8 @@
 	static const int16 _routeDirections[4];
 	static const uint16 _logicCommands[4];
 };
+
+} // End of namespace Sky
 
 #endif // AUTOROUTE_H
 

Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- compact.cpp	5 Oct 2003 20:21:19 -0000	1.23
+++ compact.cpp	3 Jan 2004 01:58:57 -0000	1.24
@@ -37,6 +37,8 @@
 #include "sky/compacts/lincmenu.h"
 #include "sky/compacts/z_compac.h"
 
+namespace Sky {
+
 #define COMPACT_SIZE (sizeof(compactOffsets)/sizeof(uint32))
 #define EXTCOMPACT_SIZE (sizeof(extCompactOffsets)/sizeof(uint32))
 #define MEGASET_SIZE (sizeof(megaSetOffsets)/sizeof(uint32))
@@ -604,3 +606,4 @@
 
 }
 
+} // End of namespace Sky

Index: compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- compact.h	21 Aug 2003 13:39:20 -0000	1.10
+++ compact.h	3 Jan 2004 01:58:57 -0000	1.11
@@ -26,6 +26,8 @@
 #include "sky/struc.h"
 #include "sky/skydefs.h"
 
+namespace Sky {
+
 namespace SkyCompact {
 	MegaSet *getMegaSet(Compact *cpt, uint16 megaSet);
 	uint16 **getTurnTable(Compact *cpt, uint16 megaSet, uint16 dir);
@@ -3253,5 +3255,7 @@
 	extern uint16 wit_auto[];
 	extern uint16 minif_auto[];
 }
+
+} // End of namespace Sky
 
 #endif

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- control.cpp	8 Nov 2003 20:27:26 -0000	1.61
+++ control.cpp	3 Jan 2004 01:58:57 -0000	1.62
@@ -40,6 +40,8 @@
 #endif
 
 
+namespace Sky {
+
 SkyConResource::SkyConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) {
 
 	_spriteData = (dataFileHeader *)pSpData;
@@ -1820,3 +1822,4 @@
 	0xFF, 0xFF
 };
 
+} // End of namespace Sky

Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- control.h	8 Nov 2003 20:27:26 -0000	1.28
+++ control.h	3 Jan 2004 01:58:57 -0000	1.29
@@ -25,6 +25,10 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 
+class OSystem;
+
+namespace Sky {
+
 class SkyDisk;
 class SkyScreen;
 class SkyLogic;
@@ -32,7 +36,6 @@
 class SkyText;
 class SkyMusicBase;
 class SkySound;
-class OSystem;
 struct Compact;
 struct dataFileHeader;
 struct MegaSet;
@@ -295,5 +298,7 @@
 	static char _quitTexts[16][35];
 	static uint8 _crossImg[594];
 };
+
+} // End of namespace Sky
 
 #endif // CONTROL_H

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- debug.cpp	5 Oct 2003 20:21:19 -0000	1.7
+++ debug.cpp	3 Jan 2004 01:58:57 -0000	1.8
@@ -23,6 +23,8 @@
 #include "common/util.h"
 #include "sky/debug.h"
 
+namespace Sky {
+
 static const char *section_0_compacts[] = {
 	"UNDEFINED",
 	"joey",
@@ -1263,3 +1265,4 @@
 	debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c);
 }
 
+} // End of namespace Sky

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debug.h	5 Oct 2003 20:21:19 -0000	1.2
+++ debug.h	3 Jan 2004 01:58:57 -0000	1.3
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 class SkyDebug {
 public:
 	static void fetchCompact(uint32 a);
@@ -32,5 +34,7 @@
 	static void script(uint32 command, uint16 *scriptData);
 	static void mcode(uint32 mcode, uint32 a, uint32 b, uint32 c);
 };
+
+} // End of namespace Sky
 
 #endif

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- disk.cpp	8 Nov 2003 20:27:26 -0000	1.52
+++ disk.cpp	3 Jan 2004 01:58:57 -0000	1.53
@@ -28,6 +28,8 @@
 #include "sky/sky.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 static const char *dataFilename = "sky.dsk";
 static const char *dinnerFilename = "sky.dnr";
 
@@ -459,3 +461,5 @@
 		break;
 	}
 }
+
+} // End of namespace Sky

Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- disk.h	10 Oct 2003 13:55:08 -0000	1.12
+++ disk.h	3 Jan 2004 01:58:57 -0000	1.13
@@ -28,6 +28,8 @@
 
 class File;
 
+namespace Sky {
+
 #define MAX_FILES_IN_LIST 60
 
 struct PrefFile {
@@ -77,5 +79,7 @@
 	File *_dataDiskHandle;
 	File *_dnrHandle;
 };
+
+} // End of namespace Sky
 
 #endif

Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- grid.cpp	5 Oct 2003 20:21:19 -0000	1.13
+++ grid.cpp	3 Jan 2004 01:58:57 -0000	1.14
@@ -24,6 +24,8 @@
 #include "sky/grid.h"
 #include "sky/logic.h"
 
+namespace Sky {
+
 #define	GRID_FILE_START	60000
 
 int8 SkyGrid::_gridConvertTable[] = {
@@ -244,3 +246,5 @@
 {
 	return _gameGrids + GRID_SIZE * _gridConvertTable[pScreen];
 }
+
+} // End of namespace Sky

Index: grid.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- grid.h	5 Oct 2003 20:21:19 -0000	1.5
+++ grid.h	3 Jan 2004 01:58:57 -0000	1.6
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 struct Compact;
 class SkyDisk;
 
@@ -56,5 +58,7 @@
 	uint8 *_gameGrids;
 	SkyDisk *_skyDisk;
 };
+
+} // End of namespace Sky
 
 #endif //SKYGRID_H

Index: hufftext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/hufftext.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hufftext.cpp	12 Jul 2003 15:21:33 -0000	1.3
+++ hufftext.cpp	3 Jan 2004 01:58:57 -0000	1.4
@@ -21,6 +21,8 @@
 
 #include "text.h"
 
+namespace Sky {
+
 const HuffTree SkyText::_huffTree_00109[] = {
 	{ 1, 22, 0 },
 	{ 2, 9, 0 },
@@ -1998,3 +2000,5 @@
 	{ 0, 0, 148 },
 	{ 0, 0, '!' },
 };
+
+} // End of namespace Sky

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- intro.cpp	24 Dec 2003 00:25:17 -0000	1.42
+++ intro.cpp	3 Jan 2004 01:58:57 -0000	1.43
@@ -30,6 +30,8 @@
 #include "sky/struc.h"
 #include "sky/text.h"
 
+namespace Sky {
+
 #define SHOWSCREEN		 0
 #define COMMANDEND		 0 // end of COMMANDFLIRT block
 #define FADEUP			 1 // fade up palette
@@ -904,3 +906,5 @@
 	} while (msecs > 0);
 	return true;
 }
+
+} // End of namespace Sky

Index: intro.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- intro.h	5 Oct 2003 20:21:19 -0000	1.2
+++ intro.h	3 Jan 2004 01:58:57 -0000	1.3
@@ -26,6 +26,8 @@
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
+namespace Sky {
+
 class SkyDisk;
 class SkyScreen;
 class SkyMusicBase;
@@ -64,5 +66,6 @@
 	void restoreScreen(void);
 };
 
-#endif // INTRO_H
+} // End of namespace Sky
 
+#endif // INTRO_H

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- logic.cpp	8 Nov 2003 20:27:26 -0000	1.139
+++ logic.cpp	3 Jan 2004 01:58:57 -0000	1.140
@@ -40,6 +40,8 @@
 #include "base/gameDetector.h"
 */
 
+namespace Sky {
+
 uint32 SkyLogic::_scriptVariables[838];
 
 typedef void (SkyLogic::*LogicTable) ();
@@ -2538,3 +2540,4 @@
 	target->logic = L_TALK; 
 }
 
+} // End of namespace Sky

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- logic.h	5 Oct 2003 20:21:19 -0000	1.34
+++ logic.h	3 Jan 2004 01:58:57 -0000	1.35
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/util.h"
 
+namespace Sky {
+
 struct Compact;
 
 enum scriptVariableOffsets {
@@ -273,5 +275,7 @@
 	SkyMouse *_skyMouse;
 	SkyControl *_skyControl;
 };
+
+} // End of namespace Sky
 
 #endif

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mouse.cpp	12 Oct 2003 13:33:20 -0000	1.27
+++ mouse.cpp	3 Jan 2004 01:58:57 -0000	1.28
@@ -28,6 +28,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define MICE_FILE	60300
 #define NO_MAIN_OBJECTS	24
 #define NO_LINC_OBJECTS	21
@@ -328,3 +330,4 @@
 		return false;
 }
 
+} // End of namespace Sky

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mouse.h	5 Oct 2003 20:21:19 -0000	1.21
+++ mouse.h	3 Jan 2004 01:58:57 -0000	1.22
@@ -26,6 +26,9 @@
 #include "common/scummsys.h"
 
 class OSystem;
+
+namespace Sky {
+
 class SkyDisk;
 class SkyLogic;
 
@@ -80,5 +83,7 @@
 	SkyDisk *_skyDisk;
 	SkyLogic *_skyLogic;
 };
+
+} // End of namespace Sky
 
 #endif //SKYMOUSE_H

Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rnc_deco.cpp	8 Nov 2003 20:27:26 -0000	1.16
+++ rnc_deco.cpp	3 Jan 2004 01:58:57 -0000	1.17
@@ -23,6 +23,8 @@
 #include "common/scummsys.h"
 #include "sky/rnc_deco.h"
 
+namespace Sky {
+
 //return codes
 #define NOT_PACKED	0
 #define PACKED_CRC	-1
@@ -258,3 +260,4 @@
 	return unpackLen;
 }
 
+} // End of namespace Sky

Index: rnc_deco.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rnc_deco.h	5 Oct 2003 20:21:19 -0000	1.3
+++ rnc_deco.h	3 Jan 2004 01:58:57 -0000	1.4
@@ -24,6 +24,8 @@
 
 #include "stdafx.h"
 
+namespace Sky {
+
 class RncDecoder {
 
 protected:
@@ -53,5 +55,7 @@
 	uint16 inputValue(uint16 *table);
 	
 };
+
+} // End of namespace Sky
 
 #endif

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- screen.cpp	8 Nov 2003 20:27:26 -0000	1.53
+++ screen.cpp	3 Jan 2004 01:58:57 -0000	1.54
@@ -28,6 +28,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 uint8 SkyScreen::_top16Colours[16*3] = {
 	0, 0, 0,
 	38, 38, 38,
@@ -783,3 +785,4 @@
 
 }
 
+} // End of namespace Sky

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- screen.h	5 Oct 2003 20:21:19 -0000	1.16
+++ screen.h	3 Jan 2004 01:58:57 -0000	1.17
@@ -27,6 +27,9 @@
 #include "sky/skydefs.h"
 
 class OSystem;
+
+namespace Sky {
+
 class SkyDisk;
 class SkyEngine;
 struct Compact;
@@ -122,5 +125,7 @@
 	void vertMaskSub(uint16 *grid, uint32 gridOfs, uint8 *screenPtr, uint32 layerId);
 	void vectorToGame(uint8 gridVal);
 };
+
+} // End of namespace Sky
 
 #endif //SKYSCREEN_H

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- sky.cpp	24 Dec 2003 17:42:21 -0000	1.135
+++ sky.cpp	3 Jan 2004 01:58:57 -0000	1.136
@@ -103,11 +103,14 @@
 }
 
 Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst) {
-	return new SkyEngine(detector, syst);
+	return new Sky::SkyEngine(detector, syst);
 }
 
 REGISTER_PLUGIN("Beneath a Steel Sky", Engine_SKY_gameList, Engine_SKY_create, Engine_SKY_detectGames)
 
+
+namespace Sky {
+
 void **SkyEngine::_itemList[300];
 
 SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false };
@@ -538,3 +541,4 @@
 	}
 }
 
+} // End of namespace Sky

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- sky.h	12 Dec 2003 14:40:40 -0000	1.55
+++ sky.h	3 Jan 2004 01:58:57 -0000	1.56
@@ -27,6 +27,8 @@
 
 class GameDetector;
 
+namespace Sky {
+
 struct SystemVars {
 	uint32 systemFlags;
 	uint32 gameVersion;
@@ -115,5 +117,7 @@
 	
 	static int CDECL game_thread_proc(void *param);
 };
+
+} // End of namespace Sky
 
 #endif

Index: skydefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/skydefs.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- skydefs.h	5 Oct 2003 20:21:20 -0000	1.26
+++ skydefs.h	3 Jan 2004 01:58:57 -0000	1.27
@@ -24,6 +24,8 @@
 
 #include "stdafx.h"
 
+namespace Sky {
+
 //This file is incomplete, several flags still missing.
 
 // grafixProg pointer types:
@@ -4305,5 +4307,6 @@
 
 #define TEXT_MOUSE_WIDTH 0x80
 
-#endif
+} // End of namespace Sky
 
+#endif

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- sound.cpp	24 Dec 2003 00:25:17 -0000	1.43
+++ sound.cpp	3 Jan 2004 01:58:57 -0000	1.44
@@ -27,6 +27,8 @@
 #include "sky/sound.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define SOUND_FILE_BASE 60203
 #define MAX_FX_NUMBER 393
 #define SFXF_START_DELAY 0x80
@@ -1245,3 +1247,5 @@
 	_mixer->pauseID(SOUND_CH0, false);
 	_mixer->pauseID(SOUND_CH1, false);
 }
+
+} // End of namespace Sky

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sound.h	24 Dec 2003 00:25:17 -0000	1.22
+++ sound.h	3 Jan 2004 01:58:57 -0000	1.23
@@ -26,6 +26,8 @@
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
+namespace Sky {
+
 class SkyDisk;
 
 enum {
@@ -86,5 +88,7 @@
 	static uint16 _speechConvertTable[8];
 	static SfxQueue _sfxQueue[MAX_QUEUED_FX];
 };
+
+} // End of namespace Sky
 
 #endif

Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- struc.h	3 Aug 2003 17:17:24 -0000	1.12
+++ struc.h	3 Jan 2004 01:58:57 -0000	1.13
@@ -22,6 +22,8 @@
 #ifndef SKYSTRUC_H
 #define SKYSTRUC_H
 
+namespace Sky {
+
 struct lowTextManager_t {
 	byte *textData;
 	uint16 compactNum;
@@ -163,5 +165,7 @@
 
 	ExtCompact *extCompact;
 };
+
+} // End of namespace Sky
 
 #endif

Index: talks.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/talks.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- talks.h	2 Jun 2003 09:35:08 -0000	1.2
+++ talks.h	3 Jan 2004 01:58:57 -0000	1.3
@@ -22,6 +22,8 @@
 #ifndef SKYTALKS_H
 #define SKYTALKS_H
 
+namespace Sky {
+
 namespace SkyTalkAnims {
 
 uint16 show_mag[] = {
@@ -11893,5 +11895,7 @@
 	true
 };
 }
-#endif	//SKYTALKS_H
 
+} // End of namespace Sky
+
+#endif	//SKYTALKS_H

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- text.cpp	8 Nov 2003 20:27:26 -0000	1.57
+++ text.cpp	3 Jan 2004 01:58:57 -0000	1.58
@@ -26,6 +26,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define FIRST_TEXT_SEC	77
 #define	FIRST_TEXT_BUFFER	274
 #define NO_OF_TEXT_SECTIONS	8	// 8 sections per language
@@ -667,3 +669,5 @@
 	0, // SKY_PORTUGUESE
 	0  // SKY_SPANISH
 };
+
+} // End of namespace Sky

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- text.h	8 Nov 2003 20:27:27 -0000	1.29
+++ text.h	3 Jan 2004 01:58:57 -0000	1.30
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 struct Compact;
 class SkyDisk;
 
@@ -116,5 +118,7 @@
 public:
 	uint32 _dtLetters;	//no of chars in message
 };
+
+} // End of namespace Sky
 
 #endif

More information about the Scummvm-git-logs mailing list