[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.128,1.129 queen.h,1.41,1.42
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:21:32 CEST 2005
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345/queen
Modified Files:
queen.cpp queen.h
Log Message:
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- queen.cpp 10 May 2005 22:55:48 -0000 1.128
+++ queen.cpp 10 May 2005 23:17:15 -0000 1.129
@@ -252,7 +252,7 @@
debug(3, "Saving game to slot %d", slot);
char name[20];
makeGameStateName(slot, name);
- OutSaveFile *file = _saveFileMan->openForSaving(name);
+ Common::OutSaveFile *file = _saveFileMan->openForSaving(name);
if (file) {
// save data
byte *saveData = new byte[30000];
@@ -287,7 +287,7 @@
void QueenEngine::loadGameState(uint16 slot) {
debug(3, "Loading game from slot %d", slot);
GameStateHeader header;
- InSaveFile *file = readGameStateHeader(slot, &header);
+ Common::InSaveFile *file = readGameStateHeader(slot, &header);
if (file && header.dataSize != 0) {
byte *saveData = new byte[header.dataSize];
byte *p = saveData;
@@ -308,10 +308,10 @@
}
}
-InSaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeader *gsh) {
+Common::InSaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeader *gsh) {
char name[20];
makeGameStateName(slot, name);
- InSaveFile *file = _saveFileMan->openForLoading(name);
+ Common::InSaveFile *file = _saveFileMan->openForLoading(name);
if (file && file->readUint32BE() == 'SCVM') {
gsh->version = file->readUint32BE();
gsh->flags = file->readUint32BE();
@@ -340,7 +340,7 @@
for (int i = 0; i < SAVESTATE_MAX; ++i) {
if (marks[i]) {
GameStateHeader header;
- InSaveFile *f = readGameStateHeader(i, &header);
+ Common::InSaveFile *f = readGameStateHeader(i, &header);
strcpy(descriptions[i], header.description);
delete f;
}
Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- queen.h 10 Apr 2005 15:13:37 -0000 1.41
+++ queen.h 10 May 2005 23:17:16 -0000 1.42
@@ -25,7 +25,9 @@
#include "base/engine.h"
class GameDetector;
-class InSaveFile;
+namespace Common {
+ class InSaveFile;
+}
#if defined(_WIN32_WCE) && (_WIN32_WCE <= 300)
@@ -114,7 +116,7 @@
void loadGameState(uint16 slot);
void makeGameStateName(uint16 slot, char *buf);
void findGameStateDescriptions(char descriptions[100][32]);
- InSaveFile *readGameStateHeader(uint16 slot, GameStateHeader *gsh);
+ Common::InSaveFile *readGameStateHeader(uint16 slot, GameStateHeader *gsh);
enum {
SAVESTATE_CUR_VER = 1,
More information about the Scummvm-git-logs
mailing list