[Scummvm-cvs-logs] SF.net SVN: scummvm: [28820] scummvm/trunk/engines/agi

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Sun Sep 2 15:44:23 CEST 2007


Revision: 28820
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28820&view=rev
Author:   mthreepwood
Date:     2007-09-02 06:44:23 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
fix a warning and some code formatting

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/preagi.cpp

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-09-02 13:23:07 UTC (rev 28819)
+++ scummvm/trunk/engines/agi/agi.h	2007-09-02 13:44:23 UTC (rev 28820)
@@ -1006,7 +1006,7 @@
 	void drawStr(int row, int col, int attr, char *buffer);
 	void drawStrMiddle(int row, int attr, char *buffer);
 	void clearTextArea();
-	void drawChar(int x, int y, int attr, int code, char *fontdata);
+	void drawChar(int x, int y, int attr, int code, const char *fontdata);
 };
 
 } // End of namespace Agi

Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp	2007-09-02 13:23:07 UTC (rev 28819)
+++ scummvm/trunk/engines/agi/preagi.cpp	2007-09-02 13:44:23 UTC (rev 28820)
@@ -282,16 +282,13 @@
 // String functions
 // TODO: These need to be moved elsewhere
 
-void PreAgiEngine::drawStr(int row, int col, int attr, char *buffer)
-{
+void PreAgiEngine::drawStr(int row, int col, int attr, char *buffer) {
 	int code;
 
-	for (int iChar = 0; iChar < (int)strlen(buffer); iChar++)
-	{
+	for (int iChar = 0; iChar < (int)strlen(buffer); iChar++) {
 		code = buffer[iChar];
 
-		switch (code)
-		{
+		switch (code) {
 		case '\n':
 		case 0x8D:
 			if (++row == 200 / 8) return;
@@ -303,10 +300,9 @@
 			break;
 
 		default:
-			drawChar(col * 8, row * 8, attr, code, (char*)mickey_fontdata);
+			drawChar(col * 8, row * 8, attr, code, (const char*)mickey_fontdata);
 
-			if (++col == 320 / 8)
-			{
+			if (++col == 320 / 8) {
 				col = 0;
 				if (++row == 200 / 8) return;
 			}
@@ -326,15 +322,12 @@
 	}
 }
 
-void PreAgiEngine::drawChar(int x, int y, int attr, int code, char *fontdata)
-{
+void PreAgiEngine::drawChar(int x, int y, int attr, int code, const char *fontdata) {
 	int cx, cy;
 	uint8 color;
 
-	for (cy = 0; cy < 8; cy++)
-	{
-		for (cx = 0; cx < 8; cx++)
-		{
+	for (cy = 0; cy < 8; cy++) {
+		for (cx = 0; cx < 8; cx++) {
 			if (fontdata[(code * 8) + cy] & (1 << (7 - cx)))
 				color = attr & 0x0f;			// foreground color
 			else


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