aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/gui_mr.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2011-04-07 01:00:41 +0200
committerJohannes Schickel2011-04-07 01:01:55 +0200
commitf19e2019b8e86f9fe4c95296428a7b31417666ac (patch)
treef75d4bfb9815ad14d0880de08a647f69a714aefe /engines/kyra/gui_mr.cpp
parent40dd4f89baed798e431b671954e28755ca1aa73b (diff)
downloadscummvm-rg350-f19e2019b8e86f9fe4c95296428a7b31417666ac.tar.gz
scummvm-rg350-f19e2019b8e86f9fe4c95296428a7b31417666ac.tar.bz2
scummvm-rg350-f19e2019b8e86f9fe4c95296428a7b31417666ac.zip
KYRA: Cleanup background music looping of Kyra3.
Diffstat (limited to 'engines/kyra/gui_mr.cpp')
-rw-r--r--engines/kyra/gui_mr.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp
index a04ec49324..6bdecfc3b8 100644
--- a/engines/kyra/gui_mr.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -830,8 +830,6 @@ void KyraEngine_MR::processAlbum() {
checkInput(buttonList);
removeInputTop();
- musicUpdate(0);
-
if (_album.curPage != _album.nextPage) {
int oldPage = _album.curPage;
_album.curPage = _album.nextPage;
@@ -1085,11 +1083,6 @@ void GUI_MR::flagButtonDisable(Button *button) {
}
}
-void GUI_MR::getInput() {
- _vm->musicUpdate(0);
- GUI_v2::getInput();
-}
-
const char *GUI_MR::getMenuTitle(const Menu &menu) {
if (!menu.menuNameId)
return 0;
@@ -1173,8 +1166,6 @@ int GUI_MR::quitGame(Button *caller) {
int GUI_MR::optionsButton(Button *button) {
PauseTimer pause(*_vm->_timer);
- _vm->musicUpdate(0);
-
_screen->hideMouse();
updateButton(&_vm->_mainButtonData[0]);
_screen->showMouse();
@@ -1200,7 +1191,6 @@ int GUI_MR::optionsButton(Button *button) {
int oldHandItem = _vm->_itemInHand;
_screen->setMouseCursor(0, 0, _vm->getShapePtr(0));
- _vm->musicUpdate(0);
_displayMenu = true;
for (int i = 0; i < 4; ++i) {
@@ -1226,8 +1216,6 @@ int GUI_MR::optionsButton(Button *button) {
_currentMenu = &_mainMenu;
- _vm->musicUpdate(0);
-
if (_vm->_menuDirectlyToLoad) {
backUpPage1(_vm->_screenBuffer);
@@ -1256,7 +1244,6 @@ int GUI_MR::optionsButton(Button *button) {
_isDeathMenu = false;
}
- _vm->musicUpdate(0);
backUpPage1(_vm->_screenBuffer);
initMenu(*_currentMenu);
_madeSave = false;
@@ -1407,7 +1394,6 @@ int GUI_MR::gameOptions(Button *caller) {
}
void GUI_MR::setupOptionsButtons() {
- _vm->musicUpdate(0);
if (_vm->_configWalkspeed == 3)
_gameOptions.item[0].itemId = 28;
else