Renamed kyra2 and kyra3 gui files.

svn-id: r31866

10 files changed, 99 insertions, 99 deletions

diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_hof.cpp
index a063109667..4449b7b9c8 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -80,25 +80,25 @@ void KyraEngine_HoF::setupLangButtonShapes() {
 	}
 }
 
-GUI_v2::GUI_v2(KyraEngine_HoF *vm) : GUI(vm), _vm(vm), _screen(vm->screen_v2()) {
+GUI_HoF::GUI_HoF(KyraEngine_HoF *vm) : GUI(vm), _vm(vm), _screen(vm->screen_v2()) {
 	_backUpButtonList = _unknownButtonList = 0;
 	initStaticData();
 	_currentMenu = 0;
 	_isDeathMenu = false;
 	_isSaveMenu = false;
 	_isLoadMenu = false;
-	_scrollUpFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::scrollUpButton);
-	_scrollDownFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::scrollDownButton);
-	_sliderHandlerFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::sliderHandler);
+	_scrollUpFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::scrollUpButton);
+	_scrollDownFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::scrollDownButton);
+	_sliderHandlerFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::sliderHandler);
 }
 
-Button *GUI_v2::addButtonToList(Button *list, Button *newButton) {
+Button *GUI_HoF::addButtonToList(Button *list, Button *newButton) {
 	list = GUI::addButtonToList(list, newButton);
 	_buttonListChanged = true;
 	return list;
 }
 
-void GUI_v2::processButton(Button *button) {
+void GUI_HoF::processButton(Button *button) {
 	if (!button)
 		return;
 
@@ -185,7 +185,7 @@ void GUI_v2::processButton(Button *button) {
 	_screen->updateScreen();
 }
 
-int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag) {
+int GUI_HoF::processButtonList(Button *buttonList, uint16 inputFlag) {
 	static uint16 flagsModifier = 0;
 
 	if (!buttonList)
@@ -420,21 +420,21 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag) {
 	return returnValue;
 }
 
-const char *GUI_v2::getMenuTitle(const Menu &menu) {
+const char *GUI_HoF::getMenuTitle(const Menu &menu) {
 	if (!menu.menuNameId)
 		return 0;
 
 	return _vm->getTableString(menu.menuNameId, _vm->_optionsBuffer, 1);
 }
 
-const char *GUI_v2::getMenuItemTitle(const MenuItem &menuItem) {
+const char *GUI_HoF::getMenuItemTitle(const MenuItem &menuItem) {
 	if (!menuItem.itemId)
 		return 0;
 
 	return _vm->getTableString(menuItem.itemId, _vm->_optionsBuffer, 1);
 }
 
-const char *GUI_v2::getMenuItemLabel(const MenuItem &menuItem) {
+const char *GUI_HoF::getMenuItemLabel(const MenuItem &menuItem) {
 	if (!menuItem.labelId)
 		return 0;
 
@@ -998,7 +998,7 @@ int KyraEngine_HoF::cauldronButton(Button *button) {
 
 #pragma mark -
 
-void GUI_v2::getInput() {
+void GUI_HoF::getInput() {
 	if (!_displayMenu)
 		return;
 
@@ -1013,7 +1013,7 @@ void GUI_v2::getInput() {
 	}
 }
 
-int GUI_v2::optionsButton(Button *button) {
+int GUI_HoF::optionsButton(Button *button) {
 	_restartGame = false;
 	_reloadTemporarySave = false;
 
@@ -1126,7 +1126,7 @@ int GUI_v2::optionsButton(Button *button) {
 
 #pragma mark -
 
-void GUI_v2::renewHighlight(Menu &menu) {
+void GUI_HoF::renewHighlight(Menu &menu) {
 	if (!_displayMenu)
 		return;
 
@@ -1139,7 +1139,7 @@ void GUI_v2::renewHighlight(Menu &menu) {
 	_screen->updateScreen();
 }
 
-void GUI_v2::setupPalette() {
+void GUI_HoF::setupPalette() {
 	memcpy(_screen->getPalette(1), _screen->getPalette(0), 768);
 
 	uint8 *palette = _screen->getPalette(0);
@@ -1157,20 +1157,20 @@ void GUI_v2::setupPalette() {
 		_screen->setScreenPalette(_screen->getPalette(0));
 }
 
-void GUI_v2::restorePalette() {
+void GUI_HoF::restorePalette() {
 	memcpy(_screen->getPalette(0), _screen->getPalette(1), 768);
 	_screen->setScreenPalette(_screen->getPalette(0));
 }
 
-void GUI_v2::backUpPage1(uint8 *buffer) {
+void GUI_HoF::backUpPage1(uint8 *buffer) {
 	_screen->copyRegionToBuffer(1, 0, 0, 320, 200, buffer);
 }
 
-void GUI_v2::restorePage1(const uint8 *buffer) {
+void GUI_HoF::restorePage1(const uint8 *buffer) {
 	_screen->copyBlockToPage(1, 0, 0, 320, 200, buffer);
 }
 
-void GUI_v2::resetState(int item) {
+void GUI_HoF::resetState(int item) {
 	_vm->_timer->resetNextRun();
 	_vm->setNextIdleAnimTimer();
 	_isDeathMenu = false;
@@ -1185,7 +1185,7 @@ void GUI_v2::resetState(int item) {
 	_buttonListChanged = true;
 }
 
-void GUI_v2::setupSavegameNames(Menu &menu, int num) {
+void GUI_HoF::setupSavegameNames(Menu &menu, int num) {
 	for (int i = 0; i < num; ++i) {
 		strcpy(_vm->getTableString(menu.item[i].itemId, _vm->_optionsBuffer, 0), "");
 		menu.item[i].saveSlot = -1;
@@ -1222,7 +1222,7 @@ void GUI_v2::setupSavegameNames(Menu &menu, int num) {
 	}
 }
 
-int GUI_v2::scrollUpButton(Button *button) {
+int GUI_HoF::scrollUpButton(Button *button) {
 	updateMenuButton(button);
 
 	if (_savegameOffset == (_isDeleteMenu ? 1 : 0))
@@ -1242,7 +1242,7 @@ int GUI_v2::scrollUpButton(Button *button) {
 	return 0;
 }
 
-int GUI_v2::scrollDownButton(Button *button) {
+int GUI_HoF::scrollDownButton(Button *button) {
 	updateMenuButton(button);
 	++_savegameOffset;
 
@@ -1264,7 +1264,7 @@ int GUI_v2::scrollDownButton(Button *button) {
 
 #pragma mark -
 
-int GUI_v2::quitGame(Button *caller) {
+int GUI_HoF::quitGame(Button *caller) {
 	updateMenuButton(caller);
 	if (choiceDialog(_vm->gameFlags().isTalkie ? 0xF : 0x17, 1)) {
 		_displayMenu = false;
@@ -1282,13 +1282,13 @@ int GUI_v2::quitGame(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::resumeGame(Button *caller) {
+int GUI_HoF::resumeGame(Button *caller) {
 	updateMenuButton(caller);
 	_displayMenu = false;
 	return 0;
 }
 
-int GUI_v2::gameOptions(Button *caller) {
+int GUI_HoF::gameOptions(Button *caller) {
 	updateMenuButton(caller);
 	restorePage1(_vm->_screenBuffer);
 	backUpPage1(_vm->_screenBuffer);
@@ -1333,7 +1333,7 @@ int GUI_v2::gameOptions(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::gameOptionsTalkie(Button *caller) {
+int GUI_HoF::gameOptionsTalkie(Button *caller) {
 	updateMenuButton(caller);
 	restorePage1(_vm->_screenBuffer);
 	backUpPage1(_vm->_screenBuffer);
@@ -1377,13 +1377,13 @@ int GUI_v2::gameOptionsTalkie(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::quitOptionsMenu(Button *caller) {
+int GUI_HoF::quitOptionsMenu(Button *caller) {
 	updateMenuButton(caller);
 	_isOptionsMenu = false;
 	return 0;
 }
 
-int GUI_v2::toggleWalkspeed(Button *caller) {
+int GUI_HoF::toggleWalkspeed(Button *caller) {
 	updateMenuButton(caller);
 	if (_vm->_configWalkspeed == 5)
 		_vm->_configWalkspeed = 3;
@@ -1395,7 +1395,7 @@ int GUI_v2::toggleWalkspeed(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::changeLanguage(Button *caller) {
+int GUI_HoF::changeLanguage(Button *caller) {
 	updateMenuButton(caller);
 	++_vm->_lang;
 	_vm->_lang %= 3;
@@ -1404,7 +1404,7 @@ int GUI_v2::changeLanguage(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::toggleText(Button *caller) {
+int GUI_HoF::toggleText(Button *caller) {
 	updateMenuButton(caller);
 	
 	if (_vm->textEnabled()) {
@@ -1424,7 +1424,7 @@ int GUI_v2::toggleText(Button *caller) {
 	return 0;
 }
 
-void GUI_v2::setupOptionsButtons() {
+void GUI_HoF::setupOptionsButtons() {
 	if (_vm->_configWalkspeed == 3)
 		_gameOptions.item[0].itemId = 28;
 	else
@@ -1453,7 +1453,7 @@ void GUI_v2::setupOptionsButtons() {
 	}
 }
 
-int GUI_v2::audioOptions(Button *caller) {
+int GUI_HoF::audioOptions(Button *caller) {
 	updateMenuButton(caller);
 	restorePage1(_vm->_screenBuffer);
 	backUpPage1(_vm->_screenBuffer);
@@ -1504,7 +1504,7 @@ int GUI_v2::audioOptions(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::sliderHandler(Button *caller) {
+int GUI_HoF::sliderHandler(Button *caller) {
 	int button = 0;
 	if (caller->index >= 24 && caller->index <= 27)
 		button = caller->index - 24;
@@ -1599,7 +1599,7 @@ int GUI_v2::sliderHandler(Button *caller) {
 	return 0;
 }
 
-void GUI_v2::drawSliderBar(int slider, const uint8 *shape) {
+void GUI_HoF::drawSliderBar(int slider, const uint8 *shape) {
 	const int menuX = _audioOptions.x;
 	const int menuY = _audioOptions.y;
 	int x = menuX + _sliderBarsPosition[slider*2+0] + 10;
@@ -1622,7 +1622,7 @@ void GUI_v2::drawSliderBar(int slider, const uint8 *shape) {
 	_screen->drawShape(0, shape, x+position, y, 0, 0);
 }
 
-int GUI_v2::loadMenu(Button *caller) {
+int GUI_HoF::loadMenu(Button *caller) {
 	updateSaveList();
 
 	if (!_vm->_menuDirectlyToLoad) {
@@ -1669,7 +1669,7 @@ int GUI_v2::loadMenu(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::clickLoadSlot(Button *caller) {
+int GUI_HoF::clickLoadSlot(Button *caller) {
 	updateMenuButton(caller);
 	
 	assert((caller->index-0x10) >= 0 && (caller->index-0x10 <= 6));
@@ -1683,14 +1683,14 @@ int GUI_v2::clickLoadSlot(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::cancelLoadMenu(Button *caller) {
+int GUI_HoF::cancelLoadMenu(Button *caller) {
 	updateMenuButton(caller);
 	_isLoadMenu = false;
 	_noLoadProcess = true;
 	return 0;
 }
 
-int GUI_v2::saveMenu(Button *caller) {
+int GUI_HoF::saveMenu(Button *caller) {
 	updateSaveList();
 
 	updateMenuButton(caller);
@@ -1731,7 +1731,7 @@ int GUI_v2::saveMenu(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::clickSaveSlot(Button *caller) {
+int GUI_HoF::clickSaveSlot(Button *caller) {
 	updateMenuButton(caller);
 
 	assert((caller->index-0x10) >= 0 && (caller->index-0x10 <= 6));
@@ -1769,7 +1769,7 @@ int GUI_v2::clickSaveSlot(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::cancelSaveMenu(Button *caller) {
+int GUI_HoF::cancelSaveMenu(Button *caller) {
 	updateMenuButton(caller);
 	_isSaveMenu = false;
 	_isDeleteMenu = false;
@@ -1777,7 +1777,7 @@ int GUI_v2::cancelSaveMenu(Button *caller) {
 	return 0;
 }
 
-int GUI_v2::deleteMenu(Button *caller) {
+int GUI_HoF::deleteMenu(Button *caller) {
 	updateSaveList();
 
 	updateMenuButton(caller);
@@ -1834,7 +1834,7 @@ int GUI_v2::deleteMenu(Button *caller) {
 	return 0;
 }
 
-const char *GUI_v2::nameInputProcess(char *buffer, int x, int y, uint8 c1, uint8 c2, uint8 c3, int bufferSize) {
+const char *GUI_HoF::nameInputProcess(char *buffer, int x, int y, uint8 c1, uint8 c2, uint8 c3, int bufferSize) {
 	bool running = true;
 	int curPos = strlen(buffer);
 
@@ -1885,19 +1885,19 @@ const char *GUI_v2::nameInputProcess(char *buffer, int x, int y, uint8 c1, uint8
 	return buffer;
 }
 
-int GUI_v2::finishSavename(Button *caller) {
+int GUI_HoF::finishSavename(Button *caller) {
 	updateMenuButton(caller);
 	_finishNameInput = true;
 	return 0;
 }
 
-int GUI_v2::cancelSavename(Button *caller) {
+int GUI_HoF::cancelSavename(Button *caller) {
 	updateMenuButton(caller);
 	_cancelNameInput = true;
 	return 0;
 }
 
-bool GUI_v2::checkSavegameDescription(const char *buffer, int size) {
+bool GUI_HoF::checkSavegameDescription(const char *buffer, int size) {
 	if (!buffer || !size)
 		return false;
 	if (buffer[0] == 0)
@@ -1911,7 +1911,7 @@ bool GUI_v2::checkSavegameDescription(const char *buffer, int size) {
 	return false;
 }
 
-int GUI_v2::getCharWidth(uint8 c) {
+int GUI_HoF::getCharWidth(uint8 c) {
 	Screen::FontId old = _screen->setFont(Screen::FID_8_FNT);
 	_screen->_charWidth = -2;
 	int width = _screen->getCharWidth(c);
@@ -1920,7 +1920,7 @@ int GUI_v2::getCharWidth(uint8 c) {
 	return width;
 }
 
-void GUI_v2::checkTextfieldInput() {
+void GUI_HoF::checkTextfieldInput() {
 	Common::Event event;
 
 	bool running = true;
@@ -1963,11 +1963,11 @@ void GUI_v2::checkTextfieldInput() {
 	processButtonList(_menuButtonList, keys | 0x8000);
 }
 
-void GUI_v2::drawTextfieldBlock(int x, int y, uint8 c) {
+void GUI_HoF::drawTextfieldBlock(int x, int y, uint8 c) {
 	_screen->fillRect(x+1, y+1, x+7, y+8, c);
 }
 
-bool GUI_v2::choiceDialog(int name, bool type) {
+bool GUI_HoF::choiceDialog(int name, bool type) {
 	_choiceMenu.highlightedItem = 0;
 	restorePage1(_vm->_screenBuffer);
 	backUpPage1(_vm->_screenBuffer);
@@ -1991,14 +1991,14 @@ bool GUI_v2::choiceDialog(int name, bool type) {
 	return _choice;
 }
 
-int GUI_v2::choiceYes(Button *caller) {
+int GUI_HoF::choiceYes(Button *caller) {
 	updateMenuButton(caller);
 	_choice = true;
 	_isChoiceMenu = false;
 	return 0;
 }
 
-int GUI_v2::choiceNo(Button *caller) {
+int GUI_HoF::choiceNo(Button *caller) {
 	updateMenuButton(caller);
 	_choice = false;
 	_isChoiceMenu = false;
diff --git a/engines/kyra/gui_v2.h b/engines/kyra/gui_hof.h
index 5f03da9ada..637af761d3 100644
--- a/engines/kyra/gui_v2.h
+++ b/engines/kyra/gui_hof.h
@@ -94,10 +94,10 @@ namespace Kyra {
 class KyraEngine_HoF;
 class Screen_v2;
 
-class GUI_v2 : public GUI {
+class GUI_HoF : public GUI {
 friend class KyraEngine_HoF;
 public:
-	GUI_v2(KyraEngine_HoF *engine);
+	GUI_HoF(KyraEngine_HoF *engine);
 
 	Button *addButtonToList(Button *list, Button *newButton);
 
diff --git a/engines/kyra/gui_v3.cpp b/engines/kyra/gui_mr.cpp
index 3a701caf91..75bc58d646 100644
--- a/engines/kyra/gui_v3.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "kyra/gui_v3.h"
+#include "kyra/gui_mr.h"
 #include "kyra/kyra_mr.h"
 #include "kyra/text_mr.h"
 #include "kyra/wsamovie.h"
@@ -607,18 +607,18 @@ int KyraEngine_MR::buttonJesterStaff(Button *button) {
 
 #pragma mark -
 
-GUI_v3::GUI_v3(KyraEngine_MR *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
+GUI_MR::GUI_MR(KyraEngine_MR *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_backUpButtonList = _unknownButtonList = 0;
 	_buttonListChanged = false;
 }
 
-Button *GUI_v3::addButtonToList(Button *list, Button *newButton) {
+Button *GUI_MR::addButtonToList(Button *list, Button *newButton) {
 	list = GUI::addButtonToList(list, newButton);
 	_buttonListChanged = true;
 	return list;
 }
 
-void GUI_v3::processButton(Button *button) {
+void GUI_MR::processButton(Button *button) {
 	if (!button)
 		return;
 
@@ -705,7 +705,7 @@ void GUI_v3::processButton(Button *button) {
 	_screen->updateScreen();
 }
 
-int GUI_v3::processButtonList(Button *buttonList, uint16 inputFlag) {
+int GUI_MR::processButtonList(Button *buttonList, uint16 inputFlag) {
 	static uint16 flagsModifier = 0;
 
 	if (!buttonList)
@@ -940,7 +940,7 @@ int GUI_v3::processButtonList(Button *buttonList, uint16 inputFlag) {
 	return returnValue;
 }
 
-void GUI_v3::flagButtonEnable(Button *button) {
+void GUI_MR::flagButtonEnable(Button *button) {
 	if (!button)
 		return;
 
@@ -950,7 +950,7 @@ void GUI_v3::flagButtonEnable(Button *button) {
 	}
 }
 
-void GUI_v3::flagButtonDisable(Button *button) {
+void GUI_MR::flagButtonDisable(Button *button) {
 	if (!button)
 		return;
 
diff --git a/engines/kyra/gui_v3.h b/engines/kyra/gui_mr.h
index b6c7953dff..1797021f91 100644
--- a/engines/kyra/gui_v3.h
+++ b/engines/kyra/gui_mr.h
@@ -56,10 +56,10 @@ namespace Kyra {
 class KyraEngine_MR;
 class Screen_MR;
 
-class GUI_v3 : public GUI {
+class GUI_MR : public GUI {
 friend class KyraEngine_MR;
 public:
-	GUI_v3(KyraEngine_MR *engine);
+	GUI_MR(KyraEngine_MR *engine);
 
 	Button *addButtonToList(Button *list, Button *newButton);
 
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 3eac999979..d7052c9332 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -189,7 +189,7 @@ int KyraEngine_HoF::init() {
 	assert(_debugger);
 	_text = new TextDisplayer_HoF(this, _screen);
 	assert(_text);
-	_gui = new GUI_v2(this);
+	_gui = new GUI_HoF(this);
 	assert(_gui);
 	_tim = new TIMInterpreter(this, _system);
 	assert(_tim);
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 46974c9889..42cdd57ae7 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -31,7 +31,7 @@
 #include "kyra/script_tim.h"
 #include "kyra/screen_hof.h"
 #include "kyra/text_hof.h"
-#include "kyra/gui_v2.h"
+#include "kyra/gui_hof.h"
 
 #include "common/list.h"
 #include "common/func.h"
@@ -194,7 +194,7 @@ struct ActiveItemAnim {
 class KyraEngine_HoF : public KyraEngine_v2 {
 friend class Debugger_v2;
 friend class TextDisplayer_HoF;
-friend class GUI_v2;
+friend class GUI_HoF;
 public:
 	KyraEngine_HoF(OSystem *system, const GameFlags &flags);
 	~KyraEngine_HoF();
@@ -473,7 +473,7 @@ protected:
 
 	// gui
 	bool _menuDirectlyToLoad;
-	GUI_v2 *_gui;
+	GUI_HoF *_gui;
 
 	void loadButtonShapes();
 	void setupLangButtonShapes();
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 06b07eaf26..2545f6ffc3 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -33,7 +33,7 @@
 #include "kyra/gui.h"
 #include "kyra/timer.h"
 #include "kyra/debugger.h"
-#include "kyra/gui_v3.h"
+#include "kyra/gui_mr.h"
 #include "kyra/resource.h"
 
 #include "common/system.h"
@@ -203,7 +203,7 @@ int KyraEngine_MR::init() {
 		error("_soundDigital->init() failed");
 	KyraEngine::_text = _text = new TextDisplayer_MR(this, _screen);
 	assert(_text);
-	_gui = new GUI_v3(this);
+	_gui = new GUI_MR(this);
 	assert(_gui);
 
 	_screen->loadFont(Screen::FID_6_FNT, "6.FNT");
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index f4d597a04a..33e2415b48 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -41,13 +41,13 @@ class MainMenu;
 class WSAMovieV2;
 class TextDisplayer_MR;
 class Debugger_v3;
-class GUI_v3;
+class GUI_MR;
 struct Button;
 
 class KyraEngine_MR : public KyraEngine_v2 {
 friend class Debugger_v3;
 friend class TextDisplayer_MR;
-friend class GUI_v3;
+friend class GUI_MR;
 public:
 	KyraEngine_MR(OSystem *system, const GameFlags &flags);
 	~KyraEngine_MR();
@@ -125,7 +125,7 @@ private:
 	void playStudioSFX(const char *str);
 
 	// gui
-	GUI_v3 *_gui;
+	GUI_MR *_gui;
 
 	Button *_mainButtonData;
 	Button *_mainButtonList;
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index 9c387b27ff..71461615ef 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -9,8 +9,8 @@ MODULE_OBJS := \
 	detection.o \
 	gui.o \
 	gui_v1.o \
-	gui_v2.o \
-	gui_v3.o \
+	gui_hof.o \
+	gui_mr.o \
 	items_v1.o \
 	items_v2.o \
 	items_hof.o \
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 723b7d334e..8d9818b856 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -36,8 +36,8 @@
 #include "kyra/screen_mr.h"
 #include "kyra/resource.h"
 #include "kyra/gui_v1.h"
-#include "kyra/gui_v2.h"
-#include "kyra/gui_v3.h"
+#include "kyra/gui_hof.h"
+#include "kyra/gui_mr.h"
 
 #include "gui/message.h"
 
@@ -1613,7 +1613,7 @@ void KyraEngine_HoF::initInventoryButtonList() {
 	assert(_inventoryButtons);
 
 	GUI_V2_BUTTON(_inventoryButtons[0], 0x1, 0x4F, 0, 1, 1, 1, 0x4487, 0, 0x00A, 0x95, 0x39, 0x1D, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
-	_inventoryButtons[0].buttonCallback = BUTTON_FUNCTOR(GUI_v2, _gui, &GUI_v2::optionsButton);
+	_inventoryButtons[0].buttonCallback = BUTTON_FUNCTOR(GUI_HoF, _gui, &GUI_HoF::optionsButton);
 
 	GUI_V2_BUTTON(_inventoryButtons[1], 0x2, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x104, 0x90, 0x3C, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	_inventoryButtons[1].buttonCallback = BUTTON_FUNCTOR(KyraEngine_HoF, this, &KyraEngine_HoF::cauldronButton);
@@ -1647,7 +1647,7 @@ void KyraEngine_HoF::initInventoryButtonList() {
 		_buttonList = _gui->addButtonToList(_buttonList, &_inventoryButtons[i]);
 }
 
-void GUI_v2::initStaticData() {
+void GUI_HoF::initStaticData() {
 	GUI_V2_BUTTON(_scrollUpButton, 0x17, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x18, 0x0F, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	GUI_V2_BUTTON(_scrollDownButton, 0x18, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x18, 0x0F, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
@@ -1665,11 +1665,11 @@ void GUI_v2::initStaticData() {
 		GUI_V2_BUTTON(_menuButtons[i], 0x10+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	}
 
-	Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::clickLoadSlot);
-	Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::clickSaveSlot);
-	Button::Callback clickLoadMenuFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::loadMenu);
-	Button::Callback clickQuitGameFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::quitGame);
-	Button::Callback clickQuitOptionsFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::quitOptionsMenu);
+	Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::clickLoadSlot);
+	Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::clickSaveSlot);
+	Button::Callback clickLoadMenuFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::loadMenu);
+	Button::Callback clickQuitGameFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::quitGame);
+	Button::Callback clickQuitOptionsFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::quitOptionsMenu);
 
 	const uint16 *menuStr = _vm->gameFlags().isTalkie ? _menuStringsTalkie : _menuStringsOther;
 
@@ -1677,17 +1677,17 @@ void GUI_v2::initStaticData() {
 	GUI_V2_MENU_ITEM(_mainMenu.item[0], 1, 0x02, -1, 0x1E, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
 	_mainMenu.item[0].callback = clickLoadMenuFunctor;
 	GUI_V2_MENU_ITEM(_mainMenu.item[1], 1, 0x03, -1, 0x2F, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_mainMenu.item[1].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::saveMenu);
+	_mainMenu.item[1].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::saveMenu);
 	GUI_V2_MENU_ITEM(_mainMenu.item[2], 1, 0x23, -1, 0x40, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_mainMenu.item[2].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::deleteMenu);
+	_mainMenu.item[2].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::deleteMenu);
 	GUI_V2_MENU_ITEM(_mainMenu.item[3], 1, 0x04, -1, 0x51, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::gameOptionsTalkie);
+	_mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::gameOptionsTalkie);
 	GUI_V2_MENU_ITEM(_mainMenu.item[4], 1, 0x25, -1, 0x62, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_mainMenu.item[4].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::audioOptions);
+	_mainMenu.item[4].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::audioOptions);
 	GUI_V2_MENU_ITEM(_mainMenu.item[5], 1, 0x05, -1, 0x73, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
 	_mainMenu.item[5].callback = clickQuitGameFunctor;
 	GUI_V2_MENU_ITEM(_mainMenu.item[6], 1, 0x06, -1, 0x90, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_mainMenu.item[6].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::resumeGame);
+	_mainMenu.item[6].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::resumeGame);
 	for (int i = 0; i < 7; ++i)
 		_mainMenu.item[i].itemId = menuStr[0 * 8 + i + 1];
 
@@ -1697,7 +1697,7 @@ void GUI_v2::initStaticData() {
 		_mainMenu.item[6].enabled = false;
 		for (int i = 4; i < 6; ++i)
 			_mainMenu.item[i].callback = _mainMenu.item[i+1].callback;
-		_mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::gameOptions);
+		_mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::gameOptions);
 		_mainMenu.item[6].callback = Button::Callback();
 		_mainMenu.item[5].y = 0x7F;
 	}
@@ -1705,11 +1705,11 @@ void GUI_v2::initStaticData() {
 	GUI_V2_MENU(_gameOptions, -1, -1, 0x120, 0x88, 0xF8, 0xF9, 0xFA, menuStr[1 * 8], 0xFB, -1, 8, 4, 4, -1, -1, -1, -1);
 	if (_vm->gameFlags().isTalkie) {
 		GUI_V2_MENU_ITEM(_gameOptions.item[0], 1, 0, 0xA0, 0x1E, 0x74, 0x0F, 0xFC, 0xFD, 5, 0xF8, 0xF9, 0xFA, -1, 0x15, 8, 0x20, 0);
-		_gameOptions.item[0].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::toggleWalkspeed);
+		_gameOptions.item[0].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::toggleWalkspeed);
 		GUI_V2_MENU_ITEM(_gameOptions.item[1], 1, 0, 0xA0, 0x2F, 0x74, 0x0F, 0xFC, 0xFD, 5, 0xF8, 0xF9, 0xFA, -1, 0x26, 8, 0x31, 0);
-		_gameOptions.item[1].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::changeLanguage);
+		_gameOptions.item[1].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::changeLanguage);
 		GUI_V2_MENU_ITEM(_gameOptions.item[2], 1, 0, 0xA0, 0x40, 0x74, 0x0F, 0xFC, 0xFD, 5, 0xF8, 0xF9, 0xFA, -1, 0x16, 8, 0x42, 0);
-		_gameOptions.item[2].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::toggleText);
+		_gameOptions.item[2].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::toggleText);
 		GUI_V2_MENU_ITEM(_gameOptions.item[3], 1, 0x10, -1, 0x6E, 0x6C, 0x0F, 0xFD, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
 		_gameOptions.item[3].callback = clickQuitOptionsFunctor;
 	} else {
@@ -1740,9 +1740,9 @@ void GUI_v2::initStaticData() {
 
 	GUI_V2_MENU(_choiceMenu, -1, -1, 0x140, 0x38, 0xF8, 0xF9, 0xFA, 0, 0xFE, -1, 8, 0, 2, -1, -1, -1, -1);
 	GUI_V2_MENU_ITEM(_choiceMenu.item[0], 1, 0x14, 0x18, 0x1E, 0x48, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_choiceMenu.item[0].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::choiceYes);
+	_choiceMenu.item[0].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::choiceYes);
 	GUI_V2_MENU_ITEM(_choiceMenu.item[1], 1, 0x13, 0xD8, 0x1E, 0x48, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_choiceMenu.item[1].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::choiceNo);
+	_choiceMenu.item[1].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::choiceNo);
 	for (int i = 2; i <= 6; ++i)
 		_choiceMenu.item[i].enabled = false;
 	for (int i = 0; i < 7; ++i)
@@ -1757,7 +1757,7 @@ void GUI_v2::initStaticData() {
 	for (int i = 0; i <= 4; ++i)
 		_loadMenu.item[i].callback = clickLoadSlotFunctor;
 	GUI_V2_MENU_ITEM(_loadMenu.item[5], 1, 0x0B, 0xB8, 0x86, 0x58, 0xF, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_loadMenu.item[5].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::cancelLoadMenu);
+	_loadMenu.item[5].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::cancelLoadMenu);
 	_loadMenu.item[6].enabled = false;
 	for (int i = 0; i < 7; ++i)
 		_loadMenu.item[i].itemId = menuStr[4 * 8 + i + 1];
@@ -1771,16 +1771,16 @@ void GUI_v2::initStaticData() {
 	for (int i = 0; i <= 4; ++i)
 		_saveMenu.item[i].callback = clickSaveSlotFunctor;
 	GUI_V2_MENU_ITEM(_saveMenu.item[5], 1, 0x0B, 0xB8, 0x86, 0x58, 0xF, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_saveMenu.item[5].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::cancelSaveMenu);
+	_saveMenu.item[5].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::cancelSaveMenu);
 	_saveMenu.item[6].enabled = false;
 	for (int i = 0; i < 7; ++i)
 		_saveMenu.item[i].itemId = menuStr[5 * 8 + i + 1];
 
 	GUI_V2_MENU(_savenameMenu, -1, -1, 0x140, 0x43, 0xF8, 0xF9, 0xFA, menuStr[6 * 8], 0xFB, -1, 8, 0, 2, -1, -1, -1, -1);
 	GUI_V2_MENU_ITEM(_savenameMenu.item[0], 1, 0xD, 0x18, 0x2C, 0x58, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_savenameMenu.item[0].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::finishSavename);
+	_savenameMenu.item[0].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::finishSavename);
 	GUI_V2_MENU_ITEM(_savenameMenu.item[1], 1, 0xB, 0xD0, 0x2C, 0x58, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0);
-	_savenameMenu.item[1].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::cancelSavename);
+	_savenameMenu.item[1].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::cancelSavename);
 	for (int i = 2; i <= 6; ++i)
 		_savenameMenu.item[i].enabled = false;
 	for (int i = 0; i < 7; ++i)
@@ -1797,7 +1797,7 @@ void GUI_v2::initStaticData() {
 		_deathMenu.item[i].itemId = menuStr[7 * 8 + i + 1];
 }
 
-const uint16 GUI_v2::_menuStringsTalkie[] = {
+const uint16 GUI_HoF::_menuStringsTalkie[] = {
 	0x001, 0x002, 0x003, 0x023, 0x004, 0x025, 0x005, 0x006,	// Main Menu String IDs
 	0x025, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000,	// Options Menu String IDs
 	0x007, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000,	// Audio Menu String IDs
@@ -1808,7 +1808,7 @@ const uint16 GUI_v2::_menuStringsTalkie[] = {
 	0x00E, 0x002, 0x005, 0x000, 0x000, 0x000, 0x000, 0x000	// Death Menu String IDs
 };
 
-const uint16 GUI_v2::_menuStringsOther[] = {
+const uint16 GUI_HoF::_menuStringsOther[] = {
 	0x009, 0x00A, 0x00B, 0x001, 0x00C, 0x00D, 0x00E, 0x000,	// Main Menu String IDs
 	0x00F, 0x02B, 0x02C, 0x02D, 0x02E, 0x018, 0x000, 0x000,	// Options Menu String IDs
 	0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,	// Dummy
@@ -1819,7 +1819,7 @@ const uint16 GUI_v2::_menuStringsOther[] = {
 	0x016, 0x00A, 0x00D, 0x000, 0x000, 0x000, 0x000, 0x000	// Death Menu String IDs
 };
 
-const int GUI_v2::_sliderBarsPosition[] = {
+const int GUI_HoF::_sliderBarsPosition[] = {
 	0x92, 0x1F, 0x92, 0x30, 0x92, 0x41, 0x92, 0x52
 };