diff options
| author | Lars Persson | 2005-09-30 21:13:49 +0000 |
|---|---|---|
| committer | Lars Persson | 2005-09-30 21:13:49 +0000 |
| commit | 7dc6b6adbdd127b72d605eb1b8b75a34da59bddf (patch) | |
| tree | 07b575647c4e68ee4b2bbf6aea11d5129b248d8c /saga | |
| parent | 654ab46cf1aef64e756412751b907725f3a0076e (diff) | |
| download | scummvm-rg350-7dc6b6adbdd127b72d605eb1b8b75a34da59bddf.tar.gz scummvm-rg350-7dc6b6adbdd127b72d605eb1b8b75a34da59bddf.tar.bz2 scummvm-rg350-7dc6b6adbdd127b72d605eb1b8b75a34da59bddf.zip | |
1.Removed warning from symbian portdefs
2.Made thumbnail.cpp compile for VC6 (Symbian Emulator environment). Order of template declaration and includes causing the problems
3.Moved int i declaration from for;loop into local variable
4.Updated stdafx uio.h is not part of the Symbian build chain.
svn-id: r18909
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/rscfile.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/saga/rscfile.cpp b/saga/rscfile.cpp index 381beb823e..cb792c1af8 100644 --- a/saga/rscfile.cpp +++ b/saga/rscfile.cpp @@ -441,6 +441,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { ResourceContext *resourceContext; ResourceContext *soundContext; + int i; resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE); if (resourceContext == NULL) { @@ -510,7 +511,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { MemoryReadStream fxS(resourcePointer, resourceLength); - for (int i = 0; i < _vm->_sndRes->_fxTableLen; i++) { + for (i = 0; i < _vm->_sndRes->_fxTableLen; i++) { _vm->_sndRes->_fxTable[i].res = fxS.readSint16LE(); _vm->_sndRes->_fxTable[i].vol = fxS.readSint16LE(); } @@ -549,7 +550,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) { MemoryReadStream songS(resourcePointer, resourceLength); - for (int i = 0; i < _vm->_music->_songTableLen; i++) + for (i = 0; i < _vm->_music->_songTableLen; i++) _vm->_music->_songTable[i] = songS.readSint32LE(); free(resourcePointer); |