diff options
Diffstat (limited to 'saga')
41 files changed, 109 insertions, 190 deletions
diff --git a/saga/actionmap.cpp b/saga/actionmap.cpp index 49ec489b65..e86a5b6f3d 100644 --- a/saga/actionmap.cpp +++ b/saga/actionmap.cpp @@ -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" diff --git a/saga/actor.cpp b/saga/actor.cpp index d69f9581dd..a5b4d55b74 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -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" diff --git a/saga/animation.cpp b/saga/animation.cpp index 6547c8b361..13bca80b66 100644 --- a/saga/animation.cpp +++ b/saga/animation.cpp @@ -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 @@ int Anim::load(const byte *anim_resdata, size_t anim_resdata_len, uint16 *anim_i uint16 i; if (!_initialized) { + warning("Anim::load not initialised"); return R_FAILURE; } @@ -77,12 +78,13 @@ int Anim::load(const byte *anim_resdata, size_t anim_resdata_len, uint16 *anim_i } 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 @@ int Anim::load(const byte *anim_resdata, size_t anim_resdata_len, uint16 *anim_i 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; } diff --git a/saga/console.cpp b/saga/console.cpp index 8c8aabe7d2..34fae3a494 100644 --- a/saga/console.cpp +++ b/saga/console.cpp @@ -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" diff --git a/saga/cvar.cpp b/saga/cvar.cpp index fe531f9162..f16dc95716 100644 --- a/saga/cvar.cpp +++ b/saga/cvar.cpp @@ -23,7 +23,7 @@ // Configuration Variable Module #include "saga.h" -#include "reinherit.h" +#include "gfx_mod.h" #include "console_mod.h" diff --git a/saga/events.cpp b/saga/events.cpp index b0011773f4..1f91aa69ff 100644 --- a/saga/events.cpp +++ b/saga/events.cpp @@ -25,7 +25,7 @@ #include "saga.h" -#include "reinherit.h" +#include "gfx_mod.h" #include "yslib.h" diff --git a/saga/expr.cpp b/saga/expr.cpp index 0833e25e1b..47cf21982e 100644 --- a/saga/expr.cpp +++ b/saga/expr.cpp @@ -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" diff --git a/saga/font.cpp b/saga/font.cpp index 56671455bd..42936fd3c0 100644 --- a/saga/font.cpp +++ b/saga/font.cpp @@ -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" diff --git a/saga/game.cpp b/saga/game.cpp index 834a978cb6..ec4ab31463 100644 --- a/saga/game.cpp +++ b/saga/game.cpp @@ -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" diff --git a/saga/gfx.cpp b/saga/gfx.cpp index 2162a3fc54..fe638d9b10 100644 --- a/saga/gfx.cpp +++ b/saga/gfx.cpp @@ -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" diff --git a/saga/gfx_mod.h b/saga/gfx_mod.h index 7a4bf2af73..d335ccb7c9 100644 --- a/saga/gfx_mod.h +++ b/saga/gfx_mod.h @@ -44,6 +44,33 @@ struct R_CLIPINFO { }; +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_GetClipInfo(R_CLIPINFO *clipinfo); 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 diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp index 622df4c576..dd9f5c500c 100644 --- a/saga/ihnm_introproc.cpp +++ b/saga/ihnm_introproc.cpp @@ -25,8 +25,7 @@ #include "saga.h" #include "yslib.h" - -#include "reinherit.h" +#include "gfx_mod.h" #include "animation.h" #include "cvar_mod.h" diff --git a/saga/image.cpp b/saga/image.cpp index bb51df5b74..d8b09f6f8c 100644 --- a/saga/image.cpp +++ b/saga/image.cpp @@ -23,7 +23,6 @@ // SAGA Image resource management routines #include "saga.h" -#include "reinherit.h" #include "game_mod.h" diff --git a/saga/input.cpp b/saga/input.cpp index 1431a46706..0f7d7388c4 100644 --- a/saga/input.cpp +++ b/saga/input.cpp @@ -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" diff --git a/saga/interface.cpp b/saga/interface.cpp index 3703823cc3..5c7191d8b0 100644 --- a/saga/interface.cpp +++ b/saga/interface.cpp @@ -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" diff --git a/saga/isomap.cpp b/saga/isomap.cpp index 8b20a4d279..e4e7e36d14 100644 --- a/saga/isomap.cpp +++ b/saga/isomap.cpp @@ -23,7 +23,6 @@ // Isometric level module #include "saga.h" -#include "reinherit.h" #include "game_mod.h" #include "gfx_mod.h" diff --git a/saga/ite_introproc.cpp b/saga/ite_introproc.cpp index f1fbbec8e0..b9fbe2d678 100644 --- a/saga/ite_introproc.cpp +++ b/saga/ite_introproc.cpp @@ -25,8 +25,7 @@ // Intro sequence scene procedures #include "saga.h" -#include "reinherit.h" - +#include "gfx_mod.h" #include "yslib.h" #include "animation.h" diff --git a/saga/music.cpp b/saga/music.cpp index a19f9be96c..947149e159 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -21,7 +21,6 @@ * */ #include "saga.h" -#include "reinherit.h" #include "music.h" #include "rscfile_mod.h" diff --git a/saga/objectmap.cpp b/saga/objectmap.cpp index 5da2eb22a3..dacb23af68 100644 --- a/saga/objectmap.cpp +++ b/saga/objectmap.cpp @@ -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" diff --git a/saga/palanim.cpp b/saga/palanim.cpp index 6936e913c8..085730d92c 100644 --- a/saga/palanim.cpp +++ b/saga/palanim.cpp @@ -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" diff --git a/saga/palanim.h b/saga/palanim.h index 9638fbdf5e..95dda8bf1c 100644 --- a/saga/palanim.h +++ b/saga/palanim.h @@ -26,8 +26,6 @@ #ifndef SAGA_PALANIM_H #define SAGA_PALANIM_H -#include "reinherit.h" - namespace Saga { #define PALANIM_CYCLETIME 100 diff --git a/saga/reinherit.h b/saga/reinherit.h deleted file mode 100644 index f2826932b9..0000000000 --- a/saga/reinherit.h +++ /dev/null @@ -1,108 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 The ScummVM project - * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Header$ - * - */ - -// Main Header File - -#ifndef SAGA_REINHERIT_H -#define SAGA_REINHERIT_H - -#include "common/stdafx.h" -#include "common/scummsys.h" -#include "common/rect.h" - -class OSystem; - -namespace Saga { - -#define R_MAXPATH 512 - -// Define opaque types - -// r_rscfile -struct R_RSCFILE_CONTEXT; - -// r_script -struct R_SEMAPHORE; - -// Define common data types - -typedef Common::Point R_POINT; -typedef Common::Rect R_RECT; - -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_RGB_RED 0x00FF0000UL -#define R_RGB_GREEN 0x0000FF00UL -#define R_RGB_BLUE 0x000000FFUL - -struct PALENTRY { - byte red; - byte green; - byte blue; -}; - -enum R_ERRORCODE { - R_MEM = -2, - R_FAILURE = -1, - R_SUCCESS = 0 -}; - -// r_transitions.c -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); - -// System specific routines - -// System : Graphics -#define R_PAL_ENTRIES 256 - -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); - -// System : Input -int SYSINPUT_ProcessInput(void); -R_POINT SYSINPUT_GetMousePos(); - -} // End of namespace Saga - -#endif diff --git a/saga/render.cpp b/saga/render.cpp index 6e5f974f50..925207c594 100644 --- a/saga/render.cpp +++ b/saga/render.cpp @@ -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" diff --git a/saga/rscfile.cpp b/saga/rscfile.cpp index fc9222e990..afbac86585 100644 --- a/saga/rscfile.cpp +++ b/saga/rscfile.cpp @@ -23,7 +23,6 @@ // RSC Resource file management module #include "saga.h" -#include "reinherit.h" #include "rscfile_mod.h" #include "rscfile.h" diff --git a/saga/saga.cpp b/saga/saga.cpp index b5b814a60e..13340a00fb 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -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" diff --git a/saga/saga.h b/saga/saga.h index d48f3c8bf8..1485f46ee1 100644 --- a/saga/saga.h +++ b/saga/saga.h @@ -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 @@ class ActionMap; 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 @@ enum SAGAGameId { 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); diff --git a/saga/scene.cpp b/saga/scene.cpp index 4a26c9ffbd..18b470374c 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -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 @@ int ProcessSceneResources() { 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 @@ int ProcessSceneResources() { &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 @@ int ProcessSceneResources() { 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 @@ int ProcessSceneResources() { 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 @@ int ProcessSceneResources() { 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 @@ int ProcessSceneResources() { 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 @@ int ProcessSceneResources() { 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 @@ int ProcessSceneResources() { 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; } diff --git a/saga/sceneproc.cpp b/saga/sceneproc.cpp index f34a7a20d8..dc0e4f1685 100644 --- a/saga/sceneproc.cpp +++ b/saga/sceneproc.cpp @@ -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" diff --git a/saga/script.cpp b/saga/script.cpp index d3019910e9..ba92d905c0 100644 --- a/saga/script.cpp +++ b/saga/script.cpp @@ -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" diff --git a/saga/sdata.cpp b/saga/sdata.cpp index 188cdfcae5..57a0595c14 100644 --- a/saga/sdata.cpp +++ b/saga/sdata.cpp @@ -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" diff --git a/saga/sdebug.cpp b/saga/sdebug.cpp index bdf9d56300..848d178b69 100644 --- a/saga/sdebug.cpp +++ b/saga/sdebug.cpp @@ -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" diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index d98558cdc4..fa592b3272 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -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" diff --git a/saga/sndres.cpp b/saga/sndres.cpp index bb63d73665..3df489c2fe 100644 --- a/saga/sndres.cpp +++ b/saga/sndres.cpp @@ -24,7 +24,6 @@ // Sound resource management class #include "saga.h" -#include "reinherit.h" #include "game_mod.h" #include "rscfile_mod.h" diff --git a/saga/sound.cpp b/saga/sound.cpp index c0c0c0eeee..ff94263487 100644 --- a/saga/sound.cpp +++ b/saga/sound.cpp @@ -21,7 +21,6 @@ * */ #include "saga.h" -#include "reinherit.h" #include "sound.h" #include "game_mod.h" diff --git a/saga/sprite.cpp b/saga/sprite.cpp index dd3eb9b887..db7e47e5fd 100644 --- a/saga/sprite.cpp +++ b/saga/sprite.cpp @@ -23,7 +23,6 @@ // Sprite management module #include "saga.h" -#include "reinherit.h" #include "game_mod.h" #include "gfx_mod.h" diff --git a/saga/sstack.cpp b/saga/sstack.cpp index 83d4796772..4d83340d03 100644 --- a/saga/sstack.cpp +++ b/saga/sstack.cpp @@ -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" diff --git a/saga/sthread.cpp b/saga/sthread.cpp index e612f798f2..c7ff22d91f 100644 --- a/saga/sthread.cpp +++ b/saga/sthread.cpp @@ -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" diff --git a/saga/text.cpp b/saga/text.cpp index 958a9ca9f3..415a325692 100644 --- a/saga/text.cpp +++ b/saga/text.cpp @@ -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" diff --git a/saga/timer.cpp b/saga/timer.cpp index b46a89776b..eeaaf7b07f 100644 --- a/saga/timer.cpp +++ b/saga/timer.cpp @@ -21,8 +21,7 @@ * */ -#include "reinherit.h" - +#include "saga.h" #include "timer.h" // FIXME: replace calls to this with direct OSystem calls diff --git a/saga/transitions.cpp b/saga/transitions.cpp index eaec66861c..23b9d07460 100644 --- a/saga/transitions.cpp +++ b/saga/transitions.cpp @@ -23,7 +23,6 @@ //Background transition routines #include "saga.h" -#include "reinherit.h" namespace Saga { diff --git a/saga/ys_dl_list.cpp b/saga/ys_dl_list.cpp index 02b166d739..1df5fdb376 100644 --- a/saga/ys_dl_list.cpp +++ b/saga/ys_dl_list.cpp @@ -20,8 +20,7 @@ * $Header$ * */ -#include "reinherit.h" - +#include "saga.h" #include "yslib.h" namespace Saga { |