[Scummvm-cvs-logs] CVS: scummvm/saga rscfile.cpp,1.43,1.44
Lars Persson
anotherguest at users.sourceforge.net
Fri Sep 30 17:05:17 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13441/saga
Modified Files:
rscfile.cpp
Log Message:
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.
Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- rscfile.cpp 29 Sep 2005 15:27:10 -0000 1.43
+++ rscfile.cpp 30 Sep 2005 21:13:49 -0000 1.44
@@ -441,6 +441,7 @@
ResourceContext *resourceContext;
ResourceContext *soundContext;
+ int i;
resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
if (resourceContext == NULL) {
@@ -510,7 +511,7 @@
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 @@
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);
More information about the Scummvm-git-logs
mailing list