[Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.23,1.24 game.cpp,1.37,1.38 global.cpp,1.13,1.14 goblin.cpp,1.34,1.35 map.cpp,1.24,1.25 mult.cpp,1.19,1.20 scenery.cpp,1.26,1.27
Pawel Kolodziejski
aquadran at users.sourceforge.net
Thu Feb 2 23:31:18 CET 2006
Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6269/gob
Modified Files:
draw.cpp game.cpp global.cpp goblin.cpp map.cpp mult.cpp
scenery.cpp
Log Message:
fixes allow compile with emsvc4 again
Index: draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/draw.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- draw.cpp 2 Feb 2006 21:11:59 -0000 1.23
+++ draw.cpp 3 Feb 2006 07:30:27 -0000 1.24
@@ -51,17 +51,19 @@
_backDeltaX = 0;
_backDeltaY = 0;
- for (int i = 0; i < 4; i++)
+ int i;
+
+ for (i = 0; i < 4; i++)
_fonts[i] = 0;
_textToPrint = 0;
_transparency = 0;
- for (int i = 0; i < 50; i++)
+ for (i = 0; i < 50; i++)
_spritesArray[i] = 0;
_invalidatedCount = 0;
- for (int i = 0; i < 30; i++) {
+ for (i = 0; i < 30; i++) {
_invalidatedTops[i] = 0;
_invalidatedLefts[i] = 0;
_invalidatedRights[i] = 0;
@@ -75,16 +77,16 @@
_backSurface = 0;
_frontSurface = 0;
- for (int i = 0; i < 18; i++)
+ for (i = 0; i < 18; i++)
_unusedPalette1[i] = 0;
- for (int i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
_unusedPalette2[i] = 0;
- for (int i = 0; i < 256; i++) {
+ for (i = 0; i < 256; i++) {
_vgaPalette[i].red = 0;
_vgaPalette[i].blue = 0;
_vgaPalette[i].green = 0;
}
- for (int i = 0; i < 16; i++) {
+ for (i = 0; i < 16; i++) {
_vgaSmallPalette[i].red = 0;
_vgaSmallPalette[i].blue = 0;
_vgaSmallPalette[i].green = 0;
@@ -98,7 +100,7 @@
_cursorXDeltaVar = -1;
_cursorYDeltaVar = -1;
- for (int i = 0; i < 40; i++) {
+ for (i = 0; i < 40; i++) {
_cursorAnimLow[i] = 0;
_cursorAnimHigh[i] = 0;
_cursorAnimDelays[i] = 0;
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- game.cpp 29 Jan 2006 19:18:15 -0000 1.37
+++ game.cpp 3 Feb 2006 07:30:28 -0000 1.38
@@ -52,12 +52,14 @@
// Collisions stack
_collStackSize = 0;
- for (int i = 0; i < 3; i++) {
+ int i;
+
+ for (i = 0; i < 3; i++) {
_collStack[i] = 0;
_collStackElemSizes[i] = 0;
}
- for (int i = 0; i < 20; i++)
+ for (i = 0; i < 20; i++)
_soundSamples[i] = 0;
_curTotFile[0] = 0;
Index: global.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/global.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- global.cpp 29 Jan 2006 02:27:10 -0000 1.13
+++ global.cpp 3 Feb 2006 07:30:28 -0000 1.14
@@ -71,7 +71,9 @@
/* Data files */
_packedSize = 0;
- for (int i = 0; i < MAX_DATA_FILES; i++) {
+ int i;
+
+ for (i = 0; i < MAX_DATA_FILES; i++) {
_dataFiles[i] = 0;
_numDataChunks[i] = 0;
_dataFileHandles[i] = -1;
@@ -111,7 +113,7 @@
_unusedPalette1[16] = (int16)0xAAAA;
_unusedPalette1[17] = (int16)0xFFFF;
- for (int i = 0; i < 16 ;i++)
+ for (i = 0; i < 16 ;i++)
_unusedPalette2[i] = i;
_vgaPalette[0].red = 0x00; _vgaPalette[0].green = 0x00; _vgaPalette[0].blue = 0x00;
Index: goblin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- goblin.cpp 29 Jan 2006 02:27:10 -0000 1.34
+++ goblin.cpp 3 Feb 2006 07:30:28 -0000 1.35
@@ -67,12 +67,13 @@
_noPick = 0;
_objList = 0;
- for (int i = 0; i < 4; i++)
+ int i;
+ for (i = 0; i < 4; i++)
_goblins[i] = 0;
_currentGoblin = 0;
- for (int i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
_soundData[i] = 0;
- for (int i = 0; i < 3; i++) {
+ for (i = 0; i < 3; i++) {
_gobPositions[i].x = 0;
_gobPositions[i].y = 0;
}
@@ -136,7 +137,7 @@
_destItemType = 0;
_destItemState = 0;
- for (int i = 0; i < 20; i++) {
+ for (i = 0; i < 20; i++) {
_itemToObject[i] = 0;
_objects[i] = 0;
}
Index: map.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/map.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- map.cpp 29 Jan 2006 02:27:10 -0000 1.24
+++ map.cpp 3 Feb 2006 07:30:28 -0000 1.25
@@ -32,16 +32,18 @@
namespace Gob {
Map::Map(GobEngine *vm) : _vm(vm) {
- for (int i = 0; i < kMapHeight; i++)
+ int i;
+
+ for (i = 0; i < kMapHeight; i++)
for (int j = 0; j < kMapWidth; j++) {
_passMap[i][j] = 0;
_itemsMap[i][j] = 0;
}
- for (int i = 0; i < 40; i++) {
+ for (i = 0; i < 40; i++) {
_wayPoints[i].x = 0;
_wayPoints[i].y = 0;
}
- for (int i = 0; i < 40; i++) {
+ for (i = 0; i < 40; i++) {
_itemPoses[i].x = 0;
_itemPoses[i].y = 0;
_itemPoses[i].orient = 0;
Index: mult.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mult.cpp 29 Jan 2006 02:27:10 -0000 1.19
+++ mult.cpp 3 Feb 2006 07:30:28 -0000 1.20
@@ -54,15 +54,16 @@
_staticKeysCount = 0;
_staticKeys = 0;
- for (int i = 0; i < 10; i++)
+ int i;
+ for (i = 0; i < 10; i++)
_staticIndices[i] = 0;
- for (int i = 0; i < 4; i++) {
+ for (i = 0; i < 4; i++) {
_animKeys[i] = 0;
_animKeysCount[i] = 0;
}
_animLayer = 0;
- for (int i = 0; i < 10; i++)
+ for (i = 0; i < 10; i++)
_animIndices[i] = 0;
_textKeysCount = 0;
@@ -75,12 +76,12 @@
_palKeys = 0;
_oldPalette = 0;
_palAnimKey = 0;
- for (int i = 0; i < 256; i++) {
+ for (i = 0; i < 256; i++) {
_palAnimPalette[i].red = 0;
_palAnimPalette[i].green = 0;
_palAnimPalette[i].blue = 0;
}
- for (int i = 0; i < 4; i++) {
+ for (i = 0; i < 4; i++) {
_palAnimIndices[i] = 0;
_palAnimRed[i] = 0;
_palAnimGreen[i] = 0;
@@ -96,7 +97,7 @@
_animDataAllocated = 0;
_dataPtr = 0;
- for (int i = 0; i < 10; i++) {
+ for (i = 0; i < 10; i++) {
_staticLoaded[i] = 0;
_animLoaded[i] = 0;
}
@@ -105,7 +106,7 @@
_sndKeysCount = 0;
_sndKeys = 0;
- for (int i = 0; i < 5; i++)
+ for (i = 0; i < 5; i++)
for (int j = 0; j < 16; j++) {
_fadePal[i][j].red = 0;
_fadePal[i][j].green = 0;
Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- scenery.cpp 29 Jan 2006 02:27:10 -0000 1.26
+++ scenery.cpp 3 Feb 2006 07:30:28 -0000 1.27
@@ -34,15 +34,17 @@
namespace Gob {
Scenery::Scenery(GobEngine *vm) : _vm(vm) {
- for (int i = 0; i < 20; i++) {
+ int i;
+
+ for (i = 0; i < 20; i++) {
_spriteRefs[i] = 0;
_spriteResId[i] = 0;
}
- for (int i = 0; i < 70; i++ ) {
+ for (i = 0; i < 70; i++ ) {
_staticPictToSprite[i] = 0;
_animPictToSprite[i] = 0;
}
- for (int i = 0; i < 10; i++) {
+ for (i = 0; i < 10; i++) {
_staticPictCount[i] = 0;
_staticFromExt[i] = 0;
_staticResId[i] = 0;
More information about the Scummvm-git-logs
mailing list