From 045d08986d3accc3fc7d55d76eb550db01ad7fc7 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 22 Jun 2011 01:08:28 +0200
Subject: KYRA: (EOB) - start implementing camp menu

---
 engines/kyra/eobcommon.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'engines/kyra/eobcommon.cpp')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 3f9782a343..d193bc0842 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -55,8 +55,6 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 		_weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
 	_tempIconShape = 0;
 
-	_menuStringsPrefsTemp = 0;
-
 	_monsterDustStrings = 0;
 	_monsterDistAttType10 = 0;
 	_monsterDistAttSfx10 = 0;
@@ -106,6 +104,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_color10 = 23;
 	_color11 = 20;
 
+	_menuDefs = 0;
+
 	_exchangeCharacterId = -1;
 	_charExchangeSwap = 0;
 	_configHpBarGraphs = true;
@@ -143,12 +143,6 @@ EobCoreEngine::~EobCoreEngine() {
 	releaseItemsAndDecorationsShapes();
 	releaseTempData();
 
-	if (_menuStringsPrefsTemp) {
-		for (int i = 0; i < 4; i++)
-			delete _menuStringsPrefsTemp[i];
-		delete[] _menuStringsPrefsTemp;
-	}
-
 	if (_faceShapes) {
 		for (int i = 0; i < 44; i++) {
 			if (_characters) {
@@ -207,6 +201,9 @@ EobCoreEngine::~EobCoreEngine() {
 
 	delete _gui;
 	_gui = 0;
+	delete[] _menuDefs;
+	_menuDefs = 0;
+
 	delete _inf;
 	delete _timer;
 	_timer = 0;
@@ -265,12 +262,10 @@ Common::Error EobCoreEngine::init() {
 		return err;
 
 	initButtonData();
+	initMenus();
 	initStaticResource();
 	initSpells();
 
-	_menuStringsPrefsTemp = new char*[4];
-	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
-
 	_timer = new TimerManager(this, _system);
 	assert(_timer);
 	setupTimers();
-- 
cgit v1.2.3