libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merge reinherit.h into saga.h and gfx_mod.h, note the error loading animations wasn't caused by this commit :)

Browse Source 
svn-id: r14405
This commit is contained in:
Jonathan Gray 2004-08-01 01:56:22 +00:00
parent 5e3236ac47
commit 182dd48bd4
41 changed files with 109 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
saga/actionmap.cpp
View File

@ -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"

3
saga/actor.cpp
View File

@ -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"

10
saga/animation.cpp
View File

@ -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;
}

4
saga/console.cpp
View File

@ -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"

2
saga/cvar.cpp
View File

@ -23,7 +23,7 @@
// Configuration Variable Module
#include "saga.h"
#include "reinherit.h"
#include "gfx_mod.h"
#include "console_mod.h"

2
saga/events.cpp
View File

@ -25,7 +25,7 @@
#include "saga.h"
#include "reinherit.h"
#include "gfx_mod.h"
#include "yslib.h"

3
saga/expr.cpp
View File

@ -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"

2
saga/font.cpp
View File

@ -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"

3
saga/game.cpp
View File

@ -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"

1
saga/gfx.cpp
View File

@ -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"

38
saga/gfx_mod.h
View File

@ -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

3
saga/ihnm_introproc.cpp
View File

@ -25,8 +25,7 @@
#include "saga.h"
#include "yslib.h"
#include "reinherit.h"
#include "gfx_mod.h"
#include "animation.h"
#include "cvar_mod.h"

1
saga/image.cpp
View File

@ -23,7 +23,6 @@
// SAGA Image resource management routines
#include "saga.h"
#include "reinherit.h"
#include "game_mod.h"

2
saga/input.cpp
View File

@ -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"

3
saga/interface.cpp
View File

@ -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"

1
saga/isomap.cpp
View File

@ -23,7 +23,6 @@
// Isometric level module
#include "saga.h"
#include "reinherit.h"
#include "game_mod.h"
#include "gfx_mod.h"

3
saga/ite_introproc.cpp
View File

@ -25,8 +25,7 @@
// Intro sequence scene procedures
#include "saga.h"
#include "reinherit.h"
#include "gfx_mod.h"
#include "yslib.h"
#include "animation.h"

1
saga/music.cpp
View File

@ -21,7 +21,6 @@
*
*/
#include "saga.h"
#include "reinherit.h"
#include "music.h"
#include "rscfile_mod.h"

3
saga/objectmap.cpp
View File

@ -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"

2
saga/palanim.cpp
View File

@ -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"

2
saga/palanim.h
View File

@ -26,8 +26,6 @@
#ifndef SAGA_PALANIM_H
#define SAGA_PALANIM_H
#include "reinherit.h"
namespace Saga {
#define PALANIM_CYCLETIME 100

108
saga/reinherit.h
View File

@ -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

3
saga/render.cpp
View File

@ -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"

1
saga/rscfile.cpp
View File

@ -23,7 +23,6 @@
// RSC Resource file management module
#include "saga.h"
#include "reinherit.h"
#include "rscfile_mod.h"
#include "rscfile.h"

4
saga/saga.cpp
View File

@ -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"

22
saga/saga.h
View File

@ -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);

35
saga/scene.cpp
View File

@ -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;
}

3
saga/sceneproc.cpp
View File

@ -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"

3
saga/script.cpp
View File

@ -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"

3
saga/sdata.cpp
View File

@ -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"

2
saga/sdebug.cpp
View File

@ -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"

4
saga/sfuncs.cpp
View File

@ -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"

1
saga/sndres.cpp
View File

@ -24,7 +24,6 @@
// Sound resource management class
#include "saga.h"
#include "reinherit.h"
#include "game_mod.h"
#include "rscfile_mod.h"

1
saga/sound.cpp
View File

@ -21,7 +21,6 @@
*
*/
#include "saga.h"
#include "reinherit.h"
#include "sound.h"
#include "game_mod.h"

1
saga/sprite.cpp
View File

@ -23,7 +23,6 @@
// Sprite management module
#include "saga.h"
#include "reinherit.h"
#include "game_mod.h"
#include "gfx_mod.h"

3
saga/sstack.cpp
View File

@ -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"

2
saga/sthread.cpp
View File

@ -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"

4
saga/text.cpp
View File

@ -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"

3
saga/timer.cpp
View File

@ -21,8 +21,7 @@
*
*/
#include "reinherit.h"
#include "saga.h"
#include "timer.h"
// FIXME: replace calls to this with direct OSystem calls

1
saga/transitions.cpp
View File

@ -23,7 +23,6 @@
//Background transition routines
#include "saga.h"
#include "reinherit.h"
namespace Saga {

3
saga/ys_dl_list.cpp
View File

@ -20,8 +20,7 @@
* $Header$
*
*/
#include "reinherit.h"
#include "saga.h"
#include "yslib.h"
namespace Saga {