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

[mthreepwood at users.sourceforge.net]

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

Log Message:
-----------
fix more warnings

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

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-09-02 13:44:37 UTC (rev 28821)
+++ scummvm/trunk/engines/agi/agi.h	2007-09-02 13:50:26 UTC (rev 28822)
@@ -1003,8 +1003,8 @@
 	int rnd(int hi) { return (rand() % hi + 1); }
 
 	// Text
-	void drawStr(int row, int col, int attr, char *buffer);
-	void drawStrMiddle(int row, int attr, char *buffer);
+	void drawStr(int row, int col, int attr, const char *buffer);
+	void drawStrMiddle(int row, int attr, const char *buffer);
 	void clearTextArea();
 	void drawChar(int x, int y, int attr, int code, const char *fontdata);
 };

Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp	2007-09-02 13:44:37 UTC (rev 28821)
+++ scummvm/trunk/engines/agi/preagi.cpp	2007-09-02 13:50:26 UTC (rev 28822)
@@ -282,7 +282,7 @@
 // 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, const char *buffer) {
 	int code;
 
 	for (int iChar = 0; iChar < (int)strlen(buffer); iChar++) {
@@ -310,7 +310,7 @@
 	}
 }
 
-void PreAgiEngine::drawStrMiddle(int row, int attr, char *buffer) {
+void PreAgiEngine::drawStrMiddle(int row, int attr, const char *buffer) {
 	int col = (25 / 2) - (strlen(buffer) / 2);	// 25 = 320 / 8 (maximum column)
 	drawStr(row, col, attr, buffer);
 }

Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-02 13:44:37 UTC (rev 28821)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-02 13:50:26 UTC (rev 28822)
@@ -1025,7 +1025,7 @@
 
 void Mickey::insertDisk(int iDisk) {
 	_vm->clearTextArea();
-	_vm->drawStr(IDI_MSA_ROW_INSERT_DISK, IDI_MSA_COL_INSERT_DISK, IDA_DEFAULT, (char *)IDS_MSA_INSERT_DISK[iDisk]);
+	_vm->drawStr(IDI_MSA_ROW_INSERT_DISK, IDI_MSA_COL_INSERT_DISK, IDA_DEFAULT, (const char *)IDS_MSA_INSERT_DISK[iDisk]);
 	_vm->_gfx->doUpdate();
 	_vm->_system->updateScreen();	// TODO: this should go in the game's main loop
 	_vm->waitAnyKey();
@@ -1111,7 +1111,7 @@
 
 	for (int iItem = 0; iItem < IDI_MSA_MAX_ITEM; iItem++) {
 		if (game.fItem[game.iItem[iItem]] && (game.iItem[iItem] != IDI_MSA_OBJECT_NONE)) {
-			_vm->drawStr(iRow++, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, (char *)IDS_MSA_NAME_ITEM[game.iItem[iItem]]);
+			_vm->drawStr(iRow++, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, (const char *)IDS_MSA_NAME_ITEM[game.iItem[iItem]]);
 		}
 	}
 
@@ -1812,9 +1812,9 @@
 	case IDI_MSA_ACTION_READ_GAUGE:
 		printDatString(arg);
 		_vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_C, IDA_DEFAULT,
-			(char *)IDS_MSA_TEMP_C[game.iPlanet]);
+			(const char *)IDS_MSA_TEMP_C[game.iPlanet]);
 		_vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_F, IDA_DEFAULT,
-			(char *)IDS_MSA_TEMP_F[game.iPlanet]);
+			(const char *)IDS_MSA_TEMP_F[game.iPlanet]);
 		_vm->_gfx->doUpdate();
 		_vm->_system->updateScreen();	// TODO: this should go in the game's main loop
 		_vm->waitAnyKey();
@@ -1848,7 +1848,7 @@
 			drawRoom();
 			printDatString(22);
 			_vm->drawStr(IDI_MSA_ROW_PLANET, IDI_MSA_COL_PLANET, IDA_DEFAULT,
-						(char *)IDS_MSA_PLANETS[game.iPlanet]);
+						(const char *)IDS_MSA_PLANETS[game.iPlanet]);
 			_vm->_gfx->doUpdate();
 			_vm->_system->updateScreen();	// TODO: this should go in the game's main loop
 			_vm->waitAnyKeyAnim();
@@ -1960,7 +1960,7 @@
 		_vm->clearTextArea();
 		sprintf(szTitle, "Object %d", iObj);
 		_vm->drawStrMiddle(22, IDA_DEFAULT, szTitle);
-		_vm->drawStrMiddle(23, IDA_DEFAULT, (char *)IDS_MSA_NAME_OBJ[iObj]);
+		_vm->drawStrMiddle(23, IDA_DEFAULT, (const char *)IDS_MSA_NAME_OBJ[iObj]);
 		_vm->_gfx->doUpdate();
 		_vm->_system->updateScreen();	// TODO: this should go in the game's main loop
 		_vm->waitAnyKey();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.