[Scummvm-cvs-logs] SF.net SVN: scummvm: [20824] scummvm/trunk/engines/cine

kirben at users.sourceforge.net kirben at users.sourceforge.net
Thu Feb 23 02:36:17 CET 2006


Revision: 20824
Author:   kirben
Date:     2006-02-23 02:35:33 -0800 (Thu, 23 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20824&view=rev

Log Message:
-----------
Fix a few compile warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/anim.cpp
    scummvm/trunk/engines/cine/prc.h
    scummvm/trunk/engines/cine/various.cpp
Modified: scummvm/trunk/engines/cine/anim.cpp
===================================================================
--- scummvm/trunk/engines/cine/anim.cpp	2006-02-23 10:26:14 UTC (rev 20823)
+++ scummvm/trunk/engines/cine/anim.cpp	2006-02-23 10:35:33 UTC (rev 20824)
@@ -838,8 +838,8 @@
 }
 
 void loadResource(char *resourceName) {
-	uint8 isMask = 0;
-	uint8 isSpl = 0;
+	/* uint8 isMask = 0; */
+	/* uint8 isSpl = 0; */
 
 	if (strstr(resourceName, ".SPL")) {
 		loadSpl(resourceName);
@@ -871,8 +871,8 @@
 }
 
 void loadAbs(char *resourceName, uint16 idx) {
-	uint8 isMask = 0;
-	uint8 isSpl = 0;
+	/* uint8 isMask = 0; */
+	/* uint8 isSpl = 0; */
 
 	if (strstr(resourceName, ".SET")) {
 		loadSetAbs(resourceName, idx);

Modified: scummvm/trunk/engines/cine/prc.h
===================================================================
--- scummvm/trunk/engines/cine/prc.h	2006-02-23 10:26:14 UTC (rev 20823)
+++ scummvm/trunk/engines/cine/prc.h	2006-02-23 10:35:33 UTC (rev 20824)
@@ -42,6 +42,6 @@
 
 void resetglobalScriptsHead(void);
 void freePrcLinkedList(void);
-void loadPrc(char *pPrcName);
+void loadPrc(const char *pPrcName);
 
 #endif

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2006-02-23 10:26:14 UTC (rev 20823)
+++ scummvm/trunk/engines/cine/various.cpp	2006-02-23 10:35:33 UTC (rev 20824)
@@ -41,7 +41,7 @@
 uint16 var4;
 uint16 var5;
 
-void drawString(char *string, uint8 param) {
+void drawString(const char *string, uint8 param) {
 }
 
 void blitRawScreen(uint8 *frontBuffer) {
@@ -2385,12 +2385,12 @@
 
 void drawSprite(overlayHeadElement *currentOverlay, uint8 *spritePtr,
 				uint8 *maskPtr, uint16 width, uint16 height, uint8 *page, int16 x, int16 y) {
+#if 0
 	uint8 *ptr = NULL;
 	uint8 i = 0;
 	uint16 si = 0;
 	overlayHeadElement *pCurrentOverlay = currentOverlay;
 
-#if 0
 	while(pCurrentOverlay) { // unfinished, probably for mask handling..
 		if (pCurrentOverlay->type == 5) {
 			int16 maskX;







More information about the Scummvm-git-logs mailing list