Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624

9 files changed, 63 insertions, 156 deletions

diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h
index 7fee5fbee1..3775e904ff 100644
--- a/engines/saga/displayinfo.h
+++ b/engines/saga/displayinfo.h
@@ -348,9 +348,9 @@ static PanelButton IHNM_QuitPanelButtons[] = {
 };
 
 static PanelButton IHNM_LoadPanelButtons[] = {
-	// TODO
-	{kPanelButtonLoad, 101,19, 60,16, kTextOK,'o',0, 0,0,0},
-	{kPanelButtonLoadText, -1,5, 0,0, kTextLoadSuccessful,'-',0, 0,0,0},
+	{kPanelButtonLoad,		26,80,	80,25,	kTextOK,'o',0, 0,0,0},
+	{kPanelButtonLoad,		156,80,	80,25,	kTextCancel,'c',0, 0,0,0},
+	{kPanelButtonLoadText,	-1,30,	0,0,	kTextLoadSavedGame,'-',0, 0,0,0},
 };
 
 static PanelButton IHNM_SavePanelButtons[] = {
diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp
index 7789949393..482b3a4c82 100644
--- a/engines/saga/font.cpp
+++ b/engines/saga/font.cpp
@@ -240,6 +240,13 @@ void Font::createOutline(FontData *font) {
 	}
 }
 
+int Font::translateChar(int charId) {
+	if (charId <= 127)
+		return charId;					// normal character
+	else
+		return _charMap[charId - 128];	// extended character
+}
+
 // Returns the horizontal length in pixels of the graphical representation
 // of at most 'count' characters of the string 'text', taking
 // into account any formatting options specified by 'flags'.
@@ -259,7 +266,7 @@ int Font::getStringWidth(FontId fontId, const char *text, size_t count, FontEffe
 	for (ct = count; *txt && (!count || ct > 0); txt++, ct--) {
 		ch = *txt & 0xFFU;
 		// Translate character
-		ch = _charMap[ch];
+		ch = translateChar(ch);
 		assert(ch < FONT_CHARCOUNT);
 		width += font->normal.fontCharEntry[ch].tracking;
 	}
@@ -338,11 +345,11 @@ void Font::outFont(const FontStyle &drawFont, Surface *ds, const char *text, siz
 				// Don't do any special font mapping for the Italian fan
 				// translation of ITE
 				if (_vm->getLanguage() != Common::IT_ITA)
-					c_code = _charMap[c_code];
+					c_code = translateChar(c_code);
 			}
 		} else if (_fontMapping == 1) {
 			// Force font mapping
-			c_code = _charMap[c_code];
+			c_code = translateChar(c_code);
 		} else {
 			// In all other cases, ignore font mapping
 		}
diff --git a/engines/saga/font.h b/engines/saga/font.h
index 6b930ddca0..76c0f06725 100644
--- a/engines/saga/font.h
+++ b/engines/saga/font.h
@@ -158,6 +158,7 @@ class Font {
 	 };
 
 	 Font::FontId knownFont2FontIdx(KnownFont font);
+	 int translateChar(int charId);
 
 	 int getStringWidth(FontId fontId, const char *text, size_t count, FontEffectFlags flags);
 	 int getHeight(FontId fontId, const char *text, int width, FontEffectFlags flags);
@@ -196,7 +197,7 @@ class Font {
 		 return byteLength;
 	 }
 
-	static const int _charMap[256];
+	static const int _charMap[128];
 	SagaEngine *_vm;
 
 	bool _initialized;
diff --git a/engines/saga/font_map.cpp b/engines/saga/font_map.cpp
index 6246cb71da..6abaeea151 100644
--- a/engines/saga/font_map.cpp
+++ b/engines/saga/font_map.cpp
@@ -32,135 +32,8 @@
 
 namespace Saga {
 
-const int Font::_charMap[256] = {
-	0,			//   0
-	1,			//   1
-	2,			//   2
-	3,			//   3
-	4,			//   4
-	5,			//   5
-	6,			//   6
-	7,			//   7
-	8,			//   8
-	9,			//   9
-	10,			//  10
-	11,			//  11
-	12,			//  12
-	13,			//  13
-	14,			//  14
-	15,			//  15
-	16,			//  16
-	17,			//  17
-	18,			//  18
-	19,			//  19
-	20,			//  20
-	21,			//  21
-	22,			//  22
-	23,			//  23
-	24,			//  24
-	25,			//  25
-	26,			//  26
-	27,			//  27
-	28,			//  28
-	29,			//  29
-	30,			//  30
-	31,			//  31
-	32,			//  32
-	33,			//  33
-	34,			//  34
-	35,			//  35
-	36,			//  36
-	37,			//  37
-	38,			//  38
-	39,			//  39
-	40,			//  40
-	41,			//  41
-	42,			//  42
-	43,			//  43
-	44,			//  44
-	45,			//  45
-	46,			//  46
-	47,			//  47
-	48,			//  48
-	49,			//  49
-	50,			//  50
-	51,			//  51
-	52,			//  52
-	53,			//  53
-	54,			//  54
-	55,			//  55
-	56,			//  56
-	57,			//  57
-	58,			//  58
-	59,			//  59
-	60,			//  60
-	61,			//  61
-	62,			//  62
-	63,			//  63
-	64,			//  64
-	65,			//  65
-	66,			//  66
-	67,			//  67
-	68,			//  68
-	69,			//  69
-	70,			//  70
-	71,			//  71
-	72,			//  72
-	73,			//  73
-	74,			//  74
-	75,			//  75
-	76,			//  76
-	77,			//  77
-	78,			//  78
-	79,			//  79
-	80,			//  80
-	81,			//  81
-	82,			//  82
-	83,			//  83
-	84,			//  84
-	85,			//  85
-	86,			//  86
-	87,			//  87
-	88,			//  88
-	89,			//  89
-	90,			//  90
-	91,			//  91
-	92,			//  92
-	93,			//  93
-	94,			//  94
-	95,			//  95
-	96,			//  96
-	97,			//  97
-	98,			//  98
-	99,			//  99
-	100,		// 100
-	101,		// 101
-	102,		// 102
-	103,		// 103
-	104,		// 104
-	105,		// 105
-	106,		// 106
-	107,		// 107
-	108,		// 108
-	109,		// 109
-	110,		// 110
-	111,		// 111
-	112,		// 112
-	113,		// 113
-	114,		// 114
-	115,		// 115
-	116,		// 116
-	117,		// 117
-	118,		// 118
-	119,		// 119
-	120,		// 120
-	121,		// 121
-	122,		// 122
-	123,		// 123
-	124,		// 124
-	125,		// 125
-	126,		// 126
-	127,		// 127
+const int Font::_charMap[128] = {
+	// Characters 0 - 127 are mapped directly to ISO 8859-1
 	199,		// 128 LATIN CAPITAL LETTER C WITH CEDILLA
 	252,		// 129 LATIN SMALL LETTER U WITH DIAERESIS
 	233,		// 130 LATIN SMALL LETTER E WITH ACUTE
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 9d3831062c..4a4573ccef 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -94,7 +94,7 @@ static int IHNMTextStringIdsLUT[56] = {
 	8,	// Give
 	10,	// Options
 	11,	// Test
-	12,	//
+	12,	// Demo
 	13,	// Help
 	14,	// Quit Game
 	16,	// Fast
@@ -905,10 +905,13 @@ void Interface::drawPanelText(Surface *ds, InterfacePanel *panel, PanelButton *p
 		textFont = kKnownFontMedium;
 		textShadowKnownColor = kKnownColorVerbTextShadow;
 	} else {
-		if (panelButton->id < 39 || panelButton->id > 50) {
+		if ((panelButton->id < 39 || panelButton->id > 50) && panelButton->id != kTextLoadSavedGame) {
 			// Read non-hardcoded strings from the LUT string table, loaded from the game
 			// data files
 			text = _vm->_script->_mainStrings.getString(IHNMTextStringIdsLUT[panelButton->id]);
+		} else if (panelButton->id == kTextLoadSavedGame) {
+			// a bit of a kludge, but it will do
+			text = _vm->getTextString(52);
 		} else {
 			// Hardcoded strings in IHNM are read from the ITE hardcoded strings
 			text = _vm->getTextString(panelButton->id);
@@ -1142,7 +1145,21 @@ void Interface::setLoad(PanelButton *panelButton) {
 	_loadPanel.currentButton = NULL;
 	switch (panelButton->id) {
 		case kTextOK:
-			setMode(kPanelMain);
+			if (_vm->getGameType() == GType_ITE) {
+				setMode(kPanelMain);
+			} else {
+				if (_vm->getSaveFilesCount() > 0) {
+					if (_vm->isSaveListFull() || (_optionSaveFileTitleNumber > 0)) {
+						debug(1, "Loading save game %d", _vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
+						setMode(kPanelMain);
+						_vm->load(_vm->calcSaveFileName(_vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber));
+					}
+				}
+			}
+			break;
+		case kTextCancel:
+			// IHNM only
+			setMode(kPanelOption);
 			break;
 	}
 }
@@ -1573,7 +1590,6 @@ void Interface::handleChapterSelectionClick(const Point& mousePoint) {
 }
 
 void Interface::setOption(PanelButton *panelButton) {
-	char * fileName;
 	_optionPanel.currentButton = NULL;
 	switch (panelButton->id) {
 	case kTextContinuePlaying:
@@ -1594,13 +1610,16 @@ void Interface::setOption(PanelButton *panelButton) {
 		setMode(kPanelQuit);
 		break;
 	case kTextLoad:
-		if (_vm->getSaveFilesCount() > 0) {
-			if (_vm->isSaveListFull() || (_optionSaveFileTitleNumber > 0)) {
-				debug(1, "Loading save game %d", _vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
-				fileName = _vm->calcSaveFileName(_vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
-				setMode(kPanelMain);
-				_vm->load(fileName);
+		if (_vm->getGameType() == GType_ITE) {
+			if (_vm->getSaveFilesCount() > 0) {
+				if (_vm->isSaveListFull() || (_optionSaveFileTitleNumber > 0)) {
+					debug(1, "Loading save game %d", _vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
+					setMode(kPanelMain);
+					_vm->load(_vm->calcSaveFileName(_vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber));
+				}
 			}
+		} else {
+			setMode(kPanelLoad);
 		}
 		break;
 	case kTextSave:
diff --git a/engines/saga/itedata.cpp b/engines/saga/itedata.cpp
index 43c3d21012..bbd5cbb615 100644
--- a/engines/saga/itedata.cpp
+++ b/engines/saga/itedata.cpp
@@ -339,7 +339,7 @@ FxTable ITE_SfxTable[ITE_SFXCOUNT] = {
 	{ 73,    64 }
 };
 
-const char *ITEinterfaceTextStrings[][52] = {
+const char *ITEinterfaceTextStrings[][53] = {
 	{
 		// Note that the "Load Successful!" string is never used in ScummVM
 		"Walk to", "Look At", "Pick Up", "Talk to", "Open",
@@ -358,7 +358,8 @@ const char *ITEinterfaceTextStrings[][52] = {
 		"There's no opening to close.",
 		"I don't know how to do that.",
 		"Show Dialog",
-		"What is Rif's reply?"
+		"What is Rif's reply?",
+		"Loading a saved game"
 	},
 	// German
 	{
@@ -378,7 +379,8 @@ const char *ITEinterfaceTextStrings[][52] = {
 		"Hier ist keine \231ffnung zum Schlie$en.",
 		"Ich wei$ nicht, wie ich das machen soll.",
 		"Text zeigen",
-		"Wie lautet die Antwort?"
+		"Wie lautet die Antwort?",
+		"Spielstand wird geladen"
 	},
 	// Italian fan translation
 	{
@@ -398,7 +400,8 @@ const char *ITEinterfaceTextStrings[][52] = {
 		"Nessuna apertura da chiudere.",
 		"Non saprei come farlo.",
 		"Dialoghi",
-		"Come risponderebbe Rif?"
+		"Come risponderebbe Rif?",
+		"Vuoi davvero caricare il gioco?"
 	},
 	// Spanish IHNM
 	{
@@ -420,7 +423,8 @@ const char *ITEinterfaceTextStrings[][52] = {
 		NULL,
 		NULL,
 		NULL,
-		NULL
+		NULL,
+		"Cardango una partida guardada"
 	}
 };
 
diff --git a/engines/saga/itedata.h b/engines/saga/itedata.h
index 00efd070c1..6d0f5a9d70 100644
--- a/engines/saga/itedata.h
+++ b/engines/saga/itedata.h
@@ -88,7 +88,7 @@ struct FxTable {
 extern ObjectTableData ITE_ObjectTable[ITE_OBJECTCOUNT];
 extern FxTable ITE_SfxTable[ITE_SFXCOUNT];
 
-extern const char *ITEinterfaceTextStrings[][52];
+extern const char *ITEinterfaceTextStrings[][53];
 
 #define PUZZLE_PIECES 15
 
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 123c11eb7d..0b6b3b1478 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -295,7 +295,8 @@ enum TextStringIds {
 	kTextVoices,
 	kTextText,
 	kTextAudio,
-	kTextBoth
+	kTextBoth,
+	kTextLoadSavedGame
 };
 
 struct GameResourceDescription {
diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index be4f2a423d..d9c7b446ba 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -74,9 +74,11 @@ Sprite::Sprite(SagaEngine *vm) : _vm(vm) {
 Sprite::~Sprite(void) {
 	debug(8, "Shutting down sprite subsystem...");
 	_mainSprites.freeMem();
-	_inventorySprites.freeMem();
-	_arrowSprites.freeMem();
-	_saveReminderSprites.freeMem();
+	if (_vm->getGameType() == GType_IHNM) {
+		_inventorySprites.freeMem();
+		_arrowSprites.freeMem();
+		_saveReminderSprites.freeMem();
+	}
 	free(_decodeBuf);
 }