[Scummvm-cvs-logs] SF.net SVN: scummvm:[54202] scummvm/trunk

[strangerke at users.sourceforge.net]

Revision: 54202
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54202&view=rev
Author:   strangerke
Date:     2010-11-11 15:01:57 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
TOOL: Suppress useless strings in textUtil 

Also add DOS version for this text array

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/hugo.dat
    scummvm/trunk/engines/hugo/hugo.cpp
    scummvm/trunk/engines/hugo/hugo.h
    scummvm/trunk/engines/hugo/util.h
    scummvm/trunk/tools/create_hugo/create_hugo.cpp
    scummvm/trunk/tools/create_hugo/create_hugo.h
    scummvm/trunk/tools/create_hugo/staticutil.h

Modified: scummvm/trunk/dists/engine-data/hugo.dat
===================================================================
(Binary files differ)

Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp	2010-11-11 14:19:44 UTC (rev 54201)
+++ scummvm/trunk/engines/hugo/hugo.cpp	2010-11-11 15:01:57 UTC (rev 54202)
@@ -464,7 +464,7 @@
 	_textSchedule = loadTexts(in);
 
 	// Read textUtil
-	_textUtil = loadTexts(in);
+	_textUtil = loadTextsVariante(in, 0);
 
 	// Read _arrayReqs
 	_arrayReqs = loadLongArray(in);

Modified: scummvm/trunk/engines/hugo/hugo.h
===================================================================
--- scummvm/trunk/engines/hugo/hugo.h	2010-11-11 14:19:44 UTC (rev 54201)
+++ scummvm/trunk/engines/hugo/hugo.h	2010-11-11 15:01:57 UTC (rev 54202)
@@ -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

Modified: scummvm/trunk/engines/hugo/util.h
===================================================================
--- scummvm/trunk/engines/hugo/util.h	2010-11-11 14:19:44 UTC (rev 54201)
+++ scummvm/trunk/engines/hugo/util.h	2010-11-11 15:01:57 UTC (rev 54202)
@@ -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 {

Modified: scummvm/trunk/tools/create_hugo/create_hugo.cpp
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.cpp	2010-11-11 14:19:44 UTC (rev 54201)
+++ scummvm/trunk/tools/create_hugo/create_hugo.cpp	2010-11-11 15:01:57 UTC (rev 54202)
@@ -369,7 +369,12 @@
 	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 *);

Modified: scummvm/trunk/tools/create_hugo/create_hugo.h
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.h	2010-11-11 14:19:44 UTC (rev 54201)
+++ scummvm/trunk/tools/create_hugo/create_hugo.h	2010-11-11 15:01:57 UTC (rev 54202)
@@ -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;

Modified: scummvm/trunk/tools/create_hugo/staticutil.h
===================================================================
--- scummvm/trunk/tools/create_hugo/staticutil.h	2010-11-11 14:19:44 UTC (rev 54201)
+++ scummvm/trunk/tools/create_hugo/staticutil.h	2010-11-11 15:01:57 UTC (rev 54202)
@@ -33,19 +33,14 @@
 #ifndef STATICUTIL_H
 #define STATICUTIL_H
 
-#define NUM_UTIL_TEXT 8
+#define NUM_UTIL_TEXT 1
 
-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",
+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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.