aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorLars Persson2006-05-31 20:05:31 +0000
committerLars Persson2006-05-31 20:05:31 +0000
commit9472476acbf10b060627f209dc9afcb7284e8516 (patch)
tree82e2b5503bc0e97a0129ba4f9d0068e762e584aa /engines
parent9644171a7b323c48d80475f82a76be1d4c0e4d5d (diff)
downloadscummvm-rg350-9472476acbf10b060627f209dc9afcb7284e8516.tar.gz
scummvm-rg350-9472476acbf10b060627f209dc9afcb7284e8516.tar.bz2
scummvm-rg350-9472476acbf10b060627f209dc9afcb7284e8516.zip
Symbian Emulator (VC6) compilation fixes.
svn-id: r22809
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/hotspots.cpp7
-rw-r--r--engines/lure/surface.h4
2 files changed, 6 insertions, 5 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 52ec0eb4f1..4639770b93 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -2319,13 +2319,14 @@ bool PathFinder::process() {
}
// ****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;
diff --git a/engines/lure/surface.h b/engines/lure/surface.h
index 730a824ac1..f8db0d08b0 100644
--- a/engines/lure/surface.h
+++ b/engines/lure/surface.h
@@ -55,12 +55,12 @@ public:
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();