[Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.18,1.19 actionmap.h,1.7,1.8 animation.cpp,1.18,1.19 animation.h,1.8,1.9 saga.cpp,1.28,1.29

[Eugene Sandulenko]

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

Modified Files:
	actionmap.cpp actionmap.h animation.cpp animation.h saga.cpp 
Log Message:
Pass SagaEngine object to Anim and ActionMap objects


Index: actionmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actionmap.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- actionmap.cpp	1 Aug 2004 13:29:39 -0000	1.18
+++ actionmap.cpp	1 Aug 2004 13:34:19 -0000	1.19
@@ -40,7 +40,7 @@
 	return R_SUCCESS;
 }
 
-ActionMap::ActionMap(void) {
+ActionMap::ActionMap(SagaEngine *vm) : _vm(vm) {
 	debug(0, "ACTIONMAP Module: Initializing...");
 
 	_exits_loaded = 0;

Index: actionmap.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actionmap.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- actionmap.h	1 Aug 2004 00:07:17 -0000	1.7
+++ actionmap.h	1 Aug 2004 13:34:19 -0000	1.8
@@ -41,7 +41,7 @@
 class ActionMap {
  public:
 	int reg(void);
-	ActionMap(void);
+	ActionMap(SagaEngine *vm);
 	~ActionMap(void);
 
 	int load(const byte *exmap_res, size_t exmap_res_len);
@@ -53,6 +53,8 @@
 	void actionInfo(int argc, char *argv[]);
 
 private:
+	SagaEngine *_vm;
+
 	bool _initialized;
 	int _exits_loaded;
 	int _n_exits;

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- animation.cpp	1 Aug 2004 11:48:52 -0000	1.18
+++ animation.cpp	1 Aug 2004 13:34:19 -0000	1.19
@@ -42,7 +42,7 @@
 	return R_SUCCESS;
 }
 
-Anim::Anim(void) {
+Anim::Anim(SagaEngine *vm) : _vm(vm) {
 	int i;
 
 	_anim_limit = R_MAX_ANIMATIONS;

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- animation.h	31 Jul 2004 23:33:14 -0000	1.8
+++ animation.h	1 Aug 2004 13:34:20 -0000	1.9
@@ -94,7 +94,7 @@
 class Anim {
 public:
 	int reg(void);
-	Anim(void);
+	Anim(SagaEngine *vm);
 	~Anim(void);
 	int load(const byte *anim_resdata, size_t anim_resdata_len, uint16 *anim_id_p);
 	int freeId(uint16 anim_id);
@@ -112,6 +112,7 @@
 					size_t thisf_len, const byte **nextf_p, size_t *nextf_len);
 	int getFrameOffset(const byte *anim_resource, size_t anim_resource_len, uint16 find_frame, size_t *frame_offset);
 
+	SagaEngine *_vm;
 	bool _initialized;
 
 	uint16 _anim_count;

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- saga.cpp	1 Aug 2004 12:06:12 -0000	1.28
+++ saga.cpp	1 Aug 2004 13:34:20 -0000	1.29
@@ -154,8 +154,8 @@
 	EVENT_Init();
 	FONT_Init();
 	SPRITE_Init();
-	_anim = new Anim();
-	_actionMap = new ActionMap();
+	_anim = new Anim(this);
+	_actionMap = new ActionMap(this);
 	OBJECTMAP_Init();
 	ISOMAP_Init();
 	SCRIPT_Init();