[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.35,1.36 anims.h,1.5,1.6 build_display.cpp,1.37,1.38 build_display.h,1.9,1.10 console.cpp,1.23,1.24 console.h,1.10,1.11 controls.cpp,1.36,1.37 credits.h,1.6,1.7 debug.cpp,1.17,1.18 debug.h,1.8,1.9 defs.h,1.5,1.6 events.cpp,1.13,1.14 events.h,1.8,1.9 function.cpp,1.29,1.30 function.h,1.4,1.5 icons.cpp,1.17,1.18 icons.h,1.6,1.7 interpreter.cpp,1.22,1.23 layers.cpp,1.15,1.16 logic.cpp,1.25,1.26 logic.h,1.10,1.11 maketext.cpp,1.25,1.26 maketext.h,1.6,1.7 mem_view.cpp,1.18,1.19 memory.cpp,1.14,1.15 module.mk,1.4,1.5 mouse.cpp,1.29,1.30 mouse.h,1.7,1.8 protocol.cpp,1.17,1.18 protocol.h,1.5,1.6 resman.cpp,1.57,1.58 resman.h,1.11,1.12 router.cpp,1.25,1.26 router.h,1.9,1.10 save_rest.cpp,1.30,1.31 save_rest.h,1.5,1.6 scroll.cpp,1.8,1.9 sound.cpp,1.29,1.30 speech.cpp,1.34,1.35 speech.h,1.4,1.5 startup.cpp,1.25,1.26 sword2.cpp,1.66,1.67 sword2.h,1.26,1.27 sync.cpp,1.10,1.11 sync.h,1.6,1.7 tony_gsdk.cpp,1.13,1.14 tony_gsdk.h,1.5,1.6 walker.cpp,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Tue Oct 28 11:54:25 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: residual main.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.24,1.25 d_draw.cpp,1.38,1.39 d_draw.h,1.12,1.13 d_sound.cpp,1.76,1.77 keyboard.cpp,1.11,1.12 language.cpp,1.9,1.10 menu.cpp,1.19,1.20 misc.cpp,1.13,1.14 palette.cpp,1.22,1.23 rdwin.cpp,1.33,1.34 render.cpp,1.37,1.38 render.h,1.10,1.11 sprite.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv20530
Modified Files:
anims.cpp anims.h build_display.cpp build_display.h
console.cpp console.h controls.cpp credits.h debug.cpp debug.h
defs.h events.cpp events.h function.cpp function.h icons.cpp
icons.h interpreter.cpp layers.cpp logic.cpp logic.h
maketext.cpp maketext.h mem_view.cpp memory.cpp module.mk
mouse.cpp mouse.h protocol.cpp protocol.h resman.cpp resman.h
router.cpp router.h save_rest.cpp save_rest.h scroll.cpp
sound.cpp speech.cpp speech.h startup.cpp sword2.cpp sword2.h
sync.cpp sync.h tony_gsdk.cpp tony_gsdk.h walker.cpp
Log Message:
bs2 -> sword2
Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- anims.cpp 28 Oct 2003 17:07:22 -0000 1.35
+++ anims.cpp 28 Oct 2003 19:51:26 -0000 1.36
@@ -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 {
Index: anims.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- anims.h 18 Oct 2003 08:11:49 -0000 1.5
+++ anims.h 28 Oct 2003 19:51:26 -0000 1.6
@@ -20,7 +20,7 @@
#ifndef _ANIM_S
#define _ANIM_S
-#include "bs2/driver/driver96.h"
+#include "sword2/driver/driver96.h"
namespace Sword2 {
Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- build_display.cpp 26 Oct 2003 15:42:49 -0000 1.37
+++ build_display.cpp 28 Oct 2003 19:51:26 -0000 1.38
@@ -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 {
Index: build_display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build_display.h 26 Oct 2003 15:42:49 -0000 1.9
+++ build_display.h 28 Oct 2003 19:51:27 -0000 1.10
@@ -20,7 +20,7 @@
#ifndef _BUILD_DISPLAY
#define _BUILD_DISPLAY
-#include "bs2/driver/driver96.h"
+#include "sword2/driver/driver96.h"
namespace Sword2 {
Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- console.cpp 26 Oct 2003 21:30:43 -0000 1.23
+++ console.cpp 28 Oct 2003 19:51:27 -0000 1.24
@@ -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"
Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- console.h 26 Oct 2003 21:30:49 -0000 1.10
+++ console.h 28 Oct 2003 19:51:27 -0000 1.11
@@ -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
Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- controls.cpp 28 Oct 2003 13:46:28 -0000 1.36
+++ controls.cpp 28 Oct 2003 19:51:27 -0000 1.37
@@ -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 {
Index: credits.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/credits.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- credits.h 18 Oct 2003 08:11:49 -0000 1.6
+++ credits.h 28 Oct 2003 19:51:27 -0000 1.7
@@ -20,7 +20,7 @@
#ifndef _CREDITS_H
#define _CREDITS_H
-#include "bs2/driver/driver96.h"
+#include "sword2/driver/driver96.h"
namespace Sword2 {
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- debug.cpp 26 Oct 2003 15:42:49 -0000 1.17
+++ debug.cpp 28 Oct 2003 19:51:27 -0000 1.18
@@ -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 {
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debug.h 26 Oct 2003 15:42:49 -0000 1.8
+++ debug.h 28 Oct 2003 19:51:27 -0000 1.9
@@ -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
Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/defs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defs.h 18 Oct 2003 08:11:49 -0000 1.5
+++ defs.h 28 Oct 2003 19:51:27 -0000 1.6
@@ -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
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/events.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- events.cpp 26 Oct 2003 15:42:49 -0000 1.13
+++ events.cpp 28 Oct 2003 19:51:27 -0000 1.14
@@ -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 {
Index: events.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/events.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- events.h 26 Oct 2003 15:42:49 -0000 1.8
+++ events.h 28 Oct 2003 19:51:27 -0000 1.9
@@ -20,7 +20,7 @@
#ifndef _EVENTS
#define _EVENTS
-#include "bs2/object.h"
+#include "sword2/object.h"
namespace Sword2 {
Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- function.cpp 28 Oct 2003 17:07:22 -0000 1.29
+++ function.cpp 28 Oct 2003 19:51:27 -0000 1.30
@@ -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 {
Index: function.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- function.h 4 Oct 2003 08:07:01 -0000 1.4
+++ function.h 28 Oct 2003 19:51:27 -0000 1.5
@@ -20,7 +20,7 @@
#ifndef _FUNCTION
#define _FUNCTION
-#include "bs2/object.h"
+#include "sword2/object.h"
namespace Sword2 {
Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/icons.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- icons.cpp 26 Oct 2003 15:42:49 -0000 1.17
+++ icons.cpp 28 Oct 2003 19:51:27 -0000 1.18
@@ -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 {
Index: icons.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/icons.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- icons.h 9 Oct 2003 06:57:35 -0000 1.6
+++ icons.h 28 Oct 2003 19:51:27 -0000 1.7
@@ -20,7 +20,7 @@
#ifndef _ICONS
#define _ICONS
-#include "bs2/object.h"
+#include "sword2/object.h"
namespace Sword2 {
Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/interpreter.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- interpreter.cpp 26 Oct 2003 15:42:49 -0000 1.22
+++ interpreter.cpp 28 Oct 2003 19:51:27 -0000 1.23
@@ -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 {
Index: layers.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/layers.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- layers.cpp 26 Oct 2003 15:42:49 -0000 1.15
+++ layers.cpp 28 Oct 2003 19:51:28 -0000 1.16
@@ -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 {
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- logic.cpp 26 Oct 2003 15:42:49 -0000 1.25
+++ logic.cpp 28 Oct 2003 19:51:28 -0000 1.26
@@ -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 {
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- logic.h 26 Oct 2003 15:42:49 -0000 1.10
+++ logic.h 28 Oct 2003 19:51:28 -0000 1.11
@@ -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 {
Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- maketext.cpp 28 Oct 2003 17:07:23 -0000 1.25
+++ maketext.cpp 28 Oct 2003 19:51:28 -0000 1.26
@@ -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 {
Index: maketext.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- maketext.h 26 Oct 2003 15:42:49 -0000 1.6
+++ maketext.h 28 Oct 2003 19:51:29 -0000 1.7
@@ -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
Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mem_view.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mem_view.cpp 26 Oct 2003 15:42:49 -0000 1.18
+++ mem_view.cpp 28 Oct 2003 19:51:29 -0000 1.19
@@ -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 {
Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/memory.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- memory.cpp 4 Oct 2003 08:07:02 -0000 1.14
+++ memory.cpp 28 Oct 2003 19:51:29 -0000 1.15
@@ -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 {
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/module.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- module.mk 26 Oct 2003 15:42:49 -0000 1.4
+++ module.mk 28 Oct 2003 19:51:29 -0000 1.5
@@ -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
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mouse.cpp 26 Oct 2003 15:42:49 -0000 1.29
+++ mouse.cpp 28 Oct 2003 19:51:29 -0000 1.30
@@ -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 {
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mouse.h 18 Oct 2003 08:11:49 -0000 1.7
+++ mouse.h 28 Oct 2003 19:51:29 -0000 1.8
@@ -20,7 +20,7 @@
#ifndef MOUSE_H
#define MOUSE_H
-#include "bs2/object.h"
+#include "sword2/object.h"
namespace Sword2 {
Index: protocol.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/protocol.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- protocol.cpp 26 Oct 2003 15:42:49 -0000 1.17
+++ protocol.cpp 28 Oct 2003 19:51:29 -0000 1.18
@@ -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 {
Index: protocol.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/protocol.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- protocol.h 4 Oct 2003 08:07:02 -0000 1.5
+++ protocol.h 28 Oct 2003 19:51:29 -0000 1.6
@@ -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 {
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- resman.cpp 28 Oct 2003 17:07:23 -0000 1.57
+++ resman.cpp 28 Oct 2003 19:51:29 -0000 1.58
@@ -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 {
Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- resman.h 26 Oct 2003 15:42:49 -0000 1.11
+++ resman.h 28 Oct 2003 19:51:29 -0000 1.12
@@ -20,7 +20,7 @@
#ifndef RESMAN_H
#define RESMAN_H
-#include "bs2/memory.h"
+#include "sword2/memory.h"
namespace Sword2 {
Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- router.cpp 26 Oct 2003 15:42:49 -0000 1.25
+++ router.cpp 28 Oct 2003 19:51:29 -0000 1.26
@@ -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 {
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- router.h 26 Oct 2003 15:42:49 -0000 1.9
+++ router.h 28 Oct 2003 19:51:29 -0000 1.10
@@ -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!
Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- save_rest.cpp 26 Oct 2003 15:42:49 -0000 1.30
+++ save_rest.cpp 28 Oct 2003 19:51:29 -0000 1.31
@@ -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 {
Index: save_rest.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- save_rest.h 4 Oct 2003 08:07:02 -0000 1.5
+++ save_rest.h 28 Oct 2003 19:51:29 -0000 1.6
@@ -20,7 +20,7 @@
#ifndef SAVE_REST_H
#define SAVE_REST_H
-#include "bs2/memory.h"
+#include "sword2/memory.h"
namespace Sword2 {
Index: scroll.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/scroll.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scroll.cpp 18 Oct 2003 08:11:50 -0000 1.8
+++ scroll.cpp 28 Oct 2003 19:51:29 -0000 1.9
@@ -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 {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- sound.cpp 28 Oct 2003 17:07:23 -0000 1.29
+++ sound.cpp 28 Oct 2003 19:51:29 -0000 1.30
@@ -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 {
Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- speech.cpp 26 Oct 2003 15:42:49 -0000 1.34
+++ speech.cpp 28 Oct 2003 19:51:30 -0000 1.35
@@ -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 {
Index: speech.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- speech.h 4 Oct 2003 08:07:02 -0000 1.4
+++ speech.h 28 Oct 2003 19:51:30 -0000 1.5
@@ -20,7 +20,7 @@
#ifndef _SPEECH
#define _SPEECH
-#include "bs2/header.h"
+#include "sword2/header.h"
namespace Sword2 {
Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/startup.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- startup.cpp 26 Oct 2003 15:42:49 -0000 1.25
+++ startup.cpp 28 Oct 2003 19:51:30 -0000 1.26
@@ -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 {
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- sword2.cpp 28 Oct 2003 17:07:23 -0000 1.66
+++ sword2.cpp 28 Oct 2003 19:51:30 -0000 1.67
@@ -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);
Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sword2.h 28 Oct 2003 17:07:23 -0000 1.26
+++ sword2.h 28 Oct 2003 19:51:30 -0000 1.27
@@ -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
Index: sync.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sync.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sync.cpp 18 Oct 2003 08:11:50 -0000 1.10
+++ sync.cpp 28 Oct 2003 19:51:30 -0000 1.11
@@ -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 {
Index: sync.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sync.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sync.h 10 Oct 2003 16:14:52 -0000 1.6
+++ sync.h 28 Oct 2003 19:51:30 -0000 1.7
@@ -20,7 +20,7 @@
#ifndef _SYNC
#define _SYNC
-#include "bs2/object.h"
+#include "sword2/object.h"
namespace Sword2 {
Index: tony_gsdk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/tony_gsdk.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tony_gsdk.cpp 4 Oct 2003 08:07:02 -0000 1.13
+++ tony_gsdk.cpp 28 Oct 2003 19:51:30 -0000 1.14
@@ -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 {
Index: tony_gsdk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/tony_gsdk.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tony_gsdk.h 4 Oct 2003 08:07:02 -0000 1.5
+++ tony_gsdk.h 28 Oct 2003 19:51:30 -0000 1.6
@@ -20,7 +20,7 @@
#ifndef TONY_GSDK
#define TONY_GSDK
-#include "bs2/memory.h"
+#include "sword2/memory.h"
namespace Sword2 {
Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/walker.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- walker.cpp 26 Oct 2003 15:42:49 -0000 1.19
+++ walker.cpp 28 Oct 2003 19:51:30 -0000 1.20
@@ -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 {
- Previous message: [Scummvm-cvs-logs] CVS: residual main.cpp,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.24,1.25 d_draw.cpp,1.38,1.39 d_draw.h,1.12,1.13 d_sound.cpp,1.76,1.77 keyboard.cpp,1.11,1.12 language.cpp,1.9,1.10 menu.cpp,1.19,1.20 misc.cpp,1.13,1.14 palette.cpp,1.22,1.23 rdwin.cpp,1.33,1.34 render.cpp,1.37,1.38 render.h,1.10,1.11 sprite.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list