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

[buddha_ at users.sourceforge.net]

Revision: 33669
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33669&view=rev
Author:   buddha_
Date:     2008-08-06 20:54:38 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Renamed page3Raw to collisionPage so it's more apparent what it does.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/bg.cpp
    scummvm/trunk/engines/cine/cine.cpp
    scummvm/trunk/engines/cine/gfx.cpp
    scummvm/trunk/engines/cine/gfx.h
    scummvm/trunk/engines/cine/script_fw.cpp

Modified: scummvm/trunk/engines/cine/bg.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg.cpp	2008-08-06 20:47:59 UTC (rev 33668)
+++ scummvm/trunk/engines/cine/bg.cpp	2008-08-06 20:54:38 UTC (rev 33669)
@@ -56,7 +56,7 @@
 		header[i] = readS.readUint16BE();
 	}
 
-	gfxConvertSpriteToRaw(page3Raw, ptr + 0x80, 160, 200);
+	gfxConvertSpriteToRaw(collisionPage, ptr + 0x80, 160, 200);
 
 	free(dataPtr);
 	return 0;
@@ -74,10 +74,10 @@
 	ptr += 2;
 
 	if (bpp == 8) {
-		memcpy(page3Raw, ptr + 256 * 3, 320 * 200);
+		memcpy(collisionPage, ptr + 256 * 3, 320 * 200);
 		renderer->loadCt256(ptr, ctName);
 	} else {
-		gfxConvertSpriteToRaw(page3Raw, ptr + 32, 160, 200);
+		gfxConvertSpriteToRaw(collisionPage, ptr + 32, 160, 200);
 		renderer->loadCt16(ptr, ctName);
 	}
 

Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp	2008-08-06 20:47:59 UTC (rev 33668)
+++ scummvm/trunk/engines/cine/cine.cpp	2008-08-06 20:54:38 UTC (rev 33669)
@@ -100,7 +100,7 @@
 	mainLoop(1);
 
 	delete renderer;
-	delete[] page3Raw;
+	delete[] collisionPage;
 	delete g_sound;
 	return 0;
 }
@@ -117,7 +117,7 @@
 		renderer = new FWRenderer;
 	}
 
-	page3Raw = new byte[320 * 200];
+	collisionPage = new byte[320 * 200];
 	textDataPtr = (byte *)malloc(8000);
 
 	partBuffer = (PartBuffer *)malloc(NUM_MAX_PARTDATA * sizeof(PartBuffer));

Modified: scummvm/trunk/engines/cine/gfx.cpp
===================================================================
--- scummvm/trunk/engines/cine/gfx.cpp	2008-08-06 20:47:59 UTC (rev 33668)
+++ scummvm/trunk/engines/cine/gfx.cpp	2008-08-06 20:54:38 UTC (rev 33669)
@@ -36,7 +36,7 @@
 
 namespace Cine {
 
-byte *page3Raw;
+byte *collisionPage;
 FWRenderer *renderer = NULL;
 
 static const byte mouseCursorNormal[] = {

Modified: scummvm/trunk/engines/cine/gfx.h
===================================================================
--- scummvm/trunk/engines/cine/gfx.h	2008-08-06 20:47:59 UTC (rev 33668)
+++ scummvm/trunk/engines/cine/gfx.h	2008-08-06 20:54:38 UTC (rev 33669)
@@ -183,7 +183,7 @@
 
 void gfxDrawSprite(byte *src4, uint16 sw, uint16 sh, byte *dst4, int16 sx, int16 sy);
 
-extern byte *page3Raw;
+extern byte *collisionPage;
 extern FWRenderer *renderer;
 
 void setMouseCursor(int cursor);

Modified: scummvm/trunk/engines/cine/script_fw.cpp
===================================================================
--- scummvm/trunk/engines/cine/script_fw.cpp	2008-08-06 20:47:59 UTC (rev 33668)
+++ scummvm/trunk/engines/cine/script_fw.cpp	2008-08-06 20:54:38 UTC (rev 33669)
@@ -1796,7 +1796,7 @@
 			}
 		}
 
-		idx = getZoneFromPositionRaw(page3Raw, lx + i, ly, 320);
+		idx = getZoneFromPositionRaw(collisionPage, lx + i, ly, 320);
 
 		assert(idx >= 0 && idx < NUM_MAX_ZONE);
 


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