diff options
Diffstat (limited to 'sword2')
-rw-r--r-- | sword2/resman.cpp | 6 | ||||
-rw-r--r-- | sword2/save_rest.h | 34 | ||||
-rw-r--r-- | sword2/sword2.h | 14 |
3 files changed, 20 insertions, 34 deletions
diff --git a/sword2/resman.cpp b/sword2/resman.cpp index cc815dae66..0ecfcc1e78 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -972,6 +972,12 @@ void ResourceManager::getCd(int cd) { // 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; diff --git a/sword2/save_rest.h b/sword2/save_rest.h index b8e1324cd9..039406a9d9 100644 --- a/sword2/save_rest.h +++ b/sword2/save_rest.h @@ -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 diff --git a/sword2/sword2.h b/sword2/sword2.h index 0bc3535973..94c1e0838f 100644 --- a/sword2/sword2.h +++ b/sword2/sword2.h @@ -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" @@ -45,19 +46,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: bool _quit; |