[Scummvm-cvs-logs] CVS: scummvm/saga rscfile.cpp,1.32,1.33
Eugene Sandulenko
sev at users.sourceforge.net
Sat Aug 6 09:06:25 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.153,1.154 gfx.cpp,2.464,2.465 script_c64.cpp,2.11,2.12 script_v2.cpp,2.280,2.281 script_v5.cpp,1.291,1.292 script_v6.cpp,1.447,1.448 script_v7he.cpp,2.165,2.166 script_v90he.cpp,2.278,2.279
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.163,1.164 actor.h,1.88,1.89 ihnm_introproc.cpp,1.49,1.50 ite_introproc.cpp,1.64,1.65 rscfile.cpp,1.33,1.34 scene.cpp,1.138,1.139 scene.h,1.71,1.72
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13796
Modified Files:
rscfile.cpp
Log Message:
Fixes for metaResources loading
Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rscfile.cpp 6 Aug 2005 14:26:59 -0000 1.32
+++ rscfile.cpp 6 Aug 2005 16:05:13 -0000 1.33
@@ -425,6 +425,9 @@
static int metaResourceTable[] = { 0, 326, 517, 677, 805, 968, 1165, 0, 1271 };
void Resource::loadGlobalResources(int chapter, int actorsEntrance) {
+ if (chapter < 0)
+ chapter = 8;
+
// TODO
//if (module.voiceLUT)
// free module.voiceLUT;
@@ -468,6 +471,10 @@
_vm->_actor->loadList(actorsEntrance, _metaResource.actorCount,
_metaResource.actorsResourceID, _metaResource.protagStatesCount,
_metaResource.protagStatesResourceID);
+
+ _vm->_actor->_protagonist->sceneNumber = _metaResource.sceneIndex;
+
+
}
} // End of namespace Saga
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.153,1.154 gfx.cpp,2.464,2.465 script_c64.cpp,2.11,2.12 script_v2.cpp,2.280,2.281 script_v5.cpp,1.291,1.292 script_v6.cpp,1.447,1.448 script_v7he.cpp,2.165,2.166 script_v90he.cpp,2.278,2.279
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.163,1.164 actor.h,1.88,1.89 ihnm_introproc.cpp,1.49,1.50 ite_introproc.cpp,1.64,1.65 rscfile.cpp,1.33,1.34 scene.cpp,1.138,1.139 scene.h,1.71,1.72
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list