[Scummvm-cvs-logs] SF.net SVN: scummvm:[44906] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Oct 11 13:30:24 CEST 2009
Revision: 44906
http://scummvm.svn.sourceforge.net/scummvm/?rev=44906&view=rev
Author: lordhoto
Date: 2009-10-11 11:30:24 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui.cpp
scummvm/trunk/engines/kyra/gui.h
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/gui_lol.h
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2009-10-11 11:29:34 UTC (rev 44905)
+++ scummvm/trunk/engines/kyra/gui.cpp 2009-10-11 11:30:24 UTC (rev 44906)
@@ -446,7 +446,7 @@
_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);
}
Modified: scummvm/trunk/engines/kyra/gui.h
===================================================================
--- scummvm/trunk/engines/kyra/gui.h 2009-10-11 11:29:34 UTC (rev 44905)
+++ scummvm/trunk/engines/kyra/gui.h 2009-10-11 11:30:24 UTC (rev 44906)
@@ -176,7 +176,7 @@
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;
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-10-11 11:29:34 UTC (rev 44905)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-10-11 11:30:24 UTC (rev 44906)
@@ -2598,7 +2598,7 @@
}
}
-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);
}
Modified: scummvm/trunk/engines/kyra/gui_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.h 2009-10-11 11:29:34 UTC (rev 44905)
+++ scummvm/trunk/engines/kyra/gui_lol.h 2009-10-11 11:30:24 UTC (rev 44906)
@@ -116,7 +116,7 @@
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();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list