[Scummvm-cvs-logs] SF.net SVN: scummvm: [23916] scummvm/trunk/engines/kyra

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Sep 17 15:06:45 CEST 2006


Revision: 23916
          http://svn.sourceforge.net/scummvm/?rev=23916&view=rev
Author:   fingolfin
Date:     2006-09-17 06:06:40 -0700 (Sun, 17 Sep 2006)

Log Message:
-----------
Const correctness

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra3.cpp
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/kyra3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra3.cpp	2006-09-17 10:16:52 UTC (rev 23915)
+++ scummvm/trunk/engines/kyra/kyra3.cpp	2006-09-17 13:06:40 UTC (rev 23916)
@@ -418,7 +418,7 @@
 #pragma mark -
 
 int KyraEngine_v3::initTableBuffer(uint8 *buf, int size) {
-	debugC(9, kDebugLevelMain, "KyraEngine::initTableBuffer(%p, %d)", (void*)buf, size);
+	debugC(9, kDebugLevelMain, "KyraEngine::initTableBuffer(%p, %d)", (void *)buf, size);
 
 	if (!buf || size < 6320)
 		return 0;
@@ -445,7 +445,7 @@
 }
 
 void KyraEngine_v3::updateTableBuffer(uint8 *buf) {
-	debugC(9, kDebugLevelMain, "KyraEngine::updateTableBuffer(%p)", (void*)buf);
+	debugC(9, kDebugLevelMain, "KyraEngine::updateTableBuffer(%p)", (void *)buf);
 
 	if (_tableBuffer2 == buf)
 		return;
@@ -457,7 +457,7 @@
 }
 
 int KyraEngine_v3::addShapeToTable(const uint8 *buf, int id, int shapeNum) {
-	debugC(9, kDebugLevelMain, "KyraEngine::addShapeToTable(%p, %d, %d)", (void*)buf, id, shapeNum);
+	debugC(9, kDebugLevelMain, "KyraEngine::addShapeToTable(%p, %d, %d)", (const void *)buf, id, shapeNum);
 
 	if (!buf)
 		return 0;
@@ -490,7 +490,7 @@
 }
 
 int KyraEngine_v3::getTableSize(uint8 *buf) {
-	debugC(9, kDebugLevelMain, "KyraEngine::getTableSize(%p)", (void*)buf);
+	debugC(9, kDebugLevelMain, "KyraEngine::getTableSize(%p)", (void *)buf);
 	updateTableBuffer(buf);
 
 	if (*((uint16*)(_tableBuffer1 + 4)) >= 450)
@@ -500,7 +500,7 @@
 }
 
 uint8 *KyraEngine_v3::allocTableSpace(uint8 *buf, int size, int id) {
-	debugC(9, kDebugLevelMain, "KyraEngine::allocTableSpace(%p, %d, %d)", (void*)buf, size, id);
+	debugC(9, kDebugLevelMain, "KyraEngine::allocTableSpace(%p, %d, %d)", (void *)buf, size, id);
 
 	if (!buf || !size)
 		return 0;
@@ -608,7 +608,7 @@
 }
 
 uint8 *KyraEngine_v3::findIdInTable(uint8 *buf, int id) {
-	debugC(9, kDebugLevelMain, "KyraEngine::findIdInTable(%p, %d)", (void*)buf, id);
+	debugC(9, kDebugLevelMain, "KyraEngine::findIdInTable(%p, %d)", (void *)buf, id);
 
 	updateTableBuffer(buf);
 

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2006-09-17 10:16:52 UTC (rev 23915)
+++ scummvm/trunk/engines/kyra/screen.cpp	2006-09-17 13:06:40 UTC (rev 23916)
@@ -2303,7 +2303,7 @@
 // kyra3 specific
 
 const uint8 *Screen::getPtrToShape(const uint8 *shpFile, int shape) {
-	debugC(9, kDebugLevelScreen, "KyraEngine::getPtrToShape(%p, %d)", (void *)shpFile, shape);
+	debugC(9, kDebugLevelScreen, "KyraEngine::getPtrToShape(%p, %d)", (const void *)shpFile, shape);
 	uint16 shapes = READ_LE_UINT16(shpFile);
 
 	if (shapes <= shape)
@@ -2327,7 +2327,7 @@
 }
 
 uint16 Screen::getShapeSize(const uint8 *shp) {
-	debugC(9, kDebugLevelScreen, "KyraEngine::getShapeSize(%p)", (void *)shp);
+	debugC(9, kDebugLevelScreen, "KyraEngine::getShapeSize(%p)", (const void *)shp);
 
 	return READ_LE_UINT16(shp+6);
 }


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