[Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.20,1.21 actor.cpp,1.18,1.19 actor.h,1.6,1.7 actordata.cpp,1.3,1.4 animation.cpp,1.19,1.20 console.cpp,1.8,1.9 cvar.cpp,1.9,1.10 events.cpp,1.15,1.16 expr.cpp,1.5,1.6 font.cpp,1.12,1.13 game.cpp,1.16,1.17 ihnm_introproc.cpp,1.10,1.11 image.cpp,1.13,1.14 interface.cpp,1.15,1.16 isomap.cpp,1.11,1.12 ite_introproc.cpp,1.14,1.15 music.cpp,1.21,1.22 music.h,1.8,1.9 objectmap.cpp,1.14,1.15 palanim.cpp,1.11,1.12 render.cpp,1.23,1.24 rscfile.cpp,1.7,1.8 rscfile_mod.h,1.3,1.4 saga.cpp,1.35,1.36 scene.cpp,1.23,1.24 scene_mod.h,1.5,1.6 script.cpp,1.15,1.16 script.h,1.8,1.9 sdata.cpp,1.11,1.12 sdebug.cpp,1.10,1.11 sfuncs.cpp,1.10,1.11 sfuncs.h,1.4,1.5 sndres.cpp,1.18,1.19 sndres.h,1.9,1.10 sound.cpp,1.9,1.10 sound.h,1.6,1.7 sprite.cpp,1.12,1.13 sstack.cpp,1.5,1.6 sstack.h,1.2,1.3 sthread.cpp,1.16,1.17 sthread.h,1.5,1.6 text.cpp,1.4,1.5 transitions.cpp,1.6,1.7 ys_dl_list.cpp,1.4,1.5
Eugene Sandulenko
sev at users.sourceforge.net
Mon Aug 2 09:21:09 CEST 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5321
Modified Files:
actionmap.cpp actor.cpp actor.h actordata.cpp animation.cpp
console.cpp cvar.cpp events.cpp expr.cpp font.cpp game.cpp
ihnm_introproc.cpp image.cpp interface.cpp isomap.cpp
ite_introproc.cpp music.cpp music.h objectmap.cpp palanim.cpp
render.cpp rscfile.cpp rscfile_mod.h saga.cpp scene.cpp
scene_mod.h script.cpp script.h sdata.cpp sdebug.cpp
sfuncs.cpp sfuncs.h sndres.cpp sndres.h sound.cpp sound.h
sprite.cpp sstack.cpp sstack.h sthread.cpp sthread.h text.cpp
transitions.cpp ys_dl_list.cpp
Log Message:
Fix #include paths.
Index: actionmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actionmap.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- actionmap.cpp 1 Aug 2004 22:52:45 -0000 1.20
+++ actionmap.cpp 2 Aug 2004 16:20:34 -0000 1.21
@@ -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 {
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- actor.cpp 2 Aug 2004 15:53:33 -0000 1.18
+++ actor.cpp 2 Aug 2004 16:20:34 -0000 1.19
@@ -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 {
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- actor.h 2 Aug 2004 15:47:42 -0000 1.6
+++ actor.h 2 Aug 2004 16:20:34 -0000 1.7
@@ -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 @@
int time;
};
-struct R_ACTOR_MODULE {
- int init;
- const char *err_str;
-};
-
class Actor {
public:
int reg();
Index: actordata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actordata.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- actordata.cpp 14 May 2004 02:25:36 -0000 1.3
+++ actordata.cpp 2 Aug 2004 16:20:34 -0000 1.4
@@ -22,8 +22,8 @@
*/
// Actor data table
-#include "saga.h"
-#include "actordata.h"
+#include "saga/saga.h"
+#include "saga/actordata.h"
namespace Saga {
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- animation.cpp 1 Aug 2004 13:34:19 -0000 1.19
+++ animation.cpp 2 Aug 2004 16:20:34 -0000 1.20
@@ -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 {
Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/console.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- console.cpp 1 Aug 2004 11:48:52 -0000 1.8
+++ console.cpp 2 Aug 2004 16:20:34 -0000 1.9
@@ -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 {
Index: cvar.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/cvar.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cvar.cpp 1 Aug 2004 11:48:52 -0000 1.9
+++ cvar.cpp 2 Aug 2004 16:20:34 -0000 1.10
@@ -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 {
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- events.cpp 1 Aug 2004 11:48:53 -0000 1.15
+++ events.cpp 2 Aug 2004 16:20:34 -0000 1.16
@@ -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 {
Index: expr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/expr.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- expr.cpp 1 Aug 2004 01:56:21 -0000 1.5
+++ expr.cpp 2 Aug 2004 16:20:34 -0000 1.6
@@ -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 {
Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- font.cpp 1 Aug 2004 11:48:53 -0000 1.12
+++ font.cpp 2 Aug 2004 16:20:34 -0000 1.13
@@ -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 {
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- game.cpp 1 Aug 2004 01:56:21 -0000 1.16
+++ game.cpp 2 Aug 2004 16:20:34 -0000 1.17
@@ -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 {
Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ihnm_introproc.cpp 1 Aug 2004 11:48:53 -0000 1.10
+++ ihnm_introproc.cpp 2 Aug 2004 16:20:34 -0000 1.11
@@ -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 {
Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- image.cpp 1 Aug 2004 10:02:41 -0000 1.13
+++ image.cpp 2 Aug 2004 16:20:34 -0000 1.14
@@ -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 {
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- interface.cpp 2 Aug 2004 15:47:42 -0000 1.15
+++ interface.cpp 2 Aug 2004 16:20:34 -0000 1.16
@@ -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 {
Index: isomap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- isomap.cpp 2 Aug 2004 14:51:48 -0000 1.11
+++ isomap.cpp 2 Aug 2004 16:20:34 -0000 1.12
@@ -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 {
Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ite_introproc.cpp 1 Aug 2004 11:48:53 -0000 1.14
+++ ite_introproc.cpp 2 Aug 2004 16:20:34 -0000 1.15
@@ -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 {
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- music.cpp 1 Aug 2004 07:56:08 -0000 1.21
+++ music.cpp 2 Aug 2004 16:20:34 -0000 1.22
@@ -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"
Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- music.h 31 Jul 2004 23:00:48 -0000 1.8
+++ music.h 2 Aug 2004 16:20:34 -0000 1.9
@@ -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"
Index: objectmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/objectmap.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- objectmap.cpp 2 Aug 2004 15:44:18 -0000 1.14
+++ objectmap.cpp 2 Aug 2004 16:20:34 -0000 1.15
@@ -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 {
Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- palanim.cpp 1 Aug 2004 23:24:22 -0000 1.11
+++ palanim.cpp 2 Aug 2004 16:20:35 -0000 1.12
@@ -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 {
Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- render.cpp 2 Aug 2004 15:47:42 -0000 1.23
+++ render.cpp 2 Aug 2004 16:20:35 -0000 1.24
@@ -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 {
Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rscfile.cpp 1 Aug 2004 23:24:22 -0000 1.7
+++ rscfile.cpp 2 Aug 2004 16:20:35 -0000 1.8
@@ -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 {
Index: rscfile_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile_mod.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rscfile_mod.h 1 May 2004 13:19:15 -0000 1.3
+++ rscfile_mod.h 2 Aug 2004 16:20:35 -0000 1.4
@@ -26,7 +26,7 @@
#ifndef SAGA_RSCFILE_MOD_H__
#define SAGA_RSCFILE_MOD_H__
-#include "resnames.h"
+#include "saga/resnames.h"
namespace Saga {
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- saga.cpp 2 Aug 2004 15:47:42 -0000 1.35
+++ saga.cpp 2 Aug 2004 16:20:35 -0000 1.36
@@ -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();
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- scene.cpp 2 Aug 2004 15:44:18 -0000 1.23
+++ scene.cpp 2 Aug 2004 16:20:35 -0000 1.24
@@ -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 {
Index: scene_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene_mod.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scene_mod.h 1 May 2004 14:05:10 -0000 1.5
+++ scene_mod.h 2 Aug 2004 16:20:35 -0000 1.6
@@ -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 {
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- script.cpp 1 Aug 2004 23:47:19 -0000 1.15
+++ script.cpp 2 Aug 2004 16:20:35 -0000 1.16
@@ -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 {
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- script.h 1 Aug 2004 23:47:19 -0000 1.8
+++ script.h 2 Aug 2004 16:20:35 -0000 1.9
@@ -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 {
Index: sdata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sdata.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sdata.cpp 1 Aug 2004 23:47:19 -0000 1.11
+++ sdata.cpp 2 Aug 2004 16:20:35 -0000 1.12
@@ -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 {
Index: sdebug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sdebug.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sdebug.cpp 2 Aug 2004 15:47:42 -0000 1.10
+++ sdebug.cpp 2 Aug 2004 16:20:35 -0000 1.11
@@ -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 {
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sfuncs.cpp 2 Aug 2004 15:47:42 -0000 1.10
+++ sfuncs.cpp 2 Aug 2004 16:20:35 -0000 1.11
@@ -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 {
Index: sfuncs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sfuncs.h 13 May 2004 01:41:23 -0000 1.4
+++ sfuncs.h 2 Aug 2004 16:20:35 -0000 1.5
@@ -26,7 +26,7 @@
#ifndef SAGA_SFUNCS_H
#define SAGA_SFUNCS_H
-#include "sthread.h"
+#include "saga/sthread.h"
namespace Saga {
Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sndres.cpp 1 Aug 2004 23:24:22 -0000 1.18
+++ sndres.cpp 2 Aug 2004 16:20:35 -0000 1.19
@@ -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"
Index: sndres.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sndres.h 1 May 2004 16:15:55 -0000 1.9
+++ sndres.h 2 Aug 2004 16:20:35 -0000 1.10
@@ -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 {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sound.cpp 1 Aug 2004 01:56:22 -0000 1.9
+++ sound.cpp 2 Aug 2004 16:20:35 -0000 1.10
@@ -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"
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.h 1 May 2004 16:15:55 -0000 1.6
+++ sound.h 2 Aug 2004 16:20:35 -0000 1.7
@@ -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 {
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sprite.cpp 1 Aug 2004 23:24:22 -0000 1.12
+++ sprite.cpp 2 Aug 2004 16:20:35 -0000 1.13
@@ -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 {
Index: sstack.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sstack.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sstack.cpp 1 Aug 2004 11:48:53 -0000 1.5
+++ sstack.cpp 2 Aug 2004 16:20:35 -0000 1.6
@@ -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 {
Index: sstack.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sstack.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sstack.h 1 May 2004 16:15:55 -0000 1.2
+++ sstack.h 2 Aug 2004 16:20:35 -0000 1.3
@@ -26,7 +26,7 @@
#ifndef SAGA_SSTACK_H
#define SAGA_SSTACK_H
-#include "script_mod.h"
+#include "saga/script_mod.h"
namespace Saga {
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sthread.cpp 2 Aug 2004 15:47:42 -0000 1.16
+++ sthread.cpp 2 Aug 2004 16:20:35 -0000 1.17
@@ -22,22 +22,21 @@
*/
// Scripting module thread management component
-#include "saga.h"
-
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
-#include "gfx.h"
-#include "actor.h"
-#include "console_mod.h"
-#include "text_mod.h"
+#include "saga/gfx.h"
+#include "saga/actor.h"
+#include "saga/console_mod.h"
+#include "saga/text_mod.h"
-#include "script.h"
-#include "script_mod.h"
+#include "saga/script.h"
+#include "saga/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 {
Index: sthread.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sthread.h 25 Jun 2004 20:11:46 -0000 1.5
+++ sthread.h 2 Aug 2004 16:20:35 -0000 1.6
@@ -26,7 +26,7 @@
#ifndef SAGA_STHREAD_H__
#define SAGA_STHREAD_H__
-#include "sstack.h"
+#include "saga/sstack.h"
namespace Saga {
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/text.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- text.cpp 1 Aug 2004 11:48:53 -0000 1.4
+++ text.cpp 2 Aug 2004 16:20:35 -0000 1.5
@@ -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 {
Index: transitions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/transitions.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- transitions.cpp 1 Aug 2004 01:56:22 -0000 1.6
+++ transitions.cpp 2 Aug 2004 16:20:35 -0000 1.7
@@ -22,7 +22,7 @@
*/
//Background transition routines
-#include "saga.h"
+#include "saga/saga.h"
namespace Saga {
Index: ys_dl_list.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ys_dl_list.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ys_dl_list.cpp 1 Aug 2004 01:56:22 -0000 1.4
+++ ys_dl_list.cpp 2 Aug 2004 16:20:35 -0000 1.5
@@ -20,8 +20,8 @@
* $Header$
*
*/
-#include "saga.h"
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
namespace Saga {
More information about the Scummvm-git-logs
mailing list