[Scummvm-cvs-logs] CVS: scummvm/saga binread.cpp,1.3,1.4 binread.h,1.1,1.2 gamedesc.cpp,1.5,1.6 gamedesc.h,1.3,1.4 gamedesc_priv.h,1.2,1.3 resfile.cpp,1.4,1.5 resfile.h,1.2,1.3 resnames.h,1.1,1.2 saga.cpp,1.2,1.3 saga.h,1.2,1.3

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Mar 22 13:36:08 CET 2004


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32242

Modified Files:
	binread.cpp binread.h gamedesc.cpp gamedesc.h gamedesc_priv.h 
	resfile.cpp resfile.h resnames.h saga.cpp saga.h 
Log Message:
corrections to namespaces

Index: binread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/binread.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- binread.cpp	15 Mar 2004 01:59:06 -0000	1.3
+++ binread.cpp	22 Mar 2004 21:25:28 -0000	1.4
@@ -148,4 +148,4 @@
 	return u32_be;
 }
 
-}
+} // End of namespace Saga

Index: binread.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/binread.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- binread.h	14 Mar 2004 23:39:41 -0000	1.1
+++ binread.h	22 Mar 2004 21:25:28 -0000	1.2
@@ -25,6 +25,8 @@
 #include <stddef.h>
 #include "common/scummsys.h"
 
+namespace Saga {
+
 class BinReader {
 
 protected:
@@ -60,6 +62,7 @@
 	int32        readSint32BE();
 };
 
+} // End of namespace Saga
 
 #endif
 

Index: gamedesc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gamedesc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gamedesc.cpp	16 Mar 2004 08:25:46 -0000	1.5
+++ gamedesc.cpp	22 Mar 2004 21:25:28 -0000	1.6
@@ -446,4 +446,4 @@
 	return true;
 }
 
-}
+} // End of namespace Saga

Index: gamedesc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gamedesc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gamedesc.h	15 Mar 2004 01:59:06 -0000	1.3
+++ gamedesc.h	22 Mar 2004 21:25:28 -0000	1.4
@@ -118,7 +118,7 @@
 	int detectGame();
 	bool openGame();
 
-} // end namespace 
+} // End of namespace Saga
 
 #endif
 

Index: gamedesc_priv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gamedesc_priv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gamedesc_priv.h	15 Mar 2004 01:59:06 -0000	1.2
+++ gamedesc_priv.h	22 Mar 2004 21:25:28 -0000	1.3
@@ -111,7 +111,7 @@
 bool verifyIHNMDEMO();
 bool verifyIHNMCD();
 
-}
+} // End of namespace Saga
 
 #endif // SAGA_GAMEDESC_PRIV_H
 

Index: resfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resfile.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resfile.cpp	16 Mar 2004 08:25:46 -0000	1.4
+++ resfile.cpp	22 Mar 2004 21:25:28 -0000	1.5
@@ -159,4 +159,4 @@
 	delete[] res;
 }
 
-}
+} // End of namespace Saga

Index: resfile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resfile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resfile.h	15 Mar 2004 01:14:49 -0000	1.2
+++ resfile.h	22 Mar 2004 21:25:28 -0000	1.3
@@ -33,6 +33,8 @@
  
 #include "common/file.h"
 
+namespace Saga {
+
 class ResourceFile : public File {
 
 public:
@@ -94,6 +96,7 @@
 
 };
 
+} // End of namespace Saga
 
 
 #endif

Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resnames.h	14 Mar 2004 23:39:41 -0000	1.1
+++ resnames.h	22 Mar 2004 21:25:28 -0000	1.2
@@ -22,6 +22,8 @@
 #ifndef SAGA_RESNAMES_H
 #define SAGA_RESNAMES_H
 
+namespace Saga {
+
 /* Lookup tables
 \*-----------------------------------------------------------------*/
 #define ITE_SCENE_LUT  1806
@@ -120,6 +122,7 @@
 #define MUSIC_25 33
 #define MUSIC_26 34
 
+} // End of namespace Saga
 
 #endif
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- saga.cpp	15 Mar 2004 01:59:06 -0000	1.2
+++ saga.cpp	22 Mar 2004 21:25:28 -0000	1.3
@@ -33,7 +33,6 @@
 
 #include "gamedesc.h"
 
-
 struct SAGAGameSettings {
 	const char *name;
 	const char *description;
@@ -132,4 +131,4 @@
 	_system->quit();
 }
 
-}
+} // End of namespace Saga

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- saga.h	15 Mar 2004 01:59:06 -0000	1.2
+++ saga.h	22 Mar 2004 21:25:29 -0000	1.3
@@ -54,6 +54,6 @@
 
 };
 
-}
+} // End of namespace Saga
 
 #endif





More information about the Scummvm-git-logs mailing list