[Scummvm-cvs-logs] CVS: scummvm/sword2 resman.cpp,1.69,1.70 save_rest.h,1.7,1.8 sword2.h,1.39,1.40
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Thu Nov 13 23:42:09 CET 2003
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv22118
Modified Files:
resman.cpp save_rest.h sword2.h
Log Message:
cleanup
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- resman.cpp 13 Nov 2003 07:59:52 -0000 1.69
+++ resman.cpp 14 Nov 2003 07:41:22 -0000 1.70
@@ -972,6 +972,12 @@
// CD had been inserted, but our backend doesn't support that, and
// anyway I don't know if all systems allow that sort of thing. So we
// wait for the user to press any key instead, or click the mouse.
+ //
+ // But just in case we ever try to identify the CDs by their labels,
+ // they should be:
+ //
+ // CD1: "RBSII1" (or "PCF76" for the PCF76 version, whatever that is)
+ // CD2: "RBSII2"
while (1) {
_keyboardEvent ke;
Index: save_rest.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- save_rest.h 3 Nov 2003 07:47:41 -0000 1.7
+++ save_rest.h 14 Nov 2003 07:41:22 -0000 1.8
@@ -20,33 +20,25 @@
#ifndef SAVE_REST_H
#define SAVE_REST_H
-#include "sword2/memory.h"
-
namespace Sword2 {
#define SAVE_DESCRIPTION_LEN 64
// Save & Restore error codes
-#define SR_OK 0x00000000 // No worries
-#define SR_ERR_FILEOPEN 0x00000001 // can't open file - Couldn't
- // create file for saving, or
- // couldn't find file for
- // loading.
-#define SR_ERR_INCOMPATIBLE 0x00000002 // (RestoreGame only)
- // incompatible savegame data.
- // Savegame file is obsolete.
- // (Won't happen after
- // development stops)
-#define SR_ERR_READFAIL 0x00000003 // (RestoreGame only) failed on
- // reading savegame file -
- // Something screwed up during
- // the fread()
-#define SR_ERR_WRITEFAIL 0x00000004 // (SaveGame only) failed on
- // writing savegame file -
- // Something screwed up during
- // the fwrite() - could be
- // hard-drive full..?
+enum {
+ SR_OK, // No worries
+ SR_ERR_FILEOPEN, // Can't open file - Couldn't create file for
+ // saving, or couldn't find file for loading.
+ SR_ERR_INCOMPATIBLE, // (Restore) Incompatible savegame data.
+ // Savegame file is obsolete. (Won't happen
+ // after development stops)
+ SR_ERR_READFAIL, // (Restore) Failed on reading savegame file -
+ // Something screwed up during the read
+ SR_ERR_WRITEFAIL // (Save) Failed on writing savegame file -
+ // Something screwed up during the write -
+ // could be hard-drive full..?
+};
} // End of namespace Sword2
Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sword2.h 12 Nov 2003 08:21:18 -0000 1.39
+++ sword2.h 14 Nov 2003 07:41:22 -0000 1.40
@@ -30,6 +30,7 @@
#include "sword2/header.h"
#include "sword2/icons.h"
#include "sword2/layers.h"
+#include "sword2/memory.h"
#include "sword2/mouse.h"
#include "sword2/object.h"
#include "sword2/save_rest.h"
@@ -44,19 +45,6 @@
enum {
GF_DEMO = 1 << 0
};
-
-// Bodge for PCF76 version so that their demo CD can be labelled "PCF76"
-// rather than "RBSII1"
-
-#ifdef _PCF76
- #define CD1_LABEL "PCF76"
-#else
- #define CD1_LABEL "RBSII1"
-#endif
-
-#define CD2_LABEL "RBSII2"
-
-// TODO move stuff into class
class Sword2Engine : public Engine {
private:
More information about the Scummvm-git-logs
mailing list