From 2846ce14f35afc029fe058b3ed50c229ef856615 Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Tue, 25 Jan 2011 00:32:48 +0000
Subject: HUGO: Move text arrays to a separate class

svn-id: r55507
---
 tools/create_hugo/create_hugo.cpp | 40 +++++++++++++++++++--------------------
 tools/create_hugo/create_hugo.h   |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'tools/create_hugo')

diff --git a/tools/create_hugo/create_hugo.cpp b/tools/create_hugo/create_hugo.cpp
index c10a8e2da2..01b6d915f0 100644
--- a/tools/create_hugo/create_hugo.cpp
+++ b/tools/create_hugo/create_hugo.cpp
@@ -97,6 +97,12 @@ int main(int argc, char *argv[]) {
 	// game versions/variantes
 	writeUint16BE(outFile, NUM_VARIANTE);
 
+	// Write palette
+	writeUint16BE(outFile, SIZE_PAL_ARRAY);
+	for (i = 0; i < SIZE_PAL_ARRAY; i++) {
+		writeByte(outFile, _palette[i]);
+	}
+
 	// Write textData
 	// textData_1w
 	nbrElem = sizeof(textData_1w) / sizeof(char *);
@@ -304,12 +310,6 @@ int main(int argc, char *argv[]) {
 	nbrElem = sizeof(screenNames_3d) / sizeof(char *);
 	writeTextArray(outFile, screenNames_3d, nbrElem);
 
-	// Write palette
-	writeUint16BE(outFile, SIZE_PAL_ARRAY);
-	for (i = 0; i < SIZE_PAL_ARRAY; i++) {
-		writeByte(outFile, _palette[i]);
-	}
-
 	// Write textEngine
 	writeTextArray(outFile, textEngine, NUM_ENGINE_TEXT);
 
@@ -321,6 +321,20 @@ int main(int argc, char *argv[]) {
 	writeTextArray(outFile, textIntro_dummy, NUM_INTRO_TEXT_DUMMY);
 	writeTextArray(outFile, textIntro_v3, NUM_INTRO_TEXT_V3);
 
+	// Write textMouse
+	writeTextArray(outFile, textMouse, NUM_MOUSE_TEXT);
+
+	// Write textParser
+	writeTextArray(outFile, textParser, NUM_PARSER_TEXT);
+
+	// Write textUtil
+	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);
+
 	// Write x_intro and y_intro
 	writeUint16BE(outFile, NUM_INTRO_TICK_DUMMY);
 	for (i = 0; i < NUM_INTRO_TICK_DUMMY; i++) {
@@ -358,20 +372,6 @@ int main(int argc, char *argv[]) {
 		writeByte(outFile, y_intro_v3[i]);
 	}
 
-	// Write textMouse
-	writeTextArray(outFile, textMouse, NUM_MOUSE_TEXT);
-
-	// Write textParser
-	writeTextArray(outFile, textParser, NUM_PARSER_TEXT);
-
-	// Write textUtil
-	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 *);
 	writeUint16Array(outFile, arrayReqs_1w, nbrElem);
diff --git a/tools/create_hugo/create_hugo.h b/tools/create_hugo/create_hugo.h
index 26b2ecb291..7fb5d761ba 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 40 // 1 byte
+#define HUGO_DAT_VER_MIN 41 // 1 byte
 
 typedef unsigned char  uint8;
 typedef unsigned char  byte;
-- 
cgit v1.2.3