diff options
62 files changed, 440 insertions, 440 deletions
diff --git a/Makefile.common b/Makefile.common index 9fc366e778..8fbc8263be 100644 --- a/Makefile.common +++ b/Makefile.common @@ -88,7 +88,7 @@ endif ifdef DISABLE_SWORD2 DEFINES += -DDISABLE_SWORD2 else -MODULES += bs2 +MODULES += sword2 endif ifdef DISABLE_QUEEN diff --git a/sword2/anims.cpp b/sword2/anims.cpp index c378394546..a29cc75e48 100644 --- a/sword2/anims.cpp +++ b/sword2/anims.cpp @@ -24,23 +24,23 @@ // --------------------------------------------------------------------------- #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/d_draw.h" -#include "bs2/anims.h" -#include "bs2/console.h" -#include "bs2/controls.h" // for 'speechSelected' & 'subtitles' -#include "bs2/defs.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" // for makeTextSprite used by fnPlaySequence ultimately -#include "bs2/object.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/sword2.h" -#include "bs2/sync.h" -#include "bs2/sound.h" // for Speech stuff. +#include "sword2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/d_draw.h" +#include "sword2/anims.h" +#include "sword2/console.h" +#include "sword2/controls.h" // for 'speechSelected' & 'subtitles' +#include "sword2/defs.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" // for makeTextSprite used by fnPlaySequence ultimately +#include "sword2/object.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/sword2.h" +#include "sword2/sync.h" +#include "sword2/sound.h" // for Speech stuff. namespace Sword2 { diff --git a/sword2/anims.h b/sword2/anims.h index 224e6ffcb5..8b0d564467 100644 --- a/sword2/anims.h +++ b/sword2/anims.h @@ -20,7 +20,7 @@ #ifndef _ANIM_S #define _ANIM_S -#include "bs2/driver/driver96.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp index f86479cead..b4e9968858 100644 --- a/sword2/build_display.cpp +++ b/sword2/build_display.cpp @@ -22,19 +22,19 @@ // --------------------------------------------------------------------------- #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/debug.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/defs.h" -#include "bs2/interpreter.h" -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" -#include "bs2/mouse.h" -#include "bs2/object.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" +#include "sword2/sword2.h" +#include "sword2/debug.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/defs.h" +#include "sword2/interpreter.h" +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" +#include "sword2/mouse.h" +#include "sword2/object.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" namespace Sword2 { diff --git a/sword2/build_display.h b/sword2/build_display.h index cd287bbc6e..1d534c2af7 100644 --- a/sword2/build_display.h +++ b/sword2/build_display.h @@ -20,7 +20,7 @@ #ifndef _BUILD_DISPLAY #define _BUILD_DISPLAY -#include "bs2/driver/driver96.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/console.cpp b/sword2/console.cpp index 08dbf3b9e4..89d6d26978 100644 --- a/sword2/console.cpp +++ b/sword2/console.cpp @@ -18,18 +18,18 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/events.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" -#include "bs2/mouse.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/save_rest.h" -#include "bs2/startup.h" +#include "sword2/sword2.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/events.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" +#include "sword2/mouse.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/save_rest.h" +#include "sword2/startup.h" #include "common/debugger.cpp" diff --git a/sword2/console.h b/sword2/console.h index b5cc286518..f81456c8dd 100644 --- a/sword2/console.h +++ b/sword2/console.h @@ -21,7 +21,7 @@ #define C_ONSOLE_H #include "common/debugger.h" -#include "bs2/memory.h" +#include "sword2/memory.h" #define Debug_Printf g_sword2->_debugger->DebugPrintf diff --git a/sword2/controls.cpp b/sword2/controls.cpp index c51861cd5f..7ca0844509 100644 --- a/sword2/controls.cpp +++ b/sword2/controls.cpp @@ -18,23 +18,23 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/controls.h" -#include "bs2/defs.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" // for font resource variables -#include "bs2/mouse.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/router.h" -#include "bs2/save_rest.h" -#include "bs2/sound.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/controls.h" +#include "sword2/defs.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" // for font resource variables +#include "sword2/mouse.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/router.h" +#include "sword2/save_rest.h" +#include "sword2/sound.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/credits.h b/sword2/credits.h index 43e9889341..913c0cec16 100644 --- a/sword2/credits.h +++ b/sword2/credits.h @@ -20,7 +20,7 @@ #ifndef _CREDITS_H #define _CREDITS_H -#include "bs2/driver/driver96.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/debug.cpp b/sword2/debug.cpp index 3d02b1bec1..a2d324f3cf 100644 --- a/sword2/debug.cpp +++ b/sword2/debug.cpp @@ -18,21 +18,21 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/sword2.h" -#include "bs2/debug.h" -#include "bs2/build_display.h" // for 'fps' -#include "bs2/console.h" -#include "bs2/defs.h" -#include "bs2/events.h" // for CountEvents() -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" -#include "bs2/mouse.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/router.h" // for plotWalkGrid() -#include "bs2/speech.h" // for 'officialTextNumber' and +#include "sword2/driver/driver96.h" +#include "sword2/sword2.h" +#include "sword2/debug.h" +#include "sword2/build_display.h" // for 'fps' +#include "sword2/console.h" +#include "sword2/defs.h" +#include "sword2/events.h" // for CountEvents() +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" +#include "sword2/mouse.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/router.h" // for plotWalkGrid() +#include "sword2/speech.h" // for 'officialTextNumber' and // 'speechScriptWaiting' namespace Sword2 { diff --git a/sword2/debug.h b/sword2/debug.h index 699a378daf..78b5c1912f 100644 --- a/sword2/debug.h +++ b/sword2/debug.h @@ -20,7 +20,7 @@ #ifndef D_DEBUG #define D_DEBUG -#include "bs2/object.h" +#include "sword2/object.h" // FIXME: I don't know how large this constant used to be #define MAX_DEBUG_TEXT_BLOCKS 50 diff --git a/sword2/defs.h b/sword2/defs.h index eb940b55ab..93e35d8abb 100644 --- a/sword2/defs.h +++ b/sword2/defs.h @@ -20,8 +20,8 @@ #ifndef DEFS #define DEFS -#include "bs2/header.h" -#include "bs2/resman.h" +#include "sword2/header.h" +#include "sword2/resman.h" #define SIZE 0x10000 // 65536 items per section #define NuSIZE 0xffff // & with this diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp index 4681249d83..8da4538daf 100644 --- a/sword2/driver/_mouse.cpp +++ b/sword2/driver/_mouse.cpp @@ -18,11 +18,11 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/render.h" -#include "bs2/driver/menu.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/render.h" +#include "sword2/driver/menu.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp index 963e5a79d4..44069de1c5 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/driver/d_draw.cpp @@ -19,14 +19,14 @@ #include "stdafx.h" #include "sound/mixer.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/rdwin.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/palette.h" -#include "bs2/driver/render.h" -#include "bs2/header.h" // HACK: For cutscenes instruction message -#include "bs2/maketext.h" // HACK: For cutscenes instruction message -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/rdwin.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/palette.h" +#include "sword2/driver/render.h" +#include "sword2/header.h" // HACK: For cutscenes instruction message +#include "sword2/maketext.h" // HACK: For cutscenes instruction message +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/driver/d_draw.h b/sword2/driver/d_draw.h index 17e79c8631..9fe87e16ab 100644 --- a/sword2/driver/d_draw.h +++ b/sword2/driver/d_draw.h @@ -20,7 +20,7 @@ #ifndef D_DRAW_H #define D_DRAW_H -#include "bs2/driver/driver96.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 69ec2fe8e0..cc8df01562 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -36,9 +36,9 @@ #include "sound/audiostream.h" #include "sound/mixer.h" #include "sound/rate.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/d_sound.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/d_sound.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/driver/keyboard.cpp b/sword2/driver/keyboard.cpp index 85272a8d51..d5f5e90f0c 100644 --- a/sword2/driver/keyboard.cpp +++ b/sword2/driver/keyboard.cpp @@ -18,7 +18,7 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/driver/language.cpp b/sword2/driver/language.cpp index eaef47999b..67bb4e8cc1 100644 --- a/sword2/driver/language.cpp +++ b/sword2/driver/language.cpp @@ -18,7 +18,7 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp index 06bbcd8044..54a87c20ac 100644 --- a/sword2/driver/menu.cpp +++ b/sword2/driver/menu.cpp @@ -19,10 +19,10 @@ #include "stdafx.h" #include "common/rect.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/menu.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/render.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/menu.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/render.h" namespace Sword2 { diff --git a/sword2/driver/misc.cpp b/sword2/driver/misc.cpp index 0fcc72a885..6e68e622f9 100644 --- a/sword2/driver/misc.cpp +++ b/sword2/driver/misc.cpp @@ -18,8 +18,8 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp index 480c0de0a5..aa0f860a62 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/driver/palette.cpp @@ -20,9 +20,9 @@ #include "stdafx.h" #include "common/util.h" #include "base/engine.h" -#include "bs2/sword2.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/driver96.h" +#include "sword2/sword2.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/driver96.h" namespace Sword2 { diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp index 2f12e6c9fa..674ac960bf 100644 --- a/sword2/driver/rdwin.cpp +++ b/sword2/driver/rdwin.cpp @@ -18,16 +18,16 @@ */ #include "common/stdafx.h" -#include "bs2/sword2.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/_mouse.h" -#include "bs2/driver/keyboard.h" -#include "bs2/driver/rdwin.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/palette.h" -#include "bs2/driver/render.h" -#include "bs2/driver/menu.h" -#include "bs2/driver/d_sound.h" +#include "sword2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/_mouse.h" +#include "sword2/driver/keyboard.h" +#include "sword2/driver/rdwin.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/palette.h" +#include "sword2/driver/render.h" +#include "sword2/driver/menu.h" +#include "sword2/driver/d_sound.h" namespace Sword2 { diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index e0cc9fc7df..e844294c43 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -18,13 +18,13 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/rdwin.h" -#include "bs2/driver/_mouse.h" -#include "bs2/driver/render.h" -#include "bs2/driver/menu.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/rdwin.h" +#include "sword2/driver/_mouse.h" +#include "sword2/driver/render.h" +#include "sword2/driver/menu.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/driver/render.h b/sword2/driver/render.h index 7fef5d9b72..b112789e9f 100644 --- a/sword2/driver/render.h +++ b/sword2/driver/render.h @@ -20,7 +20,7 @@ #ifndef RENDER_H #define RENDER_H -#include "bs2/driver/menu.h" +#include "sword2/driver/menu.h" namespace Sword2 { diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp index 65aefcd6c7..ba0a95bc0e 100644 --- a/sword2/driver/sprite.cpp +++ b/sword2/driver/sprite.cpp @@ -18,12 +18,12 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/d_draw.h" -#include "bs2/driver/render.h" -#include "bs2/driver/menu.h" -#include "bs2/driver/palette.h" -#include "bs2/driver/rdwin.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/d_draw.h" +#include "sword2/driver/render.h" +#include "sword2/driver/menu.h" +#include "sword2/driver/palette.h" +#include "sword2/driver/rdwin.h" namespace Sword2 { diff --git a/sword2/events.cpp b/sword2/events.cpp index fe2724f951..8b8d8ff957 100644 --- a/sword2/events.cpp +++ b/sword2/events.cpp @@ -18,16 +18,16 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/events.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/memory.h" -#include "bs2/object.h" -#include "bs2/sync.h" +#include "sword2/sword2.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/events.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/memory.h" +#include "sword2/object.h" +#include "sword2/sync.h" namespace Sword2 { diff --git a/sword2/events.h b/sword2/events.h index e4654a837d..6d4fc29ceb 100644 --- a/sword2/events.h +++ b/sword2/events.h @@ -20,7 +20,7 @@ #ifndef _EVENTS #define _EVENTS -#include "bs2/object.h" +#include "sword2/object.h" namespace Sword2 { diff --git a/sword2/function.cpp b/sword2/function.cpp index 13a64dc0c5..05958e9ba0 100644 --- a/sword2/function.cpp +++ b/sword2/function.cpp @@ -18,20 +18,20 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/rdwin.h" -#include "bs2/build_display.h" -#include "bs2/credits.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/function.h" -#include "bs2/interpreter.h" -#include "bs2/layers.h" // for 'this_screen' structure -#include "bs2/logic.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/sound.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/rdwin.h" +#include "sword2/build_display.h" +#include "sword2/credits.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/function.h" +#include "sword2/interpreter.h" +#include "sword2/layers.h" // for 'this_screen' structure +#include "sword2/logic.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/sound.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/function.h b/sword2/function.h index 375e626249..3b04853705 100644 --- a/sword2/function.h +++ b/sword2/function.h @@ -20,7 +20,7 @@ #ifndef _FUNCTION #define _FUNCTION -#include "bs2/object.h" +#include "sword2/object.h" namespace Sword2 { diff --git a/sword2/icons.cpp b/sword2/icons.cpp index f35dea1f3c..f27ec6b171 100644 --- a/sword2/icons.cpp +++ b/sword2/icons.cpp @@ -18,13 +18,13 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/driver/driver96.h" -#include "bs2/defs.h" -#include "bs2/icons.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/mouse.h" +#include "sword2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/defs.h" +#include "sword2/icons.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/mouse.h" namespace Sword2 { diff --git a/sword2/icons.h b/sword2/icons.h index 6e056cbf69..31f2408f47 100644 --- a/sword2/icons.h +++ b/sword2/icons.h @@ -20,7 +20,7 @@ #ifndef _ICONS #define _ICONS -#include "bs2/object.h" +#include "sword2/object.h" namespace Sword2 { diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp index 46c9fa13a6..c93bdadf05 100644 --- a/sword2/interpreter.cpp +++ b/sword2/interpreter.cpp @@ -18,10 +18,10 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/console.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" +#include "sword2/driver/driver96.h" +#include "sword2/console.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" namespace Sword2 { diff --git a/sword2/layers.cpp b/sword2/layers.cpp index a9152b3ee1..e263f71567 100644 --- a/sword2/layers.cpp +++ b/sword2/layers.cpp @@ -26,15 +26,15 @@ // up to 2 foreground parallax layers #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/build_display.h" -#include "bs2/debug.h" -#include "bs2/header.h" -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/sound.h" // for Clear_fx_queue() called from fnInitBackground() +#include "sword2/sword2.h" +#include "sword2/build_display.h" +#include "sword2/debug.h" +#include "sword2/header.h" +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/sound.h" // for Clear_fx_queue() called from fnInitBackground() namespace Sword2 { diff --git a/sword2/logic.cpp b/sword2/logic.cpp index 90161a2249..f7f8e41df2 100644 --- a/sword2/logic.cpp +++ b/sword2/logic.cpp @@ -18,16 +18,16 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/defs.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/router.h" // for clearWalkGridList() -#include "bs2/sound.h" -#include "bs2/sync.h" +#include "sword2/sword2.h" +#include "sword2/defs.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/router.h" // for clearWalkGridList() +#include "sword2/sound.h" +#include "sword2/sync.h" namespace Sword2 { diff --git a/sword2/logic.h b/sword2/logic.h index 8ec526699d..6edadf76d1 100644 --- a/sword2/logic.h +++ b/sword2/logic.h @@ -22,8 +22,8 @@ #ifndef _LOGIC #define _LOGIC -// #include "bs2/defs.h" -#include "bs2/header.h" +// #include "sword2/defs.h" +#include "sword2/header.h" namespace Sword2 { diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp index 5a233ad444..4d11be3975 100644 --- a/sword2/maketext.cpp +++ b/sword2/maketext.cpp @@ -47,16 +47,16 @@ #define DUD 64 // the first "chequered flag" (dud) symbol in // our character set is in the '@' position #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/defs.h" // for SPEECH_FONT_ID & CONSOLE_FONT_ID -#include "bs2/header.h" -#include "bs2/maketext.h" -#include "bs2/memory.h" -#include "bs2/protocol.h" // for FetchFrameHeader() -#include "bs2/resman.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/defs.h" // for SPEECH_FONT_ID & CONSOLE_FONT_ID +#include "sword2/header.h" +#include "sword2/maketext.h" +#include "sword2/memory.h" +#include "sword2/protocol.h" // for FetchFrameHeader() +#include "sword2/resman.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/maketext.h b/sword2/maketext.h index 3163524d8c..c0ca30383a 100644 --- a/sword2/maketext.h +++ b/sword2/maketext.h @@ -57,8 +57,8 @@ #ifndef _MAKETEXT_H #define _MAKETEXT_H -#include "bs2/memory.h" -#include "bs2/debug.h" +#include "sword2/memory.h" +#include "sword2/debug.h" // Output colour for character border - should be be black but note that we // have to use a different pen number during sequences diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp index 561b2b4ed1..43befd36b5 100644 --- a/sword2/mem_view.cpp +++ b/sword2/mem_view.cpp @@ -18,12 +18,12 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/header.h" -#include "bs2/memory.h" -#include "bs2/resman.h" +#include "sword2/sword2.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/header.h" +#include "sword2/memory.h" +#include "sword2/resman.h" namespace Sword2 { diff --git a/sword2/memory.cpp b/sword2/memory.cpp index f3db4aa120..c3268af953 100644 --- a/sword2/memory.cpp +++ b/sword2/memory.cpp @@ -38,10 +38,10 @@ // MemMan v1.1 #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/debug.h" -#include "bs2/memory.h" -#include "bs2/resman.h" +#include "sword2/driver/driver96.h" +#include "sword2/debug.h" +#include "sword2/memory.h" +#include "sword2/resman.h" namespace Sword2 { diff --git a/sword2/module.mk b/sword2/module.mk index 7af5c7e340..b6f43c4d4b 100644 --- a/sword2/module.mk +++ b/sword2/module.mk @@ -1,48 +1,48 @@ -MODULE := bs2 +MODULE := sword2 MODULE_OBJS := \ - bs2/anims.o \ - bs2/build_display.o \ - bs2/console.o \ - bs2/controls.o \ - bs2/debug.o \ - bs2/events.o \ - bs2/function.o \ - bs2/icons.o \ - bs2/interpreter.o \ - bs2/layers.o \ - bs2/logic.o \ - bs2/maketext.o \ - bs2/memory.o \ - bs2/mem_view.o \ - bs2/mouse.o \ - bs2/protocol.o \ - bs2/resman.o \ - bs2/router.o \ - bs2/save_rest.o \ - bs2/scroll.o \ - bs2/sound.o \ - bs2/speech.o \ - bs2/startup.o \ - bs2/sword2.o \ - bs2/sync.o \ - bs2/tony_gsdk.o \ - bs2/walker.o \ - bs2/driver/d_draw.o \ - bs2/driver/d_sound.o \ - bs2/driver/keyboard.o \ - bs2/driver/language.o \ - bs2/driver/menu.o \ - bs2/driver/misc.o \ - bs2/driver/_mouse.o \ - bs2/driver/palette.o \ - bs2/driver/rdwin.o \ - bs2/driver/render.o \ - bs2/driver/sprite.o + sword2/anims.o \ + sword2/build_display.o \ + sword2/console.o \ + sword2/controls.o \ + sword2/debug.o \ + sword2/events.o \ + sword2/function.o \ + sword2/icons.o \ + sword2/interpreter.o \ + sword2/layers.o \ + sword2/logic.o \ + sword2/maketext.o \ + sword2/memory.o \ + sword2/mem_view.o \ + sword2/mouse.o \ + sword2/protocol.o \ + sword2/resman.o \ + sword2/router.o \ + sword2/save_rest.o \ + sword2/scroll.o \ + sword2/sound.o \ + sword2/speech.o \ + sword2/startup.o \ + sword2/sword2.o \ + sword2/sync.o \ + sword2/tony_gsdk.o \ + sword2/walker.o \ + sword2/driver/d_draw.o \ + sword2/driver/d_sound.o \ + sword2/driver/keyboard.o \ + sword2/driver/language.o \ + sword2/driver/menu.o \ + sword2/driver/misc.o \ + sword2/driver/_mouse.o \ + sword2/driver/palette.o \ + sword2/driver/rdwin.o \ + sword2/driver/render.o \ + sword2/driver/sprite.o MODULE_DIRS += \ - bs2 \ - bs2/driver + sword2 \ + sword2/driver # This module can be built as a plugin ifdef BUILD_PLUGINS diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp index ff80a0172a..1aaba82a7e 100644 --- a/sword2/mouse.cpp +++ b/sword2/mouse.cpp @@ -18,23 +18,23 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/controls.h" -#include "bs2/defs.h" -#include "bs2/events.h" -#include "bs2/icons.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/layers.h" -#include "bs2/maketext.h" -#include "bs2/mouse.h" -#include "bs2/object.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/sound.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/controls.h" +#include "sword2/defs.h" +#include "sword2/events.h" +#include "sword2/icons.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/layers.h" +#include "sword2/maketext.h" +#include "sword2/mouse.h" +#include "sword2/object.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/sound.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/mouse.h b/sword2/mouse.h index 93eaa6f5eb..3f10cbdd46 100644 --- a/sword2/mouse.h +++ b/sword2/mouse.h @@ -20,7 +20,7 @@ #ifndef MOUSE_H #define MOUSE_H -#include "bs2/object.h" +#include "sword2/object.h" namespace Sword2 { diff --git a/sword2/protocol.cpp b/sword2/protocol.cpp index de175f7583..c01e3f7a91 100644 --- a/sword2/protocol.cpp +++ b/sword2/protocol.cpp @@ -18,13 +18,13 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/console.h" -#include "bs2/defs.h" -#include "bs2/header.h" -#include "bs2/memory.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" +#include "sword2/sword2.h" +#include "sword2/console.h" +#include "sword2/defs.h" +#include "sword2/header.h" +#include "sword2/memory.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" namespace Sword2 { diff --git a/sword2/protocol.h b/sword2/protocol.h index fa822b848c..e6ceb9f365 100644 --- a/sword2/protocol.h +++ b/sword2/protocol.h @@ -22,8 +22,8 @@ #ifndef _PROTOCOL #define _PROTOCOL -#include "bs2/driver/driver96.h" -#include "bs2/header.h" +#include "sword2/driver/driver96.h" +#include "sword2/header.h" namespace Sword2 { diff --git a/sword2/resman.cpp b/sword2/resman.cpp index d5047ed4d3..f9aeabb8a8 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -18,23 +18,23 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/driver/driver96.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/function.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" -#include "bs2/memory.h" -#include "bs2/mouse.h" // for system Set_mouse & Set_luggage routines -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/sound.h" // for Clear_fx_queue() called from cacheNewCluster() -#include "bs2/router.h" +#include "sword2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/function.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" +#include "sword2/memory.h" +#include "sword2/mouse.h" // for system Set_mouse & Set_luggage routines +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/sound.h" // for Clear_fx_queue() called from cacheNewCluster() +#include "sword2/router.h" namespace Sword2 { diff --git a/sword2/resman.h b/sword2/resman.h index f034ed3551..27e86e294f 100644 --- a/sword2/resman.h +++ b/sword2/resman.h @@ -20,7 +20,7 @@ #ifndef RESMAN_H #define RESMAN_H -#include "bs2/memory.h" +#include "sword2/memory.h" namespace Sword2 { diff --git a/sword2/router.cpp b/sword2/router.cpp index b9e5550116..997b4b4efe 100644 --- a/sword2/router.cpp +++ b/sword2/router.cpp @@ -74,17 +74,17 @@ ****************************************************************************/ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/sword2.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/memory.h" -#include "bs2/object.h" -#include "bs2/resman.h" -#include "bs2/router.h" +#include "sword2/driver/driver96.h" +#include "sword2/sword2.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/memory.h" +#include "sword2/object.h" +#include "sword2/resman.h" +#include "sword2/router.h" namespace Sword2 { diff --git a/sword2/router.h b/sword2/router.h index 68f73d33e5..87e3dbcc75 100644 --- a/sword2/router.h +++ b/sword2/router.h @@ -20,8 +20,8 @@ #ifndef _ROUTER_H #define _ROUTER_H -#include "bs2/memory.h" -#include "bs2/object.h" +#include "sword2/memory.h" +#include "sword2/object.h" // This used to be a variable, but it was never set. Actually, it wasn't even // initialised! diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp index afedf80804..f239880a2a 100644 --- a/sword2/save_rest.cpp +++ b/sword2/save_rest.cpp @@ -27,23 +27,23 @@ // --------------------------------------------------------------------------- #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/console.h" -#include "bs2/defs.h" -#include "bs2/function.h" // for engine_logic, engine_graph, etc -#include "bs2/interpreter.h" // for IR_CONT, etc -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/memory.h" -#include "bs2/object.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/router.h" -#include "bs2/save_rest.h" -#include "bs2/scroll.h" // for Set_scrolling() -#include "bs2/sound.h" -#include "bs2/sword2.h" -#include "bs2/walker.h" +#include "sword2/driver/driver96.h" +#include "sword2/console.h" +#include "sword2/defs.h" +#include "sword2/function.h" // for engine_logic, engine_graph, etc +#include "sword2/interpreter.h" // for IR_CONT, etc +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/memory.h" +#include "sword2/object.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/router.h" +#include "sword2/save_rest.h" +#include "sword2/scroll.h" // for Set_scrolling() +#include "sword2/sound.h" +#include "sword2/sword2.h" +#include "sword2/walker.h" namespace Sword2 { diff --git a/sword2/save_rest.h b/sword2/save_rest.h index 52a55ab156..9f60c3f7e7 100644 --- a/sword2/save_rest.h +++ b/sword2/save_rest.h @@ -20,7 +20,7 @@ #ifndef SAVE_REST_H #define SAVE_REST_H -#include "bs2/memory.h" +#include "sword2/memory.h" namespace Sword2 { diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp index 584bc2bffb..8979ebc307 100644 --- a/sword2/scroll.cpp +++ b/sword2/scroll.cpp @@ -18,14 +18,14 @@ */ #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/scroll.h" +#include "sword2/driver/driver96.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/scroll.h" namespace Sword2 { diff --git a/sword2/sound.cpp b/sword2/sound.cpp index 0eb9457b39..c062ec081e 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -28,15 +28,15 @@ // --------------------------------------------------------------------------- #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/console.h" -#include "bs2/defs.h" // for RESULT -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/protocol.h" // for FetchObjectName() for debugging fnPlayFx -#include "bs2/resman.h" -#include "bs2/sound.h" -#include "bs2/sword2.h" +#include "sword2/sword2.h" +#include "sword2/console.h" +#include "sword2/defs.h" // for RESULT +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/protocol.h" // for FetchObjectName() for debugging fnPlayFx +#include "sword2/resman.h" +#include "sword2/sound.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/speech.cpp b/sword2/speech.cpp index f9a5c19377..73bf3f917c 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -18,26 +18,26 @@ */ #include "stdafx.h" -#include "bs2/anims.h" -#include "bs2/console.h" -#include "bs2/controls.h" // for 'subtitles' & 'speechSelected' -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/events.h" -#include "bs2/function.h" -#include "bs2/interpreter.h" -#include "bs2/layers.h" // for 'this_screen' -#include "bs2/logic.h" -#include "bs2/maketext.h" -#include "bs2/memory.h" -#include "bs2/mouse.h" -#include "bs2/object.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/sound.h" -#include "bs2/speech.h" -#include "bs2/sword2.h" -#include "bs2/walker.h" +#include "sword2/anims.h" +#include "sword2/console.h" +#include "sword2/controls.h" // for 'subtitles' & 'speechSelected' +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/events.h" +#include "sword2/function.h" +#include "sword2/interpreter.h" +#include "sword2/layers.h" // for 'this_screen' +#include "sword2/logic.h" +#include "sword2/maketext.h" +#include "sword2/memory.h" +#include "sword2/mouse.h" +#include "sword2/object.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/sound.h" +#include "sword2/speech.h" +#include "sword2/sword2.h" +#include "sword2/walker.h" namespace Sword2 { diff --git a/sword2/speech.h b/sword2/speech.h index e510c5686f..aa0c117c7f 100644 --- a/sword2/speech.h +++ b/sword2/speech.h @@ -20,7 +20,7 @@ #ifndef _SPEECH #define _SPEECH -#include "bs2/header.h" +#include "sword2/header.h" namespace Sword2 { diff --git a/sword2/startup.cpp b/sword2/startup.cpp index 1d7161cfce..674ff09319 100644 --- a/sword2/startup.cpp +++ b/sword2/startup.cpp @@ -18,25 +18,25 @@ */ #include "stdafx.h" -#include "bs2/sword2.h" // for CloseGame() -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" // for Kill_text_bloc() -#include "bs2/memory.h" -#include "bs2/mouse.h" -#include "bs2/object.h" -#include "bs2/resman.h" -#include "bs2/router.h" -#include "bs2/sound.h" -#include "bs2/speech.h" // for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script -#include "bs2/startup.h" -#include "bs2/sync.h" -#include "bs2/tony_gsdk.h" +#include "sword2/sword2.h" // for CloseGame() +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" // for Kill_text_bloc() +#include "sword2/memory.h" +#include "sword2/mouse.h" +#include "sword2/object.h" +#include "sword2/resman.h" +#include "sword2/router.h" +#include "sword2/sound.h" +#include "sword2/speech.h" // for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script +#include "sword2/startup.h" +#include "sword2/sync.h" +#include "sword2/tony_gsdk.h" namespace Sword2 { diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index d94d6b60ef..c4d35f8b87 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -22,31 +22,31 @@ #include "base/gameDetector.h" #include "base/plugins.h" #include "common/config-manager.h" -#include "bs2/sword2.h" -#include "bs2/defs.h" -#include "bs2/build_display.h" -#include "bs2/console.h" -#include "bs2/controls.h" -#include "bs2/credits.h" -#include "bs2/debug.h" -#include "bs2/events.h" -#include "bs2/header.h" -#include "bs2/interpreter.h" -#include "bs2/layers.h" -#include "bs2/logic.h" -#include "bs2/maketext.h" -#include "bs2/memory.h" -#include "bs2/mouse.h" -#include "bs2/protocol.h" -#include "bs2/resman.h" -#include "bs2/save_rest.h" -#include "bs2/scroll.h" -#include "bs2/sound.h" -#include "bs2/speech.h" -#include "bs2/startup.h" -#include "bs2/sync.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/palette.h" +#include "sword2/sword2.h" +#include "sword2/defs.h" +#include "sword2/build_display.h" +#include "sword2/console.h" +#include "sword2/controls.h" +#include "sword2/credits.h" +#include "sword2/debug.h" +#include "sword2/events.h" +#include "sword2/header.h" +#include "sword2/interpreter.h" +#include "sword2/layers.h" +#include "sword2/logic.h" +#include "sword2/maketext.h" +#include "sword2/memory.h" +#include "sword2/mouse.h" +#include "sword2/protocol.h" +#include "sword2/resman.h" +#include "sword2/save_rest.h" +#include "sword2/scroll.h" +#include "sword2/sound.h" +#include "sword2/speech.h" +#include "sword2/startup.h" +#include "sword2/sync.h" +#include "sword2/driver/driver96.h" +#include "sword2/driver/palette.h" #ifdef _WIN32_WCE extern bool isSmartphone(void); diff --git a/sword2/sword2.h b/sword2/sword2.h index 21d30cff22..03dd6aaf8f 100644 --- a/sword2/sword2.h +++ b/sword2/sword2.h @@ -25,9 +25,9 @@ #include "common/map.h" #include "common/rect.h" #include "common/str.h" -#include "bs2/console.h" -#include "bs2/driver/d_sound.h" -#include "bs2/driver/d_draw.h" +#include "sword2/console.h" +#include "sword2/driver/d_sound.h" +#include "sword2/driver/d_draw.h" enum { GF_DEMO = 1 << 0 diff --git a/sword2/sync.cpp b/sword2/sync.cpp index a42cc08e54..1f22c33c72 100644 --- a/sword2/sync.cpp +++ b/sword2/sync.cpp @@ -19,11 +19,11 @@ #include "stdafx.h" #include "common/util.h" -#include "bs2/debug.h" -#include "bs2/defs.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/sync.h" +#include "sword2/debug.h" +#include "sword2/defs.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/sync.h" namespace Sword2 { diff --git a/sword2/sync.h b/sword2/sync.h index 53bf4038da..229297e875 100644 --- a/sword2/sync.h +++ b/sword2/sync.h @@ -20,7 +20,7 @@ #ifndef _SYNC #define _SYNC -#include "bs2/object.h" +#include "sword2/object.h" namespace Sword2 { diff --git a/sword2/tony_gsdk.cpp b/sword2/tony_gsdk.cpp index 118a0c90e7..22b768ecb8 100644 --- a/sword2/tony_gsdk.cpp +++ b/sword2/tony_gsdk.cpp @@ -20,11 +20,11 @@ // general odds and ends #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/debug.h" -#include "bs2/memory.h" -#include "bs2/tony_gsdk.h" -#include "bs2/sword2.h" +#include "sword2/driver/driver96.h" +#include "sword2/debug.h" +#include "sword2/memory.h" +#include "sword2/tony_gsdk.h" +#include "sword2/sword2.h" namespace Sword2 { diff --git a/sword2/tony_gsdk.h b/sword2/tony_gsdk.h index 58f5025e53..16a6d001ed 100644 --- a/sword2/tony_gsdk.h +++ b/sword2/tony_gsdk.h @@ -20,7 +20,7 @@ #ifndef TONY_GSDK #define TONY_GSDK -#include "bs2/memory.h" +#include "sword2/memory.h" namespace Sword2 { diff --git a/sword2/walker.cpp b/sword2/walker.cpp index e35c715e28..5eba3cac09 100644 --- a/sword2/walker.cpp +++ b/sword2/walker.cpp @@ -23,17 +23,17 @@ // on them #include "stdafx.h" -#include "bs2/sword2.h" -#include "bs2/console.h" -#include "bs2/defs.h" -#include "bs2/events.h" -#include "bs2/function.h" -#include "bs2/interpreter.h" -#include "bs2/logic.h" -#include "bs2/object.h" -#include "bs2/protocol.h" -#include "bs2/router.h" -#include "bs2/sync.h" +#include "sword2/sword2.h" +#include "sword2/console.h" +#include "sword2/defs.h" +#include "sword2/events.h" +#include "sword2/function.h" +#include "sword2/interpreter.h" +#include "sword2/logic.h" +#include "sword2/object.h" +#include "sword2/protocol.h" +#include "sword2/router.h" +#include "sword2/sync.h" namespace Sword2 { |