[Scummvm-cvs-logs] SF.net SVN: scummvm: [30016] scummvm/trunk/engines/cruise

[drmccoy at users.sourceforge.net]

Revision: 30016
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30016&view=rev
Author:   drmccoy
Date:     2007-12-27 09:47:31 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Muting the compiler (Sorry again, yaz0r :P)

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/ctp.cpp
    scummvm/trunk/engines/cruise/mainDraw.cpp

Modified: scummvm/trunk/engines/cruise/ctp.cpp
===================================================================
--- scummvm/trunk/engines/cruise/ctp.cpp	2007-12-27 17:37:38 UTC (rev 30015)
+++ scummvm/trunk/engines/cruise/ctp.cpp	2007-12-27 17:47:31 UTC (rev 30016)
@@ -107,7 +107,7 @@
 	int16 *destination;
 
 	int startX = X - ((upscaleValue(hotPointX, scale) + 0x8000) >> 16);
-	int startY = Y - ((upscaleValue(hotPointY, scale) + 0x8000) >> 16);
+//	int startY = Y - ((upscaleValue(hotPointY, scale) + 0x8000) >> 16);
 
 	numPoints = *(walkboxData++);
 

Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp	2007-12-27 17:37:38 UTC (rev 30015)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp	2007-12-27 17:47:31 UTC (rev 30016)
@@ -1039,7 +1039,7 @@
 }
 
 
-void drawMask(unsigned char* workBuffer, int wbWidth, int wbHeight, unsigned char* pMask, int maskWidth, int maskHeight, int maskX, int maskY, int passIdx)
+void drawMask(unsigned char* workBuf, int wbWidth, int wbHeight, unsigned char* pMask, int maskWidth, int maskHeight, int maskX, int maskY, int passIdx)
 {
 	for(int y=0; y<maskHeight; y++)
 	{
@@ -1051,7 +1051,7 @@
 				int destY = maskY + y;
 
 				if((destX >= 0) && (destX < wbWidth*8) && (destY >= 0) && (destY < wbHeight))
-					clearMaskBit(destX, destY, workBuffer, wbWidth);
+					clearMaskBit(destX, destY, workBuf, wbWidth);
 			}
 		}
 	}
@@ -1204,8 +1204,8 @@
 	cellStruct* plWork = currentObjPtr;
 	int workBufferSize = var_6 * (objX1/8);
 
-	unsigned char* workBuffer = (unsigned char*)malloc(workBufferSize);
-	memcpy(workBuffer, data2, workBufferSize);
+	unsigned char* workBuf= (unsigned char*)malloc(workBufferSize);
+	memcpy(workBuf, data2, workBufferSize);
 
 	int numPasses = 0;
 
@@ -1223,12 +1223,12 @@
 
 			if(filesDatabase[maskFrame].subData.resourceType == OBJ_TYPE_BGMK && filesDatabase[maskFrame].subData.ptrMask)
 			{
-				drawMask(workBuffer, objX1/8, var_6, filesDatabase[maskFrame].subData.ptrMask, filesDatabase[maskFrame].width/8, filesDatabase[maskFrame].height, maskX - objX2, maskY - objY2, numPasses++);
+				drawMask(workBuf, objX1/8, var_6, filesDatabase[maskFrame].subData.ptrMask, filesDatabase[maskFrame].width/8, filesDatabase[maskFrame].height, maskX - objX2, maskY - objY2, numPasses++);
 			}
 			else
 			if(filesDatabase[maskFrame].subData.resourceType == OBJ_TYPE_SPRITE && filesDatabase[maskFrame].subData.ptrMask)
 			{
-				drawMask(workBuffer, objX1/8, var_6, filesDatabase[maskFrame].subData.ptrMask, filesDatabase[maskFrame].width/8, filesDatabase[maskFrame].height, maskX - objX2, maskY - objY2, numPasses++);
+				drawMask(workBuf, objX1/8, var_6, filesDatabase[maskFrame].subData.ptrMask, filesDatabase[maskFrame].width/8, filesDatabase[maskFrame].height, maskX - objX2, maskY - objY2, numPasses++);
 			}
 
 		}
@@ -1242,14 +1242,14 @@
 			data1++;
 
 			if ((x + objX2) >= 0 && (x + objX2) < 320 && (y + objY2) >= 0 && (y + objY2) < 200) {
-				if(testMask(x, y, workBuffer, objX1/8)) {
+				if(testMask(x, y, workBuf, objX1/8)) {
 					output[320 * (y + objY2) + x + objX2] = color;
 				}
 			}
 		}
 	}
 
-	free(workBuffer);
+	free(workBuf);
 }
 
 #ifdef _DEBUG


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