aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-10-11 11:30:24 +0000
committerJohannes Schickel2009-10-11 11:30:24 +0000
commit6e93add43f5b098df8b51e1d23ba4d9a3136b8ea (patch)
tree8321c545a6c4dc673f66288b6f8cc2fa9d30149e /engines/kyra
parent8f6e9f0bf2cbd3c6cc59488aa7f8a4b5c92ffc15 (diff)
downloadscummvm-rg350-6e93add43f5b098df8b51e1d23ba4d9a3136b8ea.tar.gz
scummvm-rg350-6e93add43f5b098df8b51e1d23ba4d9a3136b8ea.tar.bz2
scummvm-rg350-6e93add43f5b098df8b51e1d23ba4d9a3136b8ea.zip
Cleanup.
svn-id: r44906
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/gui.cpp2
-rw-r--r--engines/kyra/gui.h2
-rw-r--r--engines/kyra/gui_lol.cpp2
-rw-r--r--engines/kyra/gui_lol.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 0b84b82c72..5517e68ea8 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -446,7 +446,7 @@ void GUI::checkTextfieldInput() {
_vm->_system->delayMillis(3);
}
-void GUI::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2, Screen::FontId font) {
+void GUI::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2) {
_text->printText(str, x, y, c0, c1, c2);
}
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index 6ddc1337d5..e636f634da 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -176,7 +176,7 @@ protected:
bool _displaySubMenu;
bool _cancelSubMenu;
- virtual void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2, Screen::FontId font = Screen::FID_8_FNT);
+ virtual void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2);
virtual int getMenuCenterStringX(const char *str, int x1, int x2);
Button::Callback _redrawShadedButtonFunctor;
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 587e710fc5..04c597a534 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -2598,7 +2598,7 @@ void GUI_LoL::setupSavegameNames(Menu &menu, int num) {
}
}
-void GUI_LoL::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags, Screen::FontId font) {
+void GUI_LoL::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags) {
_screen->fprintString("%s", x, y, c0, c1, _vm->gameFlags().use16ColorMode ? (flags & 3) : flags , str);
}
diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui_lol.h
index 8772dfe382..ecba3bcb16 100644
--- a/engines/kyra/gui_lol.h
+++ b/engines/kyra/gui_lol.h
@@ -116,7 +116,7 @@ private:
void setupSavegameNames(Menu &menu, int num);
- void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags, Screen::FontId font=Screen::FID_9_FNT);
+ void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags);
int getMenuCenterStringX(const char *str, int x1, int x2);
int getInput();