[Scummvm-git-logs] scummvm master -> 50f12049666414b5343816ce784be984a44ae6dc
sev-
sev at scummvm.org
Thu Jul 13 18:45:44 CEST 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e36f3ad79e SLUDGE: int32_t -> int32
50f1204966 SLUDGE: Fix line endings
Commit: e36f3ad79ee076d766d295aeed0b5e8f85604cbf
https://github.com/scummvm/scummvm/commit/e36f3ad79ee076d766d295aeed0b5e8f85604cbf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-07-13T18:43:24+02:00
Commit Message:
SLUDGE: int32_t -> int32
Changed paths:
engines/sludge/fileset.cpp
engines/sludge/hsi.cpp
engines/sludge/savedata.cpp
engines/sludge/sludger.cpp
engines/sludge/sludger.h
engines/sludge/transition.cpp
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index f0731fe..90fe451 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -187,7 +187,7 @@ void finishAccess() {
sliceBusy = false;
}
-int32_t startIndex;
+int32 startIndex;
void setFileIndices(Common::File *fp, int numLanguages, uint skipBefore) {
if (fp) {
diff --git a/engines/sludge/hsi.cpp b/engines/sludge/hsi.cpp
index 6bb333f..e5bb990 100644
--- a/engines/sludge/hsi.cpp
+++ b/engines/sludge/hsi.cpp
@@ -47,7 +47,7 @@ void HSIDecoder::destroy() {
bool HSIDecoder::loadStream(Common::SeekableReadStream &stream) {
destroy();
- int32_t transCol = _reserve > 0 ? -1 : 63519;
+ int32 transCol = _reserve > 0 ? -1 : 63519;
int n;
uint16 width = stream.readUint16BE();
debug(kSludgeDebugGraphics, "picWidth : %i", width);
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 1757798..6dd3bca 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -58,7 +58,7 @@ Common::String readStringEncoded(Common::File *fp) {
}
char *readTextPlain(Common::File *fp) {
- int32_t startPos;
+ int32 startPos;
uint32 stringSize = 0;
bool keepGoing = true;
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 6f502f3..7174fe2 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -339,7 +339,7 @@ bool initSludge(const Common::String &filename) {
gameIcon = new byte [iconW * iconH * 4];
if (!gameIcon) return fatal("Can't reserve memory for game icon.");
- int32_t transCol = 63519;
+ int32 transCol = 63519;
Uint8 *p = (Uint8 *) gameIcon;
if (fileIsPNG) {
@@ -450,7 +450,7 @@ bool initSludge(const Common::String &filename) {
gameLogo = new byte [logoW * logoH * 4];
if (!gameLogo) return fatal("Can't reserve memory for game logo.");
- // int32_t transCol = 63519;
+ // int32 transCol = 63519;
Uint8 *p = (Uint8 *) gameLogo;
if (fileIsPNG) {
diff --git a/engines/sludge/sludger.h b/engines/sludge/sludger.h
index 02dd107..fd13db0 100644
--- a/engines/sludge/sludger.h
+++ b/engines/sludge/sludger.h
@@ -51,7 +51,7 @@ struct eventHandlers {
struct lineOfCode {
sludgeCommand theCommand;
- int32_t param;
+ int32 param;
};
struct loadedFunction {
diff --git a/engines/sludge/transition.cpp b/engines/sludge/transition.cpp
index e43f8b5..c3665e3 100644
--- a/engines/sludge/transition.cpp
+++ b/engines/sludge/transition.cpp
@@ -148,7 +148,7 @@ uint32 randbuffer[KK][2]; // history buffer
int p1, p2;
void resetRandW() {
- int32_t seed = 12345;
+ int32 seed = 12345;
for (int i = 0; i < KK; i++) {
for (int j = 0; j < 2; j++) {
Commit: 50f12049666414b5343816ce784be984a44ae6dc
https://github.com/scummvm/scummvm/commit/50f12049666414b5343816ce784be984a44ae6dc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-07-13T18:45:05+02:00
Commit Message:
SLUDGE: Fix line endings
Changed paths:
engines/sludge/allfiles.h
engines/sludge/bg_effects.h
engines/sludge/builtin.h
engines/sludge/csludge.h
engines/sludge/cursors.h
engines/sludge/errors.h
engines/sludge/fileset.h
engines/sludge/fonttext.h
engines/sludge/loadsave.h
engines/sludge/memwatch.cpp
engines/sludge/memwatch.h
engines/sludge/objtypes.h
engines/sludge/people.h
engines/sludge/region.h
engines/sludge/savedata.h
engines/sludge/sludger.h
engines/sludge/specialsettings.h
engines/sludge/sprbanks.h
engines/sludge/statusba.h
engines/sludge/talk.h
engines/sludge/thumbnail.h
engines/sludge/timing.h
engines/sludge/transition.h
engines/sludge/variable.h
diff --git a/engines/sludge/allfiles.h b/engines/sludge/allfiles.h
index 2f6acff..8d67f55 100644
--- a/engines/sludge/allfiles.h
+++ b/engines/sludge/allfiles.h
@@ -1,31 +1,31 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_ALLFILES_H
-#define SLUDGE_ALLFILES_H
-
-#include "common/system.h"
-
-//#define debuggy2 int
-#define IN_THE_CENTRE 65535
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SLUDGE_ALLFILES_H
+#define SLUDGE_ALLFILES_H
+
+#include "common/system.h"
+
+//#define debuggy2 int
+#define IN_THE_CENTRE 65535
+
+#endif
diff --git a/engines/sludge/bg_effects.h b/engines/sludge/bg_effects.h
index b726ec7..8cfde0e 100644
--- a/engines/sludge/bg_effects.h
+++ b/engines/sludge/bg_effects.h
@@ -1,37 +1,37 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_BG_EFFECTS_H
-#define SLUDGE_BG_EFFECTS_H
-
-#include "common/file.h"
-
-namespace Sludge {
-
-bool blurScreen();
-void blur_saveSettings(Common::WriteStream *stream);
-void blur_loadSettings(Common::SeekableReadStream *stream);
-bool blur_createSettings(int numParams, variableStack *&stack);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SLUDGE_BG_EFFECTS_H
+#define SLUDGE_BG_EFFECTS_H
+
+#include "common/file.h"
+
+namespace Sludge {
+
+bool blurScreen();
+void blur_saveSettings(Common::WriteStream *stream);
+void blur_loadSettings(Common::SeekableReadStream *stream);
+bool blur_createSettings(int numParams, variableStack *&stack);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/builtin.h b/engines/sludge/builtin.h
index 3049268..a11d15a 100644
--- a/engines/sludge/builtin.h
+++ b/engines/sludge/builtin.h
@@ -1,42 +1,42 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_BUILTIN_H
-#define SLUDGE_BUILTIN_H
-
-namespace Sludge {
-
-enum builtReturn {
- BR_KEEP_AND_PAUSE,
- BR_ERROR,
- BR_CONTINUE,
- BR_PAUSE,
- BR_CALLAFUNC,
- BR_ALREADY_GONE
-};
-
-bool failSecurityCheck(const Common::String &fn);
-builtReturn callBuiltIn(int whichFunc, int numParams, loadedFunction *fun);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SLUDGE_BUILTIN_H
+#define SLUDGE_BUILTIN_H
+
+namespace Sludge {
+
+enum builtReturn {
+ BR_KEEP_AND_PAUSE,
+ BR_ERROR,
+ BR_CONTINUE,
+ BR_PAUSE,
+ BR_CALLAFUNC,
+ BR_ALREADY_GONE
+};
+
+bool failSecurityCheck(const Common::String &fn);
+builtReturn callBuiltIn(int whichFunc, int numParams, loadedFunction *fun);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/csludge.h b/engines/sludge/csludge.h
index 0564853..435a220 100644
--- a/engines/sludge/csludge.h
+++ b/engines/sludge/csludge.h
@@ -1,76 +1,76 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_CSLUDGE_H
-#define SLUDGE_CSLUDGE_H
-
-namespace Sludge {
-
-enum sludgeCommand {
- SLU_UNKNOWN,
- SLU_RETURN,
- SLU_BRANCH,
- SLU_BR_ZERO,
- SLU_SET_GLOBAL,
- SLU_SET_LOCAL,
- SLU_LOAD_GLOBAL,
- SLU_LOAD_LOCAL,
- SLU_PLUS,
- SLU_MINUS,
- SLU_MULT,
- SLU_DIVIDE,
- SLU_AND,
- SLU_OR,
- SLU_EQUALS,
- SLU_NOT_EQ,
- SLU_MODULUS,
- SLU_LOAD_VALUE,
- SLU_LOAD_BUILT,
- SLU_LOAD_FUNC,
- SLU_CALLIT,
- SLU_LOAD_STRING,
- SLU_LOAD_FILE, /*SLU_LOAD_SCENE,*/
- SLU_LOAD_OBJTYPE,
- SLU_NOT,
- SLU_LOAD_NULL,
- SLU_STACK_PUSH,
- SLU_LESSTHAN,
- SLU_MORETHAN,
- SLU_NEGATIVE,
- SLU_UNREG,
- SLU_LESS_EQUAL,
- SLU_MORE_EQUAL,
- SLU_INCREMENT_LOCAL,
- SLU_DECREMENT_LOCAL,
- SLU_INCREMENT_GLOBAL,
- SLU_DECREMENT_GLOBAL,
- SLU_INDEXSET,
- SLU_INDEXGET,
- SLU_INCREMENT_INDEX,
- SLU_DECREMENT_INDEX,
- SLU_QUICK_PUSH,
- numSludgeCommands
-};
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SLUDGE_CSLUDGE_H
+#define SLUDGE_CSLUDGE_H
+
+namespace Sludge {
+
+enum sludgeCommand {
+ SLU_UNKNOWN,
+ SLU_RETURN,
+ SLU_BRANCH,
+ SLU_BR_ZERO,
+ SLU_SET_GLOBAL,
+ SLU_SET_LOCAL,
+ SLU_LOAD_GLOBAL,
+ SLU_LOAD_LOCAL,
+ SLU_PLUS,
+ SLU_MINUS,
+ SLU_MULT,
+ SLU_DIVIDE,
+ SLU_AND,
+ SLU_OR,
+ SLU_EQUALS,
+ SLU_NOT_EQ,
+ SLU_MODULUS,
+ SLU_LOAD_VALUE,
+ SLU_LOAD_BUILT,
+ SLU_LOAD_FUNC,
+ SLU_CALLIT,
+ SLU_LOAD_STRING,
+ SLU_LOAD_FILE, /*SLU_LOAD_SCENE,*/
+ SLU_LOAD_OBJTYPE,
+ SLU_NOT,
+ SLU_LOAD_NULL,
+ SLU_STACK_PUSH,
+ SLU_LESSTHAN,
+ SLU_MORETHAN,
+ SLU_NEGATIVE,
+ SLU_UNREG,
+ SLU_LESS_EQUAL,
+ SLU_MORE_EQUAL,
+ SLU_INCREMENT_LOCAL,
+ SLU_DECREMENT_LOCAL,
+ SLU_INCREMENT_GLOBAL,
+ SLU_DECREMENT_GLOBAL,
+ SLU_INDEXSET,
+ SLU_INDEXGET,
+ SLU_INCREMENT_INDEX,
+ SLU_DECREMENT_INDEX,
+ SLU_QUICK_PUSH,
+ numSludgeCommands
+};
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/cursors.h b/engines/sludge/cursors.h
index 6a32665..2d81c39 100644
--- a/engines/sludge/cursors.h
+++ b/engines/sludge/cursors.h
@@ -1,34 +1,34 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_CURSORS_H
-#define SLUDGE_CURSORS_H
-
-namespace Sludge {
-
-void pickAnimCursor(struct personaAnimation *pp);
-void displayCursor();
-void pasteCursor(int x, int y, struct personaAnimation *c);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SLUDGE_CURSORS_H
+#define SLUDGE_CURSORS_H
+
+namespace Sludge {
+
+void pickAnimCursor(struct personaAnimation *pp);
+void displayCursor();
+void pasteCursor(int x, int y, struct personaAnimation *c);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/errors.h b/engines/sludge/errors.h
index 388d4a0..8b11158 100644
--- a/engines/sludge/errors.h
+++ b/engines/sludge/errors.h
@@ -1,76 +1,76 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_ERRRORS_H
-#define SLUDGE_ERRRORS_H
-
-namespace Sludge {
-
-#define _NO_MEMORY_GENERAL_ "\n\nTry closing down any programs you don't really need running (or freeing up a bit of disk space, which will give you more virtual memory - that should help too)."
-
-//---------------------------------------
-// Fatal errors
-//---------------------------------------
-
-#define ERROR_VERSION_TOO_LOW_1 "This SLUDGE file requires a more recent version of the SLUDGE engine"
-#define ERROR_VERSION_TOO_LOW_2 "(it was created for v%i.%i).\n\nVisit http://opensludge.github.io/ to download the most recent version."
-#define ERROR_VERSION_TOO_HIGH_1 "This SLUDGE file was created for an older version of the SLUDGE engine"
-#define ERROR_VERSION_TOO_HIGH_2 "(v%i.%i).\n\nPlease contact the author of this game to obtain a version compatible with your SLUDGE engine (v" TEXT_VERSION ")."
-#define ERROR_BAD_HEADER "Bad header information... this isn't a valid SLUDGE game"
-#define ERROR_HACKER "What have you been up to? Think we're a hacker, do we? Nice try."
-
-#define ERROR_GAME_LOAD_NO "This isn't a SLUDGE saved game!\n"
-#define ERROR_GAME_LOAD_WRONG "Can't load this saved game! It was either created by...\n\n (a) a different SLUDGE game to the one which you're playing, or...\n (b) a different (newer or older) version of the same game.\n\nFilename"
-#define ERROR_GAME_SAVE_FROZEN "Can't save games while I'm frozen"
-#define ERROR_GAME_LOAD_CORRUPT "This saved game appears to be corrupted"
-
-#define ERROR_NON_EMPTY_STACK "Returning from function with non-empty stack"
-#define ERROR_UNKNOWN_MCODE "Unknown SLUDGE machine code"
-#define ERROR_CALL_NONFUNCTION "Call of non-function"
-#define ERROR_INCDEC_UNKNOWN "Tried to increment/decrement index of an undefined variable"
-#define ERROR_INDEX_EMPTY "Tried to index an empty stack"
-#define ERROR_INDEX_NONSTACK "Tried to index a non-stack variable"
-#define ERROR_NOSTACK "Corrupt file - no stack"
-#define ERROR_UNKNOWN_CODE "Unimplemented internal SLUDGE command code."
-#define ERROR_OUT_OF_MEMORY "Out of memory!" _NO_MEMORY_GENERAL_
-
-#define ERROR_MUSIC_MEMORY_LOW "Your computer doesn't have enough memory available to load a music resource that needs playing." _NO_MEMORY_GENERAL_
-#define ERROR_SOUND_MEMORY_LOW "Your computer doesn't have enough memory available to load a sound resource that needs playing." _NO_MEMORY_GENERAL_
-#define ERROR_MUSIC_UNKNOWN "I can't understand a piece of music which I've been told to play!\n\n" \
- "Maybe it's stored in a format that SLUDGE doesn't know about... " \
- "make sure you've got a recent version of the SLUDGE engine from http://opensludge.github.io/. " \
- "Failing that, maybe the resource in question isn't a valid music format at all... in which case, contact the game's author and tell them what's happened."
-#define ERROR_SOUND_UNKNOWN "I can't understand a sample which I've been told to play!\nMake sure you've got the latest SLUDGE engine from http://opensludge.github.io/. Failing that, maybe the resource in question isn't a valid sound at all... in which case, contact the game's author and tell them what's happened."
-#define ERROR_MUSIC_ODDNESS "I can't load a music resource I've been told to play. Sorry."
-#define ERROR_SOUND_ODDNESS "I can't load a sound resource I've been told to play. Sorry."
-#define ERROR_MOVIE_ODDNESS "I can't load a music resource I've been told to play. Sorry."
-
-//---------------------------------------
-// Startup warnings
-//---------------------------------------
-
-#define WARNING_BASS_WRONG_VERSION "Incompatible version of BASS.DLL found!"
-#define WARNING_BASS_FAIL "Can't initialise sound engine."
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SLUDGE_ERRRORS_H
+#define SLUDGE_ERRRORS_H
+
+namespace Sludge {
+
+#define _NO_MEMORY_GENERAL_ "\n\nTry closing down any programs you don't really need running (or freeing up a bit of disk space, which will give you more virtual memory - that should help too)."
+
+//---------------------------------------
+// Fatal errors
+//---------------------------------------
+
+#define ERROR_VERSION_TOO_LOW_1 "This SLUDGE file requires a more recent version of the SLUDGE engine"
+#define ERROR_VERSION_TOO_LOW_2 "(it was created for v%i.%i).\n\nVisit http://opensludge.github.io/ to download the most recent version."
+#define ERROR_VERSION_TOO_HIGH_1 "This SLUDGE file was created for an older version of the SLUDGE engine"
+#define ERROR_VERSION_TOO_HIGH_2 "(v%i.%i).\n\nPlease contact the author of this game to obtain a version compatible with your SLUDGE engine (v" TEXT_VERSION ")."
+#define ERROR_BAD_HEADER "Bad header information... this isn't a valid SLUDGE game"
+#define ERROR_HACKER "What have you been up to? Think we're a hacker, do we? Nice try."
+
+#define ERROR_GAME_LOAD_NO "This isn't a SLUDGE saved game!\n"
+#define ERROR_GAME_LOAD_WRONG "Can't load this saved game! It was either created by...\n\n (a) a different SLUDGE game to the one which you're playing, or...\n (b) a different (newer or older) version of the same game.\n\nFilename"
+#define ERROR_GAME_SAVE_FROZEN "Can't save games while I'm frozen"
+#define ERROR_GAME_LOAD_CORRUPT "This saved game appears to be corrupted"
+
+#define ERROR_NON_EMPTY_STACK "Returning from function with non-empty stack"
+#define ERROR_UNKNOWN_MCODE "Unknown SLUDGE machine code"
+#define ERROR_CALL_NONFUNCTION "Call of non-function"
+#define ERROR_INCDEC_UNKNOWN "Tried to increment/decrement index of an undefined variable"
+#define ERROR_INDEX_EMPTY "Tried to index an empty stack"
+#define ERROR_INDEX_NONSTACK "Tried to index a non-stack variable"
+#define ERROR_NOSTACK "Corrupt file - no stack"
+#define ERROR_UNKNOWN_CODE "Unimplemented internal SLUDGE command code."
+#define ERROR_OUT_OF_MEMORY "Out of memory!" _NO_MEMORY_GENERAL_
+
+#define ERROR_MUSIC_MEMORY_LOW "Your computer doesn't have enough memory available to load a music resource that needs playing." _NO_MEMORY_GENERAL_
+#define ERROR_SOUND_MEMORY_LOW "Your computer doesn't have enough memory available to load a sound resource that needs playing." _NO_MEMORY_GENERAL_
+#define ERROR_MUSIC_UNKNOWN "I can't understand a piece of music which I've been told to play!\n\n" \
+ "Maybe it's stored in a format that SLUDGE doesn't know about... " \
+ "make sure you've got a recent version of the SLUDGE engine from http://opensludge.github.io/. " \
+ "Failing that, maybe the resource in question isn't a valid music format at all... in which case, contact the game's author and tell them what's happened."
+#define ERROR_SOUND_UNKNOWN "I can't understand a sample which I've been told to play!\nMake sure you've got the latest SLUDGE engine from http://opensludge.github.io/. Failing that, maybe the resource in question isn't a valid sound at all... in which case, contact the game's author and tell them what's happened."
+#define ERROR_MUSIC_ODDNESS "I can't load a music resource I've been told to play. Sorry."
+#define ERROR_SOUND_ODDNESS "I can't load a sound resource I've been told to play. Sorry."
+#define ERROR_MOVIE_ODDNESS "I can't load a music resource I've been told to play. Sorry."
+
+//---------------------------------------
+// Startup warnings
+//---------------------------------------
+
+#define WARNING_BASS_WRONG_VERSION "Incompatible version of BASS.DLL found!"
+#define WARNING_BASS_FAIL "Can't initialise sound engine."
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/fileset.h b/engines/sludge/fileset.h
index b18c87c..3a19ea5 100644
--- a/engines/sludge/fileset.h
+++ b/engines/sludge/fileset.h
@@ -1,43 +1,43 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_FILESET_H
-#define SLUDGE_FILESET_H
-
-#include "common/file.h"
-
-namespace Sludge {
-
-extern Common::File *bigDataFile;
-
-void setFileIndices(Common::File *fp, int, uint);
-
-uint openFileFromNum(int num);
-bool openSubSlice(int num);
-bool openObjectSlice(int num);
-Common::String getNumberedString(int value);
-
-bool startAccess();
-void finishAccess();
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_FILESET_H
+#define SLUDGE_FILESET_H
+
+#include "common/file.h"
+
+namespace Sludge {
+
+extern Common::File *bigDataFile;
+
+void setFileIndices(Common::File *fp, int, uint);
+
+uint openFileFromNum(int num);
+bool openSubSlice(int num);
+bool openObjectSlice(int num);
+Common::String getNumberedString(int value);
+
+bool startAccess();
+void finishAccess();
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/fonttext.h b/engines/sludge/fonttext.h
index 63a38c7..4ddd614 100644
--- a/engines/sludge/fonttext.h
+++ b/engines/sludge/fonttext.h
@@ -1,41 +1,41 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_FONTTEXT_H
-#define SLUDGE_FONTTEXT_H
-
-#include "common/ustr.h"
-
-namespace Sludge {
-
-bool loadFont(int filenum, const Common::String &charOrder, int);
-void pasteString(const Common::String &theText, int, int, spritePalette &);
-void fixFont(spritePalette &spal);
-void setFontColour(spritePalette &sP, byte r, byte g, byte b);
-int stringWidth(const Common::String &theText);
-int stringLength(const Common::String &theText);
-void pasteStringToBackdrop(const Common::String &theText, int xOff, int y, spritePalette &thePal);
-void burnStringToBackdrop(const Common::String &theText, int xOff, int y, spritePalette &thePal);
-bool isInFont(const Common::String &theText);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_FONTTEXT_H
+#define SLUDGE_FONTTEXT_H
+
+#include "common/ustr.h"
+
+namespace Sludge {
+
+bool loadFont(int filenum, const Common::String &charOrder, int);
+void pasteString(const Common::String &theText, int, int, spritePalette &);
+void fixFont(spritePalette &spal);
+void setFontColour(spritePalette &sP, byte r, byte g, byte b);
+int stringWidth(const Common::String &theText);
+int stringLength(const Common::String &theText);
+void pasteStringToBackdrop(const Common::String &theText, int xOff, int y, spritePalette &thePal);
+void burnStringToBackdrop(const Common::String &theText, int xOff, int y, spritePalette &thePal);
+bool isInFont(const Common::String &theText);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/loadsave.h b/engines/sludge/loadsave.h
index b02fd2d..8de291d 100644
--- a/engines/sludge/loadsave.h
+++ b/engines/sludge/loadsave.h
@@ -1,42 +1,42 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_LOADSAVE_H
-#define SLUDGE_LOADSAVE_H
-
-namespace Sludge {
-
-bool saveGame(const Common::String &fname);
-bool loadGame(const Common::String &fname);
-
-bool saveVariable(variable *from, Common::WriteStream *stream);
-bool loadVariable(variable *to, Common::SeekableReadStream *stream);
-
-variableStack *loadStack(Common::SeekableReadStream *stream, variableStack **last);
-bool saveStackRef(stackHandler *vs, Common::WriteStream *stream);
-stackHandler *loadStackRef(Common::SeekableReadStream *stream);
-
-loadedFunction *loadFunction(Common::SeekableReadStream *stream);
-void saveFunction(loadedFunction *fun, Common::WriteStream *stream);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_LOADSAVE_H
+#define SLUDGE_LOADSAVE_H
+
+namespace Sludge {
+
+bool saveGame(const Common::String &fname);
+bool loadGame(const Common::String &fname);
+
+bool saveVariable(variable *from, Common::WriteStream *stream);
+bool loadVariable(variable *to, Common::SeekableReadStream *stream);
+
+variableStack *loadStack(Common::SeekableReadStream *stream, variableStack **last);
+bool saveStackRef(stackHandler *vs, Common::WriteStream *stream);
+stackHandler *loadStackRef(Common::SeekableReadStream *stream);
+
+loadedFunction *loadFunction(Common::SeekableReadStream *stream);
+void saveFunction(loadedFunction *fun, Common::WriteStream *stream);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/memwatch.cpp b/engines/sludge/memwatch.cpp
index 1a35f53..e654f92 100644
--- a/engines/sludge/memwatch.cpp
+++ b/engines/sludge/memwatch.cpp
@@ -1,73 +1,73 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/debug.h"
-
-#include "sludge/allfiles.h"
-
-namespace Sludge {
-
-void *allKnownMem[3000];
-int allKnownNum = 0;
-
-void outputKnownMem() {
-#if 0
- FILE *debu = fopen("debuTURN.txt", "at");
-
- fprintf(debu, "%i lumps:", allKnownNum);
- for (int i = 0; i < allKnownNum; i ++) {
- fprintf(debu, " %p", allKnownMem[i]);
- }
- fprintf(debu, "\n");
- fclose(debu);
-#endif
-}
-
-void adding(void *mem) {
- allKnownMem[allKnownNum] = mem;
- allKnownNum++;
-
- outputKnownMem();
- if (allKnownNum == 3000) {
- debug("Error! Array too full!");
-#if 0
- exit(1);
-#endif
- }
-}
-
-void deleting(void *mem) {
- allKnownNum--;
- for (int i = 0; i <= allKnownNum; i++) {
- if (allKnownMem[i] == mem) {
- allKnownMem[i] = allKnownMem[allKnownNum];
- outputKnownMem();
- return;
- }
- }
-#if 0
- //db ("Error! Deleted a block which hasn't been allocated!");
- exit(1);
-#endif
-}
-
-} // End of namespace Sludge
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/debug.h"
+
+#include "sludge/allfiles.h"
+
+namespace Sludge {
+
+void *allKnownMem[3000];
+int allKnownNum = 0;
+
+void outputKnownMem() {
+#if 0
+ FILE *debu = fopen("debuTURN.txt", "at");
+
+ fprintf(debu, "%i lumps:", allKnownNum);
+ for (int i = 0; i < allKnownNum; i ++) {
+ fprintf(debu, " %p", allKnownMem[i]);
+ }
+ fprintf(debu, "\n");
+ fclose(debu);
+#endif
+}
+
+void adding(void *mem) {
+ allKnownMem[allKnownNum] = mem;
+ allKnownNum++;
+
+ outputKnownMem();
+ if (allKnownNum == 3000) {
+ debug("Error! Array too full!");
+#if 0
+ exit(1);
+#endif
+ }
+}
+
+void deleting(void *mem) {
+ allKnownNum--;
+ for (int i = 0; i <= allKnownNum; i++) {
+ if (allKnownMem[i] == mem) {
+ allKnownMem[i] = allKnownMem[allKnownNum];
+ outputKnownMem();
+ return;
+ }
+ }
+#if 0
+ //db ("Error! Deleted a block which hasn't been allocated!");
+ exit(1);
+#endif
+}
+
+} // End of namespace Sludge
diff --git a/engines/sludge/memwatch.h b/engines/sludge/memwatch.h
index 0fb6f26..6f8cd9c 100644
--- a/engines/sludge/memwatch.h
+++ b/engines/sludge/memwatch.h
@@ -1,32 +1,32 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_MEMWATCH_H
-#define SLUDGE_MEMWATCH_H
-
-namespace Sludge {
-
-void adding(void *);
-void deleting(void *);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_MEMWATCH_H
+#define SLUDGE_MEMWATCH_H
+
+namespace Sludge {
+
+void adding(void *);
+void deleting(void *);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/objtypes.h b/engines/sludge/objtypes.h
index af9abe3..3958301 100644
--- a/engines/sludge/objtypes.h
+++ b/engines/sludge/objtypes.h
@@ -1,52 +1,52 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_OBJTYPES_H
-#define SLUDGE_OBJTYPES_H
-
-namespace Sludge {
-
-struct combination {
- int withObj, funcNum;
-};
-
-struct objectType {
- Common::String screenName;
- int objectNum;
- objectType *next;
- byte r, g, b;
- int numCom;
- int speechGap, walkSpeed, wrapSpeech, spinSpeed;
- uint16 flags;
- combination *allCombis;
-};
-
-bool initObjectTypes();
-objectType *findObjectType(int i);
-objectType *loadObjectType(int i);
-int getCombinationFunction(int a, int b);
-void removeObjectType(objectType *oT);
-void saveObjectRef(objectType *r, Common::WriteStream *stream);
-objectType *loadObjectRef(Common::SeekableReadStream *stream);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_OBJTYPES_H
+#define SLUDGE_OBJTYPES_H
+
+namespace Sludge {
+
+struct combination {
+ int withObj, funcNum;
+};
+
+struct objectType {
+ Common::String screenName;
+ int objectNum;
+ objectType *next;
+ byte r, g, b;
+ int numCom;
+ int speechGap, walkSpeed, wrapSpeech, spinSpeed;
+ uint16 flags;
+ combination *allCombis;
+};
+
+bool initObjectTypes();
+objectType *findObjectType(int i);
+objectType *loadObjectType(int i);
+int getCombinationFunction(int a, int b);
+void removeObjectType(objectType *oT);
+void saveObjectRef(objectType *r, Common::WriteStream *stream);
+objectType *loadObjectRef(Common::SeekableReadStream *stream);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/people.h b/engines/sludge/people.h
index eb19e4f..87f6170 100644
--- a/engines/sludge/people.h
+++ b/engines/sludge/people.h
@@ -1,132 +1,132 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_PEOPLE_H
-#define SLUDGE_PEOPLE_H
-
-#include "sludge/variable.h"
-
-namespace Sludge {
-
-struct animFrame {
- int frameNum, howMany;
- int noise;
-};
-
-#define EXTRA_FRONT 1
-#define EXTRA_FIXEDSIZE 2
-#define EXTRA_NOSCALE 2 // Alternative name
-#define EXTRA_NOZB 4
-#define EXTRA_FIXTOSCREEN 8
-#define EXTRA_NOLITE 16
-#define EXTRA_NOREMOVE 32
-#define EXTRA_RECTANGULAR 64
-
-struct personaAnimation {
- struct loadedSpriteBank *theSprites;
- animFrame *frames;
- int numFrames;
-};
-
-struct persona {
- personaAnimation **animation;
- int numDirections;
-};
-
-struct onScreenPerson {
- float x, y;
- int height, floaty, walkSpeed;
- float scale;
- onScreenPerson *next;
- int walkToX, walkToY, thisStepX, thisStepY, inPoly, walkToPoly;
- bool walking, spinning;
- struct loadedFunction *continueAfterWalking;
- personaAnimation *myAnim;
- personaAnimation *lastUsedAnim;
- persona *myPersona;
- int frameNum, frameTick, angle, wantAngle, angleOffset;
- bool show;
- int direction, directionWhenDoneWalking;
- struct objectType *thisType;
- int extra, spinSpeed;
- byte r, g, b, colourmix, transparency;
-};
-
-// Initialisation and creation
-bool initPeople();
-bool addPerson(int x, int y, int objNum, persona *p);
-
-// Draw to screen and to backdrop
-void drawPeople();
-void freezePeople(int, int);
-
-// Removalisationisms
-void killAllPeople();
-void killMostPeople();
-void removeOneCharacter(int i);
-
-// Things which affect or use all characters
-onScreenPerson *findPerson(int v);
-void setScale(int16 h, int16 d);
-
-// Things which affect one character
-void makeTalker(onScreenPerson &me);
-void makeSilent(onScreenPerson &me);
-void setShown(bool h, int ob);
-void setDrawMode(int h, int ob);
-void setPersonTransparency(int ob, byte x);
-void setPersonColourise(int ob, byte r, byte g, byte b, byte colourmix);
-
-// Moving 'em
-void movePerson(int x, int y, int objNum);
-bool makeWalkingPerson(int x, int y, int objNum, struct loadedFunction *func, int di);
-bool forceWalkingPerson(int x, int y, int objNum, struct loadedFunction *func, int di);
-void jumpPerson(int x, int y, int objNum);
-void walkAllPeople();
-bool turnPersonToFace(int thisNum, int direc);
-bool stopPerson(int o);
-bool floatCharacter(int f, int objNum);
-bool setCharacterWalkSpeed(int f, int objNum);
-
-// Animating 'em
-void animatePerson(int obj, personaAnimation *);
-void animatePerson(int obj, persona *per);
-personaAnimation *createPersonaAnim(int num, struct variableStack *&stacky);
-inline void setBankFile(personaAnimation *newP, loadedSpriteBank *sB) {
- newP->theSprites = sB;
-}
-bool setPersonExtra(int f, int newSetting);
-int timeForAnim(personaAnimation *fram);
-personaAnimation *copyAnim(personaAnimation *orig);
-personaAnimation *makeNullAnim();
-void deleteAnim(personaAnimation *orig);
-
-// Loading and saving
-bool saveAnim(personaAnimation *p, Common::WriteStream *stream);
-bool loadAnim(personaAnimation *p, Common::SeekableReadStream *stream);
-bool savePeople(Common::WriteStream *stream);
-bool loadPeople(Common::SeekableReadStream *stream);
-bool saveCostume(persona *cossy, Common::WriteStream *stream);
-bool loadCostume(persona *cossy, Common::SeekableReadStream *stream);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_PEOPLE_H
+#define SLUDGE_PEOPLE_H
+
+#include "sludge/variable.h"
+
+namespace Sludge {
+
+struct animFrame {
+ int frameNum, howMany;
+ int noise;
+};
+
+#define EXTRA_FRONT 1
+#define EXTRA_FIXEDSIZE 2
+#define EXTRA_NOSCALE 2 // Alternative name
+#define EXTRA_NOZB 4
+#define EXTRA_FIXTOSCREEN 8
+#define EXTRA_NOLITE 16
+#define EXTRA_NOREMOVE 32
+#define EXTRA_RECTANGULAR 64
+
+struct personaAnimation {
+ struct loadedSpriteBank *theSprites;
+ animFrame *frames;
+ int numFrames;
+};
+
+struct persona {
+ personaAnimation **animation;
+ int numDirections;
+};
+
+struct onScreenPerson {
+ float x, y;
+ int height, floaty, walkSpeed;
+ float scale;
+ onScreenPerson *next;
+ int walkToX, walkToY, thisStepX, thisStepY, inPoly, walkToPoly;
+ bool walking, spinning;
+ struct loadedFunction *continueAfterWalking;
+ personaAnimation *myAnim;
+ personaAnimation *lastUsedAnim;
+ persona *myPersona;
+ int frameNum, frameTick, angle, wantAngle, angleOffset;
+ bool show;
+ int direction, directionWhenDoneWalking;
+ struct objectType *thisType;
+ int extra, spinSpeed;
+ byte r, g, b, colourmix, transparency;
+};
+
+// Initialisation and creation
+bool initPeople();
+bool addPerson(int x, int y, int objNum, persona *p);
+
+// Draw to screen and to backdrop
+void drawPeople();
+void freezePeople(int, int);
+
+// Removalisationisms
+void killAllPeople();
+void killMostPeople();
+void removeOneCharacter(int i);
+
+// Things which affect or use all characters
+onScreenPerson *findPerson(int v);
+void setScale(int16 h, int16 d);
+
+// Things which affect one character
+void makeTalker(onScreenPerson &me);
+void makeSilent(onScreenPerson &me);
+void setShown(bool h, int ob);
+void setDrawMode(int h, int ob);
+void setPersonTransparency(int ob, byte x);
+void setPersonColourise(int ob, byte r, byte g, byte b, byte colourmix);
+
+// Moving 'em
+void movePerson(int x, int y, int objNum);
+bool makeWalkingPerson(int x, int y, int objNum, struct loadedFunction *func, int di);
+bool forceWalkingPerson(int x, int y, int objNum, struct loadedFunction *func, int di);
+void jumpPerson(int x, int y, int objNum);
+void walkAllPeople();
+bool turnPersonToFace(int thisNum, int direc);
+bool stopPerson(int o);
+bool floatCharacter(int f, int objNum);
+bool setCharacterWalkSpeed(int f, int objNum);
+
+// Animating 'em
+void animatePerson(int obj, personaAnimation *);
+void animatePerson(int obj, persona *per);
+personaAnimation *createPersonaAnim(int num, struct variableStack *&stacky);
+inline void setBankFile(personaAnimation *newP, loadedSpriteBank *sB) {
+ newP->theSprites = sB;
+}
+bool setPersonExtra(int f, int newSetting);
+int timeForAnim(personaAnimation *fram);
+personaAnimation *copyAnim(personaAnimation *orig);
+personaAnimation *makeNullAnim();
+void deleteAnim(personaAnimation *orig);
+
+// Loading and saving
+bool saveAnim(personaAnimation *p, Common::WriteStream *stream);
+bool loadAnim(personaAnimation *p, Common::SeekableReadStream *stream);
+bool savePeople(Common::WriteStream *stream);
+bool loadPeople(Common::SeekableReadStream *stream);
+bool saveCostume(persona *cossy, Common::WriteStream *stream);
+bool loadCostume(persona *cossy, Common::SeekableReadStream *stream);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/region.h b/engines/sludge/region.h
index 2bc4ab6..4cefd85 100644
--- a/engines/sludge/region.h
+++ b/engines/sludge/region.h
@@ -1,45 +1,45 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_REGION_H
-#define SLUDGE_REGION_H
-
-namespace Sludge {
-
-struct screenRegion {
- int x1, y1, x2, y2, sX, sY, di;
- objectType *thisType;
- screenRegion *next;
-};
-
-bool addScreenRegion(int x1, int y1, int x2, int y2, int, int, int, int objectNum);
-void getOverRegion();
-screenRegion *getRegionForObject(int obj);
-void removeScreenRegion(int objectNum);
-void loadRegions(Common::SeekableReadStream *stream);
-void saveRegions(Common::WriteStream *stream);
-void killAllRegions();
-
-void showBoxes();
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_REGION_H
+#define SLUDGE_REGION_H
+
+namespace Sludge {
+
+struct screenRegion {
+ int x1, y1, x2, y2, sX, sY, di;
+ objectType *thisType;
+ screenRegion *next;
+};
+
+bool addScreenRegion(int x1, int y1, int x2, int y2, int, int, int, int objectNum);
+void getOverRegion();
+screenRegion *getRegionForObject(int obj);
+void removeScreenRegion(int objectNum);
+void loadRegions(Common::SeekableReadStream *stream);
+void saveRegions(Common::WriteStream *stream);
+void killAllRegions();
+
+void showBoxes();
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/savedata.h b/engines/sludge/savedata.h
index 823d2dd..5031e76 100644
--- a/engines/sludge/savedata.h
+++ b/engines/sludge/savedata.h
@@ -1,32 +1,32 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_SAVEDATA_H
-#define SLUDGE_SAVEDATA_H
-
-namespace Sludge {
-
-bool fileToStack(const Common::String &filename, stackHandler *sH);
-bool stackToFile(const Common::String &filename, const variable &from);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_SAVEDATA_H
+#define SLUDGE_SAVEDATA_H
+
+namespace Sludge {
+
+bool fileToStack(const Common::String &filename, stackHandler *sH);
+bool stackToFile(const Common::String &filename, const variable &from);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/sludger.h b/engines/sludge/sludger.h
index fd13db0..19340f4 100644
--- a/engines/sludge/sludger.h
+++ b/engines/sludge/sludger.h
@@ -1,101 +1,101 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGER_H
-#define SLUDGER_H
-
-#include "common/file.h"
-
-#include "sludge/allfiles.h"
-#include "sludge/variable.h"
-#include "sludge/csludge.h"
-#include "sludge/language.h"
-
-namespace Sludge {
-
-typedef struct _FILETIME {
- uint32 dwLowDateTime;
- uint32 dwHighDateTime;
-} FILETIME;
-
-struct variable;
-struct variableStack;
-
-struct eventHandlers {
- int leftMouseFunction;
- int leftMouseUpFunction;
- int rightMouseFunction;
- int rightMouseUpFunction;
- int moveMouseFunction;
- int focusFunction;
- int spaceFunction;
-};
-
-struct lineOfCode {
- sludgeCommand theCommand;
- int32 param;
-};
-
-struct loadedFunction {
- int originalNumber;
- lineOfCode *compiledLines;
- int numLocals, timeLeft, numArgs;
- variable *localVars;
- variableStack *stack;
- variable reg;
- uint runThisLine;
- loadedFunction *calledBy;
- loadedFunction *next;
- bool returnSomething, isSpeech, unfreezable, cancelMe;
- byte freezerLevel;
-};
-
-struct inputType {
- bool leftClick, rightClick, justMoved, leftRelease, rightRelease;
- int mouseX, mouseY, keyPressed;
-};
-
-extern byte *gameIcon;
-extern int iconW, iconH;
-
-bool initSludge(const Common::String &);
-void displayBase();
-void sludgeDisplay();
-int startNewFunctionNum(uint, uint, loadedFunction *, variableStack*&, bool = true);
-bool handleInput();
-void restartFunction(loadedFunction *fun);
-bool loadFunctionCode(loadedFunction *newFunc);
-void loadHandlers(Common::SeekableReadStream *stream);
-void saveHandlers(Common::WriteStream *stream);
-
-void finishFunction(loadedFunction *fun);
-void abortFunction(loadedFunction *fun);
-Common::File *openAndVerify(const Common::String &filename, char extra1, char extra2, const char *er, int &fileVersion);
-
-void freezeSubs();
-void unfreezeSubs();
-void completeTimers();
-void killSpeechTimers();
-int cancelAFunction(int funcNum, loadedFunction *myself, bool &killedMyself);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGER_H
+#define SLUDGER_H
+
+#include "common/file.h"
+
+#include "sludge/allfiles.h"
+#include "sludge/variable.h"
+#include "sludge/csludge.h"
+#include "sludge/language.h"
+
+namespace Sludge {
+
+typedef struct _FILETIME {
+ uint32 dwLowDateTime;
+ uint32 dwHighDateTime;
+} FILETIME;
+
+struct variable;
+struct variableStack;
+
+struct eventHandlers {
+ int leftMouseFunction;
+ int leftMouseUpFunction;
+ int rightMouseFunction;
+ int rightMouseUpFunction;
+ int moveMouseFunction;
+ int focusFunction;
+ int spaceFunction;
+};
+
+struct lineOfCode {
+ sludgeCommand theCommand;
+ int32 param;
+};
+
+struct loadedFunction {
+ int originalNumber;
+ lineOfCode *compiledLines;
+ int numLocals, timeLeft, numArgs;
+ variable *localVars;
+ variableStack *stack;
+ variable reg;
+ uint runThisLine;
+ loadedFunction *calledBy;
+ loadedFunction *next;
+ bool returnSomething, isSpeech, unfreezable, cancelMe;
+ byte freezerLevel;
+};
+
+struct inputType {
+ bool leftClick, rightClick, justMoved, leftRelease, rightRelease;
+ int mouseX, mouseY, keyPressed;
+};
+
+extern byte *gameIcon;
+extern int iconW, iconH;
+
+bool initSludge(const Common::String &);
+void displayBase();
+void sludgeDisplay();
+int startNewFunctionNum(uint, uint, loadedFunction *, variableStack*&, bool = true);
+bool handleInput();
+void restartFunction(loadedFunction *fun);
+bool loadFunctionCode(loadedFunction *newFunc);
+void loadHandlers(Common::SeekableReadStream *stream);
+void saveHandlers(Common::WriteStream *stream);
+
+void finishFunction(loadedFunction *fun);
+void abortFunction(loadedFunction *fun);
+Common::File *openAndVerify(const Common::String &filename, char extra1, char extra2, const char *er, int &fileVersion);
+
+void freezeSubs();
+void unfreezeSubs();
+void completeTimers();
+void killSpeechTimers();
+int cancelAFunction(int funcNum, loadedFunction *myself, bool &killedMyself);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/specialsettings.h b/engines/sludge/specialsettings.h
index 0aa4786..adcecec 100644
--- a/engines/sludge/specialsettings.h
+++ b/engines/sludge/specialsettings.h
@@ -1,29 +1,29 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#define SPECIAL_REGISTERED 1
-#define SPECIAL_FULLSCREEN 2
-#define SPECIAL_MOUSE_1 4
-#define SPECIAL_SILENT 8
-#define SPECIAL_MOUSE_2 16
-#define SPECIAL_INVISIBLE 32
-#define SPECIAL_HIDELOGO 64
-#define SPECIAL_HIDELOADING 128
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#define SPECIAL_REGISTERED 1
+#define SPECIAL_FULLSCREEN 2
+#define SPECIAL_MOUSE_1 4
+#define SPECIAL_SILENT 8
+#define SPECIAL_MOUSE_2 16
+#define SPECIAL_INVISIBLE 32
+#define SPECIAL_HIDELOGO 64
+#define SPECIAL_HIDELOADING 128
diff --git a/engines/sludge/sprbanks.h b/engines/sludge/sprbanks.h
index ed60be5..6372a82 100644
--- a/engines/sludge/sprbanks.h
+++ b/engines/sludge/sprbanks.h
@@ -1,40 +1,40 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_SPRBANKS_H
-#define SLUDGE_SPRBANKS_H
-
-#include "sludge/sprites.h"
-
-namespace Sludge {
-
-struct loadedSpriteBank {
- int ID, timesUsed;
- spriteBank bank;
- loadedSpriteBank *next;
-};
-
-loadedSpriteBank *loadBankForAnim(int ID);
-void reloadSpriteTextures();
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_SPRBANKS_H
+#define SLUDGE_SPRBANKS_H
+
+#include "sludge/sprites.h"
+
+namespace Sludge {
+
+struct loadedSpriteBank {
+ int ID, timesUsed;
+ spriteBank bank;
+ loadedSpriteBank *next;
+};
+
+loadedSpriteBank *loadBankForAnim(int ID);
+void reloadSpriteTextures();
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/statusba.h b/engines/sludge/statusba.h
index 65895f3..4de04fb 100644
--- a/engines/sludge/statusba.h
+++ b/engines/sludge/statusba.h
@@ -1,66 +1,66 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_STATUSBA_H
-#define SLUDGE_STATUSBA_H
-
-#include "common/str.h"
-
-namespace Sludge {
-
-struct statusBar {
- Common::String text;
- statusBar *next;
-};
-
-struct statusStuff {
- statusBar *firstStatusBar;
- uint16 alignStatus;
- int litStatus;
- int statusX, statusY;
- int statusR, statusG, statusB;
- int statusLR, statusLG, statusLB;
-};
-
-void initStatusBar();
-
-void setStatusBar(Common::String &txt);
-void clearStatusBar();
-void addStatusBar();
-void killLastStatus();
-void statusBarColour(byte r, byte g, byte b);
-void statusBarLitColour(byte r, byte g, byte b);
-void setLitStatus(int i);
-const Common::String &statusBarText();
-void positionStatus(int, int);
-void drawStatusBar();
-
-// Load and save
-bool loadStatusBars(Common::SeekableReadStream *stream);
-void saveStatusBars(Common::WriteStream *stream);
-
-// For freezing
-void restoreBarStuff(statusStuff *here);
-statusStuff *copyStatusBarStuff(statusStuff *here);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_STATUSBA_H
+#define SLUDGE_STATUSBA_H
+
+#include "common/str.h"
+
+namespace Sludge {
+
+struct statusBar {
+ Common::String text;
+ statusBar *next;
+};
+
+struct statusStuff {
+ statusBar *firstStatusBar;
+ uint16 alignStatus;
+ int litStatus;
+ int statusX, statusY;
+ int statusR, statusG, statusB;
+ int statusLR, statusLG, statusLB;
+};
+
+void initStatusBar();
+
+void setStatusBar(Common::String &txt);
+void clearStatusBar();
+void addStatusBar();
+void killLastStatus();
+void statusBarColour(byte r, byte g, byte b);
+void statusBarLitColour(byte r, byte g, byte b);
+void setLitStatus(int i);
+const Common::String &statusBarText();
+void positionStatus(int, int);
+void drawStatusBar();
+
+// Load and save
+bool loadStatusBars(Common::SeekableReadStream *stream);
+void saveStatusBars(Common::WriteStream *stream);
+
+// For freezing
+void restoreBarStuff(statusStuff *here);
+statusStuff *copyStatusBarStuff(statusStuff *here);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/talk.h b/engines/sludge/talk.h
index fe966ca..68c81c4 100644
--- a/engines/sludge/talk.h
+++ b/engines/sludge/talk.h
@@ -1,52 +1,52 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_TALK_H
-#define SLUDGE_TALK_H
-
-#include "sludge/sprites.h"
-
-namespace Sludge {
-
-struct speechLine {
- Common::String textLine;
- speechLine *next;
- int x;
-};
-
-struct speechStruct {
- onScreenPerson *currentTalker;
- speechLine *allSpeech;
- int speechY, lastFile, lookWhosTalking;
- spritePalette talkCol;
-};
-
-int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool);
-void viewSpeech();
-void killAllSpeech();
-int isThereAnySpeechGoingOn();
-void initSpeech();
-void saveSpeech(speechStruct *sS, Common::WriteStream *stream);
-bool loadSpeech(speechStruct *sS, Common::SeekableReadStream *stream);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_TALK_H
+#define SLUDGE_TALK_H
+
+#include "sludge/sprites.h"
+
+namespace Sludge {
+
+struct speechLine {
+ Common::String textLine;
+ speechLine *next;
+ int x;
+};
+
+struct speechStruct {
+ onScreenPerson *currentTalker;
+ speechLine *allSpeech;
+ int speechY, lastFile, lookWhosTalking;
+ spritePalette talkCol;
+};
+
+int wrapSpeech(const Common::String &theText, int objT, int sampleFile, bool);
+void viewSpeech();
+void killAllSpeech();
+int isThereAnySpeechGoingOn();
+void initSpeech();
+void saveSpeech(speechStruct *sS, Common::WriteStream *stream);
+bool loadSpeech(speechStruct *sS, Common::SeekableReadStream *stream);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/thumbnail.h b/engines/sludge/thumbnail.h
index 5b58ecb..43c0e6b 100644
--- a/engines/sludge/thumbnail.h
+++ b/engines/sludge/thumbnail.h
@@ -1,34 +1,34 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_THUMBNAIL_H
-#define SLUDGE_THUMBNAIL_H
-
-namespace Sludge {
-
-bool saveThumbnail(Common::WriteStream *stream);
-bool skipThumbnail(Common::SeekableReadStream *stream);
-
-void showThumbnail(const Common::String &filename, int x, int y);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_THUMBNAIL_H
+#define SLUDGE_THUMBNAIL_H
+
+namespace Sludge {
+
+bool saveThumbnail(Common::WriteStream *stream);
+bool skipThumbnail(Common::SeekableReadStream *stream);
+
+void showThumbnail(const Common::String &filename, int x, int y);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/timing.h b/engines/sludge/timing.h
index 0fd59f5..16f406b 100644
--- a/engines/sludge/timing.h
+++ b/engines/sludge/timing.h
@@ -1,35 +1,35 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_TIMING_H
-#define SLUDGE_TIMING_H
-
-namespace Sludge {
-
-void Init_Timer(void);
-void Init_Special_Timer(int t);
-void Get_Start_Time(void);
-void Get_End_Time(void);
-void Wait_Frame(void);
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_TIMING_H
+#define SLUDGE_TIMING_H
+
+namespace Sludge {
+
+void Init_Timer(void);
+void Init_Special_Timer(int t);
+void Get_Start_Time(void);
+void Get_End_Time(void);
+void Wait_Frame(void);
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/transition.h b/engines/sludge/transition.h
index 7dc29f7..5ce5568 100644
--- a/engines/sludge/transition.h
+++ b/engines/sludge/transition.h
@@ -1,32 +1,32 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_TRANSITION_H
-#define SLUDGE_TRANSITION_H
-
-namespace Sludge {
-
-void fixBrightness();
-void resetRandW();
-
-} // End of namespace Sludge
-
-#endif
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_TRANSITION_H
+#define SLUDGE_TRANSITION_H
+
+namespace Sludge {
+
+void fixBrightness();
+void resetRandW();
+
+} // End of namespace Sludge
+
+#endif
diff --git a/engines/sludge/variable.h b/engines/sludge/variable.h
index 3278b8e..1cac125 100644
--- a/engines/sludge/variable.h
+++ b/engines/sludge/variable.h
@@ -1,135 +1,135 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-#ifndef SLUDGE_VARIABLE_H
-#define SLUDGE_VARIABLE_H
-
-namespace Sludge {
-
-struct variable;
-struct variableStack;
-
-enum variableType {
- SVT_NULL,
- SVT_INT,
- SVT_FUNC,
- SVT_STRING,
- SVT_BUILT,
- SVT_FILE,
- SVT_STACK,
- SVT_OBJTYPE,
- SVT_ANIM,
- SVT_COSTUME,
- SVT_FASTARRAY,
- SVT_NUM_TYPES
-};
-
-struct fastArrayHandler {
- struct variable *fastVariables;
- int size;
- int timesUsed;
-};
-
-struct stackHandler {
- struct variableStack *first;
- struct variableStack *last;
- int timesUsed;
-};
-
-union variableData {
- signed int intValue;
- const char *theString;
- stackHandler *theStack;
- struct personaAnimation *animHandler;
- struct persona *costumeHandler;
- fastArrayHandler *fastArray;
-};
-
-struct variable {
- variableType varType;
- variableData varData;
-};
-
-struct variableStack {
- variable thisVar;
- variableStack *next;
-};
-
-// Initialisation
-
-#define initVarNew(thisVar) thisVar.varType = SVT_NULL
-
-// Setting variables
-
-void setVariable(variable &thisVar, variableType vT, int value);
-bool copyVariable(const variable &from, variable &to);
-bool loadStringToVar(variable &thisVar, int value);
-void newAnimationVariable(variable &thisVar, struct personaAnimation *i);
-void newCostumeVariable(variable &thisVar, struct persona *i);
-void makeTextVar(variable &thisVar, const Common::String &txt);
-void addVariablesInSecond(variable &var1, variable &var2);
-void compareVariablesInSecond(const variable &var1, variable &var2);
-char *createCString(const Common::String &s);
-
-// Misc.
-
-void unlinkVar(variable &thisVar);
-Common::String getNumberedString(int value);
-Common::String getTextFromAnyVar(const variable &from);
-struct persona *getCostumeFromVar(variable &thisVar);
-struct personaAnimation *getAnimationFromVar(variable &thisVar);
-bool getBoolean(const variable &from);
-bool getValueType(int &toHere, variableType vT, const variable &v);
-
-// Stacky stuff
-
-bool addVarToStack(const variable &va, variableStack *&thisStack);
-bool addVarToStackQuick(variable &va, variableStack *&thisStack);
-void trimStack(variableStack *&stack);
-int deleteVarFromStack(const variable &va, variableStack *&thisStack,
- bool allOfEm = false);
-variableStack *stackFindLast(variableStack *hunt);
-bool copyStack(const variable &from, variable &to);
-int stackSize(const stackHandler *me);
-bool stackSetByIndex(variableStack *, uint, const variable &);
-variable *stackGetByIndex(variableStack *, uint);
-bool getSavedGamesStack(stackHandler *sH, const Common::String &ext);
-
-bool makeFastArrayFromStack(variable &to, const stackHandler *stacky);
-bool makeFastArraySize(variable &to, int size);
-variable *fastArrayGetByIndex(fastArrayHandler *vS, uint theIndex);
-
-#define DEBUG_STACKINESS 0
-
-#if DEBUG_STACKINESS
-#define stackDebug(params) { \
- FILE * stackfp = fopen ("stackout.txt", "at"); \
- fprintf params; \
- fclose (stackfp); \
- }
-#else
-#define stackDebug(a) {}
-#endif
-
-} // End of namespace Sludge
-
-#endif
-
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef SLUDGE_VARIABLE_H
+#define SLUDGE_VARIABLE_H
+
+namespace Sludge {
+
+struct variable;
+struct variableStack;
+
+enum variableType {
+ SVT_NULL,
+ SVT_INT,
+ SVT_FUNC,
+ SVT_STRING,
+ SVT_BUILT,
+ SVT_FILE,
+ SVT_STACK,
+ SVT_OBJTYPE,
+ SVT_ANIM,
+ SVT_COSTUME,
+ SVT_FASTARRAY,
+ SVT_NUM_TYPES
+};
+
+struct fastArrayHandler {
+ struct variable *fastVariables;
+ int size;
+ int timesUsed;
+};
+
+struct stackHandler {
+ struct variableStack *first;
+ struct variableStack *last;
+ int timesUsed;
+};
+
+union variableData {
+ signed int intValue;
+ const char *theString;
+ stackHandler *theStack;
+ struct personaAnimation *animHandler;
+ struct persona *costumeHandler;
+ fastArrayHandler *fastArray;
+};
+
+struct variable {
+ variableType varType;
+ variableData varData;
+};
+
+struct variableStack {
+ variable thisVar;
+ variableStack *next;
+};
+
+// Initialisation
+
+#define initVarNew(thisVar) thisVar.varType = SVT_NULL
+
+// Setting variables
+
+void setVariable(variable &thisVar, variableType vT, int value);
+bool copyVariable(const variable &from, variable &to);
+bool loadStringToVar(variable &thisVar, int value);
+void newAnimationVariable(variable &thisVar, struct personaAnimation *i);
+void newCostumeVariable(variable &thisVar, struct persona *i);
+void makeTextVar(variable &thisVar, const Common::String &txt);
+void addVariablesInSecond(variable &var1, variable &var2);
+void compareVariablesInSecond(const variable &var1, variable &var2);
+char *createCString(const Common::String &s);
+
+// Misc.
+
+void unlinkVar(variable &thisVar);
+Common::String getNumberedString(int value);
+Common::String getTextFromAnyVar(const variable &from);
+struct persona *getCostumeFromVar(variable &thisVar);
+struct personaAnimation *getAnimationFromVar(variable &thisVar);
+bool getBoolean(const variable &from);
+bool getValueType(int &toHere, variableType vT, const variable &v);
+
+// Stacky stuff
+
+bool addVarToStack(const variable &va, variableStack *&thisStack);
+bool addVarToStackQuick(variable &va, variableStack *&thisStack);
+void trimStack(variableStack *&stack);
+int deleteVarFromStack(const variable &va, variableStack *&thisStack,
+ bool allOfEm = false);
+variableStack *stackFindLast(variableStack *hunt);
+bool copyStack(const variable &from, variable &to);
+int stackSize(const stackHandler *me);
+bool stackSetByIndex(variableStack *, uint, const variable &);
+variable *stackGetByIndex(variableStack *, uint);
+bool getSavedGamesStack(stackHandler *sH, const Common::String &ext);
+
+bool makeFastArrayFromStack(variable &to, const stackHandler *stacky);
+bool makeFastArraySize(variable &to, int size);
+variable *fastArrayGetByIndex(fastArrayHandler *vS, uint theIndex);
+
+#define DEBUG_STACKINESS 0
+
+#if DEBUG_STACKINESS
+#define stackDebug(params) { \
+ FILE * stackfp = fopen ("stackout.txt", "at"); \
+ fprintf params; \
+ fclose (stackfp); \
+ }
+#else
+#define stackDebug(a) {}
+#endif
+
+} // End of namespace Sludge
+
+#endif
+
More information about the Scummvm-git-logs
mailing list