[Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.11,1.12 actor.cpp,1.13,1.14 animation.cpp,1.11,1.12 console.cpp,1.6,1.7 cvar.cpp,1.7,1.8 events.cpp,1.13,1.14 expr.cpp,1.4,1.5 font.cpp,1.9,1.10 game.cpp,1.15,1.16 gfx.cpp,1.20,1.21 gfx_mod.h,1.6,1.7 ihnm_introproc.cpp,1.8,1.9 image.cpp,1.11,1.12 input.cpp,1.4,1.5 interface.cpp,1.10,1.11 isomap.cpp,1.7,1.8 ite_introproc.cpp,1.11,1.12 music.cpp,1.19,1.20 objectmap.cpp,1.10,1.11 palanim.cpp,1.8,1.9 palanim.h,1.4,1.5 render.cpp,1.16,1.17 rscfile.cpp,1.5,1.6 saga.cpp,1.26,1.27 saga.h,1.18,1.19 scene.cpp,1.15,1.16 sceneproc.cpp,1.10,1.11 script.cpp,1.9,1.10 sdata.cpp,1.6,1.7 sdebug.cpp,1.4,1.5 sfuncs.cpp,1.6,1.7 sndres.cpp,1.16,1.17 sound.cpp,1.8,1.9 sprite.cpp,1.9,1.10 sstack.cpp,1.3,1.4 sthread.cpp,1.9,1.10 text.cpp,1.2,1.3 timer.cpp,1.3,1.4 transitions.cpp,1.5,1.6 ys_dl_list.cpp,1.3,1.4 reinherit.h,1.22,NONE

Jonathan Gray khalek at users.sourceforge.net
Sat Jul 31 18:57:16 CEST 2004


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

Modified Files:
	actionmap.cpp actor.cpp animation.cpp console.cpp cvar.cpp 
	events.cpp expr.cpp font.cpp game.cpp gfx.cpp gfx_mod.h 
	ihnm_introproc.cpp image.cpp input.cpp interface.cpp 
	isomap.cpp ite_introproc.cpp music.cpp objectmap.cpp 
	palanim.cpp palanim.h render.cpp rscfile.cpp saga.cpp saga.h 
	scene.cpp sceneproc.cpp script.cpp sdata.cpp sdebug.cpp 
	sfuncs.cpp sndres.cpp sound.cpp sprite.cpp sstack.cpp 
	sthread.cpp text.cpp timer.cpp transitions.cpp ys_dl_list.cpp 
Removed Files:
	reinherit.h 
Log Message:
merge reinherit.h into saga.h and gfx_mod.h, note the error loading animations wasn't caused by this commit :)

Index: actionmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actionmap.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- actionmap.cpp	1 Aug 2004 00:07:17 -0000	1.11
+++ actionmap.cpp	1 Aug 2004 01:56:21 -0000	1.12
@@ -23,11 +23,10 @@
 
 /* Action map module */
 #include "saga.h"
-#include "reinherit.h"
 
 #include "cvar_mod.h"
-#include "console_mod.h"
 #include "gfx_mod.h"
+#include "console_mod.h"
 
 #include "actionmap.h"
 

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- actor.cpp	31 Jul 2004 23:33:14 -0000	1.13
+++ actor.cpp	1 Aug 2004 01:56:21 -0000	1.14
@@ -22,9 +22,8 @@
  */
 
 #include "saga.h"
-#include "reinherit.h"
-
 #include "yslib.h"
+#include "gfx_mod.h"
 
 #include "game_mod.h"
 #include "cvar_mod.h"

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- animation.cpp	31 Jul 2004 23:33:14 -0000	1.11
+++ animation.cpp	1 Aug 2004 01:56:21 -0000	1.12
@@ -23,7 +23,7 @@
 
 // Background animation management module
 #include "saga.h"
-#include "reinherit.h"
+#include "gfx_mod.h"
 
 #include "cvar_mod.h"
 #include "console_mod.h"
@@ -65,6 +65,7 @@
 	uint16 i;
 
 	if (!_initialized) {
+		warning("Anim::load not initialised");
 		return R_FAILURE;
 	}
 
@@ -77,12 +78,13 @@
 	}
 
 	if (i == R_MAX_ANIMATIONS) {
+		warning("Anim::load could not find unused animation slot");
 		return R_FAILURE;
 	}
 
 	new_anim = (R_ANIMATION *)malloc(sizeof *new_anim);
 	if (new_anim == NULL) {
-		warning("Error: Allocation failure");
+		warning("Anim::load Allocation failure");
 		return R_MEM;
 	}
 
@@ -91,14 +93,14 @@
 
 	if (GAME_GetGameType() == R_GAMETYPE_ITE) {
 		if (getNumFrames(anim_resdata, anim_resdata_len, &new_anim->n_frames) != R_SUCCESS) {
-			warning("Error: Couldn't get animation frame count");
+			warning("Anim::load Couldn't get animation frame count");
 			return R_FAILURE;
 		}
 
 		// Cache frame offsets
 		new_anim->frame_offsets = (size_t *)malloc(new_anim->n_frames * sizeof *new_anim->frame_offsets);
 		if (new_anim->frame_offsets == NULL) {
-			warning("Error: Allocation failure");
+			warning("Anim::load Allocation failure");
 			return R_MEM;
 		}
 

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/console.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- console.cpp	5 May 2004 13:05:30 -0000	1.6
+++ console.cpp	1 Aug 2004 01:56:21 -0000	1.7
@@ -23,8 +23,8 @@
 
 // Console module
 
-#include "reinherit.h"
-
+#include "saga.h"
+#include "gfx_mod.h"
 #include "font_mod.h"
 #include "cvar_mod.h"
 #include "events_mod.h"

Index: cvar.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/cvar.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cvar.cpp	31 Jul 2004 23:33:14 -0000	1.7
+++ cvar.cpp	1 Aug 2004 01:56:21 -0000	1.8
@@ -23,7 +23,7 @@
 
 // Configuration Variable Module
 #include "saga.h"
-#include "reinherit.h"
+#include "gfx_mod.h"
 
 #include "console_mod.h"
 

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- events.cpp	31 Jul 2004 23:00:48 -0000	1.13
+++ events.cpp	1 Aug 2004 01:56:21 -0000	1.14
@@ -25,7 +25,7 @@
 
 
 #include "saga.h"
-#include "reinherit.h"
+#include "gfx_mod.h"
 
 #include "yslib.h"
 

Index: expr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/expr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- expr.cpp	1 May 2004 06:57:54 -0000	1.4
+++ expr.cpp	1 Aug 2004 01:56:21 -0000	1.5
@@ -25,8 +25,7 @@
 
 // EXPR_ParseArgs() lifted wholesale from SDL win32 initialization code by Sam Lantinga
 
-#include "reinherit.h"
-
+#include "saga.h"
 #include "cvar_mod.h"
 #include "expr.h"
 

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- font.cpp	27 Jun 2004 21:30:32 -0000	1.9
+++ font.cpp	1 Aug 2004 01:56:21 -0000	1.10
@@ -23,7 +23,7 @@
 
 // Font management and font drawing module
 #include "saga.h"
-#include "reinherit.h"
+#include "gfx_mod.h"
 
 #include "rscfile_mod.h"
 #include "game_mod.h"

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- game.cpp	31 Jul 2004 12:37:36 -0000	1.15
+++ game.cpp	1 Aug 2004 01:56:21 -0000	1.16
@@ -23,8 +23,7 @@
 
 // Game detection, general game parameters
 
-#include "reinherit.h"
-
+#include "saga.h"
 #include "common/file.h"
 #include "base/gameDetector.h"
 #include "base/plugins.h"

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gfx.cpp	31 Jul 2004 12:39:26 -0000	1.20
+++ gfx.cpp	1 Aug 2004 01:56:21 -0000	1.21
@@ -28,7 +28,6 @@
 // Coriolis Group Books, 1997
 
 #include "saga/saga.h"
-#include "saga/reinherit.h"
 #include "saga/gfx_mod.h"
 #include "saga/gfx.h"
 

Index: gfx_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx_mod.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gfx_mod.h	2 May 2004 15:44:19 -0000	1.6
+++ gfx_mod.h	1 Aug 2004 01:56:21 -0000	1.7
@@ -44,6 +44,33 @@
 
 };
 
+struct PALENTRY {
+	byte red;
+	byte green;
+	byte blue;
+};
+
+struct R_COLOR {
+	int red;
+	int green;
+	int blue;
+	int alpha;
+};
+
+struct R_SURFACE {
+	byte *buf;
+	int buf_w;
+	int buf_h;
+	int buf_pitch;
+	R_RECT clip_rect;
+};
+
+#define R_PAL_ENTRIES 256
+
+#define R_RGB_RED   0x00FF0000UL
+#define R_RGB_GREEN 0x0000FF00UL
+#define R_RGB_BLUE  0x000000FFUL
+
 int GFX_SimpleBlit(R_SURFACE *dst_s, R_SURFACE *src_s);
 int GFX_DrawPalette(R_SURFACE *dst_s);
 int GFX_BufToSurface(R_SURFACE *ds, const byte *src, int src_w, int src_h, R_RECT *src_rect, R_POINT *dst_pt);
@@ -56,6 +83,17 @@
 int GFX_ClipLine(R_SURFACE *ds, const R_POINT *src_p1, const R_POINT *src_p2, R_POINT *dst_p1, R_POINT *dst_p2);
 void GFX_DrawLine(R_SURFACE * ds, R_POINT *p1, R_POINT *p2, int color);
 
+int GFX_Init(OSystem *system, int width, int height);
+R_SURFACE *GFX_GetBackBuffer();
+int GFX_GetWhite();
+int GFX_GetBlack();
+int GFX_MatchColor(unsigned long colormask);
+int GFX_SetPalette(R_SURFACE *surface, PALENTRY *pal);
+int GFX_GetCurrentPal(PALENTRY *src_pal);
+int GFX_PalToBlack(R_SURFACE *surface, PALENTRY *src_pal, double percent);
+int GFX_BlackToPal(R_SURFACE *surface, PALENTRY *src_pal, double percent);
+
+
 } // End of namespace Saga
 
 #endif

Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ihnm_introproc.cpp	31 Jul 2004 13:34:43 -0000	1.8
+++ ihnm_introproc.cpp	1 Aug 2004 01:56:21 -0000	1.9
@@ -25,8 +25,7 @@
 
 #include "saga.h"
 #include "yslib.h"
-
-#include "reinherit.h"
+#include "gfx_mod.h"
 
 #include "animation.h"
 #include "cvar_mod.h"

Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- image.cpp	31 Jul 2004 20:50:34 -0000	1.11
+++ image.cpp	1 Aug 2004 01:56:21 -0000	1.12
@@ -23,7 +23,6 @@
 
 // SAGA Image resource management routines
 #include "saga.h"
-#include "reinherit.h"
 
 #include "game_mod.h"
 

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input.cpp	31 Jul 2004 23:00:48 -0000	1.4
+++ input.cpp	1 Aug 2004 01:56:21 -0000	1.5
@@ -21,8 +21,8 @@
  *
  */
 #include "saga/saga.h"
-#include "saga/reinherit.h"
 
+#include "saga/gfx_mod.h"
 #include "saga/actor_mod.h"
 #include "saga/console_mod.h"
 #include "saga/interface_mod.h"

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- interface.cpp	31 Jul 2004 13:49:26 -0000	1.10
+++ interface.cpp	1 Aug 2004 01:56:21 -0000	1.11
@@ -23,14 +23,13 @@
 
 // Game interface module
 #include "saga.h"
-#include "reinherit.h"
 
+#include "gfx_mod.h"
 #include "game_mod.h"
 #include "cvar_mod.h"
 #include "actor_mod.h"
 #include "console_mod.h"
 #include "font_mod.h"
-#include "gfx_mod.h"
 #include "objectmap_mod.h"
 #include "rscfile_mod.h"
 #include "script_mod.h"

Index: isomap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- isomap.cpp	27 Jun 2004 21:30:32 -0000	1.7
+++ isomap.cpp	1 Aug 2004 01:56:21 -0000	1.8
@@ -23,7 +23,6 @@
 
 // Isometric level module
 #include "saga.h"
-#include "reinherit.h"
 
 #include "game_mod.h"
 #include "gfx_mod.h"

Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ite_introproc.cpp	31 Jul 2004 13:34:43 -0000	1.11
+++ ite_introproc.cpp	1 Aug 2004 01:56:21 -0000	1.12
@@ -25,8 +25,7 @@
 // Intro sequence scene procedures
 
 #include "saga.h"
-#include "reinherit.h"
-
+#include "gfx_mod.h"
 #include "yslib.h"
 
 #include "animation.h"

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- music.cpp	31 Jul 2004 12:37:36 -0000	1.19
+++ music.cpp	1 Aug 2004 01:56:21 -0000	1.20
@@ -21,7 +21,6 @@
  *
  */
 #include "saga.h"
-#include "reinherit.h"
 
 #include "music.h"
 #include "rscfile_mod.h"

Index: objectmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/objectmap.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- objectmap.cpp	31 Jul 2004 23:33:14 -0000	1.10
+++ objectmap.cpp	1 Aug 2004 01:56:21 -0000	1.11
@@ -27,11 +27,10 @@
 // appearing in Graphics Gems IV, "Point in Polygon Strategies."
 // p. 24-46, code: p. 34-45
 #include "saga.h"
-#include "reinherit.h"
 
+#include "gfx_mod.h"
 #include "cvar_mod.h"
 #include "console_mod.h"
-#include "gfx_mod.h"
 #include "font_mod.h"
 
 #include "objectmap_mod.h"

Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- palanim.cpp	5 May 2004 13:05:30 -0000	1.8
+++ palanim.cpp	1 Aug 2004 01:56:21 -0000	1.9
@@ -23,7 +23,7 @@
 
 // Palette animation module
 #include "saga.h"
-#include "reinherit.h"
+#include "gfx_mod.h"
 
 #include "events_mod.h"
 #include "game_mod.h"

Index: palanim.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- palanim.h	1 May 2004 13:19:15 -0000	1.4
+++ palanim.h	1 Aug 2004 01:56:21 -0000	1.5
@@ -26,8 +26,6 @@
 #ifndef SAGA_PALANIM_H
 #define SAGA_PALANIM_H
 
-#include "reinherit.h"
-
 namespace Saga {
 
 #define PALANIM_CYCLETIME 100

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- render.cpp	1 Aug 2004 00:03:45 -0000	1.16
+++ render.cpp	1 Aug 2004 01:56:21 -0000	1.17
@@ -23,15 +23,14 @@
 
 // Main rendering loop
 #include "saga.h"
-#include "reinherit.h"
 
+#include "gfx_mod.h"
 #include "timer.h"
 #include "actor_mod.h"
 #include "console_mod.h"
 #include "cvar_mod.h"
 #include "font_mod.h"
 #include "game_mod.h"
-#include "gfx_mod.h"
 #include "interface_mod.h"
 #include "scene_mod.h"
 #include "sprite_mod.h"

Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rscfile.cpp	4 May 2004 03:33:03 -0000	1.5
+++ rscfile.cpp	1 Aug 2004 01:56:21 -0000	1.6
@@ -23,7 +23,6 @@
 
 // RSC Resource file management module
 #include "saga.h"
-#include "reinherit.h"
 
 #include "rscfile_mod.h"
 #include "rscfile.h"

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- saga.cpp	1 Aug 2004 00:07:17 -0000	1.26
+++ saga.cpp	1 Aug 2004 01:56:21 -0000	1.27
@@ -32,10 +32,8 @@
 
 #include "saga.h"
 
-#include "reinherit.h"
-
 #include "timer.h"
-
+#include "gfx_mod.h"
 #include "rscfile_mod.h"
 #include "render.h"
 #include "actor_mod.h"

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- saga.h	1 Aug 2004 00:03:45 -0000	1.18
+++ saga.h	1 Aug 2004 01:56:21 -0000	1.19
@@ -30,12 +30,11 @@
 #include "base/gameDetector.h"
 #include "common/util.h"
 #include "common/stream.h"
+#include "common/rect.h"
 
 #include <limits.h>
 #include <stddef.h>
 
-//#include "gamedesc.h"
-
 namespace Saga {
 
 class SndRes;
@@ -48,6 +47,19 @@
 using Common::MemoryReadStream;
 
 #define R_PBOUNDS(n,max) (((n)>=(0))&&((n)<(max)))
+#define R_MAXPATH 512
+
+struct R_RSCFILE_CONTEXT;
+struct R_SEMAPHORE;
+
+typedef Common::Point R_POINT;
+typedef Common::Rect R_RECT;
+
+enum R_ERRORCODE {
+	R_MEM = -2,
+	R_FAILURE = -1,
+	R_SUCCESS = 0
+};
 
 enum SAGAGameId {
 	GID_ITE,
@@ -55,6 +67,12 @@
 	GID_IHNM
 };
 
+int TRANSITION_Dissolve(byte *dst_img, int dst_w, int dst_h,
+	int dst_p, const byte *src_img, int src_p, int flags, double percent);
+
+int SYSINPUT_ProcessInput(void);
+R_POINT SYSINPUT_GetMousePos();
+
 class SagaEngine : public Engine {
 	void errorString(const char *buf_input, char *buf_output);
 

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- scene.cpp	1 Aug 2004 00:03:45 -0000	1.15
+++ scene.cpp	1 Aug 2004 01:56:21 -0000	1.16
@@ -23,17 +23,15 @@
 
 // Scene management module
 #include "saga.h"
-#include "reinherit.h"
-
 #include "yslib.h"
 
+#include "gfx_mod.h"
 #include "game_mod.h"
 #include "animation.h"
 #include "console_mod.h"
 #include "cvar_mod.h"
 #include "events_mod.h"
 #include "actionmap.h"
-#include "gfx_mod.h"
 #include "isomap_mod.h"
 #include "script_mod.h"
 #include "objectmap_mod.h"
@@ -574,7 +572,7 @@
 		switch (SceneModule.reslist[i].res_type) {
 		case SAGA_BG_IMAGE: // Scene background resource
 			if (SceneModule.bg.loaded) {
-				warning("Error: Multiple background resources encountered");
+				warning("ProcessSceneResources: Multiple background resources encountered");
 				return R_FAILURE;
 			}
 
@@ -589,7 +587,7 @@
 				&SceneModule.bg.buf_len,
 				&SceneModule.bg.w,
 				&SceneModule.bg.h) != R_SUCCESS) {
-				warning("Error loading background resource: %u", SceneModule.reslist[i].res_number);
+				warning("ProcessSceneResources: Error loading background resource: %u", SceneModule.reslist[i].res_number);
 				return R_FAILURE;
 			}
 
@@ -599,7 +597,7 @@
 			break;
 		case SAGA_BG_MASK: // Scene background mask resource
 			if (SceneModule.bg_mask.loaded) {
-				warning("Error: Duplicate background mask resource encountered");
+				warning("ProcessSceneResources: Duplicate background mask resource encountered");
 			}
 			debug(0, "Loading BACKGROUND MASK resource.");
 			SceneModule.bg_mask.res_buf = SceneModule.reslist[i].res_data;
@@ -623,20 +621,20 @@
 		case SAGA_ACTION_MAP:
 			debug(0, "Loading exit map resource...");
 			if (_vm->_actionMap->load(res_data, res_data_len) != R_SUCCESS) {
-				warning("Error loading exit map resource");
+				warning("ProcessSceneResources: Error loading exit map resource");
 				return R_FAILURE;
 			}
 			break;
 		case SAGA_ISO_TILESET:
 			if (SceneModule.scene_mode == R_SCENE_MODE_NORMAL) {
-				warning("Isometric tileset incompatible with normal scene mode");
+				warning("ProcessSceneResources: Isometric tileset incompatible with normal scene mode");
 				return R_FAILURE;
 			}
 
 			debug(0, "Loading isometric tileset resource.");
 
 			if (ISOMAP_LoadTileset(res_data, res_data_len) != R_SUCCESS) {
-				warning("Error loading isometric tileset resource");
+				warning("ProcessSceneResources: Error loading isometric tileset resource");
 				return R_FAILURE;
 			}
 
@@ -644,14 +642,14 @@
 			break;
 		case SAGA_ISO_METAMAP:
 			if (SceneModule.scene_mode == R_SCENE_MODE_NORMAL) {
-				warning("Isometric metamap incompatible with normal scene mode");
+				warning("ProcessSceneResources: Isometric metamap incompatible with normal scene mode");
 				return R_FAILURE;
 			}
 
 			debug(0, "Loading isometric metamap resource.");
 
 			if (ISOMAP_LoadMetamap(res_data, res_data_len) != R_SUCCESS) {
-				warning("Error loading isometric metamap resource");
+				warning("ProcessSceneResources: Error loading isometric metamap resource");
 				return R_FAILURE;
 			}
 
@@ -659,14 +657,14 @@
 			break;
 		case SAGA_ISO_METATILESET:
 			if (SceneModule.scene_mode == R_SCENE_MODE_NORMAL) {
-				warning("Isometric metatileset incompatible with normal scene mode");
+				warning("ProcessSceneResources: Isometric metatileset incompatible with normal scene mode");
 				return R_FAILURE;
 			}
 
 			debug(0, "Loading isometric metatileset resource.");
 
 			if (ISOMAP_LoadMetaTileset(res_data, res_data_len) != R_SUCCESS) {
-				warning("Error loading isometric tileset resource");
+				warning("ProcessSceneResources: Error loading isometric tileset resource");
 				return R_FAILURE;
 			}
 
@@ -687,15 +685,13 @@
 
 				new_animinfo = (SCENE_ANIMINFO *)malloc(sizeof *new_animinfo);
 				if (new_animinfo == NULL) {
-					warning("Memory allocation error");
+					warning("ProcessSceneResources: Memory allocation error");
 					return R_MEM;
 				}
 
 				if (_vm->_anim->load(SceneModule.reslist[i].res_data,
-					SceneModule.reslist[i].res_data_len,
-					&new_anim_id) == R_SUCCESS) {
-				} else {
-					warning("Error loading animation resource");
+					SceneModule.reslist[i].res_data_len, &new_anim_id) != R_SUCCESS) {
+					warning("ProcessSceneResources: Error loading animation resource");
 					return R_FAILURE;
 				}
 
@@ -710,11 +706,10 @@
 			PALANIM_Load(SceneModule.reslist[i].res_data, SceneModule.reslist[i].res_data_len);
 			break;
 		default:
-			warning("Encountered unknown resource type: %d", SceneModule.reslist[i].res_type);
+			warning("ProcessSceneResources: Encountered unknown resource type: %d", SceneModule.reslist[i].res_type);
 			break;
 		}
 	}
-
 	return R_SUCCESS;
 }
 

Index: sceneproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sceneproc.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sceneproc.cpp	31 Jul 2004 13:34:43 -0000	1.10
+++ sceneproc.cpp	1 Aug 2004 01:56:21 -0000	1.11
@@ -24,10 +24,9 @@
 // Initial and default scene procedures
 
 #include "saga.h"
-#include "reinherit.h"
-
 #include "yslib.h"
 
+#include "gfx_mod.h"
 #include "animation.h"
 #include "events_mod.h"
 #include "scene_mod.h"

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- script.cpp	31 Jul 2004 23:33:14 -0000	1.9
+++ script.cpp	1 Aug 2004 01:56:22 -0000	1.10
@@ -23,10 +23,9 @@
 
 // Scripting module: Script resource handling functions
 #include "saga.h"
-#include "reinherit.h"
-
 #include "yslib.h"
 
+#include "gfx_mod.h"
 #include "rscfile_mod.h"
 #include "game_mod.h"
 #include "text_mod.h"

Index: sdata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sdata.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sdata.cpp	31 Jul 2004 12:37:36 -0000	1.6
+++ sdata.cpp	1 Aug 2004 01:56:22 -0000	1.7
@@ -22,10 +22,9 @@
  */
 // Type SDataWord_T must be unpadded
 #include "saga.h"
-#include "reinherit.h"
 
+#include "gfx_mod.h"
 #include "text_mod.h"
-
 #include "script_mod.h"
 #include "script.h"
 #include "sdata.h"

Index: sdebug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sdebug.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sdebug.cpp	4 May 2004 03:33:03 -0000	1.4
+++ sdebug.cpp	1 Aug 2004 01:56:22 -0000	1.5
@@ -23,8 +23,8 @@
 
 // Scripting module simple thread debugging support
 #include "saga.h"
-#include "reinherit.h"
 
+#include "gfx_mod.h"
 #include "actor_mod.h"
 #include "console_mod.h"
 #include "text_mod.h"

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sfuncs.cpp	31 Jul 2004 13:34:43 -0000	1.6
+++ sfuncs.cpp	1 Aug 2004 01:56:22 -0000	1.7
@@ -23,15 +23,15 @@
 
 // Scripting module script function component
 
-#include "reinherit.h"
+#include "saga.h"
 
+#include "gfx_mod.h"
 #include "actor_mod.h"
 #include "animation.h"
 #include "console_mod.h"
 #include "interface_mod.h"
 #include "text_mod.h"
 
-#include "saga.h"
 #include "script.h"
 #include "sfuncs.h"
 

Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sndres.cpp	31 Jul 2004 23:00:48 -0000	1.16
+++ sndres.cpp	1 Aug 2004 01:56:22 -0000	1.17
@@ -24,7 +24,6 @@
 // Sound resource management class
 
 #include "saga.h"
-#include "reinherit.h"
 
 #include "game_mod.h"
 #include "rscfile_mod.h"

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sound.cpp	31 Jul 2004 12:37:36 -0000	1.8
+++ sound.cpp	1 Aug 2004 01:56:22 -0000	1.9
@@ -21,7 +21,6 @@
  *
  */
 #include "saga.h"
-#include "reinherit.h"
 
 #include "sound.h"
 #include "game_mod.h"

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sprite.cpp	27 Jun 2004 21:30:33 -0000	1.9
+++ sprite.cpp	1 Aug 2004 01:56:22 -0000	1.10
@@ -23,7 +23,6 @@
 
 // Sprite management module
 #include "saga.h"
-#include "reinherit.h"
 
 #include "game_mod.h"
 #include "gfx_mod.h"

Index: sstack.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sstack.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sstack.cpp	31 Jul 2004 12:37:36 -0000	1.3
+++ sstack.cpp	1 Aug 2004 01:56:22 -0000	1.4
@@ -23,8 +23,9 @@
 
 // Scripting engine stack component
 
-#include "reinherit.h"
+#include "saga.h"
 
+#include "gfx_mod.h"
 #include "console_mod.h"
 #include "text_mod.h"
 

Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sthread.cpp	27 Jun 2004 21:30:33 -0000	1.9
+++ sthread.cpp	1 Aug 2004 01:56:22 -0000	1.10
@@ -23,10 +23,10 @@
 
 // Scripting module thread management component
 #include "saga.h"
-#include "reinherit.h"
 
 #include "yslib.h"
 
+#include "gfx_mod.h"
 #include "actor_mod.h"
 #include "console_mod.h"
 #include "text_mod.h"

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/text.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- text.cpp	1 May 2004 16:15:55 -0000	1.2
+++ text.cpp	1 Aug 2004 01:56:22 -0000	1.3
@@ -23,10 +23,10 @@
 
 // Text / dialogue display management module
 
-#include "reinherit.h"
-
+#include "saga.h"
 #include "yslib.h"
 
+#include "gfx_mod.h"
 #include "font_mod.h"
 
 #include "text_mod.h"

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/timer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- timer.cpp	2 May 2004 02:11:55 -0000	1.3
+++ timer.cpp	1 Aug 2004 01:56:22 -0000	1.4
@@ -21,8 +21,7 @@
  *
  */
 
-#include "reinherit.h"
-
+#include "saga.h"
 #include "timer.h"
 
 // FIXME: replace calls to this with direct OSystem calls

Index: transitions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/transitions.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- transitions.cpp	31 Jul 2004 12:37:36 -0000	1.5
+++ transitions.cpp	1 Aug 2004 01:56:22 -0000	1.6
@@ -23,7 +23,6 @@
 
 //Background transition routines
 #include "saga.h"
-#include "reinherit.h"
 
 namespace Saga {
 

Index: ys_dl_list.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ys_dl_list.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ys_dl_list.cpp	1 May 2004 16:15:55 -0000	1.3
+++ ys_dl_list.cpp	1 Aug 2004 01:56:22 -0000	1.4
@@ -20,8 +20,7 @@
  * $Header$
  *
  */
-#include "reinherit.h"
-
+#include "saga.h"
 #include "yslib.h"
 
 namespace Saga {

--- reinherit.h DELETED ---





More information about the Scummvm-git-logs mailing list