[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.162,1.163 actor.h,1.87,1.88 rscfile.cpp,1.31,1.32 rscfile.h,1.17,1.18 scene.cpp,1.137,1.138 scene.h,1.70,1.71

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31973

Modified Files:
	actor.cpp actor.h rscfile.cpp rscfile.h scene.cpp scene.h 
Log Message:
o Fix uint -> int with scene numbers
o WIP for metaResources


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- actor.cpp	5 Aug 2005 23:14:09 -0000	1.162
+++ actor.cpp	6 Aug 2005 14:26:58 -0000	1.163
@@ -372,6 +372,10 @@
 	return true;
 }
 
+void Actor::loadList(int actorsEntrance, int actorCount, int actorsResourceID,
+					 int protagStatesCount, int protagStatesResourceID) {
+}
+
 void Actor::takeExit(uint16 actorId, const HitZone *hitZone) {
 	ActorData *actor;
 	actor = getActor(actorId);

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- actor.h	30 Jul 2005 21:11:20 -0000	1.87
+++ actor.h	6 Aug 2005 14:26:58 -0000	1.88
@@ -572,6 +572,9 @@
 	void setProtagState(int state);
 	int getProtagState() { return _protagState; }
 
+	void loadList(int actorsEntrance, int actorCount, int actorsResourceID,
+				  int protagStatesCount, int protagStatesResourceID);
+
 private:
 	bool loadActorResources(ActorData *actor);
 	void stepZoneAction(ActorData *actor, const HitZone *hitZone, bool exit, bool stopped);

Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- rscfile.cpp	5 Aug 2005 23:14:10 -0000	1.31
+++ rscfile.cpp	6 Aug 2005 14:26:59 -0000	1.32
@@ -24,6 +24,7 @@
 // RSC Resource file management module
 #include "saga/saga.h"
 
+#include "saga/actor.h"
 #include "saga/rscfile.h"
 #include "saga/stream.h"
 
@@ -457,12 +458,16 @@
 	_metaResource.protagFaceSpritesID = metaS.readSint32LE();
 	_metaResource.field_22 = metaS.readSint32LE();
 	_metaResource.field_26 = metaS.readSint16LE();
-	_metaResource.field_28 = metaS.readSint16LE();
-	_metaResource.field_2a = metaS.readSint32LE();
+	_metaResource.protagStatesCount = metaS.readSint16LE();
+	_metaResource.protagStatesResourceID = metaS.readSint32LE();
 	_metaResource.cutawayListResourceID = metaS.readSint32LE();
 	_metaResource.songTableID = metaS.readSint32LE();
 
 	free(resourcePointer);
+
+	_vm->_actor->loadList(actorsEntrance, _metaResource.actorCount,
+						  _metaResource.actorsResourceID, _metaResource.protagStatesCount,
+						  _metaResource.protagStatesResourceID);
 }
 
 } // End of namespace Saga

Index: rscfile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- rscfile.h	5 Aug 2005 23:14:11 -0000	1.17
+++ rscfile.h	6 Aug 2005 14:26:59 -0000	1.18
@@ -102,8 +102,8 @@
 	int32 protagFaceSpritesID;
 	int32 field_22;
 	int16 field_26;
-	int16 field_28;
-	int32 field_2a;
+	int16 protagStatesCount;
+	int32 protagStatesResourceID;
 	int32 cutawayListResourceID;
 	int32 songTableID;
 

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- scene.cpp	6 Aug 2005 12:20:09 -0000	1.137
+++ scene.cpp	6 Aug 2005 14:26:59 -0000	1.138
@@ -417,7 +417,7 @@
 	}
 };
 
-void Scene::changeScene(uint16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter) {
+void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter) {
 	// This is used for latter demos where all places on world map except
 	// Tent Faire are substituted with LBM picture and short description
 	if (_vm->getFeatures() & GF_SCENE_SUBSTITUTES) {

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- scene.h	6 Aug 2005 12:20:10 -0000	1.70
+++ scene.h	6 Aug 2005 14:26:59 -0000	1.71
@@ -156,7 +156,7 @@
 };
 
 struct LoadSceneParams {
-	uint32 sceneDescriptor;
+	int32 sceneDescriptor;
 	SceneLoadFlags loadFlag;
 	SceneDescription* sceneDescription;
 	SceneProc *sceneProc;
@@ -248,7 +248,7 @@
 	void clearSceneQueue(void) {
 		_sceneQueue.clear();
 	}
-	void changeScene(uint16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter = -1);
+	void changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter = -1);
 	void freeCutawayList();
 
 	bool isSceneLoaded() const { return _sceneLoaded; }