aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/kyra/gui_lol.cpp2
-rw-r--r--engines/kyra/lol.h2
-rw-r--r--engines/kyra/staticres.cpp3
3 files changed, 1 insertions, 6 deletions
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 356b08e740..f2a8b3bd6f 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -954,7 +954,7 @@ void LoLEngine::gui_initButton(int index, int x, int y, int val) {
b->height = _buttonData[index].h - 1;
}
- assignButtonCallback(b, index);
+ b->buttonCallback = _buttonCallbacks[index];
}
int LoLEngine::clickedUpArrow(Button *button) {
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 6d73f50c4a..e4504428d3 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -498,8 +498,6 @@ private:
void gui_notifyButtonListChanged() { if (_gui) _gui->_buttonListChanged = true; }
Common::Array<Button::Callback> _buttonCallbacks;
- void assignButtonCallback(Button *button, int index);
-
Button *_activeButtons;
ButtonDef _sceneWindowButton;
bool _preserveEvents;
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 6a33cf4c7f..9e27d6c829 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1997,9 +1997,6 @@ void LoLEngine::initStaticResource() {
#undef cb
}
-void LoLEngine::assignButtonCallback(Button *button, int index) {
- button->buttonCallback = _buttonCallbacks[index];
-}
#endif // ENABLE_LOL
const ScreenDim Screen_LoK::_screenDimTable[] = {