aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile.common3
-rwxr-xr-xbackends/platform/maemo/debian/rules1
-rw-r--r--devtools/create_cryomni3d/create_cryomni3d_dat.cpp131
-rw-r--r--devtools/create_cryomni3d/create_cryomni3d_dat.h43
-rw-r--r--devtools/create_cryomni3d/module.mk14
-rw-r--r--devtools/create_cryomni3d/util.cpp174
-rw-r--r--devtools/create_cryomni3d/util.h57
-rw-r--r--devtools/create_cryomni3d/versailles.cpp60
-rw-r--r--devtools/create_cryomni3d/versailles.h267
-rw-r--r--devtools/create_project/xcode.cpp1
-rw-r--r--dists/engine-data/README5
-rw-r--r--dists/engine-data/cryomni3d.datbin0 -> 5840 bytes
-rw-r--r--dists/scummvm.rc3
-rw-r--r--engines/cryomni3d/cryomni3d.cpp21
-rw-r--r--engines/cryomni3d/cryomni3d.h4
-rw-r--r--engines/cryomni3d/datstream.cpp146
-rw-r--r--engines/cryomni3d/datstream.h58
-rw-r--r--engines/cryomni3d/module.mk1
-rw-r--r--engines/cryomni3d/versailles/data.cpp239
-rw-r--r--engines/cryomni3d/versailles/documentation.cpp23
-rw-r--r--engines/cryomni3d/versailles/documentation.h7
-rw-r--r--engines/cryomni3d/versailles/engine.cpp11
-rw-r--r--engines/cryomni3d/versailles/engine.h23
-rw-r--r--engines/cryomni3d/versailles/logic.cpp42
-rw-r--r--engines/cryomni3d/versailles/menus.cpp5
26 files changed, 1074 insertions, 266 deletions
diff --git a/.gitignore b/.gitignore
index 4abb33914d..2342c7b23d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,7 @@ project.xcworkspace
/devtools/make-scumm-fontdata
/devtools/create_access/create_access
/devtools/create_cryo/create_cryo_dat
+/devtools/create_cryomni3d/create_cryomni3d_dat
/devtools/create_drascula/create_drascula
/devtools/create_hugo/create_hugo
/devtools/create_kyradat/create_kyradat
diff --git a/Makefile.common b/Makefile.common
index 78e0d6e423..9df4e60f9e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -310,6 +310,9 @@ endif
ifdef ENABLE_CRYO
DIST_FILES_ENGINEDATA+=cryo.dat
endif
+ifdef ENABLE_CRYOMNI3D
+DIST_FILES_ENGINEDATA+=cryomni3d.dat
+endif
ifdef ENABLE_DRASCULA
DIST_FILES_ENGINEDATA+=drascula.dat
endif
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index 2a763c9c42..9fbdff61cd 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -49,6 +49,7 @@ install: build
install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share
# for optified version we can also add engine datafiles
install -m0644 dists/engine-data/access.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/cryomni3d.dat debian/scummvm/opt/scummvm/share
install -m0644 dists/engine-data/drascula.dat debian/scummvm/opt/scummvm/share
install -m0644 dists/engine-data/fonts.dat debian/scummvm/opt/scummvm/share
install -m0644 dists/engine-data/hugo.dat debian/scummvm/opt/scummvm/share
diff --git a/devtools/create_cryomni3d/create_cryomni3d_dat.cpp b/devtools/create_cryomni3d/create_cryomni3d_dat.cpp
new file mode 100644
index 0000000000..01262b22d2
--- /dev/null
+++ b/devtools/create_cryomni3d/create_cryomni3d_dat.cpp
@@ -0,0 +1,131 @@
+/* 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.
+ *
+ */
+
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+// HACK to allow building with the SDL backend on MinGW
+// see bug #1800764 "TOOLS: MinGW tools building broken"
+#ifdef main
+#undef main
+#endif // main
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "util.h"
+#include "create_cryomni3d_dat.h"
+
+struct Parts {
+ size_t (*writeHeader)(FILE *f, uint32 offset, uint32 size);
+ size_t (*writeData)(FILE *f);
+ uint32 offset;
+ uint32 size;
+};
+
+#define DEFINE_GAME_PLATFORM_LANG_FUNCS(game, platform, lang) \
+ size_t write ## game ## _ ## platform ## _ ## lang ## Header(FILE *f, \
+ uint32 offset, uint32 size); \
+ size_t write ## game ## _ ## platform ## _ ## lang ## Data(FILE *f);
+#define GAME_PLATFORM_LANG_PART(game, platform, lang) { write ## game ## _ ## platform ## _ ## lang ## Header, \
+ write ## game ## _ ## platform ## _ ## lang ## Data, 0, 0 }
+
+DEFINE_GAME_PLATFORM_LANG_FUNCS(Versailles, ALL, FR)
+
+static Parts gamesParts[] = {
+ GAME_PLATFORM_LANG_PART(Versailles, ALL, FR),
+};
+
+#define CRYOMNI3D_DAT_VER 1 // 32-bit integer
+
+size_t writeFileHeader(FILE *f, uint16 games) {
+ size_t headerSize = 0;
+ fwrite("CY3DDATA", 8, 1, f);
+ headerSize += 8;
+ headerSize += writeUint16LE(f, CRYOMNI3D_DAT_VER);
+ headerSize += writeUint16LE(f, games);
+ // Dummy value to pad to 16 bytes
+ headerSize += writeUint32LE(f, 0);
+ assert((headerSize & PADDING_MASK) == 0);
+ return headerSize;
+}
+
+size_t writeGameHeader(FILE *f, uint32 gameId, uint16 version, uint16 lang, uint32 platforms,
+ uint32 offset, uint32 size) {
+ size_t headerSize = 0;
+ headerSize += writeUint32BE(f, gameId); // BE to keep the tag readable
+ headerSize += writeUint16LE(f, version);
+ headerSize += writeUint16BE(f, lang); // BE to keep the tag readable
+ headerSize += writeUint32LE(f, platforms);
+ headerSize += writeUint32LE(f, offset);
+ headerSize += writeUint32LE(f, size);
+ return headerSize;
+}
+
+static int emitData(char *outputFilename) {
+ FILE *f = fopen(outputFilename, "w+b");
+ if (!f) {
+ printf("ERROR: Unable to create output file %s\n", outputFilename);
+ return 1;
+ }
+
+ printf("Generating %s...\n", outputFilename);
+
+ writeFileHeader(f);
+
+ for (unsigned int i = 0; i < ARRAYSIZE(gamesParts); i++) {
+ gamesParts[i].writeHeader(f, 0xdeadfeed, 0xdeadfeed);
+ }
+
+ // Pad the games list
+ writePadding(f);
+
+ for (unsigned int i = 0; i < ARRAYSIZE(gamesParts); i++) {
+ gamesParts[i].offset = ftell(f);
+ gamesParts[i].size = gamesParts[i].writeData(f);
+ }
+
+ fseek(f, 0, SEEK_SET);
+
+ writeFileHeader(f, ARRAYSIZE(gamesParts));
+
+ for (unsigned int i = 0; i < ARRAYSIZE(gamesParts); i++) {
+ gamesParts[i].writeHeader(f, gamesParts[i].offset, gamesParts[i].size);
+ }
+
+ fclose(f);
+
+ printf("Done!\n");
+
+ return 0;
+}
+
+int main(int argc, char **argv) {
+
+ if (argc > 1) {
+ return emitData(argv[1]);
+ } else {
+ printf("Usage: %s <output.dat>\n", argv[0]);
+ }
+
+ return 0;
+}
diff --git a/devtools/create_cryomni3d/create_cryomni3d_dat.h b/devtools/create_cryomni3d/create_cryomni3d_dat.h
new file mode 100644
index 0000000000..a040ca47db
--- /dev/null
+++ b/devtools/create_cryomni3d/create_cryomni3d_dat.h
@@ -0,0 +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 CREATE_CRYOMNI3D_DAT_H
+#define CREATE_CRYOMNI3D_DAT_H
+
+#ifndef MKTAG16
+#define MKTAG16(a0,a1) ((uint16)((a1) | ((a0) << 8)))
+#endif
+
+size_t writeFileHeader(FILE *f, uint16 games = 0xdead);
+size_t writeGameHeader(FILE *f, uint32 gameId, uint16 version, uint16 lang, uint32 platforms,
+ uint32 offset = 0xdeadfeed, uint32 size = 0xdeadfeed);
+
+#define PLATFORM_WIN 0x1
+#define PLATFORM_DOS 0x2
+#define PLATFORM_MAC 0x4
+#define PLATFORM_PLAYSTATION 0x8
+#define PLATFORM_SATURN 0x10
+#define PLATFORM_ALL 0xffffffff
+
+#define LANG_FR MKTAG16('f', 'r')
+
+#endif
diff --git a/devtools/create_cryomni3d/module.mk b/devtools/create_cryomni3d/module.mk
new file mode 100644
index 0000000000..79e2b1a11a
--- /dev/null
+++ b/devtools/create_cryomni3d/module.mk
@@ -0,0 +1,14 @@
+
+MODULE := devtools/create_cryomni3d
+
+MODULE_OBJS := \
+ create_cryomni3d_dat.o \
+ util.o \
+ versailles.o
+
+# Set the name of the executable
+TOOL_EXECUTABLE := create_cryomni3d_dat
+
+# Include common rules
+include $(srcdir)/rules.mk
+
diff --git a/devtools/create_cryomni3d/util.cpp b/devtools/create_cryomni3d/util.cpp
new file mode 100644
index 0000000000..4ce94efb8c
--- /dev/null
+++ b/devtools/create_cryomni3d/util.cpp
@@ -0,0 +1,174 @@
+/* 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.
+ *
+ */
+
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "util.h"
+#include <stdarg.h>
+
+#ifdef _MSC_VER
+#define vsnprintf _vsnprintf
+#endif
+
+void error(const char *s, ...) {
+ char buf[1024];
+ va_list va;
+
+ va_start(va, s);
+ vsnprintf(buf, 1024, s, va);
+ va_end(va);
+
+ fprintf(stderr, "ERROR: %s!\n", buf);
+
+ exit(1);
+}
+
+void warning(const char *s, ...) {
+ char buf[1024];
+ va_list va;
+
+ va_start(va, s);
+ vsnprintf(buf, 1024, s, va);
+ va_end(va);
+
+ fprintf(stderr, "WARNING: %s!\n", buf);
+}
+
+int scumm_stricmp(const char *s1, const char *s2) {
+ byte l1, l2;
+ do {
+ // Don't use ++ inside tolower, in case the macro uses its
+ // arguments more than once.
+ l1 = (byte) * s1++;
+ l1 = tolower(l1);
+ l2 = (byte) * s2++;
+ l2 = tolower(l2);
+ } while (l1 == l2 && l1 != 0);
+ return l1 - l2;
+}
+
+void debug(int level, const char *s, ...) {
+ char buf[1024];
+ va_list va;
+
+ va_start(va, s);
+ vsnprintf(buf, 1024, s, va);
+ va_end(va);
+
+ fprintf(stderr, "DEBUG: %s!\n", buf);
+}
+
+size_t writeByte(FILE *fp, uint8 b) {
+ fwrite(&b, 1, 1, fp);
+ return sizeof(b);
+}
+
+size_t writeUint16BE(FILE *fp, uint16 value) {
+ writeByte(fp, (uint8)(value >> 8));
+ writeByte(fp, (uint8)(value));
+ return sizeof(value);
+}
+
+size_t writeUint16LE(FILE *fp, uint16 value) {
+ writeByte(fp, (uint8)(value));
+ writeByte(fp, (uint8)(value >> 8));
+ return sizeof(value);
+}
+
+size_t writeUint32BE(FILE *fp, uint32 value) {
+ writeByte(fp, (uint8)(value >> 24));
+ writeByte(fp, (uint8)(value >> 16));
+ writeByte(fp, (uint8)(value >> 8));
+ writeByte(fp, (uint8)(value));
+ return sizeof(value);
+}
+
+size_t writeUint32LE(FILE *fp, uint32 value) {
+ writeByte(fp, (uint8)(value));
+ writeByte(fp, (uint8)(value >> 8));
+ writeByte(fp, (uint8)(value >> 16));
+ writeByte(fp, (uint8)(value >> 24));
+ return sizeof(value);
+}
+
+size_t writeString16(FILE *fp, const char *string) {
+ if (string == nullptr) {
+ // Like an empty string
+ return writeUint16LE(fp, 0);
+ }
+ size_t n = strlen(string);
+ if (n > 0xffff) {
+ return 0;
+ }
+ size_t written = 0;
+ written += writeUint16LE(fp, n);
+ fwrite(string, n, 1, fp);
+ written += n;
+ return written;
+}
+
+template<typename T, size_t (*Tf)(FILE *fp, T), typename U, size_t (*Uf)(FILE *fp, U)>
+size_t writeArray(FILE *fp, T const *array, U elems) {
+ size_t written = 0;
+ written += Uf(fp, elems);
+ for (U i = 0; i < elems; i++) {
+ written += Tf(fp, array[i]);
+ }
+ return written;
+}
+
+size_t writeString16Array16(FILE *fp, char const *const *array, uint16 elems) {
+ return writeArray<char const *, writeString16, uint16, writeUint16LE>(fp, array, elems);
+}
+
+
+//#define DEBUG
+static const char padBuf[PADDING_ALIGNMENT] = {
+#ifndef DEBUG
+ 0
+#else
+ 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
+#endif
+};
+
+size_t writePadding(FILE *fp) {
+ long pos = ftell(fp);
+
+ pos = pos & PADDING_MASK; // Keep only remainder
+ if (pos == 0) {
+ return 0;
+ }
+
+ pos = PADDING_ALIGNMENT - pos;
+ fwrite(padBuf, pos, 1, fp);
+ return pos;
+}
+
+uint32 fileSize(FILE *fp) {
+ uint32 sz;
+ uint32 pos = ftell(fp);
+ fseek(fp, 0, SEEK_END);
+ sz = ftell(fp);
+ fseek(fp, pos, SEEK_SET);
+ return sz;
+}
diff --git a/devtools/create_cryomni3d/util.h b/devtools/create_cryomni3d/util.h
new file mode 100644
index 0000000000..4cd685e927
--- /dev/null
+++ b/devtools/create_cryomni3d/util.h
@@ -0,0 +1,57 @@
+/* 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 UTIL_H
+#define UTIL_H
+
+#include "common/scummsys.h"
+#include "common/endian.h"
+#include "common/util.h"
+
+#ifdef WIN32
+#include <io.h>
+#include <process.h>
+#endif
+
+#define PADDING_ALIGNMENT 16
+#define PADDING_MASK 0xf
+
+/* File I/O */
+size_t writeByte(FILE *fp, uint8 b);
+size_t writeUint16BE(FILE *fp, uint16 value);
+size_t writeUint16LE(FILE *fp, uint16 value);
+size_t writeUint32BE(FILE *fp, uint32 value);
+size_t writeUint32LE(FILE *fp, uint32 value);
+size_t writeString16(FILE *fp, char const *string);
+size_t writeString16Array16(FILE *fp, char const *const *string, uint16 elems);
+size_t writePadding(FILE *fp);
+uint32 fileSize(FILE *fp);
+
+/* Misc stuff */
+void NORETURN_PRE error(const char *s, ...) NORETURN_POST;
+void warning(const char *s, ...);
+void debug(int level, const char *s, ...);
+int scumm_stricmp(const char *s1, const char *s2);
+
+using namespace Common;
+
+#endif
diff --git a/devtools/create_cryomni3d/versailles.cpp b/devtools/create_cryomni3d/versailles.cpp
new file mode 100644
index 0000000000..edddd7a4ce
--- /dev/null
+++ b/devtools/create_cryomni3d/versailles.cpp
@@ -0,0 +1,60 @@
+/* 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.
+ *
+ */
+
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "util.h"
+#include "create_cryomni3d_dat.h"
+
+#include "versailles.h"
+
+// In Versailles platform doesn't seem to change anything
+#define DEFINE_FUNCS(lang) \
+ size_t writeVersailles_ALL_ ## lang ## Header(FILE *f, uint32 offset, uint32 size) { \
+ return writeGameHeader(f, VERSAILLES_GAMEID, VERSAILLES_VERSION, LANG_ ## lang, PLATFORM_ALL, \
+ offset, size); \
+ } \
+ \
+ size_t writeVersailles_ALL_ ## lang ## Data(FILE *f) { \
+ size_t size = 0; \
+ \
+ assert(VERSAILLES_LOCALIZED_FILENAMES_COUNT == ARRAYSIZE(versailles ## lang ## localizedFilenames)); \
+ size += writeString16Array16(f, versailles ## lang ## localizedFilenames, \
+ VERSAILLES_LOCALIZED_FILENAMES_COUNT); \
+ \
+ size += writeString16(f, versailles ## lang ## EpilMsg); \
+ size += writeString16(f, versailles ## lang ## EpilPwd); \
+ \
+ size += writeString16(f, versailles ## lang ## BombPwd); \
+ \
+ assert(VERSAILLES_MESSAGES_COUNT == ARRAYSIZE(versailles ## lang ## messages)); \
+ size += writeString16Array16(f, versailles ## lang ## messages, VERSAILLES_MESSAGES_COUNT); \
+ \
+ assert(VERSAILLES_PAINTINGS_COUNT == ARRAYSIZE(versailles ## lang ## paintings)); \
+ size += writeString16Array16(f, versailles ## lang ## paintings, VERSAILLES_PAINTINGS_COUNT); \
+ \
+ size += writePadding(f); \
+ return size; \
+ }
+
+DEFINE_FUNCS(FR)
diff --git a/devtools/create_cryomni3d/versailles.h b/devtools/create_cryomni3d/versailles.h
new file mode 100644
index 0000000000..e0bd191c88
--- /dev/null
+++ b/devtools/create_cryomni3d/versailles.h
@@ -0,0 +1,267 @@
+/* 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 VERSAILLES_H
+#define VERSAILLES_H
+
+// This file contains static data and should be included only once
+
+#define VERSAILLES_GAMEID MKTAG('V', 'R', 'S', 'L')
+#define VERSAILLES_VERSION 1
+
+#define VERSAILLES_LOCALIZED_FILENAMES_COUNT 5
+static char const *const versaillesFRlocalizedFilenames[] = {
+ "DIALOG1.GTO",
+ "tous_doc.txt",
+ "lien_doc.txt",
+ "credits.txt",
+ "LEB001__.WAV",
+};
+
+static char const versaillesFREpilMsg[] = "FELIXFORTUNADIVINUMEXPLORATUMACTUIIT";
+static char const versaillesFREpilPwd[] = "LELOUPETLATETE";
+
+static char const versaillesFRBombPwd[] = "JEMENVAISMAISLETATDEMEURERATOUJOURS";
+
+#define VERSAILLES_MESSAGES_COUNT 146
+#define VERSAILLES_PAINTINGS_COUNT 48
+
+static char const *const versaillesFRmessages[] = {
+ "Il est interdit d'ouvrir cette porte pour l'instant.", /* 0 */
+ "Cette porte est ferm" "\x8e" "e " "\x88" " clef.", /* 1 */
+ "Cette porte est ferm" "\x8e" "e.", /* 2 */
+ "Ce tiroir est vide.", /* 3 */
+ "Vous ne pouvez pas atteindre la b" "\x89" "che.", /* 4 */
+ "Il n'y a rien dans cet oranger", /* 5 */
+ "Ceci n'est pas un oranger!", /* 6 */
+ "Il fait trop sombre. ", /* 7 */
+ "Le coffre est ferm" "\x8e" ". ", /* 8 */
+ "Vous pouvez ouvrir la porte", /* 9 */
+ "Il faudrait quelque chose pour atteindre la bombe.", /* 10 */
+ "Ce vase est vide.", /* 11 */
+ "Maintenant, vous pouvez y aller.", /* 12 */
+ "Vous n" "\xd5" "avez plus le temps de vous renseigner sur la "
+ "Cour!", /* 13 */
+ "Il est trop tard pour regarder les tableaux!", /* 14 */
+ "Attendez ! Transmettez donc vos indices " "\x88" " l'huissier.", /* 15 */
+ "Vous ne pouvez pas atteindre le papier.", /* 16 */
+ "Vers l'apothicairerie", /* 17 */
+ "Attention : Vous allez pouvoir terminer ce niveau, mais vous "
+ "n'avez pas effectu" "\x8e" " toutes les actions necessaires pour "
+ "la suite. Il est conseill" "\x8e" " de SAUVEGARDER votre partie "
+ "maintenant.", /* 18 */
+ "Attention : Vous allez pouvoir terminer ce niveau, mais vous "
+ "n'avez peut-" "\x90" "tre pas effectu" "\x8e" " toutes les "
+ "actions necessaires pour la suite. Il est conseill" "\x8e" " de "
+ "SAUVEGARDER votre partie maintenant.", /* 19 */
+ "Vous ne pouvez pas vous d" "\x8e" "placer en portant une " "\x8e"
+ "chelle!", /* 20 */
+ "Il n'y a plus rien ici", /* 21 */
+ "Au revoir ...", /* 22 */
+ "VERSAILLES,", /* 23 */
+ "Complot " "\x88" " la Cour du Roi Soleil", /* 24 */
+ "Consulter l'espace documentaire", /* 25 */
+ " Reprendre la partie en cours", /* 26 */
+ " Commencer une nouvelle partie", /* 27 */
+ " Charger une partie", /* 28 */
+ " Sauver la partie", /* 29 */
+ " Afficher les sous-titres : OUI", /* 30 */
+ " Afficher les sous-titres : NON", /* 31 */
+ " Musique : OUI", /* 32 */
+ " Musique : NON", /* 33 */
+ " Une seule musique sur disque dur (20 Mo)", /* 34 */
+ " Toutes les musiques sur disque dur (92 Mo)", /* 35 */
+ " Aucune musique sur disque dur (lecture CD)", /* 36 */
+ nullptr, /* 37 */
+ nullptr, /* 38 */
+ "Volume", /* 39 */
+ "Quitter le jeu", /* 40 */
+ "", /* 41 */
+ "Visiter le ch" "\x89" "teau", /* 42 */
+ "Cr" "\x8e" "dits", /* 43 */
+ " Reprendre la visite en cours", /* 44 */
+ " Sauver la visite", /* 45 */
+ " Charger une visite", /* 46 */
+ nullptr, /* 47 */
+ " Omni3D : normal", /* 48 */
+ " Omni3D : lent", /* 49 */
+ " Omni3D : tr" "\x8f" "s lent", /* 50 */
+ " Omni3D : rapide", /* 51 */
+ " Omni3D : tr" "\x8f" "s rapide", /* 52 */
+ "Confirmer", /* 53 */
+ "Annuler", /* 54 */
+ "libre", /* 55 */
+ "sans nom", /* 56 */
+ "Attention : la partie en cours va " "\x90" "tre abandonn" "\x8e"
+ "e.", /* 57 */
+ "Retour", /* 58 */
+ "Le chateau", /* 59 */
+ "Retour Menu Principal", /* 60 */
+ "Sommaire Espace documentaire", /* 61 */
+ "Plan du ch" "\x89" "teau et des jardins", /* 62 */
+ "Plan des int" "\x8e" "rieurs du ch" "\x89" "teau", /* 63 */
+ "Probl" "\x8f" "me d'" "\x8e" "criture sur dique dur : disque "
+ "plein ", /* 64 */
+ nullptr, /* 65 */
+ "Veuillez ins" "\x8e" "rer le CD ", /* 66 */
+ "Veuillez ins" "\x8e" "rer le CD %d et presser une touche", /* 67 */
+ "Les arts", /* 68 */
+ "Le r" "\x8f" "gne", /* 69 */
+ "La Cour", /* 70 */
+ "Vie de Ch" "\x89" "teau", /* 71 */
+ "Le ch" "\x89" "teau et les jardins", /* 72 */
+ "Chronologie", /* 73 */
+ "Bassin d'Apollon", /* 74 */
+ "Le Ch" "\x89" "teau", /* 75 */
+ "Colonnade", /* 76 */
+ "Labyrinthe", /* 77 */
+ "Latone", /* 78 */
+ "Orangerie", /* 79 */
+ "Parterre d'eau", /* 80 */
+ "Tapis vert", /* 81 */
+ "Grandes Ecuries", /* 82 */
+ "Petites Ecuries", /* 83 */
+ "Les jardins", /* 84 */
+ "Avant cour", /* 85 */
+ "Grand Canal", /* 86 */
+ "Parterre du Midi", /* 87 */
+ "Parterre du nord", /* 88 */
+ "Potager du Roi", /* 89 */
+ "Salle de bal", /* 90 */
+ "Bassin de Neptune", /* 91 */
+ "Pi" "\x8f" "ce d'eau des suisses", /* 92 */
+ "Aiguilles (Inutile!)", /* 93 */
+ "Ciseaux", /* 94 */
+ "Papier", /* 95 */
+ "Pamphlet sur les arts", /* 96 */
+ "Petite clef 1", /* 97 */
+ "Papier r" "\x8e" "v" "\x8e" "l" "\x8e", /* 98 */
+ "Papier t" "\x89" "ch" "\x8e", /* 99 */
+ "Papier du coffre", /* 100 */
+ "Pamphlet sur la lign" "\x8e" "e royale", /* 101 */
+ "Bougie allum" "\x8e" "e", /* 102 */
+ "Bougie", /* 103 */
+ "Clef ", /* 104 */
+ "Carton " "\x88" " dessin", /* 105 */
+ "Carton " "\x88" " dessin", /* 106 */
+ "Fausse esquisse", /* 107 */
+ "Echelle", /* 108 */
+ "Esquisse d" "\x8e" "truite", /* 109 */
+ "pinceau", /* 110 */
+ "pinceau Or", /* 111 */
+ "pinceau Rouge", /* 112 */
+ "Fusain", /* 113 */
+ "Papier", /* 114 */
+ "Pamphlet sur l" "\xd5" "architecture", /* 115 */
+ "Petite clef 2", /* 116 */
+ "Archer(inutile!)", /* 117 */
+ "Partition", /* 118 */
+ "Queue de billard", /* 119 */
+ "Autorisation", /* 120 */
+ "Reproduction des m" "\x8e" "dailles", /* 121 */
+ "Tiroir " "\x88" " m" "\x8e" "dailles", /* 122 */
+ "Clef de la petite porte d" "\xd5" "Apollon", /* 123 */
+ "Nourriture", /* 124 */
+ "Pamphlet sur la religion", /* 125 */
+ "Epigraphe", /* 126 */
+ "Pamphlet sur le gouvernement", /* 127 */
+ "Plume", /* 128 */
+ "Pense-b" "\x90" "te", /* 129 */
+ "Lunette", /* 130 */
+ "Plan Vauban", /* 131 */
+ "Plan Vauban", /* 132 */
+ "Cordon", /* 133 */
+ "Gravure", /* 134 */
+ "Petite clef 3", /* 135 */
+ "Petite clef 4", /* 136 */
+ "M" "\x8e" "morandum", /* 137 */
+ "Plans du chateau", /* 138 */
+ "Plans du chateau", /* 139 */
+ "Clef des combles", /* 140 */
+ "Fables", /* 141 */
+ "Plan du Labyrinthe", /* 142 */
+ "Outil", /* 143 */
+ "M" "\x8e" "dicament", /* 144 */
+ "Eteignoir", /* 145 */
+};
+
+static char const *const versaillesFRpaintings[] = {
+ "\"Entr" "\x8e" "e des animaux dans l'arche\"\rGerolamo Bassano", /* 0: 41201 */
+ "\"Le repas d'Emma" "\x9f" "s\"\rJacopo Bassano", /* 1: 41202 */
+ "\"La Madeleine aux pieds de J" "\x8e" "sus Christ\"\rSustris", /* 2: 41203 */
+ "\"La sortie de l'arche\"\rGerolamo Bassano ", /* 3: 41204 */
+ "\"Le frappement du rocher\"\rJacopo Bassano", /* 4: 41205 */
+ "\"La Bataille d'Arbelles\"\rJoseph Parrocel", /* 5: 41301 */
+ "\"Alexandre Le Grand vainqueur de Darius " "\x88" " la bataille "
+ "d'Arbelles\"\rLe Bourguignon", /* 6: 41302 */
+ "\"Le Combat de Leuze\"\rJoseph Parrocel", /* 7: 42401 */
+ "\"Sainte C" "\x8e" "cile avec un ange tenant une partition "
+ "musicale\"\rDominiquin", /* 8: 42901 */
+ "\"Don Francisco du Moncada \"\rVan Dyck", /* 9: 42902 */
+ "\"Le Petit Saint Jean Baptiste\"\rLe Carrache", /* 10: 42903 */
+ "\"Saint Mathieu\"\rValentin", /* 11: 42904 */
+ "\"Le Denier de C" "\x8e" "sar \"\rValentin", /* 12: 42905 */
+ "\"Saint Luc\"\rValentin", /* 13: 42906 */
+ "\"Le mariage mystique de Sainte Catherine\"\r Alessandro Turchi", /* 14: 42907 */
+ "\"R" "\x8e" "union de buveurs\"\rNicolas Tournier", /* 15: 42908 */
+ "\"La diseuse de Bonne aventure \"\rValentin", /* 16: 42909 */
+ "\"le roi David jouant de la harpe \"\rDominiquin", /* 17: 42910 */
+ "\"Sainte Madeleine\"\rDominiquin", /* 18: 42911 */
+ "\"Autoportrait \"\rVan Dyck", /* 19: 42912 */
+ "\"Saint Jean l'" "\x8e" "vang" "\x8e" "liste\"\r Valentin", /* 20: 42913 */
+ "\"Agar secouru par un ange \"\rGiovanni Lanfranco", /* 21: 42914 */
+ "\"Saint Marc \"\rValentin", /* 22: 42915 */
+ "\"M" "\x8e" "l" "\x8e" "agre ayant " "\x88" " ses pieds la hure "
+ "du sanglier de Calydon\"\r Jacques Rousseau", /* 23: 43090 */
+ "\"Le Roi en costume romain\"\rJean Warin", /* 24: 43091 */
+ "\"attalante\"\rJacques Rousseau", /* 25: 43092 */
+ "\"En" "\x8e" "e portant Anchise\"\rSpada", /* 26: 43100 */
+ "\"David et Bethsab" "\x8e" "e\"\rV" "\x8e" "ron" "\x8f" "se", /* 27: 43101 */
+ "\"La fuite en Egypte\"\rGuido R" "\x8e" "ni ", /* 28: 43102 */
+ "\"Louis XIV " "\x88" " cheval\"\rPierre Mignard", /* 29: 43103 */
+ "\"La magnificience royale & le progr" "\x8f" "s des beaux "
+ "arts\"\rHouasse", /* 30: 43104 */
+ "\"Le Sacrifice d'Iphig" "\x8e" "nie\"\rCharles de la Fosse", /* 31: 43130 */
+ "\"Buste de Louis XIV\"\rsculpt" "\x8e" " par le Chevalier Bernin ", /* 32: 43131 */
+ "\"Diane d" "\x8e" "couvrant son berger Endymion endormi dans les "
+ "bras de Morph" "\x8e" "e\"\rGabriel Blanchard", /* 33: 43132 */
+ "\"La vierge & Saint Pierre\"\rGuerchin", /* 34: 43140 */
+ "\"Les P" "\x8e" "lerins d'Emma" "\x9f" "s\"\rV" "\x8e" "ron"
+ "\x8f" "se", /* 35: 43141 */
+ "\"La sainte Famille\"\rV" "\x8e" "ron" "\x8f" "se", /* 36: 43142 */
+ "\"La famille de Darius aux pieds d'Alexandre\"\rCharles LeBrun", /* 37: 43143 */
+ "\"Saint Jean-Baptiste\"\rRapha" "\x91" "l", /* 38: 43144 */
+ "\"Marie de m" "\x8e" "dicis\"\rVan Dyck", /* 39: 43150 */
+ "\"Hercule luttant contre Achelous\"\rGuido R" "\x8e" "ni", /* 40: 43151 */
+ "\"Le Centaure Nessus porte Dejanire\"\rGuido R" "\x8e" "ni", /* 41: 43152 */
+ "\"Saint Fran" "\x8d" "ois d'Assise r" "\x8e" "confort" "\x8e" " "
+ "apr" "\x8f" "s sa stigmatisation\"\rSeghers", /* 42: 43153 */
+ "\"Thomiris faisant tremper la t" "\x90" "te de Cyrus dans le "
+ "sang\"\rRubens", /* 43: 43154 */
+ "\"Hercule tuant l'Hydre\"\rGuido R" "\x8e" "ni", /* 44: 43155 */
+ "\"Hercule sur le b" "\x9e" "cher\"\rGuido R" "\x8e" "ni", /* 45: 43156 */
+ "\"Portrait du Prince Palatin & de son fr" "\x8f" "re le Prince "
+ "Robert\"\rVan Dyck", /* 46: 43157 */
+ "\"La descente de Croix \"\rCharles Lebrun", /* 47: 45260 */
+};
+
+#endif
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 8312a3ce10..586eaa314c 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -751,6 +751,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
files.push_back("gui/themes/translations.dat");
files.push_back("dists/engine-data/access.dat");
files.push_back("dists/engine-data/cryo.dat");
+ files.push_back("dists/engine-data/cryomni3d.dat");
files.push_back("dists/engine-data/drascula.dat");
files.push_back("dists/engine-data/fonts.dat");
files.push_back("dists/engine-data/hugo.dat");
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 31673d8beb..080fd6ab56 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -7,6 +7,11 @@ TODO
cryo.dat
This file contains a lot of hardcoded tables used by the Cryo engine.
+cryomni3d.dat
+This file contains all strings and some file names depending only on platform/localization.
+Some filenames depend on the edition, these are handled by game flags in engine code.
+Those informations were stored in the original executables.
+
drascula.dat
TODO
diff --git a/dists/engine-data/cryomni3d.dat b/dists/engine-data/cryomni3d.dat
new file mode 100644
index 0000000000..a4a0bebe23
--- /dev/null
+++ b/dists/engine-data/cryomni3d.dat
Binary files differ
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 17b1caf54d..c7846fe0eb 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -36,6 +36,9 @@ access.dat FILE "dists/engine-data/access.dat"
#if PLUGIN_ENABLED_STATIC(CRYO)
cryo.dat FILE "dists/engine-data/cryo.dat"
#endif
+#if PLUGIN_ENABLED_STATIC(CRYOMNI3D)
+cryomni3d.dat FILE "dists/engine-data/cryomni3d.dat"
+#endif
#if PLUGIN_ENABLED_STATIC(DRASCULA)
drascula.dat FILE "dists/engine-data/drascula.dat"
#endif
diff --git a/engines/cryomni3d/cryomni3d.cpp b/engines/cryomni3d/cryomni3d.cpp
index 334bcd3d4d..35a4cceb09 100644
--- a/engines/cryomni3d/cryomni3d.cpp
+++ b/engines/cryomni3d/cryomni3d.cpp
@@ -34,6 +34,7 @@
#include "graphics/palette.h"
#include "cryomni3d/cryomni3d.h"
+#include "cryomni3d/datstream.h"
#include "cryomni3d/image/hlz.h"
#include "cryomni3d/video/hnm_decoder.h"
@@ -79,6 +80,26 @@ void CryOmni3DEngine::pauseEngineIntern(bool pause) {
*/
}
+DATSeekableStream *CryOmni3DEngine::getStaticData(uint32 gameId, uint16 version) const {
+ Common::File *datFile = new Common::File();
+
+ if (!datFile->open("cryomni3d.dat")) {
+ delete datFile;
+ error("Failed to open cryomni3d.dat file");
+ return nullptr;
+ }
+
+ DATSeekableStream *gameStream = DATSeekableStream::getGame(datFile, gameId, version, getLanguage(),
+ getPlatform());
+ if (!gameStream) {
+ delete datFile;
+ error("Failed to find game in cryomni3d.dat file");
+ return nullptr;
+ }
+
+ return gameStream;
+}
+
Common::String CryOmni3DEngine::prepareFileName(const Common::String &baseName,
const char *const *extensions) const {
Common::String fname(baseName);
diff --git a/engines/cryomni3d/cryomni3d.h b/engines/cryomni3d/cryomni3d.h
index 95f3b54efc..86803a17fc 100644
--- a/engines/cryomni3d/cryomni3d.h
+++ b/engines/cryomni3d/cryomni3d.h
@@ -61,6 +61,8 @@ class ImageDecoder;
*/
namespace CryOmni3D {
+class DATSeekableStream;
+
enum CryOmni3DGameType {
GType_VERSAILLES
};
@@ -155,6 +157,8 @@ public:
virtual void setupPalette(const byte *colors, uint start, uint num) = 0;
protected:
+ DATSeekableStream *getStaticData(uint32 gameId, uint16 version) const;
+
void copySubPalette(byte *dst, const byte *src, uint start, uint num);
void setPalette(const byte *colors, uint start, uint num);
void lockPalette(uint startRW, uint endRW) { _lockPaletteStartRW = startRW; _lockPaletteEndRW = endRW; }
diff --git a/engines/cryomni3d/datstream.cpp b/engines/cryomni3d/datstream.cpp
new file mode 100644
index 0000000000..461146fd35
--- /dev/null
+++ b/engines/cryomni3d/datstream.cpp
@@ -0,0 +1,146 @@
+/* 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 "cryomni3d/datstream.h"
+
+namespace CryOmni3D {
+
+DATSeekableStream *DATSeekableStream::getGame(Common::SeekableReadStream *stream,
+ uint32 gameId, uint16 version, Common::Language lang, Common::Platform platform) {
+ if (stream == nullptr) {
+ return nullptr;
+ }
+
+ // Go to start of file
+ stream->seek(0, SEEK_SET);
+
+ // ALl of this should match devtools/create_cryomni3d_dat
+
+ // Check header
+ byte header[8];
+ memset(header, 0, sizeof(header));
+ stream->read(header, sizeof(header));
+ if (memcmp(header, "CY3DDATA", sizeof(header))) {
+ return nullptr;
+ }
+
+ // Check version
+ uint16 fileVersion = stream->readUint16LE();
+ if (fileVersion != kFileVersion) {
+ return nullptr;
+ }
+
+ uint16 langTranslated = translateLanguage(lang);
+ uint32 platformTranslated = translatePlatform(platform);
+
+ uint16 games = stream->readUint16LE();
+
+ // Padding to align to 16 bytes boundary
+ (void)stream->readUint32LE();
+
+ for (uint16 game = 0; game < games; game++) {
+ // Keep tag readable
+ uint32 readGameId = stream->readUint32BE();
+ uint16 readVersion = stream->readUint16LE();
+ // Keep tag readable
+ uint16 readLang = stream->readUint16BE();
+ uint32 readPlatforms = stream->readUint32LE();
+ uint32 offset = stream->readUint32LE();
+ uint32 size = stream->readUint32LE();
+
+ if (gameId != readGameId) {
+ continue;
+ }
+ if (version != readVersion) {
+ continue;
+ }
+ if (langTranslated != readLang) {
+ continue;
+ }
+ if (!(platformTranslated & readPlatforms)) {
+ continue;
+ }
+
+ // If we are there, we got a match
+ return new DATSeekableStream(stream, offset, offset + size);
+ }
+
+ // No match
+ return nullptr;
+}
+
+Common::String DATSeekableStream::readString16() {
+ char *buf;
+ uint16 len;
+
+ len = readUint16LE();
+ buf = (char *)malloc(len);
+ read(buf, len);
+
+ Common::String s(buf, len);
+ free(buf);
+
+ return s;
+}
+
+void DATSeekableStream::readString16Array16(Common::StringArray &array) {
+ uint16 items;
+ uint16 i;
+
+ items = readUint16LE();
+
+ array.reserve(items);
+ for (i = 0; i < items; i++) {
+ array.push_back(readString16());
+ }
+}
+
+uint16 DATSeekableStream::translateLanguage(Common::Language lang) {
+ switch (lang) {
+ case Common::FR_FRA:
+ return MKTAG16('f', 'r');
+ default:
+ // Invalid language
+ return 0;
+ }
+}
+
+uint32 DATSeekableStream::translatePlatform(Common::Platform platform) {
+ switch (platform) {
+ case Common::kPlatformWindows:
+ return 0x1;
+ case Common::kPlatformDOS:
+ return 0x2;
+ case Common::kPlatformMacintosh:
+ return 0x4;
+ case Common::kPlatformPSX:
+ return 0x8;
+ case Common::kPlatformSegaCD:
+ return 0x10;
+ default:
+ // Invalid platform
+ return 0;
+ }
+}
+
+} // End of namespace CryOmni3D
diff --git a/engines/cryomni3d/datstream.h b/engines/cryomni3d/datstream.h
new file mode 100644
index 0000000000..78614ef7d1
--- /dev/null
+++ b/engines/cryomni3d/datstream.h
@@ -0,0 +1,58 @@
+/* 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 CRYOMNI3D_DATSTREAM_H
+#define CRYOMNI3D_DATSTREAM_H
+
+#include "common/language.h"
+#include "common/platform.h"
+#include "common/str.h"
+#include "common/str-array.h"
+#include "common/substream.h"
+
+namespace CryOmni3D {
+
+class DATSeekableStream : public Common::SeekableSubReadStream {
+public:
+
+ /* Parent stream must not be used after this call and will be disposed if fetch succeeded */
+ static DATSeekableStream *getGame(Common::SeekableReadStream *stream,
+ uint32 gameId, uint16 version, Common::Language lang, Common::Platform platform);
+
+ Common::String readString16();
+ void readString16Array16(Common::StringArray &array);
+
+private:
+ DATSeekableStream(SeekableReadStream *parentStream, uint32 start, uint32 end) :
+ SeekableSubReadStream(parentStream, start, end, DisposeAfterUse::YES) { }
+
+ static uint16 translateLanguage(Common::Language lang);
+ static uint32 translatePlatform(Common::Platform platform);
+
+ /* This is the version of the global file format
+ * Each game has then a version specific for its data */
+ static const uint16 kFileVersion = 1;
+};
+
+} // End of namespace CryOmni3D
+
+#endif
diff --git a/engines/cryomni3d/module.mk b/engines/cryomni3d/module.mk
index 30dd767fb5..830f4502f7 100644
--- a/engines/cryomni3d/module.mk
+++ b/engines/cryomni3d/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS = \
image/hlz.o \
video/hnm_decoder.o \
cryomni3d.o \
+ datstream.o \
detection.o \
dialogs_manager.o \
fixed_image.o \
diff --git a/engines/cryomni3d/versailles/data.cpp b/engines/cryomni3d/versailles/data.cpp
index af3dae45e4..f97e0da917 100644
--- a/engines/cryomni3d/versailles/data.cpp
+++ b/engines/cryomni3d/versailles/data.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "cryomni3d/datstream.h"
+
#include "cryomni3d/versailles/engine.h"
namespace CryOmni3D {
@@ -69,224 +71,27 @@ const FakeTransitionActionPlace CryOmni3DEngine_Versailles::kFakeTransitions[] =
{0, 0} // Must be the last one
};
-void CryOmni3DEngine_Versailles::setupMessages() {
- _messages.resize(146);
-#define SET_MESSAGE(id, str) _messages[id] = str
- SET_MESSAGE(0, "Il est interdit d'ouvrir cette porte pour l'instant.");
- SET_MESSAGE(1, "Cette porte est ferm" "\x8e" "e " "\x88" " clef.");
- SET_MESSAGE(2, "Cette porte est ferm" "\x8e" "e.");
- SET_MESSAGE(3, "Ce tiroir est vide.");
- SET_MESSAGE(4, "Vous ne pouvez pas atteindre la b" "\x89" "che.");
- SET_MESSAGE(5, "Il n'y a rien dans cet oranger");
- SET_MESSAGE(6, "Ceci n'est pas un oranger!");
- SET_MESSAGE(7, "Il fait trop sombre. ");
- SET_MESSAGE(8, "Le coffre est ferm" "\x8e" ". ");
- SET_MESSAGE(9, "Vous pouvez ouvrir la porte");
- SET_MESSAGE(10, "Il faudrait quelque chose pour atteindre la bombe.");
- SET_MESSAGE(11, "Ce vase est vide.");
- SET_MESSAGE(12, "Maintenant, vous pouvez y aller.");
- SET_MESSAGE(13, "Vous n" "\xd5" "avez plus le temps de vous renseigner sur la Cour!");
- SET_MESSAGE(14, "Il est trop tard pour regarder les tableaux!");
- SET_MESSAGE(16, "Vous ne pouvez pas atteindre le papier.");
- SET_MESSAGE(15, "Attendez ! Transmettez donc vos indices " "\x88" " l'huissier.");
- SET_MESSAGE(17, "Vers l'apothicairerie");
- SET_MESSAGE(
- 18,
- "Attention : Vous allez pouvoir terminer ce niveau, mais vous n'avez pas effectu" "\x8e"
- " toutes les actions necessaires pour la suite. "
- "Il est conseill" "\x8e" " de SAUVEGARDER votre partie maintenant.");
- SET_MESSAGE(
- 19,
- "Attention : Vous allez pouvoir terminer ce niveau, mais vous n'avez peut-" "\x90" "tre"
- " pas effectu" "\x8e" " toutes les actions necessaires pour la suite. "
- "Il est conseill" "\x8e" " de SAUVEGARDER votre partie maintenant.");
- SET_MESSAGE(20, "Vous ne pouvez pas vous d" "\x8e" "placer en portant une " "\x8e" "chelle!");
- SET_MESSAGE(21, "Il n'y a plus rien ici");
- SET_MESSAGE(22, "Au revoir ...");
- SET_MESSAGE(23, "VERSAILLES,");
- SET_MESSAGE(24, "Complot " "\x88" " la Cour du Roi Soleil");
- SET_MESSAGE(27, " Commencer une nouvelle partie");
- SET_MESSAGE(26, " Reprendre la partie en cours");
- SET_MESSAGE(44, " Reprendre la visite en cours");
- SET_MESSAGE(28, " Charger une partie");
- SET_MESSAGE(46, " Charger une visite");
- SET_MESSAGE(29, " Sauver la partie");
- SET_MESSAGE(45, " Sauver la visite");
- SET_MESSAGE(25, "Consulter l'espace documentaire");
- SET_MESSAGE(42, "Visiter le ch" "\x89" "teau");
- SET_MESSAGE(48, " Omni3D : normal");
- SET_MESSAGE(51, " Omni3D : rapide");
- SET_MESSAGE(52, " Omni3D : tr" "\x8f" "s rapide");
- SET_MESSAGE(49, " Omni3D : lent");
- SET_MESSAGE(50, " Omni3D : tr" "\x8f" "s lent");
- SET_MESSAGE(30, " Afficher les sous-titres : OUI");
- SET_MESSAGE(31, " Afficher les sous-titres : NON");
- SET_MESSAGE(32, " Musique : OUI");
- SET_MESSAGE(33, " Musique : NON");
- SET_MESSAGE(35, " Toutes les musiques sur disque dur (92 Mo)");
- SET_MESSAGE(34, " Une seule musique sur disque dur (20 Mo)");
- SET_MESSAGE(36, " Aucune musique sur disque dur (lecture CD)");
- SET_MESSAGE(43, "Cr" "\x8e" "dits");
- SET_MESSAGE(39, "Volume");
- SET_MESSAGE(41, "");
- SET_MESSAGE(40, "Quitter le jeu");
- SET_MESSAGE(53, "Confirmer");
- SET_MESSAGE(54, "Annuler");
- SET_MESSAGE(55, "libre");
- SET_MESSAGE(56, "sans nom");
- SET_MESSAGE(57, "Attention : la partie en cours va " "\x90" "tre abandonn" "\x8e" "e.");
- SET_MESSAGE(58, "Retour");
- SET_MESSAGE(59, "Le chateau");
- SET_MESSAGE(60, "Retour Menu Principal");
- SET_MESSAGE(61, "Sommaire Espace documentaire");
- SET_MESSAGE(62, "Plan du ch" "\x89" "teau et des jardins");
- SET_MESSAGE(63, "Plan des int" "\x8e" "rieurs du ch" "\x89" "teau");
- SET_MESSAGE(64, "Probl" "\x8f" "me d'" "\x8e" "criture sur dique dur : disque plein ");
- SET_MESSAGE(66, "Veuillez ins" "\x8e" "rer le CD ");
- SET_MESSAGE(67, "Veuillez ins" "\x8e" "rer le CD %d et presser une touche");
- SET_MESSAGE(68, "Les arts");
- SET_MESSAGE(69, "Le r" "\x8f" "gne");
- SET_MESSAGE(70, "La Cour");
- SET_MESSAGE(71, "Vie de Ch" "\x89" "teau");
- SET_MESSAGE(72, "Le ch" "\x89" "teau et les jardins");
- SET_MESSAGE(73, "Chronologie");
- SET_MESSAGE(74, "Bassin d'Apollon");
- SET_MESSAGE(75, "Le Ch" "\x89" "teau");
- SET_MESSAGE(76, "Colonnade");
- SET_MESSAGE(77, "Labyrinthe");
- SET_MESSAGE(78, "Latone");
- SET_MESSAGE(79, "Orangerie");
- SET_MESSAGE(80, "Parterre d'eau");
- SET_MESSAGE(81, "Tapis vert");
- SET_MESSAGE(86, "Grand Canal");
- SET_MESSAGE(87, "Parterre du Midi");
- SET_MESSAGE(88, "Parterre du nord");
- SET_MESSAGE(89, "Potager du Roi");
- SET_MESSAGE(90, "Salle de bal");
- SET_MESSAGE(91, "Bassin de Neptune");
- SET_MESSAGE(92, "Pi" "\x8f" "ce d'eau des suisses");
- SET_MESSAGE(82, "Grandes Ecuries");
- SET_MESSAGE(83, "Petites Ecuries");
- SET_MESSAGE(84, "Les jardins");
- SET_MESSAGE(85, "Avant cour");
- SET_MESSAGE(93, "Aiguilles (Inutile!)");
- SET_MESSAGE(94, "Ciseaux");
- SET_MESSAGE(95, "Papier");
- SET_MESSAGE(96, "Pamphlet sur les arts");
- SET_MESSAGE(97, "Petite clef 1");
- SET_MESSAGE(98, "Papier r" "\x8e" "v" "\x8e" "l" "\x8e" "");
- SET_MESSAGE(99, "Papier t" "\x89" "ch" "\x8e" "");
- SET_MESSAGE(100, "Papier du coffre");
- SET_MESSAGE(101, "Pamphlet sur la lign" "\x8e" "e royale");
- SET_MESSAGE(102, "Bougie allum" "\x8e" "e");
- SET_MESSAGE(103, "Bougie");
- SET_MESSAGE(104, "Clef ");
- SET_MESSAGE(105, "Carton " "\x88" " dessin");
- SET_MESSAGE(106, "Carton " "\x88" " dessin");
- SET_MESSAGE(107, "Fausse esquisse");
- SET_MESSAGE(108, "Echelle");
- SET_MESSAGE(109, "Esquisse d" "\x8e" "truite");
- SET_MESSAGE(110, "pinceau");
- SET_MESSAGE(111, "pinceau Or");
- SET_MESSAGE(112, "pinceau Rouge");
- SET_MESSAGE(113, "Fusain");
- SET_MESSAGE(114, "Papier");
- SET_MESSAGE(115, "Pamphlet sur l" "\xd5" "architecture");
- SET_MESSAGE(116, "Petite clef 2");
- SET_MESSAGE(117, "Archer(inutile!)");
- SET_MESSAGE(118, "Partition");
- SET_MESSAGE(119, "Queue de billard");
- SET_MESSAGE(120, "Autorisation");
- SET_MESSAGE(121, "Reproduction des m" "\x8e" "dailles");
- SET_MESSAGE(122, "Tiroir " "\x88" " m" "\x8e" "dailles");
- SET_MESSAGE(123, "Clef de la petite porte d" "\xd5" "Apollon");
- SET_MESSAGE(124, "Nourriture");
- SET_MESSAGE(125, "Pamphlet sur la religion");
- SET_MESSAGE(126, "Epigraphe");
- SET_MESSAGE(127, "Pamphlet sur le gouvernement");
- SET_MESSAGE(128, "Plume");
- SET_MESSAGE(129, "Pense-b" "\x90" "te");
- SET_MESSAGE(130, "Lunette");
- SET_MESSAGE(131, "Plan Vauban");
- SET_MESSAGE(132, "Plan Vauban");
- SET_MESSAGE(133, "Cordon");
- SET_MESSAGE(134, "Gravure");
- SET_MESSAGE(135, "Petite clef 3");
- SET_MESSAGE(136, "Petite clef 4");
- SET_MESSAGE(137, "M" "\x8e" "morandum");
- SET_MESSAGE(138, "Plans du chateau");
- SET_MESSAGE(139, "Plans du chateau");
- SET_MESSAGE(140, "Clef des combles");
- SET_MESSAGE(141, "Fables");
- SET_MESSAGE(142, "Plan du Labyrinthe");
- SET_MESSAGE(143, "Outil");
- SET_MESSAGE(144, "M" "\x8e" "dicament");
- SET_MESSAGE(145, "Eteignoir");
-#undef SET_MESSAGE
-}
+void CryOmni3DEngine_Versailles::loadStaticData() {
+ // This should match data in devtools/create_cryomni3d_dat
+ DATSeekableStream *data = getStaticData(MKTAG('V', 'R', 'S', 'L'), 1);
+
+ // In the dat file we have
+ // file names
+ data->readString16Array16(_localizedFilenames);
+ assert(_localizedFilenames.size() == LocalizedFilenames::kMax);
+
+ // epigraph settings, bomb password
+ _epigraphContent = data->readString16();
+ _epigraphPassword = data->readString16();
+ _bombPassword = data->readString16();
+
+ // messages, paintings titles
+ data->readString16Array16(_messages);
+ assert(_messages.size() == 146);
+ data->readString16Array16(_paintingsTitles);
+ assert(_paintingsTitles.size() == 48);
-void CryOmni3DEngine_Versailles::setupPaintingsTitles() {
- _paintingsTitles.reserve(48);
-#define SET_PAINTING_TITLE(str) _paintingsTitles.push_back(str)
- SET_PAINTING_TITLE("\"Entr" "\x8e" "e des animaux dans l'arche\"\rGerolamo Bassano"); // 0: 41201
- SET_PAINTING_TITLE("\"Le repas d'Emma" "\x9f" "s\"\rJacopo Bassano"); // 1: 41202
- SET_PAINTING_TITLE("\"La Madeleine aux pieds de J" "\x8e" "sus Christ\"\rSustris"); // 2: 41203
- SET_PAINTING_TITLE("\"La sortie de l'arche\"\rGerolamo Bassano"); // 3: 41204
- SET_PAINTING_TITLE("\"Le frappement du rocher\"\rJacopo Bassano"); // 4: 41205
- SET_PAINTING_TITLE("\"La Bataille d'Arbelles\"\rJoseph Parrocel"); // 5: 41301
- SET_PAINTING_TITLE("\"Alexandre Le Grand vainqueur de Darius " "\x88"
- " la bataille d'Arbelles\"\rLe Bourguignon"); // 6: 41302
- SET_PAINTING_TITLE("\"Le Combat de Leuze\"\rJoseph Parrocel"); // 7: 42401
- SET_PAINTING_TITLE("\"Sainte C" "\x8e"
- "cile avec un ange tenant une partition musicale\"\rDominiquin"); // 8: 42901
- SET_PAINTING_TITLE("\"Don Francisco du Moncada \"\rVan Dyck"); // 9: 42902
- SET_PAINTING_TITLE("\"Le Petit Saint Jean Baptiste\"\rLe Carrache"); // 10: 42903
- SET_PAINTING_TITLE("\"Saint Mathieu\"\rValentin"); // 11: 42904
- SET_PAINTING_TITLE("\"Le Denier de C" "\x8e" "sar \"\rValentin"); // 12: 42905
- SET_PAINTING_TITLE("\"Saint Luc\"\rValentin"); // 13: 42906
- SET_PAINTING_TITLE("\"Le mariage mystique de Sainte Catherine\"\r Alessandro Turchi"); // 14: 42907
- SET_PAINTING_TITLE("\"R" "\x8e" "union de buveurs\"\rNicolas Tournier"); // 15: 42908
- SET_PAINTING_TITLE("\"La diseuse de Bonne aventure \"\rValentin"); // 16: 42909
- SET_PAINTING_TITLE("\"le roi David jouant de la harpe \"\rDominiquin"); // 17: 42910
- SET_PAINTING_TITLE("\"Sainte Madeleine\"\rDominiquin"); // 18: 42911
- SET_PAINTING_TITLE("\"Autoportrait \"\rVan Dyck"); // 19: 42912
- SET_PAINTING_TITLE("\"Saint Jean l'" "\x8e" "vang" "\x8e" "liste\"\r Valentin"); // 20: 42913
- SET_PAINTING_TITLE("\"Agar secouru par un ange \"\rGiovanni Lanfranco"); // 21: 42914
- SET_PAINTING_TITLE("\"Saint Marc \"\rValentin"); // 22: 42915
- SET_PAINTING_TITLE("\"M" "\x8e" "l" "\x8e" "agre ayant " "\x88"
- " ses pieds la hure du sanglier de Calydon\"\r Jacques Rousseau"); // 23: 43090
- SET_PAINTING_TITLE("\"Le Roi en costume romain\"\rJean Warin"); // 24: 43091
- SET_PAINTING_TITLE("\"attalante\"\rJacques Rousseau"); // 25: 43092
- SET_PAINTING_TITLE("\"En" "\x8e" "e portant Anchise\"\rSpada"); // 26: 43100
- SET_PAINTING_TITLE("\"David et Bethsab" "\x8e" "e\"\rV" "\x8e" "ron" "\x8f" "se"); // 27: 43101
- SET_PAINTING_TITLE("\"La fuite en Egypte\"\rGuido R" "\x8e" "ni "); // 28: 43102
- SET_PAINTING_TITLE("\"Louis XIV " "\x88" " cheval\"\rPierre Mignard"); // 29: 43103
- SET_PAINTING_TITLE("\"La magnificience royale & le progr" "\x8f"
- "s des beaux arts\"\rHouasse"); // 30: 43104
- SET_PAINTING_TITLE("\"Le Sacrifice d'Iphig" "\x8e" "nie\"\rCharles de la Fosse"); // 31: 43130
- SET_PAINTING_TITLE("\"Buste de Louis XIV\"\rsculpt" "\x8e"
- " par le Chevalier Bernin "); // 32: 43131
- SET_PAINTING_TITLE("\"Diane d" "\x8e" "couvrant son berger Endymion endormi dans les bras de Morph"
- "\x8e" "e\"\rGabriel Blanchard"); // 33: 43132
- SET_PAINTING_TITLE("\"La vierge & Saint Pierre\"\rGuerchin"); // 34: 43140
- SET_PAINTING_TITLE("\"Les P" "\x8e" "lerins d'Emma" "\x9f" "s\"\rV" "\x8e" "ron" "\x8f"
- "se"); // 35: 43141
- SET_PAINTING_TITLE("\"La sainte Famille\"\rV" "\x8e" "ron" "\x8f" "se"); // 36: 43142
- SET_PAINTING_TITLE("\"La famille de Darius aux pieds d'Alexandre\"\rCharles LeBrun"); // 37: 43143
- SET_PAINTING_TITLE("\"Saint Jean-Baptiste\"\rRapha" "\x91" "l"); // 38: 43144
- SET_PAINTING_TITLE("\"Marie de m" "\x8e" "dicis\"\rVan Dyck"); // 39: 43150
- SET_PAINTING_TITLE("\"Hercule luttant contre Achelous\"\rGuido R" "\x8e" "ni"); // 40: 43151
- SET_PAINTING_TITLE("\"Le Centaure Nessus porte Dejanire\"\rGuido R" "\x8e" "ni"); // 41: 43152
- SET_PAINTING_TITLE("\"Saint Fran" "\x8d" "ois d'Assise r" "\x8e" "confort" "\x8e" " apr" "\x8f"
- "s sa stigmatisation\"\rSeghers"); // 42: 43153
- SET_PAINTING_TITLE("\"Thomiris faisant tremper la t" "\x90"
- "te de Cyrus dans le sang\"\rRubens"); // 43: 43154
- SET_PAINTING_TITLE("\"Hercule tuant l'Hydre\"\rGuido R" "\x8e" "ni"); // 44: 43155
- SET_PAINTING_TITLE("\"Hercule sur le b" "\x9e" "cher\"\rGuido R" "\x8e" "ni"); // 45: 43156
- SET_PAINTING_TITLE("\"Portrait du Prince Palatin & de son fr" "\x8f"
- "re le Prince Robert\"\rVan Dyck"); // 46: 43157
- SET_PAINTING_TITLE("\"La descente de Croix \"\rCharles Lebrun"); // 47: 45260
-#undef SET_PAINTING_TITLE
+ delete data;
}
struct VideoSubSetting {
diff --git a/engines/cryomni3d/versailles/documentation.cpp b/engines/cryomni3d/versailles/documentation.cpp
index c74aaa90c7..c207d9df12 100644
--- a/engines/cryomni3d/versailles/documentation.cpp
+++ b/engines/cryomni3d/versailles/documentation.cpp
@@ -35,8 +35,6 @@
namespace CryOmni3D {
namespace Versailles {
-const char *Versailles_Documentation::kAllDocsFile = "tous_doc.txt";
-const char *Versailles_Documentation::kLinksDocsFile = "lien_doc.txt";
const Versailles_Documentation::TimelineEntry Versailles_Documentation::kTimelineEntries[] = {
{ "1638", 340, 15 },
{ "1643", 470, 30 },
@@ -84,17 +82,20 @@ const Versailles_Documentation::TimelineEntry Versailles_Documentation::kTimelin
};
void Versailles_Documentation::init(const Sprites *sprites, FontManager *fontManager,
- const Common::StringArray *messages, CryOmni3DEngine *engine) {
+ const Common::StringArray *messages, CryOmni3DEngine *engine,
+ const Common::String &allDocsFileName, const Common::String &linksDocsFileName) {
_sprites = sprites;
_fontManager = fontManager;
_messages = messages;
_engine = engine;
+ _allDocsFileName = allDocsFileName;
+ _linksDocsFileName = linksDocsFileName;
// Build list of records
Common::File allDocsFile;
- if (!allDocsFile.open(kAllDocsFile)) {
- error("Can't open %s", kAllDocsFile);
+ if (!allDocsFile.open(_allDocsFileName)) {
+ error("Can't open %s", _allDocsFileName.c_str());
}
uint allDocsSize = allDocsFile.size();
@@ -1940,8 +1941,8 @@ Common::String Versailles_Documentation::getRecordTitle(const Common::String &re
const RecordInfo &recordInfo = it->_value;
Common::File allDocsFile;
- if (!allDocsFile.open(kAllDocsFile)) {
- error("Can't open %s", kAllDocsFile);
+ if (!allDocsFile.open(_allDocsFileName)) {
+ error("Can't open %s", _allDocsFileName.c_str());
}
allDocsFile.seek(recordInfo.position);
@@ -1969,8 +1970,8 @@ Common::String Versailles_Documentation::getRecordData(const Common::String &rec
const RecordInfo &recordInfo = it->_value;
Common::File allDocsFile;
- if (!allDocsFile.open(kAllDocsFile)) {
- error("Can't open %s", kAllDocsFile);
+ if (!allDocsFile.open(_allDocsFileName)) {
+ error("Can't open %s", _allDocsFileName.c_str());
}
allDocsFile.seek(recordInfo.position);
@@ -2014,8 +2015,8 @@ void Versailles_Documentation::loadLinksFile() {
}
Common::File linksFile;
- if (!linksFile.open(kLinksDocsFile)) {
- error("Can't open links file: %s", kLinksDocsFile);
+ if (!linksFile.open(_linksDocsFileName)) {
+ error("Can't open links file: %s", _linksDocsFileName.c_str());
}
_linksSize = linksFile.size();
diff --git a/engines/cryomni3d/versailles/documentation.h b/engines/cryomni3d/versailles/documentation.h
index 1808956e2e..dd889e1469 100644
--- a/engines/cryomni3d/versailles/documentation.h
+++ b/engines/cryomni3d/versailles/documentation.h
@@ -44,7 +44,8 @@ public:
~Versailles_Documentation() { delete [] _linksData; }
void init(const Sprites *sprites, FontManager *fontManager, const Common::StringArray *messages,
- CryOmni3DEngine *engine);
+ CryOmni3DEngine *engine, const Common::String &allDocsFileName,
+ const Common::String &linksDocsFileName);
void handleDocArea();
void handleDocInGame(const Common::String &record);
@@ -109,8 +110,8 @@ private:
void loadLinksFile();
void getLinks(const Common::String &record, Common::Array<LinkInfo> &links);
- static const char *kAllDocsFile;
- static const char *kLinksDocsFile;
+ Common::String _allDocsFileName;
+ Common::String _linksDocsFileName;
static const uint kPopupMenuMargin = 5;
diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp
index 98a34e31d5..7fba90102c 100644
--- a/engines/cryomni3d/versailles/engine.cpp
+++ b/engines/cryomni3d/versailles/engine.cpp
@@ -122,17 +122,18 @@ Common::Error CryOmni3DEngine_Versailles::run() {
SearchMan.add("__fallbackFiles", fallbackFiles);
- setupMessages();
+ // First thing, load all data that was originally in the executable
+ // We don't need anything prepared for that
+ loadStaticData();
_dialogsMan.init(138, _messages[22]);
_gameVariables.resize(GameVariables::kMax);
_omni3dMan.init(75. / 180. * M_PI);
- _dialogsMan.loadGTO("DIALOG1.GTO");
+ _dialogsMan.loadGTO(_localizedFilenames[LocalizedFilenames::kDialogs]);
setupDialogVariables();
setupDialogShows();
- setupPaintingsTitles();
setupImgScripts();
_mainPalette = new byte[3 * 256];
@@ -162,7 +163,9 @@ Common::Error CryOmni3DEngine_Versailles::run() {
// Documentation is needed by noone at init time, let's do it last
initDocPeopleRecord();
- _docManager.init(&_sprites, &_fontManager, &_messages, this);
+ _docManager.init(&_sprites, &_fontManager, &_messages, this,
+ _localizedFilenames[LocalizedFilenames::kAllDocs],
+ _localizedFilenames[LocalizedFilenames::kLinksDocs]);
_countdownSurface.create(40, 15, Graphics::PixelFormat::createFormatCLUT8());
diff --git a/engines/cryomni3d/versailles/engine.h b/engines/cryomni3d/versailles/engine.h
index ff00dfd385..95747ced42 100644
--- a/engines/cryomni3d/versailles/engine.h
+++ b/engines/cryomni3d/versailles/engine.h
@@ -168,6 +168,17 @@ struct SoundIds {
};
};
+struct LocalizedFilenames {
+ enum {
+ kDialogs = 0,
+ kAllDocs,
+ kLinksDocs,
+ kCredits,
+ kLeb001,
+ kMax
+ };
+};
+
struct PlaceState {
typedef void (CryOmni3DEngine_Versailles::*InitFunc)();
typedef bool (CryOmni3DEngine_Versailles::*FilterEventFunc)(uint *event);
@@ -242,11 +253,10 @@ private:
void setupSprites();
void loadCursorsPalette();
void calculateTransparentMapping();
- void setupMessages();
void setupObjects();
void setupDialogVariables();
void setupImgScripts();
- void setupPaintingsTitles();
+ void loadStaticData();
void syncOmni3DSettings();
void syncSoundSettings();
@@ -340,6 +350,7 @@ private:
void musicStop();
void musicSetQuiet(bool quiet);
+ Common::StringArray _localizedFilenames;
Common::StringArray _messages;
static const uint kSpritesMapTable[];
static const uint kSpritesMapTableSize;
@@ -509,8 +520,8 @@ private:
IMG_CB(44161e);
IMG_CB(44161f);
static const uint kEpigraphMaxLetters = 32;
- static const char *kEpigraphContent;
- static const char *kEpigraphPassword;
+ Common::String _epigraphContent;
+ Common::String _epigraphPassword;
bool handleEpigraph(ZonFixedImage *fimg);
void drawEpigraphLetters(Graphics::ManagedSurface &surface,
const Graphics::Surface(&bmpLetters)[28], const Common::String &letters);
@@ -531,13 +542,13 @@ private:
IMG_CB(88003d);
IMG_CB(88003e);
IMG_CB(88003f);
+ Common::String _bombPassword;
static const uint kBombPasswordSmallLength = 40;
static const uint kBombPasswordMaxLength = 60;
static const uint16 kBombLettersPos[2][kBombPasswordMaxLength][2];
- static const char *kBombPassword;
bool handleBomb(ZonFixedImage *fimg);
void drawBombLetters(Graphics::ManagedSurface &surface, const Graphics::Surface(&bmpLetters)[28],
- const uint kBombPasswordLength,
+ const uint bombPasswordLength,
const unsigned char (&bombPossibilites)[kBombPasswordMaxLength][5],
const unsigned char (&bombCurrentLetters)[kBombPasswordMaxLength]);
IMG_CB(88004);
diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp
index e46c1a7ca0..952489c41e 100644
--- a/engines/cryomni3d/versailles/logic.cpp
+++ b/engines/cryomni3d/versailles/logic.cpp
@@ -187,7 +187,7 @@ void CryOmni3DEngine_Versailles::obj_126hk(Graphics::ManagedSurface &surface) {
Graphics::Surface bmpLetters[28];
loadBMPs("bomb_%02d.bmp", bmpLetters, 28);
- drawEpigraphLetters(surface, bmpLetters, kEpigraphPassword);
+ drawEpigraphLetters(surface, bmpLetters, _epigraphPassword);
for (uint i = 0; i < 28; i++) {
bmpLetters[i].free();
@@ -2361,7 +2361,7 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) {
continue;
}
// Find which letter got clicked
- char letter = kEpigraphContent[fimg->_currentZone];
+ char letter = _epigraphContent[fimg->_currentZone];
password += letter;
// Reset the surface and redraw digits on it
tempSurf.blitFrom(*fimgSurface);
@@ -2379,7 +2379,7 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) {
}
if (keyCode >= Common::KEYCODE_a &&
keyCode <= Common::KEYCODE_z &&
- strchr(kEpigraphContent, keyCode - Common::KEYCODE_a + 'A')) {
+ _epigraphContent.contains(keyCode - Common::KEYCODE_a + 'A')) {
password += keyCode - Common::KEYCODE_a + 'A';
} else {
continue;
@@ -2391,7 +2391,7 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) {
fimg->updateSurface(&tempSurf.rawSurface());
}
- if (password == kEpigraphPassword) {
+ if (password == _epigraphPassword) {
success = true;
break;
}
@@ -2403,9 +2403,6 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) {
return success;
}
-const char *CryOmni3DEngine_Versailles::kEpigraphContent = "FELIXFORTUNADIVINUMEXPLORATUMACTUIIT";
-const char *CryOmni3DEngine_Versailles::kEpigraphPassword = "LELOUPETLATETE";
-
void CryOmni3DEngine_Versailles::drawEpigraphLetters(Graphics::ManagedSurface &surface,
const Graphics::Surface(&bmpLetters)[28], const Common::String &letters) {
for (uint i = 0; i < letters.size() && i < kEpigraphMaxLetters; i++) {
@@ -2934,14 +2931,14 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) {
unsigned char bombCurrentLetters[60];
Graphics::ManagedSurface tempSurf;
- const uint kBombPasswordLength = strlen(kBombPassword);
- if (kBombPasswordLength >= kBombPasswordMaxLength) {
+ const uint bombPasswordLength = _bombPassword.size();
+ if (bombPasswordLength >= kBombPasswordMaxLength) {
error("Bomb password is too long");
}
loadBMPs("bomb_%02d.bmp", bmpLetters, 28);
- for (uint i = 0; i < kBombPasswordLength; i++) {
- bombPossibilites[i][0] = toupper(kBombPassword[i]);
+ for (uint i = 0; i < bombPasswordLength; i++) {
+ bombPossibilites[i][0] = toupper(_bombPassword[i]);
for (uint j = 1; j < 5; j++) {
bool foundSameLetter;
do {
@@ -2957,7 +2954,7 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) {
bombCurrentLetters[i] = rnd.getRandomNumber(4);
}
- if (kBombPasswordLength <= kBombPasswordSmallLength) {
+ if (bombPasswordLength <= kBombPasswordSmallLength) {
fimg->load("70z_16.GIF");
} else {
fimg->load("70z_17.GIF");
@@ -2965,7 +2962,7 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) {
const Graphics::Surface *fimgSurface = fimg->surface();
tempSurf.create(fimgSurface->w, fimgSurface->h, fimgSurface->format);
tempSurf.blitFrom(*fimgSurface);
- drawBombLetters(tempSurf, bmpLetters, kBombPasswordLength, bombPossibilites, bombCurrentLetters);
+ drawBombLetters(tempSurf, bmpLetters, bombPasswordLength, bombPossibilites, bombCurrentLetters);
drawCountdown(&tempSurf);
fimg->updateSurface(&tempSurf.rawSurface());
@@ -2975,12 +2972,12 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) {
break;
}
if (fimg->_zoneUse) {
- if (fimg->_currentZone < kBombPasswordLength) {
+ if (fimg->_currentZone < bombPasswordLength) {
// Safe digit
bombCurrentLetters[fimg->_currentZone] = (bombCurrentLetters[fimg->_currentZone] + 1) % 5;
// Reset the surface and redraw letters on it
tempSurf.blitFrom(*fimgSurface);
- drawBombLetters(tempSurf, bmpLetters, kBombPasswordLength, bombPossibilites, bombCurrentLetters);
+ drawBombLetters(tempSurf, bmpLetters, bombPasswordLength, bombPossibilites, bombCurrentLetters);
drawCountdown(&tempSurf);
fimg->updateSurface(&tempSurf.rawSurface());
@@ -2988,9 +2985,9 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) {
// Check if password is OK
success = true;
- for (uint i = 0; i < kBombPasswordLength; i++) {
+ for (uint i = 0; i < bombPasswordLength; i++) {
unsigned char letterChar = bombPossibilites[i][bombCurrentLetters[i]];
- if (letterChar != kBombPassword[i]) {
+ if (letterChar != _bombPassword[i]) {
success = false;
break;
}
@@ -3013,7 +3010,6 @@ bool CryOmni3DEngine_Versailles::handleBomb(ZonFixedImage *fimg) {
return success;
}
-const char *CryOmni3DEngine_Versailles::kBombPassword = "JEMENVAISMAISLETATDEMEURERATOUJOURS";
const uint16 CryOmni3DEngine_Versailles::kBombLettersPos[2][kBombPasswordMaxLength][2] = {
{
{26, 91},
@@ -3122,11 +3118,11 @@ const uint16 CryOmni3DEngine_Versailles::kBombLettersPos[2][kBombPasswordMaxLeng
};
void CryOmni3DEngine_Versailles::drawBombLetters(Graphics::ManagedSurface &surface,
- const Graphics::Surface(&bmpLetters)[28], const uint kBombPasswordLength,
+ const Graphics::Surface(&bmpLetters)[28], const uint bombPasswordLength,
const unsigned char (&bombPossibilites)[kBombPasswordMaxLength][5],
const unsigned char (&bombCurrentLetters)[kBombPasswordMaxLength]) {
- uint table = kBombPasswordLength <= kBombPasswordSmallLength ? 0 : 1;
- for (uint i = 0; i < kBombPasswordLength; i++) {
+ uint table = bombPasswordLength <= kBombPasswordSmallLength ? 0 : 1;
+ for (uint i = 0; i < bombPasswordLength; i++) {
unsigned char letterChar = bombPossibilites[i][bombCurrentLetters[i]];
uint letterId = 0;
if (letterChar >= 'A' && letterChar <= 'Z') {
@@ -3232,8 +3228,8 @@ FILTER_EVENT(1, 2) {
INIT_PLACE(1, 3) {
if (!_gameVariables[GameVariables::kHasPlayedLebrun]) {
Common::File *audioFile = new Common::File();
- if (!audioFile->open("LEB001__.WAV")) {
- warning("Failed to open sound file %s", "LEB001__.WAV");
+ if (!audioFile->open(_localizedFilenames[LocalizedFilenames::kLeb001])) {
+ warning("Failed to open sound file %s", _localizedFilenames[LocalizedFilenames::kLeb001].c_str());
delete audioFile;
return;
}
diff --git a/engines/cryomni3d/versailles/menus.cpp b/engines/cryomni3d/versailles/menus.cpp
index 9e072e8262..2459882657 100644
--- a/engines/cryomni3d/versailles/menus.cpp
+++ b/engines/cryomni3d/versailles/menus.cpp
@@ -956,8 +956,9 @@ void CryOmni3DEngine_Versailles::displayCredits() {
_fontManager.setSurface(&creditsSurface);
Common::File creditsFile;
- if (!creditsFile.open("credits.txt")) {
- warning("Failed to open credits file: %s", "credits.txt");
+ if (!creditsFile.open(_localizedFilenames[LocalizedFilenames::kCredits])) {
+ warning("Failed to open credits file: %s",
+ _localizedFilenames[LocalizedFilenames::kCredits].c_str());
delete imageDecoder;
return;
}