aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/sludge/builtin.cpp7
-rw-r--r--engines/sludge/loadsave.cpp6
-rw-r--r--engines/sludge/savedata.cpp154
-rw-r--r--engines/sludge/savedata.h22
-rw-r--r--engines/sludge/sludger.cpp5
5 files changed, 98 insertions, 96 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 42fcfcf988..376849a7f9 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -66,7 +66,6 @@ extern Common::String *allUserFunc;
extern Common::String *allBIFNames;
extern byte fadeMode;
-extern uint16 saveEncoding;
int paramNum[] = { -1, 0, 1, 1, -1, -1, 1, 3, 4, 1, 0, 0, 8, -1, // SAY->MOVEMOUSE
-1, 0, 0, -1, -1, 1, 1, 1, 1, 4, 1, 1, 2, 1,// FOCUS->REMOVEREGION
@@ -2246,7 +2245,7 @@ builtIn(saveCustomData) {
fatal("First parameter isn't a stack");
return BR_ERROR;
}
- if (!stackToFile(fileName, fun->stack->thisVar))
+ if (!CustomSaveHelper::stackToFile(fileName, fun->stack->thisVar))
return BR_ERROR;
trimStack(fun->stack);
return BR_CONTINUE;
@@ -2271,7 +2270,7 @@ builtIn(loadCustomData) {
fun->reg.varData.theStack->first = NULL;
fun->reg.varData.theStack->last = NULL;
fun->reg.varData.theStack->timesUsed = 1;
- if (!fileToStack(newText, fun->reg.varData.theStack))
+ if (!CustomSaveHelper::fileToStack(newText, fun->reg.varData.theStack))
return BR_ERROR;
return BR_CONTINUE;
}
@@ -2281,7 +2280,7 @@ builtIn(setCustomEncoding) {
int n;
if (!getValueType(n, SVT_INT, fun->stack->thisVar))
return BR_ERROR;
- saveEncoding = n;
+ CustomSaveHelper::_saveEncoding = n;
trimStack(fun->stack);
setVariable(fun->reg, SVT_INT, 1);
return BR_CONTINUE;
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 65ea4742c2..a962019226 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -37,6 +37,7 @@
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
+#include "sludge/savedata.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/sound.h"
@@ -62,7 +63,6 @@ extern Floor *currentFloor; // In floor.cpp
extern FILETIME fileTime; // In sludger.cpp
extern byte fadeMode; // In transition.cpp
extern bool allowAnyFilename;
-extern uint16 saveEncoding; // in savedata.cpp
//----------------------------------------------------------------------
// Globals (so we know what's saved already and what's a reference
@@ -409,7 +409,7 @@ bool saveGame(const Common::String &fname) {
saveStatusBars(fp);
g_sludge->_soundMan->saveSounds(fp);
- fp->writeUint16BE(saveEncoding);
+ fp->writeUint16BE(CustomSaveHelper::_saveEncoding);
blur_saveSettings(fp);
@@ -544,7 +544,7 @@ bool loadGame(const Common::String &fname) {
loadStatusBars(fp);
g_sludge->_soundMan->loadSounds(fp);
- saveEncoding = fp->readUint16BE();
+ CustomSaveHelper::_saveEncoding = fp->readUint16BE();
if (ssgVersion >= VERSION(1, 6)) {
if (ssgVersion < VERSION(2, 0)) {
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 9e2c92395d..687c913999 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -20,44 +20,45 @@
*
*/
-#include "common/file.h"
+#include "common/savefile.h"
#include "sludge/allfiles.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
+#include "sludge/savedata.h"
#include "sludge/variable.h"
#define LOAD_ERROR "Can't load custom data...\n\n"
namespace Sludge {
-const char UTF8_CHECKER[] = {'U', 'N', '\xef', '\xbf', '\xbd', 'L', 'O', '\xef', '\xbf', '\xbd', 'C', 'K', 'E', 'D', '\0'};
-uint16 saveEncoding = false;
-char encode1 = 0;
-char encode2 = 0;
+const char CustomSaveHelper::UTF8_CHECKER[] = {'U', 'N', '\xef', '\xbf', '\xbd', 'L', 'O', '\xef', '\xbf', '\xbd', 'C', 'K', 'E', 'D', '\0'};
+uint16 CustomSaveHelper::_saveEncoding = false;
+char CustomSaveHelper::_encode1 = 0;
+char CustomSaveHelper::_encode2 = 0;
-void writeStringEncoded(const Common::String &s, Common::WriteStream *stream) {
- int len = s.size();
+void CustomSaveHelper::writeStringEncoded(const Common::String checker, Common::WriteStream *stream) {
+ int len = checker.size();
stream->writeUint16BE(len);
for (int a = 0; a < len; a++) {
- stream->writeByte(s[a] ^ encode1);
- encode1 += encode2;
+ stream->writeByte(checker[a] ^ _encode1);
+ _encode1 += _encode2;
}
}
-Common::String readStringEncoded(Common::File *fp) {
+Common::String CustomSaveHelper::readStringEncoded(Common::SeekableReadStream *fp) {
int len = fp->readUint16BE();
Common::String res = "";
for (int a = 0; a < len; a++) {
- res += (char)(fp->readByte() ^ encode1);
- encode1 += encode2;
+ res += (char)(fp->readByte() ^ _encode1);
+ _encode1 += _encode2;
}
return res;
}
-char *readTextPlain(Common::File *fp) {
+char *CustomSaveHelper::readTextPlain(Common::SeekableReadStream *fp) {
int32 startPos;
uint32 stringSize = 0;
@@ -94,83 +95,63 @@ char *readTextPlain(Common::File *fp) {
return reply;
}
-bool fileToStack(const Common::String &filename, StackHandler *sH) {
-
+bool CustomSaveHelper::fileToStack(const Common::String &filename, StackHandler *sH) {
Variable stringVar;
stringVar.varType = SVT_NULL;
- Common::String checker = saveEncoding ? "[Custom data (encoded)]\r\n" : "[Custom data (ASCII)]\n";
-
- Common::File fd;
-
- if (!fd.open(filename)) {
-#if 0
- char currentDir[1000];
- if (!getcwd(currentDir, 998)) {
- debugOut("Can't get current directory.\n");
- }
-
- if (chdir(gamePath)) {
- debugOut("Error: Failed changing to directory %s\n", gamePath);
- }
+ Common::String checker = _saveEncoding ? "[Custom data (encoded)]\r\n" : "[Custom data (ASCII)]\n";
- if (chdir(currentDir)) {
- debugOut("Error: Failed changing to directory %s\n", currentDir);
- }
+ Common::InSaveFile *fp = g_system->getSavefileManager()->openForLoading(filename);
- if (!fd.open(filename)) {
- return fatal("No such file", filename);
- }
-#endif
+ if (fp == NULL) {
return fatal("No such file", filename); //TODO: false value
}
- encode1 = (byte)saveEncoding & 255;
- encode2 = (byte)(saveEncoding >> 8);
+ _encode1 = (byte)_saveEncoding & 255;
+ _encode2 = (byte)(_saveEncoding >> 8);
for (uint i = 0; i < checker.size(); ++i) {
- if (fd.readByte() != checker[i]) {
- fd.close();
+ if (fp->readByte() != checker[i]) {
+ delete fp;
return fatal(LOAD_ERROR "This isn't a SLUDGE custom data file:", filename);
}
}
- if (saveEncoding) {
- checker = readStringEncoded(&fd);
+ if (_saveEncoding) {
+ checker = readStringEncoded(fp);
if (checker == UTF8_CHECKER) {
- fd.close();
- return fatal(
- LOAD_ERROR "The current file encoding setting does not match the encoding setting used when this file was created:", filename);
+ delete fp;
+ return fatal(LOAD_ERROR "The current file encoding setting does not match the encoding setting used when this file was created:", filename);
}
}
for (;;) {
- if (saveEncoding) {
- char i = fd.readByte() ^ encode1;
+ if (_saveEncoding) {
+ char i = fp->readByte() ^ _encode1;
- if (fd.eos())
+ if (fp->eos())
break;
switch (i) {
case 0: {
- Common::String g = readStringEncoded(&fd);
+ Common::String g = readStringEncoded(fp);
makeTextVar(stringVar, g);
}
break;
case 1:
- setVariable(stringVar, SVT_INT, fd.readUint32LE());
+ setVariable(stringVar, SVT_INT, fp->readUint32LE());
break;
case 2:
- setVariable(stringVar, SVT_INT, fd.readByte());
+ setVariable(stringVar, SVT_INT, fp->readByte());
break;
default:
fatal(LOAD_ERROR "Corrupt custom data file:", filename);
- fd.close();
+ delete fp;
return false;
}
} else {
- char *line = readTextPlain(&fd);
+ char *line = readTextPlain(fp);
if (!line)
break;
makeTextVar(stringVar, line);
@@ -188,63 +169,66 @@ bool fileToStack(const Common::String &filename, StackHandler *sH) {
sH->last = sH->last->next;
}
}
- fd.close();
+
+ delete fp;
return true;
}
-bool stackToFile(const Common::String &filename, const Variable &from) {
-#if 0
- FILE *fp = fopen(filename, saveEncoding ? "wb" : "wt");
- if (!fp) return fatal("Can't create file", filename);
+bool CustomSaveHelper::stackToFile(const Common::String &filename, const Variable &from) {
+ Common::OutSaveFile *fp = g_system->getSavefileManager()->openForSaving(filename);
+ if (fp == NULL) {
+ return fatal("Can't create file", filename);
+ }
VariableStack *hereWeAre = from.varData.theStack -> first;
- encode1 = (byte)saveEncoding & 255;
- encode2 = (byte)(saveEncoding >> 8);
+ _encode1 = (byte)_saveEncoding & 255;
+ _encode2 = (byte)(_saveEncoding >> 8);
- if (saveEncoding) {
- fprintf(fp, "[Custom data (encoded)]\r\n");
+ if (_saveEncoding) {
+ fp->writeString("[Custom data (encoded)]\r\n");
writeStringEncoded(UTF8_CHECKER, fp);
} else {
- fprintf(fp, "[Custom data (ASCII)]\n");
+ fp->writeString("[Custom data (ASCII)]\n");
}
while (hereWeAre) {
- if (saveEncoding) {
+ if (_saveEncoding) {
switch (hereWeAre -> thisVar.varType) {
case SVT_STRING:
- fputc(encode1, fp);
- writeStringEncoded(hereWeAre -> thisVar.varData.theString, fp);
- break;
+ fp->writeByte(_encode1);
+ writeStringEncoded(hereWeAre -> thisVar.varData.theString, fp);
+ break;
case SVT_INT:
- // Small enough to be stored as a char
- if (hereWeAre -> thisVar.varData.intValue >= 0 && hereWeAre -> thisVar.varData.intValue < 256) {
- fputc(2 ^ encode1, fp);
- fputc(hereWeAre -> thisVar.varData.intValue, fp);
- } else {
- fputc(1 ^ encode1, fp);
- fp->writeUint32LE(hereWeAre -> thisVar.varData.intValue);
- }
- break;
+ // Small enough to be stored as a char
+ if (hereWeAre -> thisVar.varData.intValue >= 0 && hereWeAre -> thisVar.varData.intValue < 256) {
+ fp->writeByte(2 ^ _encode1);
+ fp->writeByte(hereWeAre -> thisVar.varData.intValue);
+ } else {
+ fp->writeByte(1 ^ _encode1);
+ fp->writeUint32LE(hereWeAre -> thisVar.varData.intValue);
+ }
+ break;
default:
- fatal("Can't create an encoded custom data file containing anything other than numbers and strings", filename);
- fclose(fp);
- return false;
+ fatal("Can't create an encoded custom data file containing anything other than numbers and strings", filename);
+ delete fp;
+ return false;
}
} else {
- char *makeSureItsText = getTextFromAnyVar(hereWeAre -> thisVar);
- if (makeSureItsText == NULL) break;
- fprintf(fp, "%s\n", makeSureItsText);
- delete makeSureItsText;
+ Common::String makeSureItsText = getTextFromAnyVar(hereWeAre -> thisVar);
+ if (makeSureItsText.empty())
+ break;
+ fp->writeString((makeSureItsText + "\n").c_str());
}
hereWeAre = hereWeAre -> next;
}
- fclose(fp);
-#endif
+
+ delete fp;
+
return true;
}
diff --git a/engines/sludge/savedata.h b/engines/sludge/savedata.h
index 956df93f35..90b093f4ff 100644
--- a/engines/sludge/savedata.h
+++ b/engines/sludge/savedata.h
@@ -24,8 +24,26 @@
namespace Sludge {
-bool fileToStack(const Common::String &filename, StackHandler *sH);
-bool stackToFile(const Common::String &filename, const Variable &from);
+struct StackHandler;
+struct Variable;
+
+class CustomSaveHelper {
+public:
+ static bool fileToStack(const Common::String &filename, StackHandler *sH);
+ static bool stackToFile(const Common::String &filename, const Variable &from);
+
+ static uint16 _saveEncoding;
+
+private:
+ static const char UTF8_CHECKER[];
+ static char _encode1;
+ static char _encode2;
+
+ static void writeStringEncoded(const Common::String checker, Common::WriteStream *stream);
+ static Common::String readStringEncoded(Common::SeekableReadStream *fp);
+ static char *readTextPlain(Common::SeekableReadStream *fp);
+
+};
} // End of namespace Sludge
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index f616fe696b..64727dfeb0 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -41,6 +41,7 @@
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
+#include "sludge/savedata.h"
#include "sludge/statusba.h"
#include "sludge/sprites.h"
#include "sludge/sprbanks.h"
@@ -83,7 +84,6 @@ extern int lastFramesPerSecond;
extern bool allowAnyFilename;
extern byte fadeMode;
-extern uint16 saveEncoding;
const char *sludgeText[] = { "?????", "RETURN", "BRANCH", "BR_ZERO",
"SET_GLOBAL", "SET_LOCAL", "LOAD_GLOBAL", "LOAD_LOCAL", "PLUS", "MINUS",
@@ -162,6 +162,8 @@ void initSludge() {
g_sludge->_soundMan->initSoundStuff();
}
+ CustomSaveHelper::_saveEncoding = false;
+
// global variables
numGlobals = 0;
launchResult = nullptr;
@@ -173,7 +175,6 @@ void initSludge() {
allUserFunc = allBIFNames = nullptr;
brightnessLevel = 255;
fadeMode = 2;
- saveEncoding = false;
}
void killSludge() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 20:49:10 +0000