Fix #include paths.

svn-id: r14443
This commit is contained in:
Eugene Sandulenko 2004-08-02 16:20:35 +00:00
parent 79e2af8787
commit 166b05aed4
44 changed files with 300 additions and 306 deletions

View file

@ -22,13 +22,13 @@
*/
/* Action map module */
#include "saga.h"
#include "saga/saga.h"
#include "cvar_mod.h"
#include "gfx.h"
#include "console_mod.h"
#include "saga/cvar_mod.h"
#include "saga/gfx.h"
#include "saga/console_mod.h"
#include "actionmap.h"
#include "saga/actionmap.h"
namespace Saga {

View file

@ -21,23 +21,23 @@
*
*/
#include "saga.h"
#include "yslib.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/yslib.h"
#include "saga/gfx.h"
#include "game_mod.h"
#include "cvar_mod.h"
#include "console_mod.h"
#include "rscfile_mod.h"
#include "script_mod.h"
#include "sndres.h"
#include "sprite_mod.h"
#include "font_mod.h"
#include "text_mod.h"
#include "sound.h"
#include "saga/game_mod.h"
#include "saga/cvar_mod.h"
#include "saga/console_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/script_mod.h"
#include "saga/sndres.h"
#include "saga/sprite_mod.h"
#include "saga/font_mod.h"
#include "saga/text_mod.h"
#include "saga/sound.h"
#include "actor.h"
#include "actordata.h"
#include "saga/actor.h"
#include "saga/actordata.h"
namespace Saga {

View file

@ -26,8 +26,8 @@
#ifndef SAGA_ACTOR_H__
#define SAGA_ACTOR_H__
#include "yslib.h"
#include "sprite_mod.h"
#include "saga/yslib.h"
#include "saga/sprite_mod.h"
namespace Saga {
@ -184,11 +184,6 @@ struct R_ACTIONTIMES {
int time;
};
struct R_ACTOR_MODULE {
int init;
const char *err_str;
};
class Actor {
public:
int reg();

View file

@ -22,8 +22,8 @@
*/
// Actor data table
#include "saga.h"
#include "actordata.h"
#include "saga/saga.h"
#include "saga/actordata.h"
namespace Saga {

View file

@ -22,16 +22,16 @@
*/
// Background animation management module
#include "saga.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "cvar_mod.h"
#include "console_mod.h"
#include "game_mod.h"
#include "events_mod.h"
#include "render.h"
#include "saga/cvar_mod.h"
#include "saga/console_mod.h"
#include "saga/game_mod.h"
#include "saga/events_mod.h"
#include "saga/render.h"
#include "animation.h"
#include "saga/animation.h"
namespace Saga {

View file

@ -23,14 +23,14 @@
// Console module
#include "saga.h"
#include "gfx.h"
#include "font_mod.h"
#include "cvar_mod.h"
#include "events_mod.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "saga/font_mod.h"
#include "saga/cvar_mod.h"
#include "saga/events_mod.h"
#include "console_mod.h"
#include "console.h"
#include "saga/console_mod.h"
#include "saga/console.h"
namespace Saga {

View file

@ -22,13 +22,13 @@
*/
// Configuration Variable Module
#include "saga.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "console_mod.h"
#include "saga/console_mod.h"
#include "cvar_mod.h"
#include "cvar.h"
#include "saga/cvar_mod.h"
#include "saga/cvar.h"
namespace Saga {

View file

@ -24,24 +24,24 @@
// Event management module
#include "saga.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "yslib.h"
#include "saga/yslib.h"
#include "animation.h"
#include "console_mod.h"
#include "scene_mod.h"
#include "interface_mod.h"
#include "text_mod.h"
#include "palanim_mod.h"
#include "render.h"
#include "game_mod.h"
#include "sndres.h"
#include "music.h"
#include "saga/animation.h"
#include "saga/console_mod.h"
#include "saga/scene_mod.h"
#include "saga/interface_mod.h"
#include "saga/text_mod.h"
#include "saga/palanim_mod.h"
#include "saga/render.h"
#include "saga/game_mod.h"
#include "saga/sndres.h"
#include "saga/music.h"
#include "events_mod.h"
#include "events.h"
#include "saga/events_mod.h"
#include "saga/events.h"
namespace Saga {

View file

@ -25,9 +25,9 @@
// EXPR_ParseArgs() lifted wholesale from SDL win32 initialization code by Sam Lantinga
#include "saga.h"
#include "cvar_mod.h"
#include "expr.h"
#include "saga/saga.h"
#include "saga/cvar_mod.h"
#include "saga/expr.h"
namespace Saga {

View file

@ -22,14 +22,14 @@
*/
// Font management and font drawing module
#include "saga.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "rscfile_mod.h"
#include "game_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/game_mod.h"
#include "font_mod.h"
#include "font.h"
#include "saga/font_mod.h"
#include "saga/font.h"
namespace Saga {

View file

@ -23,19 +23,19 @@
// Game detection, general game parameters
#include "saga.h"
#include "saga/saga.h"
#include "common/file.h"
#include "base/gameDetector.h"
#include "base/plugins.h"
#include "backends/fs/fs.h"
#include "rscfile_mod.h"
#include "cvar_mod.h"
#include "ite_introproc_mod.h"
#include "interface_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/cvar_mod.h"
#include "saga/ite_introproc_mod.h"
#include "saga/interface_mod.h"
#include "game_mod.h"
#include "game.h"
#include "saga/game_mod.h"
#include "saga/game.h"
namespace Saga {

View file

@ -23,21 +23,21 @@
// "I Have No Mouth" Intro sequence scene procedures
#include "saga.h"
#include "yslib.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/yslib.h"
#include "saga/gfx.h"
#include "animation.h"
#include "cvar_mod.h"
#include "events_mod.h"
#include "font_mod.h"
#include "rscfile_mod.h"
#include "scene_mod.h"
#include "text_mod.h"
#include "palanim_mod.h"
#include "saga/animation.h"
#include "saga/cvar_mod.h"
#include "saga/events_mod.h"
#include "saga/font_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/scene_mod.h"
#include "saga/text_mod.h"
#include "saga/palanim_mod.h"
#include "scene.h"
#include "ihnm_introproc.h"
#include "saga/scene.h"
#include "saga/ihnm_introproc.h"
namespace Saga {

View file

@ -22,11 +22,11 @@
*/
// SAGA Image resource management routines
#include "saga.h"
#include "saga/saga.h"
#include "game_mod.h"
#include "saga/game_mod.h"
#include "image.h"
#include "saga/image.h"
namespace Saga {

View file

@ -22,22 +22,22 @@
*/
// Game interface module
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "game_mod.h"
#include "cvar_mod.h"
#include "actor.h"
#include "console_mod.h"
#include "font_mod.h"
#include "objectmap.h"
#include "rscfile_mod.h"
#include "script_mod.h"
#include "sprite_mod.h"
#include "saga/gfx.h"
#include "saga/game_mod.h"
#include "saga/cvar_mod.h"
#include "saga/actor.h"
#include "saga/console_mod.h"
#include "saga/font_mod.h"
#include "saga/objectmap.h"
#include "saga/rscfile_mod.h"
#include "saga/script_mod.h"
#include "saga/sprite_mod.h"
#include "interface_mod.h"
#include "interface.h"
#include "sdata.h"
#include "saga/interface_mod.h"
#include "saga/interface.h"
#include "saga/sdata.h"
namespace Saga {

View file

@ -22,12 +22,12 @@
*/
// Isometric level module
#include "saga.h"
#include "saga/saga.h"
#include "game_mod.h"
#include "gfx.h"
#include "saga/game_mod.h"
#include "saga/gfx.h"
#include "isomap.h"
#include "saga/isomap.h"
namespace Saga {

View file

@ -24,24 +24,24 @@
// Intro sequence scene procedures
#include "saga.h"
#include "gfx.h"
#include "yslib.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "saga/yslib.h"
#include "animation.h"
#include "cvar_mod.h"
#include "events_mod.h"
#include "font_mod.h"
#include "game_mod.h"
#include "rscfile_mod.h"
#include "scene_mod.h"
#include "sndres.h"
#include "text_mod.h"
#include "palanim_mod.h"
#include "music.h"
#include "saga/animation.h"
#include "saga/cvar_mod.h"
#include "saga/events_mod.h"
#include "saga/font_mod.h"
#include "saga/game_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/scene_mod.h"
#include "saga/sndres.h"
#include "saga/text_mod.h"
#include "saga/palanim_mod.h"
#include "saga/music.h"
#include "scene.h"
#include "ite_introproc.h"
#include "saga/scene.h"
#include "saga/ite_introproc.h"
namespace Saga {

View file

@ -20,11 +20,11 @@
* $Header$
*
*/
#include "saga.h"
#include "saga/saga.h"
#include "music.h"
#include "rscfile_mod.h"
#include "game_mod.h"
#include "saga/music.h"
#include "saga/rscfile_mod.h"
#include "saga/game_mod.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"
#include "common/config-manager.h"

View file

@ -26,8 +26,8 @@
#ifndef SAGA_MUSIC_H_
#define SAGA_MUSIC_H_
#include "rscfile_mod.h"
#include "game_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/game_mod.h"
#include "sound/mixer.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"

View file

@ -26,13 +26,13 @@
// Polygon Hit Test code ( HitTestPoly() ) adapted from code (C) Eric Haines
// appearing in Graphics Gems IV, "Point in Polygon Strategies."
// p. 24-46, code: p. 34-45
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "cvar_mod.h"
#include "console_mod.h"
#include "font_mod.h"
#include "objectmap.h"
#include "saga/gfx.h"
#include "saga/cvar_mod.h"
#include "saga/console_mod.h"
#include "saga/font_mod.h"
#include "saga/objectmap.h"
namespace Saga {

View file

@ -22,14 +22,14 @@
*/
// Palette animation module
#include "saga.h"
#include "gfx.h"
#include "saga/saga.h"
#include "saga/gfx.h"
#include "events_mod.h"
#include "game_mod.h"
#include "saga/events_mod.h"
#include "saga/game_mod.h"
#include "palanim_mod.h"
#include "palanim.h"
#include "saga/palanim_mod.h"
#include "saga/palanim.h"
namespace Saga {

View file

@ -22,23 +22,23 @@
*/
// Main rendering loop
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "actor.h"
#include "console_mod.h"
#include "cvar_mod.h"
#include "font_mod.h"
#include "game_mod.h"
#include "interface_mod.h"
#include "scene_mod.h"
#include "sprite_mod.h"
#include "text_mod.h"
#include "saga/gfx.h"
#include "saga/actor.h"
#include "saga/console_mod.h"
#include "saga/cvar_mod.h"
#include "saga/font_mod.h"
#include "saga/game_mod.h"
#include "saga/interface_mod.h"
#include "saga/scene_mod.h"
#include "saga/sprite_mod.h"
#include "saga/text_mod.h"
#include "actionmap.h"
#include "objectmap.h"
#include "saga/actionmap.h"
#include "saga/objectmap.h"
#include "render.h"
#include "saga/render.h"
#include <common/timer.h>
namespace Saga {

View file

@ -22,10 +22,10 @@
*/
// RSC Resource file management module
#include "saga.h"
#include "saga/saga.h"
#include "rscfile_mod.h"
#include "rscfile.h"
#include "saga/rscfile_mod.h"
#include "saga/rscfile.h"
namespace Saga {

View file

@ -26,7 +26,7 @@
#ifndef SAGA_RSCFILE_MOD_H__
#define SAGA_RSCFILE_MOD_H__
#include "resnames.h"
#include "saga/resnames.h"
namespace Saga {

View file

@ -30,33 +30,33 @@
#include "common/file.h"
#include "common/config-manager.h"
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "rscfile_mod.h"
#include "render.h"
#include "actor.h"
#include "animation.h"
#include "console_mod.h"
#include "cvar_mod.h"
#include "events_mod.h"
#include "actionmap.h"
#include "font_mod.h"
#include "game_mod.h"
#include "game.h"
#include "interface_mod.h"
#include "isomap.h"
#include "script.h"
#include "script_mod.h"
#include "scene_mod.h"
#include "sdata.h"
#include "sndres.h"
#include "sprite_mod.h"
#include "text_mod.h"
#include "objectmap.h"
#include "sound.h"
#include "music.h"
#include "game_mod.h"
#include "saga/gfx.h"
#include "saga/rscfile_mod.h"
#include "saga/render.h"
#include "saga/actor.h"
#include "saga/animation.h"
#include "saga/console_mod.h"
#include "saga/cvar_mod.h"
#include "saga/events_mod.h"
#include "saga/actionmap.h"
#include "saga/font_mod.h"
#include "saga/game_mod.h"
#include "saga/game.h"
#include "saga/interface_mod.h"
#include "saga/isomap.h"
#include "saga/script.h"
#include "saga/script_mod.h"
#include "saga/scene_mod.h"
#include "saga/sdata.h"
#include "saga/sndres.h"
#include "saga/sprite_mod.h"
#include "saga/text_mod.h"
#include "saga/objectmap.h"
#include "saga/sound.h"
#include "saga/music.h"
#include "saga/game_mod.h"
GameList Engine_SAGA_gameList() {
return Saga::GAME_GameList();

View file

@ -22,29 +22,29 @@
*/
// Scene management module
#include "saga.h"
#include "yslib.h"
#include "saga/saga.h"
#include "saga/yslib.h"
#include "gfx.h"
#include "game_mod.h"
#include "animation.h"
#include "console_mod.h"
#include "cvar_mod.h"
#include "events_mod.h"
#include "actionmap.h"
#include "isomap.h"
#include "script_mod.h"
#include "objectmap.h"
#include "palanim_mod.h"
#include "render.h"
#include "rscfile_mod.h"
#include "script.h"
#include "text_mod.h"
#include "sound.h"
#include "music.h"
#include "saga/gfx.h"
#include "saga/game_mod.h"
#include "saga/animation.h"
#include "saga/console_mod.h"
#include "saga/cvar_mod.h"
#include "saga/events_mod.h"
#include "saga/actionmap.h"
#include "saga/isomap.h"
#include "saga/script_mod.h"
#include "saga/objectmap.h"
#include "saga/palanim_mod.h"
#include "saga/render.h"
#include "saga/rscfile_mod.h"
#include "saga/script.h"
#include "saga/text_mod.h"
#include "saga/sound.h"
#include "saga/music.h"
#include "scene_mod.h"
#include "scene.h"
#include "saga/scene_mod.h"
#include "saga/scene.h"
namespace Saga {

View file

@ -26,7 +26,7 @@
#ifndef SAGA_SCENE_MOD_H__
#define SAGA_SCENE_MOD_H__
#include "text_mod.h"
#include "saga/text_mod.h"
namespace Saga {

View file

@ -22,20 +22,20 @@
*/
// Scripting module: Script resource handling functions
#include "saga.h"
#include "yslib.h"
#include "saga/saga.h"
#include "saga/yslib.h"
#include "gfx.h"
#include "rscfile_mod.h"
#include "game_mod.h"
#include "text_mod.h"
#include "console_mod.h"
#include "cvar_mod.h"
#include "saga/gfx.h"
#include "saga/rscfile_mod.h"
#include "saga/game_mod.h"
#include "saga/text_mod.h"
#include "saga/console_mod.h"
#include "saga/cvar_mod.h"
#include "script_mod.h"
#include "script.h"
#include "sstack.h"
#include "sthread.h"
#include "saga/script_mod.h"
#include "saga/script.h"
#include "saga/sstack.h"
#include "saga/sthread.h"
namespace Saga {

View file

@ -26,10 +26,10 @@
#ifndef SAGA_SCRIPT_H
#define SAGA_SCRIPT_H
#include "sstack.h"
#include "sdata.h"
#include "text_mod.h"
#include "yslib.h"
#include "saga/sstack.h"
#include "saga/sdata.h"
#include "saga/text_mod.h"
#include "saga/yslib.h"
namespace Saga {

View file

@ -21,13 +21,13 @@
*
*/
// Type SDataWord_T must be unpadded
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "text_mod.h"
#include "script_mod.h"
#include "script.h"
#include "sdata.h"
#include "saga/gfx.h"
#include "saga/text_mod.h"
#include "saga/script_mod.h"
#include "saga/script.h"
#include "saga/sdata.h"
namespace Saga {

View file

@ -22,16 +22,16 @@
*/
// Scripting module simple thread debugging support
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "console_mod.h"
#include "text_mod.h"
#include "scene_mod.h"
#include "font_mod.h"
#include "saga/gfx.h"
#include "saga/console_mod.h"
#include "saga/text_mod.h"
#include "saga/scene_mod.h"
#include "saga/font_mod.h"
#include "script.h"
#include "sthread.h"
#include "saga/script.h"
#include "saga/sthread.h"
namespace Saga {

View file

@ -23,17 +23,17 @@
// Scripting module script function component
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "actor.h"
#include "animation.h"
#include "console_mod.h"
#include "interface_mod.h"
#include "text_mod.h"
#include "saga/gfx.h"
#include "saga/actor.h"
#include "saga/animation.h"
#include "saga/console_mod.h"
#include "saga/interface_mod.h"
#include "saga/text_mod.h"
#include "script.h"
#include "sfuncs.h"
#include "saga/script.h"
#include "saga/sfuncs.h"
namespace Saga {

View file

@ -26,7 +26,7 @@
#ifndef SAGA_SFUNCS_H
#define SAGA_SFUNCS_H
#include "sthread.h"
#include "saga/sthread.h"
namespace Saga {

View file

@ -23,13 +23,13 @@
// Sound resource management class
#include "saga.h"
#include "saga/saga.h"
#include "game_mod.h"
#include "rscfile_mod.h"
#include "saga/game_mod.h"
#include "saga/rscfile_mod.h"
#include "sndres.h"
#include "sound.h"
#include "saga/sndres.h"
#include "saga/sound.h"
#include "common/file.h"

View file

@ -26,9 +26,9 @@
#ifndef SAGA_SNDRES_H_
#define SAGA_SNDRES_H_
#include "rscfile_mod.h"
#include "game_mod.h"
#include "sound.h"
#include "saga/rscfile_mod.h"
#include "saga/game_mod.h"
#include "saga/sound.h"
namespace Saga {

View file

@ -20,10 +20,10 @@
* $Header$
*
*/
#include "saga.h"
#include "saga/saga.h"
#include "sound.h"
#include "game_mod.h"
#include "saga/sound.h"
#include "saga/game_mod.h"
#include "sound/mixer.h"

View file

@ -26,8 +26,8 @@
#ifndef SAGA_SOUND_H_
#define SAGA_SOUND_H_
#include "rscfile_mod.h"
#include "game_mod.h"
#include "saga/rscfile_mod.h"
#include "saga/game_mod.h"
#include "sound/mixer.h"
namespace Saga {

View file

@ -22,18 +22,18 @@
*/
// Sprite management module
#include "saga.h"
#include "saga/saga.h"
#include "game_mod.h"
#include "gfx.h"
#include "scene_mod.h"
#include "rscfile_mod.h"
#include "saga/game_mod.h"
#include "saga/gfx.h"
#include "saga/scene_mod.h"
#include "saga/rscfile_mod.h"
#include "text_mod.h"
#include "font_mod.h"
#include "saga/text_mod.h"
#include "saga/font_mod.h"
#include "sprite_mod.h"
#include "sprite.h"
#include "saga/sprite_mod.h"
#include "saga/sprite.h"
namespace Saga {

View file

@ -23,14 +23,14 @@
// Scripting engine stack component
#include "saga.h"
#include "saga/saga.h"
#include "gfx.h"
#include "console_mod.h"
#include "text_mod.h"
#include "saga/gfx.h"
#include "saga/console_mod.h"
#include "saga/text_mod.h"
#include "script.h"
#include "sstack.h"
#include "saga/script.h"
#include "saga/sstack.h"
namespace Saga {

View file

@ -26,7 +26,7 @@
#ifndef SAGA_SSTACK_H
#define SAGA_SSTACK_H
#include "script_mod.h"
#include "saga/script_mod.h"
namespace Saga {

View file

@ -22,22 +22,21 @@
*/
// Scripting module thread management component
#include "saga.h"
#include "saga/saga.h"
#include "saga/yslib.h"
#include "yslib.h"
#include "saga/gfx.h"
#include "saga/actor.h"
#include "saga/console_mod.h"
#include "saga/text_mod.h"
#include "gfx.h"
#include "actor.h"
#include "console_mod.h"
#include "text_mod.h"
#include "saga/script.h"
#include "saga/script_mod.h"
#include "script.h"
#include "script_mod.h"
#include "sdata.h"
#include "sstack.h"
#include "sthread.h"
#include "sfuncs.h"
#include "saga/sdata.h"
#include "saga/sstack.h"
#include "saga/sthread.h"
#include "saga/sfuncs.h"
namespace Saga {

View file

@ -26,7 +26,7 @@
#ifndef SAGA_STHREAD_H__
#define SAGA_STHREAD_H__
#include "sstack.h"
#include "saga/sstack.h"
namespace Saga {

View file

@ -23,14 +23,14 @@
// Text / dialogue display management module
#include "saga.h"
#include "yslib.h"
#include "saga/saga.h"
#include "saga/yslib.h"
#include "gfx.h"
#include "font_mod.h"
#include "saga/gfx.h"
#include "saga/font_mod.h"
#include "text_mod.h"
#include "text.h"
#include "saga/text_mod.h"
#include "saga/text.h"
namespace Saga {

View file

@ -22,7 +22,7 @@
*/
//Background transition routines
#include "saga.h"
#include "saga/saga.h"
namespace Saga {

View file

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