Wrote the string map for V7. Gui colors are still bad

svn-id: r3847

3 files changed, 56 insertions, 4 deletions

diff --git a/gui.cpp b/gui.cpp
index dc9e4bf255..6625ed53f8 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -672,6 +672,9 @@ const char *Gui::queryString(int stringno, int id) {
 	if (stringno == 0)
 		return NULL;
 
+	if (_s->_features&GF_AFTER_V7)
+		string = _s->_vars[string_map_table_v7[stringno-1].num];
+	else
 	if (_s->_features&GF_AFTER_V6)
 		string = _s->_vars[string_map_table_v6[stringno-1].num];
 	else
diff --git a/gui.h b/gui.h
index 0b1cd15d2a..114cf168c5 100644
--- a/gui.h
+++ b/gui.h
@@ -48,6 +48,53 @@ static const char* string_map_table_custom[] = {
 	"Options"										//17
 };
 
+static ResString string_map_table_v7[] = {
+	{96, "game name and version"}, //that's how it's supposed to be
+	{77, "Select a game to LOAD"},
+	{76, "Name your SAVE game"},
+        {70, "save"}, //boot8
+	{71, "load"}, //boot9
+	{72, "play"}, //boot10
+	{73, "cancel"}, //boot11
+	{74, "quit"}, //boot12
+	{75, "ok"}, //boot13
+	{85, "game paused"}, // boot3					
+	
+	/* this is the almost complete string map for v7
+	{63, "how may I serve you?"},
+	{64, "the dig v1.0"}, //(game name/version)
+	{67, "text display only"},
+	{68, "c:\\dig"}, //boot007 (save path ?)
+	{69, "the dig"}, //boot21 (game name)
+	{70, "save"}, //boot8
+	{71, "load"}, //boot9
+	{72, "play"}, //boot10
+	{73, "cancel"}, //boot11
+	{74, "quit"}, //boot12
+	{75, "ok"}, //boot13
+	{76, "name your save game"}, //boot19
+	{77, "select a game to load"}, //boot20
+	{78, "you must enter a name"},//boot14
+	{79, "saving '%s'"}, //boot17
+	{80, "loading '%s'"}, //boot18
+	{81, "the game was NOT saved"}, //boot15
+	{82, "the game was NOT loaded"}, //boot16
+	{83, "how may I serve you?"},
+	{84, "how may I serve you?"},
+	{85, "game paused"}, // boot3
+	{86, "Are you sure you want to restart"},
+	{87, "Are you sure you want to quit?"}, //boot05
+	{89, "how may I serve you?"},
+	{90, "music"}, //boot22
+	{91, "voice"}, //boot23
+	{92, "sfx"}, //boot24
+	{93, "disabled"}, //boot25
+	{94, "text speed"}, //boot26
+	{95, "text display"}, //boot27
+	{96, "the dig v1.0"},*/
+	
+};
+
 static ResString string_map_table_v6[] = {
 	{117, "How may I serve you?"}, 
 	{109, "Select a game to LOAD"}, 
diff --git a/insane.cpp b/insane.cpp
index 498baceae3..77333c2198 100644
--- a/insane.cpp
+++ b/insane.cpp
@@ -111,10 +111,10 @@ bool SmushPlayer::parseTag() {
 
 
 void SmushPlayer::parseAHDR() {
-	memcpy(_fluPalette, _block, 0x300);
+//	memcpy(_fluPalette, _block, 0x300);
 	_paletteChanged = true;
 
-	printf("parse AHDR\n");
+//	printf("parse AHDR\n");
 }
 
 
@@ -499,12 +499,14 @@ void SmushPlayer::parseXPAL() {
 		return;
 	}
 
-	for(i=0; i<0x300; i++) {
+	parseNPAL();
+
+/*	for(i=0; i<0x300; i++) {
 		_fluPalMul129[i] += _fluPalWords[i];
 		_fluPalette[i] = _fluPalMul129[i]>>7;
 	}
 
-	_paletteChanged = true;
+	_paletteChanged = true;*/
 }
 
 void SmushPlayer::parseFRME() {