diff options
| author | Kari Salminen | 2008-08-06 20:54:38 +0000 | 
|---|---|---|
| committer | Kari Salminen | 2008-08-06 20:54:38 +0000 | 
| commit | a10753e2a1d0f6b0a8d98fd215beac5acd91edd3 (patch) | |
| tree | 25e54ff2c3e1d23469cf4b59b58af46c0b6d1b02 | |
| parent | 66fc0d6a2579bf8346ccb91cce37fe517938156f (diff) | |
| download | scummvm-rg350-a10753e2a1d0f6b0a8d98fd215beac5acd91edd3.tar.gz scummvm-rg350-a10753e2a1d0f6b0a8d98fd215beac5acd91edd3.tar.bz2 scummvm-rg350-a10753e2a1d0f6b0a8d98fd215beac5acd91edd3.zip  | |
Renamed page3Raw to collisionPage so it's more apparent what it does.
svn-id: r33669
| -rw-r--r-- | engines/cine/bg.cpp | 6 | ||||
| -rw-r--r-- | engines/cine/cine.cpp | 4 | ||||
| -rw-r--r-- | engines/cine/gfx.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/gfx.h | 2 | ||||
| -rw-r--r-- | engines/cine/script_fw.cpp | 2 | 
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp index 2a4e7f0ab1..45bfae7925 100644 --- a/engines/cine/bg.cpp +++ b/engines/cine/bg.cpp @@ -56,7 +56,7 @@ byte loadCtFW(const char *ctName) {  		header[i] = readS.readUint16BE();  	} -	gfxConvertSpriteToRaw(page3Raw, ptr + 0x80, 160, 200); +	gfxConvertSpriteToRaw(collisionPage, ptr + 0x80, 160, 200);  	free(dataPtr);  	return 0; @@ -74,10 +74,10 @@ byte loadCtOS(const char *ctName) {  	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);  	} diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index f6778b6457..9594b42e51 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -100,7 +100,7 @@ int CineEngine::go() {  	mainLoop(1);  	delete renderer; -	delete[] page3Raw; +	delete[] collisionPage;  	delete g_sound;  	return 0;  } @@ -117,7 +117,7 @@ void CineEngine::initialize() {  		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)); diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp index 16bf4baa07..9632c1c005 100644 --- a/engines/cine/gfx.cpp +++ b/engines/cine/gfx.cpp @@ -36,7 +36,7 @@  namespace Cine { -byte *page3Raw; +byte *collisionPage;  FWRenderer *renderer = NULL;  static const byte mouseCursorNormal[] = { diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h index c028aa123c..078954e3b9 100644 --- a/engines/cine/gfx.h +++ b/engines/cine/gfx.h @@ -183,7 +183,7 @@ public:  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); diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp index c6f5f73cf1..782f7819c0 100644 --- a/engines/cine/script_fw.cpp +++ b/engines/cine/script_fw.cpp @@ -1796,7 +1796,7 @@ int16 checkCollision(int16 objIdx, int16 x, int16 y, int16 numZones, int16 zoneI  			}  		} -		idx = getZoneFromPositionRaw(page3Raw, lx + i, ly, 320); +		idx = getZoneFromPositionRaw(collisionPage, lx + i, ly, 320);  		assert(idx >= 0 && idx < NUM_MAX_ZONE);  | 
