[Scummvm-cvs-logs] SF.net SVN: scummvm: [22809] scummvm/trunk/engines/lure

[anotherguest at users.sourceforge.net]

Revision: 22809
Author:   anotherguest
Date:     2006-05-31 13:05:31 -0700 (Wed, 31 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22809&view=rev

Log Message:
-----------
Symbian Emulator (VC6) compilation fixes.

Modified Paths:
--------------
    scummvm/trunk/engines/lure/hotspots.cpp
    scummvm/trunk/engines/lure/surface.h
Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2006-05-31 19:55:54 UTC (rev 22808)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2006-05-31 20:05:31 UTC (rev 22809)
@@ -2319,13 +2319,14 @@
 	}
 
 	// ****DEBUG****
-	for (int ctr = 0; ctr < DECODED_PATHS_WIDTH * DECODED_PATHS_HEIGHT; ++ctr)
+	int ctr;
+	for (ctr = 0; ctr < DECODED_PATHS_WIDTH * DECODED_PATHS_HEIGHT; ++ctr)
 		Room::getReference().tempLayer[ctr] = _layer[ctr];
 
 	// Determine the walk path by working backwards from the destination, adding in the 
 	// walking steps in reverse order until source is reached
-
-	for (int stageCtr = 0; stageCtr < 3; ++stageCtr) {
+	int stageCtr;
+	for (stageCtr = 0; stageCtr < 3; ++stageCtr) {
 		altFlag = stageCtr == 1;
 		pCurrent = _pDest;
 

Modified: scummvm/trunk/engines/lure/surface.h
===================================================================
--- scummvm/trunk/engines/lure/surface.h	2006-05-31 19:55:54 UTC (rev 22808)
+++ scummvm/trunk/engines/lure/surface.h	2006-05-31 20:05:31 UTC (rev 22809)
@@ -55,12 +55,12 @@
 	void transparentCopyTo(Surface *dest);
 	void copyTo(Surface *dest);
 	void copyTo(Surface *dest, uint16 x, uint16 y);
-	void copyTo(Surface *dest, const Rect &srcBounds, uint16 destX, uint16 destY,
+	void copyTo(Surface *dest, const Common::Rect &srcBounds, uint16 destX, uint16 destY,
 		int transparentColour = -1);
 	void copyFrom(MemoryBlock *src) { _data->copyFrom(src); }
 	void copyFrom(MemoryBlock *src, uint32 destOffset);
 	void empty() { _data->empty(); }
-	void fillRect(const Rect &r, uint8 colour);
+	void fillRect(const Common::Rect &r, uint8 colour);
 	void createDialog(bool blackFlag = false);
 	void copyToScreen(uint16 x, uint16 y);
 	void centerOnScreen();


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