thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bs2 -> sword2

Browse source 
svn-id: r10997
This commit is contained in:
Max Horn 2003-10-28 19:51:30 +00:00
parent 8be0e318b6
commit 2fef2dcb84
62 changed files with 440 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.common
View file

@ -88,7 +88,7 @@ endif
ifdef DISABLE_SWORD2
DEFINES += -DDISABLE_SWORD2
else
MODULES += bs2
MODULES += sword2
endif
ifdef DISABLE_QUEEN

34
sword2/anims.cpp
View file

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

2
sword2/anims.h
View file

@ -20,7 +20,7 @@
#ifndef _ANIM_S
#define _ANIM_S
#include "bs2/driver/driver96.h"
#include "sword2/driver/driver96.h"
namespace Sword2 {

26
sword2/build_display.cpp
View file

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

2
sword2/build_display.h
View file

@ -20,7 +20,7 @@
#ifndef _BUILD_DISPLAY
#define _BUILD_DISPLAY
#include "bs2/driver/driver96.h"
#include "sword2/driver/driver96.h"
namespace Sword2 {

24
sword2/console.cpp
View file

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

2
sword2/console.h
View file

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

34
sword2/controls.cpp
View file

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

2
sword2/credits.h
View file

@ -20,7 +20,7 @@
#ifndef _CREDITS_H
#define _CREDITS_H
#include "bs2/driver/driver96.h"
#include "sword2/driver/driver96.h"
namespace Sword2 {

30
sword2/debug.cpp
View file

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

2
sword2/debug.h
View file

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

4
sword2/defs.h
View file

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

10
sword2/driver/_mouse.cpp
View file

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

16
sword2/driver/d_draw.cpp
View file

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

2
sword2/driver/d_draw.h
View file

@ -20,7 +20,7 @@
#ifndef D_DRAW_H
#define D_DRAW_H
#include "bs2/driver/driver96.h"
#include "sword2/driver/driver96.h"
namespace Sword2 {

6
sword2/driver/d_sound.cpp
View file

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

2
sword2/driver/keyboard.cpp
View file

@ -18,7 +18,7 @@
*/
#include "stdafx.h"
#include "bs2/driver/driver96.h"
#include "sword2/driver/driver96.h"
namespace Sword2 {

2
sword2/driver/language.cpp
View file

@ -18,7 +18,7 @@
*/
#include "stdafx.h"
#include "bs2/driver/driver96.h"
#include "sword2/driver/driver96.h"
namespace Sword2 {

8
sword2/driver/menu.cpp
View file

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

4
sword2/driver/misc.cpp
View file

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

6
sword2/driver/palette.cpp
View file

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

20
sword2/driver/rdwin.cpp
View file

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

14
sword2/driver/render.cpp
View file

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

2
sword2/driver/render.h
View file

@ -20,7 +20,7 @@
#ifndef RENDER_H
#define RENDER_H
#include "bs2/driver/menu.h"
#include "sword2/driver/menu.h"
namespace Sword2 {

12
sword2/driver/sprite.cpp
View file

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

20
sword2/events.cpp
View file

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

2
sword2/events.h
View file

@ -20,7 +20,7 @@
#ifndef _EVENTS
#define _EVENTS
#include "bs2/object.h"
#include "sword2/object.h"
namespace Sword2 {

28
sword2/function.cpp
View file

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

2
sword2/function.h
View file

@ -20,7 +20,7 @@
#ifndef _FUNCTION
#define _FUNCTION
#include "bs2/object.h"
#include "sword2/object.h"
namespace Sword2 {

14
sword2/icons.cpp
View file

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

2
sword2/icons.h
View file

@ -20,7 +20,7 @@
#ifndef _ICONS
#define _ICONS
#include "bs2/object.h"
#include "sword2/object.h"
namespace Sword2 {

8
sword2/interpreter.cpp
View file

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

18
sword2/layers.cpp
View file

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

20
sword2/logic.cpp
View file

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

4
sword2/logic.h
View file

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

20
sword2/maketext.cpp
View file

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

4
sword2/maketext.h
View file

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

12
sword2/mem_view.cpp
View file

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

8
sword2/memory.cpp
View file

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

82
sword2/module.mk
View file

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

34
sword2/mouse.cpp
View file

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

2
sword2/mouse.h
View file

@ -20,7 +20,7 @@
#ifndef MOUSE_H
#define MOUSE_H
#include "bs2/object.h"
#include "sword2/object.h"
namespace Sword2 {

14
sword2/protocol.cpp
View file

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

4
sword2/protocol.h
View file

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

34
sword2/resman.cpp
View file

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

2
sword2/resman.h
View file

@ -20,7 +20,7 @@
#ifndef RESMAN_H
#define RESMAN_H
#include "bs2/memory.h"
#include "sword2/memory.h"
namespace Sword2 {

22
sword2/router.cpp
View file

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

4
sword2/router.h
View file

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

34
sword2/save_rest.cpp
View file

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

2
sword2/save_rest.h
View file

@ -20,7 +20,7 @@
#ifndef SAVE_REST_H
#define SAVE_REST_H
#include "bs2/memory.h"
#include "sword2/memory.h"
namespace Sword2 {

16
sword2/scroll.cpp
View file

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

18
sword2/sound.cpp
View file

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

40
sword2/speech.cpp
View file

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

2
sword2/speech.h
View file

@ -20,7 +20,7 @@
#ifndef _SPEECH
#define _SPEECH
#include "bs2/header.h"
#include "sword2/header.h"
namespace Sword2 {

38
sword2/startup.cpp
View file

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

50
sword2/sword2.cpp
View file

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

6
sword2/sword2.h
View file

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

10
sword2/sync.cpp
View file

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

2
sword2/sync.h
View file

@ -20,7 +20,7 @@
#ifndef _SYNC
#define _SYNC
#include "bs2/object.h"
#include "sword2/object.h"
namespace Sword2 {

10
sword2/tony_gsdk.cpp
View file

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

2
sword2/tony_gsdk.h
View file

@ -20,7 +20,7 @@
#ifndef TONY_GSDK
#define TONY_GSDK
#include "bs2/memory.h"
#include "sword2/memory.h"
namespace Sword2 {

22
sword2/walker.cpp
View file

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