[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.5,1.6 cutaway.h,1.3,1.4 graphics.cpp,1.6,1.7 graphics.h,1.5,1.6 logic.cpp,1.14,1.15 logic.h,1.7,1.8 queen.cpp,1.2,1.3 queen.h,1.2,1.3 resource.cpp,1.5,1.6 resource.h,1.5,1.6 restables.cpp,1.1,1.2 version.cpp,1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Fri Oct 3 12:49:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.16,1.17 debug.cpp,1.21,1.22 debug.h,1.14,1.15 intern.h,1.20,1.21 items.cpp,1.92,1.93 midi.cpp,1.58,1.59 midi.h,1.22,1.23 midiparser_s1d.cpp,1.6,1.7 res.cpp,1.26,1.27 simon.cpp,1.305,1.306 simon.h,1.88,1.89 sound.cpp,1.46,1.47 sound.h,1.11,1.12 verb.cpp,1.20,1.21 vga.cpp,1.81,1.82 vga.h,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv24957
Modified Files:
cutaway.cpp cutaway.h graphics.cpp graphics.h logic.cpp
logic.h queen.cpp queen.h resource.cpp resource.h
restables.cpp version.cpp
Log Message:
namespace Queen
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cutaway.cpp 3 Oct 2003 12:55:11 -0000 1.5
+++ cutaway.cpp 3 Oct 2003 19:47:41 -0000 1.6
@@ -23,6 +23,8 @@
#include "cutaway.h"
#include "graphics.h"
+namespace Queen {
+
/*
Functions needed:
@@ -1036,3 +1038,4 @@
}
}
+} // End of namespace Queen
Index: cutaway.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cutaway.h 3 Oct 2003 12:55:11 -0000 1.3
+++ cutaway.h 3 Oct 2003 19:47:41 -0000 1.4
@@ -24,6 +24,8 @@
#include "queen/queen.h"
+namespace Queen {
+
class QueenResource;
class QueenLogic;
class QueenGraphics;
@@ -248,5 +250,6 @@
};
-#endif
+} // End of namespace Queen
+#endif
Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- graphics.cpp 2 Oct 2003 19:31:43 -0000 1.6
+++ graphics.cpp 3 Oct 2003 19:47:41 -0000 1.7
@@ -21,6 +21,7 @@
#include "queen/graphics.h"
+namespace Queen {
QueenGraphics::QueenGraphics(QueenResource *resource)
:_resource(resource) {
@@ -509,3 +510,5 @@
delete[] pbf->data;
}
+
+} // End of namespace Queen
Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- graphics.h 2 Oct 2003 19:31:43 -0000 1.5
+++ graphics.h 3 Oct 2003 19:47:41 -0000 1.6
@@ -24,6 +24,7 @@
#include "queen/queen.h"
+namespace Queen {
#define MAX_BANK_SIZE 110
#define MAX_FRAMES_NUMBER 256
@@ -134,5 +135,6 @@
};
-#endif
+} // End of namespace Queen
+#endif
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- logic.cpp 3 Oct 2003 12:55:11 -0000 1.14
+++ logic.cpp 3 Oct 2003 19:47:41 -0000 1.15
@@ -21,6 +21,8 @@
#include "queen/logic.h"
+namespace Queen {
+
QueenLogic::QueenLogic(QueenResource *resource)
: _maxAnimatedFrame(0), _maxStaticFrame(0), _resource(resource) {
_jas = _resource->loadFile("QUEEN.JAS", 20);
@@ -370,3 +372,5 @@
}
return framenum;
}
+
+} // End of namespace Queen
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- logic.h 3 Oct 2003 12:55:11 -0000 1.7
+++ logic.h 3 Oct 2003 19:47:41 -0000 1.8
@@ -24,6 +24,7 @@
#include "queen/queen.h"
+namespace Queen {
struct GraphicData {
uint16 x, y;
@@ -100,5 +101,7 @@
void initialise();
};
+
+} // End of namespace Queen
#endif
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- queen.cpp 28 Sep 2003 17:48:07 -0000 1.2
+++ queen.cpp 3 Oct 2003 19:47:41 -0000 1.3
@@ -45,11 +45,13 @@
}
Engine *Engine_QUEEN_create(GameDetector *detector, OSystem *syst) {
- return new QueenEngine(detector, syst);
+ return new Queen::QueenEngine(detector, syst);
}
REGISTER_PLUGIN("Flight of the Amazon Queen", Engine_QUEEN_targetList, Engine_QUEEN_create);
+namespace Queen {
+
QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
: Engine(detector, syst) {
@@ -179,3 +181,4 @@
} while (cur < start + amount);
}
+} // End of namespace Queen
Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- queen.h 28 Sep 2003 15:59:30 -0000 1.2
+++ queen.h 3 Oct 2003 19:47:41 -0000 1.3
@@ -31,6 +31,8 @@
#include "queen/logic.h"
#include "common/config-file.h"
+namespace Queen {
+
class QueenLogic;
class QueenEngine : public Engine {
@@ -67,5 +69,7 @@
static int CDECL game_thread_proc(void *param);
};
+
+} // End of namespace Queen
#endif
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resource.cpp 2 Oct 2003 14:55:28 -0000 1.5
+++ resource.cpp 3 Oct 2003 19:47:41 -0000 1.6
@@ -22,6 +22,8 @@
#include "queen/queen.h"
#include "queen/resource.h"
+namespace Queen {
+
#define DEMO_JAS_VERSION_OFFSET 0x119A8
#define JAS_VERSION_OFFSET 0x12484
@@ -142,3 +144,4 @@
return _gameVersion->isDemo;
}
+} // End of namespace Queen
Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resource.h 2 Oct 2003 14:55:28 -0000 1.5
+++ resource.h 3 Oct 2003 19:47:41 -0000 1.6
@@ -19,11 +19,13 @@
*
*/
-#ifndef QUEENRESOURCE_H
-#define QUEENRESOURCE_H
+#ifndef QUEEN_RESOURCE_H
+#define QUEEN_RESOURCE_H
#include "common/file.h"
+namespace Queen {
+
struct ResourceEntry {
char filename[13];
uint8 inBundle;
@@ -67,6 +69,8 @@
uint32 fileOffset(const char *filename);
const char *JASVersion();
};
+
+} // End of namespace Queen
#endif
Index: restables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/restables.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- restables.cpp 28 Sep 2003 15:48:54 -0000 1.1
+++ restables.cpp 3 Oct 2003 19:47:41 -0000 1.2
@@ -21,6 +21,8 @@
#include "queen/resource.h"
+namespace Queen {
+
//English Floppy Demo v1
const ResourceEntry QueenResource::_resourceTablePE100v1[] = {
{ "ANDERSON.ACT", 1, 0x00000000, 0x00007c0a },
@@ -9094,3 +9096,4 @@
{ "ZOMBIE2.DOG", 1, 0x0b5f218d, 0x00000c40 }
};
+} // End of namespace Queen
Index: version.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/version.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- version.cpp 28 Sep 2003 15:48:54 -0000 1.1
+++ version.cpp 3 Oct 2003 19:47:41 -0000 1.2
@@ -21,6 +21,8 @@
#include "queen/resource.h"
+namespace Queen {
+
//English Floppy Demo v1
const GameVersion QueenResource::_gameVersionPE100v1 = {
"PE100",
@@ -57,3 +59,4 @@
_resourceTableCEM10
};
+} // End of namespace Queen
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.16,1.17 debug.cpp,1.21,1.22 debug.h,1.14,1.15 intern.h,1.20,1.21 items.cpp,1.92,1.93 midi.cpp,1.58,1.59 midi.h,1.22,1.23 midiparser_s1d.cpp,1.6,1.7 res.cpp,1.26,1.27 simon.cpp,1.305,1.306 simon.h,1.88,1.89 sound.cpp,1.46,1.47 sound.h,1.11,1.12 verb.cpp,1.20,1.21 vga.cpp,1.81,1.82 vga.h,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list