diff options
| -rw-r--r-- | dists/engine-data/hugo.dat | bin | 174483 -> 174689 bytes | |||
| -rw-r--r-- | engines/hugo/hugo.cpp | 2 | ||||
| -rw-r--r-- | engines/hugo/hugo.h | 2 | ||||
| -rw-r--r-- | engines/hugo/util.h | 11 | ||||
| -rw-r--r-- | tools/create_hugo/create_hugo.cpp | 7 | ||||
| -rw-r--r-- | tools/create_hugo/create_hugo.h | 2 | ||||
| -rw-r--r-- | tools/create_hugo/staticutil.h | 19 |
7 files changed, 17 insertions, 26 deletions
diff --git a/dists/engine-data/hugo.dat b/dists/engine-data/hugo.dat Binary files differindex 465f6cccb4..02f995cc56 100644 --- a/dists/engine-data/hugo.dat +++ b/dists/engine-data/hugo.dat diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 5c1b7d8d4e..f648473bdb 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -464,7 +464,7 @@ bool HugoEngine::loadHugoDat() { _textSchedule = loadTexts(in); // Read textUtil - _textUtil = loadTexts(in); + _textUtil = loadTextsVariante(in, 0); // Read _arrayReqs _arrayReqs = loadLongArray(in); diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 4cfd9b0485..4f371117ab 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -34,7 +34,7 @@ #include "hugo/game.h" #define HUGO_DAT_VER_MAJ 0 // 1 byte -#define HUGO_DAT_VER_MIN 27 // 1 byte +#define HUGO_DAT_VER_MIN 28 // 1 byte #define DATAALIGNMENT 4 #define EDGE 10 // Closest object can get to edge of screen #define EDGE2 (EDGE * 2) // Push object further back on edge collision diff --git a/engines/hugo/util.h b/engines/hugo/util.h index 7120ebf771..4cf30b1903 100644 --- a/engines/hugo/util.h +++ b/engines/hugo/util.h @@ -36,16 +36,7 @@ namespace Hugo { enum seqTextUtil { - kTech = 0, - kErr1 = 1, - kErr2 = 2, - kErr3 = 3, - kErr4 = 4, - kErr5 = 5, - kErr6 = 6, - kGameOver = 7 -// kObsoleteErr1 = 8, -// kObsoleteErr2 = 9 + kGameOver = 0 }; namespace Utils { diff --git a/tools/create_hugo/create_hugo.cpp b/tools/create_hugo/create_hugo.cpp index 921d09d7ef..2b39b80c63 100644 --- a/tools/create_hugo/create_hugo.cpp +++ b/tools/create_hugo/create_hugo.cpp @@ -369,7 +369,12 @@ int main(int argc, char *argv[]) { writeTextArray(outFile, textSchedule, NUM_SCHEDULE_TEXT); // Write textUtil - writeTextArray(outFile, textUtil, NUM_UTIL_TEXT); + writeTextArray(outFile, textUtil_v1w, NUM_UTIL_TEXT); + writeTextArray(outFile, textUtil_v1w, NUM_UTIL_TEXT); + writeTextArray(outFile, textUtil_v1w, NUM_UTIL_TEXT); + writeTextArray(outFile, textUtil_v1d, NUM_UTIL_TEXT); + writeTextArray(outFile, textUtil_v1d, NUM_UTIL_TEXT); + writeTextArray(outFile, textUtil_v1d, NUM_UTIL_TEXT); // arrayReqs_1w nbrElem = sizeof(arrayReqs_1w) / sizeof(uint16 *); diff --git a/tools/create_hugo/create_hugo.h b/tools/create_hugo/create_hugo.h index bae0aa4592..a3cca0efe1 100644 --- a/tools/create_hugo/create_hugo.h +++ b/tools/create_hugo/create_hugo.h @@ -31,7 +31,7 @@ #define DATAALIGNMENT 4 #define HUGO_DAT_VER_MAJ 0 // 1 byte -#define HUGO_DAT_VER_MIN 27 // 1 byte +#define HUGO_DAT_VER_MIN 28 // 1 byte typedef unsigned char uint8; typedef unsigned char byte; diff --git a/tools/create_hugo/staticutil.h b/tools/create_hugo/staticutil.h index 090b07de93..050655a4de 100644 --- a/tools/create_hugo/staticutil.h +++ b/tools/create_hugo/staticutil.h @@ -33,19 +33,14 @@ #ifndef STATICUTIL_H #define STATICUTIL_H -#define NUM_UTIL_TEXT 8 - -const char *textUtil[NUM_UTIL_TEXT] = { - "\n\nPlease read the supplied 'technote' file which may contain information on this problem.", - "File not found: ", - "Unable to write file.\nDisk full or perhaps read-only?\n", - "Bad data file format:\n", - "Insufficient memory to run game.\n", - "Sound missing from sound file:\n", - "An error has occurred.\n", +#define NUM_UTIL_TEXT 1 + +const char *textUtil_v1w[NUM_UTIL_TEXT] = { "I'm afraid all you can do at this point is:\n\n- Load a saved game (Ctrl+L)\n- Start a new game (Ctrl+N)\n- Quit! (Alt+F4)" -// "No timers available, try again later.\n", -// "Unable to find or load VBX file:\n" +}; + +const char *textUtil_v1d[NUM_UTIL_TEXT] = { + "I'm afraid all you can do\nat this point is restore\na saved game or quit!" }; #endif //STATICENGINE_H |