KYRA: (EOB) - update static resources (menu strings)

4 files changed, 88 insertions, 2 deletions

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 8b28e86f2e..9ead3c2408 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -956,6 +956,28 @@ protected:
 
 	const uint8 *_magicFlightObjectProperties;
 
+	// Menu
+	const char *const *_menuStringsMain;
+	const char *const *_menuStringsSaveLoad;
+	const char *const *_menuStringsOnOff;
+	const char *const *_menuStringsSpells;
+	const char *const *_menuStringsRest;
+	const char *const *_menuStringsDrop;
+	const char *const *_menuStringsExit;
+	const char *const *_menuStringsStarve;
+	const char *const *_menuStringsScribe;
+	const char *const *_menuStringsDrop2;
+	const char *const *_menuStringsHead;
+	const char *const *_menuStringsPoison;
+	const char *const *_menuStringsMgc;
+	const char *const *_menuStringsPrefs;
+	const char *const *_menuStringsRest2;
+	const char *const *_menuStringsDefeat;
+
+	const char *const *_menuStringsTransfer;
+	const char *const *_menuStringsSpec;
+	const char *const *_menuStringsSpellNo;
+
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
 };
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 34ab19034d..02af458d65 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -834,6 +834,29 @@ int EobCoreEngine::clickedCharPortraitDefault(Button *button) {
 }
 
 int EobCoreEngine::clickedCamp(Button *button) {
+	gui_updateControls();
+	disableSysTimer(2);
+	int cd = _screen->curDimIndex();
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		_characters[i].damageTaken = 0;
+		_characters[i].slotStatus[0] = _characters[i].slotStatus[1] = 0;
+		gui_drawCharPortraitWithStats(i);
+	}
+
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	
+
+	_screen->setFont(of);
+	_screen->setCurPage(0);
+	_screen->setScreenDim(cd);
+
+	enableSysTimer(2);	
+	updateCharacterEvents(true);
+
 	return button->arg;
 }
 
@@ -1317,13 +1340,14 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 
 		case 7:
 			// Food ration
-			/* don't do anything if mouse control is enabled */
-			//eatItemInHand(charIndex);
+			// Don't do anything if mouse control is enabled (we don't support anything else)
+			// eatItemInHand(charIndex);
 			break;
 
 		case 10:
 			if (_flags.gameID == GI_EOB1)
 				vl += _clericSpellOffset;
+			// drop through
 		case 9:
 			// Mage/Cleric Scroll
 			if (!_currentControlMode)
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 2f93adde3c..90a3e74b19 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -299,6 +299,26 @@ enum KyraResources {
 	kEobBaseCancelStrings,
 	kEobBaseAbortStrings,
 
+	kEobBaseMenuStringsMain,
+	kEobBaseMenuStringsSaveLoad,
+	kEobBaseMenuStringsOnOff,
+	kEobBaseMenuStringsSpells,
+	kEobBaseMenuStringsRest,
+	kEobBaseMenuStringsDrop,
+	kEobBaseMenuStringsExit,
+	kEobBaseMenuStringsStarve,
+	kEobBaseMenuStringsScribe,
+	kEobBaseMenuStringsDrop2,
+	kEobBaseMenuStringsHead,
+	kEobBaseMenuStringsPoison,
+	kEobBaseMenuStringsMgc,
+	kEobBaseMenuStringsPrefs,
+	kEobBaseMenuStringsRest2,
+	kEobBaseMenuStringsDefeat,
+	kEobBaseMenuStringsTransfer,
+	kEobBaseMenuStringsSpec,
+	kEobBaseMenuStringsSpellNo,
+
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
 	kEobBaseCharGuiStringsWp2,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index a291a486f4..da4e6752b0 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -366,6 +366,26 @@ void EobCoreEngine::initStaticResource() {
 	_cancelStrings = _staticres->loadStrings(kEobBaseCancelStrings, temp);
 	_abortStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseAbortStrings : kEobBaseCancelStrings, temp);
 
+	_menuStringsMain = _staticres->loadStrings(kEobBaseMenuStringsMain, temp);
+	_menuStringsSaveLoad = _staticres->loadStrings(kEobBaseMenuStringsSaveLoad, temp);
+	_menuStringsOnOff = _staticres->loadStrings(kEobBaseMenuStringsOnOff, temp);
+	_menuStringsSpells = _staticres->loadStrings(kEobBaseMenuStringsSpells, temp);
+	_menuStringsRest = _staticres->loadStrings(kEobBaseMenuStringsRest, temp);
+	_menuStringsDrop = _staticres->loadStrings(kEobBaseMenuStringsDrop, temp);
+	_menuStringsExit = _staticres->loadStrings(kEobBaseMenuStringsExit, temp);
+	_menuStringsStarve = _staticres->loadStrings(kEobBaseMenuStringsStarve, temp);
+	_menuStringsScribe = _staticres->loadStrings(kEobBaseMenuStringsScribe, temp);
+	_menuStringsDrop2 = _staticres->loadStrings(kEobBaseMenuStringsDrop2, temp);
+	_menuStringsHead = _staticres->loadStrings(kEobBaseMenuStringsHead, temp);
+	_menuStringsPoison = _staticres->loadStrings(kEobBaseMenuStringsPoison, temp);
+	_menuStringsMgc = _staticres->loadStrings(kEobBaseMenuStringsMgc, temp);
+	_menuStringsPrefs = _staticres->loadStrings(kEobBaseMenuStringsPrefs, temp);
+	_menuStringsRest2 = _staticres->loadStrings(kEobBaseMenuStringsRest2, temp);
+	_menuStringsDefeat = _staticres->loadStrings(kEobBaseMenuStringsDefeat, temp);
+	_menuStringsTransfer = _staticres->loadStrings(kEobBaseMenuStringsTransfer, temp);
+	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
+	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
+
 	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
 	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
 	_characterGuiStringsWr = _staticres->loadStrings(kEobBaseCharGuiStringsWr, temp);