thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes allow compile with emsvc4 again

Browse source 
svn-id: r20355
This commit is contained in:
Paweł Kołodziejski 2006-02-03 07:30:29 +00:00
parent 4df095cb36
commit 2ebdbbf5e0
12 changed files with 54 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/wince/CELauncherDialog.cpp
View file

@ -98,7 +98,7 @@ void CELauncherDialog::addCandidate(String &path, DetectedGameList &candidates)
strcpy(candidateName, &path[i + 1]);
candidateName[strlen(candidateName) - 1] = '\0';
for (i=0; i<candidates.size(); i++) {
if (scumm_stricmp(candidateName, candidates[i].name) == 0) {
if (scumm_stricmp(candidateName, candidates[i].description) == 0) {
idx = i;
break;
}
@ -118,7 +118,7 @@ void CELauncherDialog::addCandidate(String &path, DetectedGameList &candidates)
// The auto detector or the user made a choice.
// Pick a domain name which does not yet exist (after all, we
// are *adding* a game to the config, not replacing).
String domain(result.name);
String domain(result.description);
if (ConfMan.hasGameDomain(domain)) {
char suffix = 'a';
domain += suffix;
@ -128,7 +128,7 @@ void CELauncherDialog::addCandidate(String &path, DetectedGameList &candidates)
suffix++;
domain += suffix;
}
ConfMan.set("gameid", result.name, domain);
ConfMan.set("gameid", result.description, domain);
ConfMan.set("description", result.description, domain);
}
ConfMan.set("path", path, domain);

18
gob/draw.cpp
View file

@ -51,17 +51,19 @@ Draw::Draw(GobEngine *vm) : _vm(vm) {
_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 @@ Draw::Draw(GobEngine *vm) : _vm(vm) {
_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 @@ Draw::Draw(GobEngine *vm) : _vm(vm) {
_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;

6
gob/game.cpp
View file

@ -52,12 +52,14 @@ Game::Game(GobEngine *vm) : _vm(vm) {
// 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;

6
gob/global.cpp
View file

@ -71,7 +71,9 @@ Global::Global(GobEngine *vm) : _vm(vm) {
/* 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 @@ Global::Global(GobEngine *vm) : _vm(vm) {
_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;

9
gob/goblin.cpp
View file

@ -67,12 +67,13 @@ Goblin::Goblin(GobEngine *vm) : _vm(vm) {
_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 @@ Goblin::Goblin(GobEngine *vm) : _vm(vm) {
_destItemType = 0;
_destItemState = 0;
for (int i = 0; i < 20; i++) {
for (i = 0; i < 20; i++) {
_itemToObject[i] = 0;
_objects[i] = 0;
}

8
gob/map.cpp
View file

@ -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;

15
gob/mult.cpp
View file

@ -54,15 +54,16 @@ Mult::Mult(GobEngine *vm) : _vm(vm) {
_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 @@ Mult::Mult(GobEngine *vm) : _vm(vm) {
_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 @@ Mult::Mult(GobEngine *vm) : _vm(vm) {
_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 @@ Mult::Mult(GobEngine *vm) : _vm(vm) {
_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;

8
gob/scenery.cpp
View file

@ -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;

4
graphics/imageman.cpp
View file

@ -41,8 +41,8 @@ ImageManager::~ImageManager() {
}
_surfaces.clear();
#ifdef USE_ZLIB
for (ZipIterator pos = _archives.begin(); pos != _archives.end(); ++pos) {
unzClose(*pos);
for (ZipIterator pos2 = _archives.begin(); pos2 != _archives.end(); ++pos2) {
unzClose(*pos2);
}
_archives.clear();
#endif

5
gui/ThemeNew.cpp
View file

@ -1032,11 +1032,12 @@ void ThemeNew::resetupGuiRenderer() {
_lastUsedBitMask = gBitFormat;
for (int i = 0; i < kImageHandlesMax; ++i) {
int i;
for (i = 0; i < kImageHandlesMax; ++i) {
ImageMan.unregisterSurface(_imageHandles[i]);
}
for (int i = 0; i < kImageHandlesMax; ++i) {
for (i = 0; i < kImageHandlesMax; ++i) {
ImageMan.registerSurface(_imageHandles[i], 0);
_images[i] = ImageMan.getSurface(_imageHandles[i]);
}

6
gui/newgui.cpp
View file

@ -113,10 +113,12 @@ void NewGui::runLoop() {
// This is necessary to get the blending right.
_theme->clearAll();
for (int i = 0; i < _dialogStack.size(); ++i) {
int i;
for (i = 0; i < _dialogStack.size(); ++i) {
_theme->closeDialog();
}
for (int i = 0; i < _dialogStack.size(); i++) {
for (i = 0; i < _dialogStack.size(); i++) {
_theme->openDialog();
_dialogStack[i]->drawDialog();
}

2
scumm/intern.h
View file

@ -1347,7 +1347,7 @@ public:
int _languageIndexSize;
char _lastStringTag[12+1];
#if defined(__SYMBIAN32__) // for some reason VC6 cannot find the base class TextObject
#if defined(__SYMBIAN32__) || defined (_WIN32_WCE) // for some reason VC6 cannot find the base class TextObject
struct SubtitleText {
int16 xpos, ypos;
byte color;