[Scummvm-cvs-logs] SF.net SVN: scummvm:[55178] scummvm/trunk/engines/sci/graphics

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Jan 9 00:16:44 CET 2011


Revision: 55178
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55178&view=rev
Author:   thebluegr
Date:     2011-01-08 23:16:44 +0000 (Sat, 08 Jan 2011)

Log Message:
-----------
SCI: Some function renaming

Draw_Status -> DrawStatus
Draw_String -> DrawString

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/menu.cpp
    scummvm/trunk/engines/sci/graphics/text16.cpp
    scummvm/trunk/engines/sci/graphics/text16.h

Modified: scummvm/trunk/engines/sci/graphics/menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/menu.cpp	2011-01-08 23:15:10 UTC (rev 55177)
+++ scummvm/trunk/engines/sci/graphics/menu.cpp	2011-01-08 23:16:44 UTC (rev 55178)
@@ -345,7 +345,7 @@
 	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 @@
 			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 @@
 	_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);
 }

Modified: scummvm/trunk/engines/sci/graphics/text16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/text16.cpp	2011-01-08 23:15:10 UTC (rev 55177)
+++ scummvm/trunk/engines/sci/graphics/text16.cpp	2011-01-08 23:16:44 UTC (rev 55178)
@@ -482,7 +482,7 @@
 	}
 }
 
-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 @@
 
 // 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;

Modified: scummvm/trunk/engines/sci/graphics/text16.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/text16.h	2011-01-08 23:15:10 UTC (rev 55177)
+++ scummvm/trunk/engines/sci/graphics/text16.h	2011-01-08 23:16:44 UTC (rev 55178)
@@ -63,8 +63,8 @@
 	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;
 


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