aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-08 23:16:44 +0000
committerFilippos Karapetis2011-01-08 23:16:44 +0000
commit505e1888e5ff8c34d52cffeaa59e8b33274d283f (patch)
tree68dce08cc2a54769a98cccedaacef36b4f202681 /engines/sci/graphics
parent8c554a8ec29c216e807f0cd0a85e0740a17c6b0d (diff)
downloadscummvm-rg350-505e1888e5ff8c34d52cffeaa59e8b33274d283f.tar.gz
scummvm-rg350-505e1888e5ff8c34d52cffeaa59e8b33274d283f.tar.bz2
scummvm-rg350-505e1888e5ff8c34d52cffeaa59e8b33274d283f.zip
SCI: Some function renaming
Draw_Status -> DrawStatus Draw_String -> DrawString svn-id: r55178
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/menu.cpp8
-rw-r--r--engines/sci/graphics/text16.cpp4
-rw-r--r--engines/sci/graphics/text16.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index efc696aa34..c597d4aca8 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -345,7 +345,7 @@ void GfxMenu::drawBar() {
listIterator = _list.begin();
while (listIterator != listEnd) {
listEntry = *listIterator;
- _text16->Draw_String(listEntry->textSplit.c_str());
+ _text16->DrawString(listEntry->textSplit.c_str());
listIterator++;
}
@@ -604,9 +604,9 @@ void GfxMenu::drawMenu(uint16 oldMenuId, uint16 newMenuId) {
if (!listItemEntry->separatorLine) {
_ports->textGreyedOutput(listItemEntry->enabled ? false : true);
_ports->moveTo(_menuRect.left, topPos);
- _text16->Draw_String(listItemEntry->textSplit.c_str());
+ _text16->DrawString(listItemEntry->textSplit.c_str());
_ports->moveTo(_menuRect.right - listItemEntry->textRightAlignedWidth - 5, topPos);
- _text16->Draw_String(listItemEntry->textRightAligned.c_str());
+ _text16->DrawString(listItemEntry->textRightAligned.c_str());
} else {
// We dont 100% follow sierra here, we draw the line from left to right. Looks better
// BTW. SCI1.1 seems to put 2 pixels and then skip one, we don't do this at all (lsl6)
@@ -905,7 +905,7 @@ void GfxMenu::kernelDrawStatus(const char *text, int16 colorPen, int16 colorBack
_paint16->fillRect(_ports->_menuBarRect, 1, colorBack);
_ports->penColor(colorPen);
_ports->moveTo(0, 1);
- _text16->Draw_Status(text);
+ _text16->DrawStatus(text);
_paint16->bitsShow(_ports->_menuBarRect);
_ports->setPort(oldPort);
}
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index b886ad70a9..17ad59e35a 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -482,7 +482,7 @@ void GfxText16::Box(const char *text, int16 bshow, const Common::Rect &rect, Tex
}
}
-void GfxText16::Draw_String(const char *text) {
+void GfxText16::DrawString(const char *text) {
GuiResourceId previousFontId = GetFontId();
int16 previousPenColor = _ports->_curPort->penClr;
@@ -493,7 +493,7 @@ void GfxText16::Draw_String(const char *text) {
// we need to have a separate status drawing code
// In KQ4 the IV char is actually 0xA, which would otherwise get considered as linebreak and not printed
-void GfxText16::Draw_Status(const char *text) {
+void GfxText16::DrawStatus(const char *text) {
uint16 curChar, charWidth;
uint16 textLen = strlen(text);
Common::Rect rect;
diff --git a/engines/sci/graphics/text16.h b/engines/sci/graphics/text16.h
index dc3ed2f62b..19c95f3f13 100644
--- a/engines/sci/graphics/text16.h
+++ b/engines/sci/graphics/text16.h
@@ -63,8 +63,8 @@ public:
void Draw(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);
void Show(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);
void Box(const char *text, int16 bshow, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId);
- void Draw_String(const char *text);
- void Draw_Status(const char *text);
+ void DrawString(const char *text);
+ void DrawStatus(const char *text);
GfxFont *_font;