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

Changed to use #include "bs2/..." and removed the inclusion of standard C

Browse source 
headers. Most (all?) of the ones we need should probably come from stdafx.h
instead.

svn-id: r10588
This commit is contained in:
Torbjörn Andersson 2003-10-04 08:07:03 +00:00
parent 1efd91d515
commit 4fad04846a
65 changed files with 331 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sword2/anims.cpp
View file

@ -23,28 +23,22 @@
// DON'T TOUCH! // DON'T TOUCH!
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#include <stdio.h> // for sprintf
#ifdef _SWORD2_DEBUG
#include <string.h> // for strlen
#endif
#include "stdafx.h" #include "stdafx.h"
#include "common/scummsys.h" #include "common/scummsys.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "anims.h" #include "bs2/anims.h"
#include "console.h" #include "bs2/console.h"
#include "controls.h" // for 'speechSelected' & 'subtitles' #include "bs2/controls.h" // for 'speechSelected' & 'subtitles'
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "maketext.h" // for MakeTextSprite used by FN_play_sequence ultimately #include "bs2/maketext.h" // for MakeTextSprite used by FN_play_sequence ultimately
#include "object.h" #include "bs2/object.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
#include "sword2.h" #include "bs2/sword2.h"
#include "sync.h" #include "bs2/sync.h"
#include "sound.h" // for Speech stuff. #include "bs2/sound.h" // for Speech stuff.
namespace Sword2 { namespace Sword2 {

2
sword2/anims.h
View file

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

22
sword2/build_display.cpp
View file

@ -21,19 +21,17 @@
// BUILD_DISPLAY.CPP like the old spr_engi but slightly more aptly named // BUILD_DISPLAY.CPP like the old spr_engi but slightly more aptly named
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "console.h" #include "bs2/console.h"
#include "defs.h" #include "bs2/defs.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "layers.h" #include "bs2/layers.h"
#include "maketext.h" #include "bs2/maketext.h"
#include "mouse.h" #include "bs2/mouse.h"
#include "object.h" #include "bs2/object.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
namespace Sword2 { namespace Sword2 {

2
sword2/build_display.h
View file

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

44
sword2/console.cpp
View file

@ -18,7 +18,7 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
namespace Sword2 { namespace Sword2 {
uint32 console_status = 0; //0 off // LEFT IN RELEASE VERSION uint32 console_status = 0; //0 off // LEFT IN RELEASE VERSION
@ -28,30 +28,24 @@ uint32 console_status = 0; //0 off // LEFT IN RELEASE VERSION
// its the console! <great> // its the console! <great>
#include <ctype.h> #include "bs2/build_display.h"
#include <stdarg.h> #include "bs2/console.h"
#include <stdio.h> #include "bs2/debug.h"
#include <stdlib.h> #include "bs2/defs.h"
#include <time.h> // for version string stuff #include "bs2/events.h" // so we can display the event list in Con_display_events()
#include "bs2/header.h"
#include "build_display.h" #include "bs2/layers.h"
#include "console.h" #include "bs2/logic.h"
#include "debug.h" #include "bs2/maketext.h" // for InitialiseFontResourceFlags()
#include "defs.h" #include "bs2/mouse.h"
#include "events.h" // so we can display the event list in Con_display_events() #include "bs2/mem_view.h"
#include "header.h" #include "bs2/memory.h"
#include "layers.h" #include "bs2/protocol.h"
#include "logic.h" #include "bs2/resman.h"
#include "maketext.h" // for InitialiseFontResourceFlags() #include "bs2/save_rest.h"
#include "mouse.h" #include "bs2/startup.h"
#include "mem_view.h" #include "bs2/sword2.h"
#include "memory.h" #include "bs2/time.h"
#include "protocol.h"
#include "resman.h"
#include "save_rest.h"
#include "startup.h"
#include "sword2.h"
#include "time.h"
namespace Sword2 { namespace Sword2 {

4
sword2/console.h
View file

@ -20,8 +20,8 @@
#ifndef C_ONSOLE_H #ifndef C_ONSOLE_H
#define C_ONSOLE_H #define C_ONSOLE_H
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "memory.h" #include "bs2/memory.h"
namespace Sword2 { namespace Sword2 {

34
sword2/controls.cpp
View file

@ -18,23 +18,23 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "console.h" #include "bs2/console.h"
#include "controls.h" #include "bs2/controls.h"
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "layers.h" #include "bs2/layers.h"
#include "logic.h" #include "bs2/logic.h"
#include "maketext.h" // for font resource variables #include "bs2/maketext.h" // for font resource variables
#include "mouse.h" #include "bs2/mouse.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
#include "router.h" #include "bs2/router.h"
#include "save_rest.h" #include "bs2/save_rest.h"
#include "sound.h" #include "bs2/sound.h"
#include "sword2.h" #include "bs2/sword2.h"
namespace Sword2 { namespace Sword2 {

6
sword2/credits.h
View file

@ -17,10 +17,10 @@
* $Header$ * $Header$
*/ */
#ifndef _Credits_h_ #ifndef _CREDITS_H
#define _Credits_h_ #define _CREDITS_H
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
namespace Sword2 { namespace Sword2 {

34
sword2/debug.cpp
View file

@ -17,31 +17,25 @@
* $Header$ * $Header$
*/ */
#include <stdarg.h> // for ExitWithReport, which stays in RELEASE version
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "debug.h" #include "bs2/debug.h"
// this whole file (except ExitWithReport) only included on debug versions // this whole file (except ExitWithReport) only included on debug versions
#ifdef _SWORD2_DEBUG #ifdef _SWORD2_DEBUG
#include <stdlib.h> #include "bs2/build_display.h" // for 'fps'
#include "bs2/console.h"
#include "build_display.h" // for 'fps' #include "bs2/defs.h"
#include "console.h" #include "bs2/events.h" // for CountEvents()
#include "defs.h" #include "bs2/layers.h"
#include "events.h" // for CountEvents() #include "bs2/logic.h"
#include "layers.h" #include "bs2/maketext.h"
#include "logic.h" #include "bs2/mouse.h"
#include "maketext.h" #include "bs2/protocol.h"
#include "mem_view.h" #include "bs2/resman.h"
#include "mouse.h" #include "bs2/router.h" // for PlotWalkGrid()
#include "protocol.h" #include "bs2/speech.h" // for 'officialTextNumber' and
#include "resman.h"
#include "router.h" // for PlotWalkGrid()
#include "speech.h" // for 'officialTextNumber' and
// 'speechScriptWaiting' // 'speechScriptWaiting'
namespace Sword2 { namespace Sword2 {

4
sword2/debug.h
View file

@ -23,8 +23,8 @@
// this whole file only included on debug versions // this whole file only included on debug versions
#ifdef _SWORD2_DEBUG #ifdef _SWORD2_DEBUG
#include "driver.h" #include "bs2/driver.h"
#include "object.h" #include "bs2/object.h"
namespace Sword2 { namespace Sword2 {

4
sword2/defs.h
View file

@ -20,8 +20,8 @@
#ifndef DEFS #ifndef DEFS
#define DEFS #define DEFS
#include "header.h" #include "bs2/header.h"
#include "resman.h" #include "bs2/resman.h"
#define SIZE 0x10000 // 65536 items per section #define SIZE 0x10000 // 65536 items per section
#define NuSIZE 0xffff // & with this #define NuSIZE 0xffff // & with this

5
sword2/driver/_console.cpp
View file

@ -43,15 +43,10 @@
// //
//============================================================================= //=============================================================================
//#include "ddraw.h"
#include "stdafx.h" #include "stdafx.h"
#include "bs2/driver/driver96.h" #include "bs2/driver/driver96.h"
#include "bs2/driver/d_draw.h" #include "bs2/driver/d_draw.h"
namespace Sword2 { namespace Sword2 {
uint8 consoleStatus = 0; // 1 - console display uint8 consoleStatus = 0; // 1 - console display

14
sword2/driver/_console.h
View file

@ -17,19 +17,6 @@
* $Header$ * $Header$
*/ */
//=============================================================================
//
// Filename : console.h
// Created : 19th September 1996
// By : P.R.Porter
//
// Summary : This include file defines links to all data which is
// defined in the console.c module, but can be accessed by
// other parts of the driver96 library.
//
//=============================================================================
#ifndef DRIVER_CONSOLE_H #ifndef DRIVER_CONSOLE_H
#define DRIVER_CONSOLE_H #define DRIVER_CONSOLE_H
@ -39,5 +26,4 @@ extern void DisplayConsole(void);
} // End of namespace Sword2 } // End of namespace Sword2
#endif #endif

9
sword2/driver/d_draw.cpp
View file

@ -17,17 +17,16 @@
* $Header$ * $Header$
*/ */
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "bs2/driver/driver96.h"
#include "bs2/header.h" // HACK: For cutscenes instruction message
#include "bs2/maketext.h" // HACK: For cutscenes instruction message
#include "bs2/sword2.h"
#include "sound/mixer.h" #include "sound/mixer.h"
#include "bs2/driver/driver96.h"
#include "bs2/driver/rdwin.h" #include "bs2/driver/rdwin.h"
#include "bs2/driver/d_draw.h" #include "bs2/driver/d_draw.h"
#include "bs2/driver/palette.h" #include "bs2/driver/palette.h"
#include "bs2/driver/render.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"
namespace Sword2 { namespace Sword2 {

6
sword2/driver/d_sound.cpp
View file

@ -33,12 +33,12 @@
// opinions on this? // opinions on this?
#include "stdafx.h" #include "stdafx.h"
#include "bs2/driver/driver96.h"
#include "bs2/driver/d_sound.h"
#include "bs2/sword2.h"
#include "sound/audiostream.h" #include "sound/audiostream.h"
#include "sound/mixer.h" #include "sound/mixer.h"
#include "sound/rate.h" #include "sound/rate.h"
#include "bs2/driver/driver96.h"
#include "bs2/driver/d_sound.h"
#include "bs2/sword2.h"
namespace Sword2 { namespace Sword2 {

4
sword2/driver/driver96.h
View file

@ -20,10 +20,6 @@
#ifndef DRIVER96_H #ifndef DRIVER96_H
#define DRIVER96_H #define DRIVER96_H
#include <limits.h>
#include <stdio.h>
#include <string.h>
#include "common/scummsys.h" #include "common/scummsys.h"
#include "base/engine.h" // for warning() #include "base/engine.h" // for warning()
#include "common/system.h" #include "common/system.h"

14
sword2/driver/keyboard.h
View file

@ -17,20 +17,6 @@
* $Header$ * $Header$
*/ */
//=============================================================================
//
// Filename : keyboard.h
// Created : 19th September 1996
// By : P.R.Porter
//
// Summary : This include file defines links to all data which is
// defined in the keyboard.c module, but can be accessed by
// other parts of the driver96 library.
//
//
//=============================================================================
#ifndef KEYBOARD_H #ifndef KEYBOARD_H
#define KEYBOARD_H #define KEYBOARD_H

2
sword2/driver/menu.cpp
View file

@ -18,11 +18,11 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "common/rect.h"
#include "bs2/driver/driver96.h" #include "bs2/driver/driver96.h"
#include "bs2/driver/menu.h" #include "bs2/driver/menu.h"
#include "bs2/driver/d_draw.h" #include "bs2/driver/d_draw.h"
#include "bs2/driver/render.h" #include "bs2/driver/render.h"
#include "common/rect.h"
namespace Sword2 { namespace Sword2 {

17
sword2/driver/menu.h
View file

@ -17,25 +17,14 @@
* $Header$ * $Header$
*/ */
//=============================================================================
//
// Filename : menu.h
// Created : 15th November 1996
// By : P.R.Porter
//
// Summary : This include file defines links to all data which is
// defined in the menu.c module, but can be accessed by
// other parts of the driver96 library.
//
//
//=============================================================================
#ifndef MENU_H #ifndef MENU_H
#define MENU_H #define MENU_H
namespace Sword2 {
#define MENUDEEP 40 #define MENUDEEP 40
} // End of namespace Sword2
#endif #endif

2
sword2/driver/palette.cpp
View file

@ -18,8 +18,6 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include <stdio.h>
#include "common/util.h" #include "common/util.h"
#include "base/engine.h" #include "base/engine.h"
#include "bs2/driver/d_draw.h" #include "bs2/driver/d_draw.h"

14
sword2/driver/palette.h
View file

@ -17,20 +17,6 @@
* $Header$ * $Header$
*/ */
//=============================================================================
//
// Filename : palette.h
// Created : 8th November 1996
// By : P.R.Porter
//
// Summary : This include file defines links to all data which is
// defined in the palette.c module, but can be accessed by
// other parts of the driver96 library.
//
//
//=============================================================================
#ifndef PALETTE_H #ifndef PALETTE_H
#define PALETTE_H #define PALETTE_H

2
sword2/driver/rdwin.cpp
View file

@ -20,9 +20,7 @@
#include "common/stdafx.h" #include "common/stdafx.h"
#include "base/engine.h" #include "base/engine.h"
#include "common/timer.h" #include "common/timer.h"
#include "bs2/driver/driver96.h" #include "bs2/driver/driver96.h"
#include "bs2/driver/_mouse.h" #include "bs2/driver/_mouse.h"
#include "bs2/driver/keyboard.h" #include "bs2/driver/keyboard.h"
#include "bs2/driver/rdwin.h" #include "bs2/driver/rdwin.h"

13
sword2/driver/render.h
View file

@ -17,19 +17,6 @@
* $Header$ * $Header$
*/ */
//=============================================================================
//
// Filename : render.h
// Created : 26th August 1996
// By : P.R.Porter
//
// Summary : This include file defines links to all data which is
// defined in the render.c module, but can be accessed by
// other parts of the driver96 library.
//
//
//=============================================================================
#ifndef RENDER_H #ifndef RENDER_H
#define RENDER_H #define RENDER_H

12
sword2/driver/sprite.cpp
View file

@ -18,12 +18,12 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver96.h" #include "bs2/driver/driver96.h"
#include "d_draw.h" #include "bs2/driver/d_draw.h"
#include "render.h" #include "bs2/driver/render.h"
#include "menu.h" #include "bs2/driver/menu.h"
#include "palette.h" #include "bs2/driver/palette.h"
#include "rdwin.h" #include "bs2/driver/rdwin.h"
namespace Sword2 { namespace Sword2 {

18
sword2/events.cpp
View file

@ -18,15 +18,15 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "console.h" #include "bs2/console.h"
#include "debug.h" #include "bs2/debug.h"
#include "defs.h" #include "bs2/defs.h"
#include "events.h" #include "bs2/events.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "logic.h" #include "bs2/logic.h"
#include "memory.h" #include "bs2/memory.h"
#include "object.h" #include "bs2/object.h"
#include "sync.h" #include "bs2/sync.h"
namespace Sword2 { namespace Sword2 {

2
sword2/events.h
View file

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

28
sword2/function.cpp
View file

@ -18,20 +18,20 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "driver/rdwin.h" #include "bs2/driver/rdwin.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "credits.h" #include "bs2/credits.h"
#include "debug.h" #include "bs2/debug.h"
#include "defs.h" #include "bs2/defs.h"
#include "function.h" #include "bs2/function.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "layers.h" // for 'this_screen' structure #include "bs2/layers.h" // for 'this_screen' structure
#include "logic.h" #include "bs2/logic.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
#include "sound.h" #include "bs2/sound.h"
#include "sword2.h" // for CloseGame() #include "bs2/sword2.h" // for CloseGame()
namespace Sword2 { namespace Sword2 {

2
sword2/function.h
View file

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

9
sword2/icons.cpp
View file

@ -18,10 +18,11 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "defs.h" #include "bs2/driver/driver96.h"
#include "icons.h" #include "bs2/defs.h"
#include "interpreter.h" #include "bs2/icons.h"
#include "mouse.h" #include "bs2/interpreter.h"
#include "bs2/mouse.h"
namespace Sword2 { namespace Sword2 {

2
sword2/icons.h
View file

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

7
sword2/interpreter.cpp
View file

@ -18,10 +18,9 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "bs2/driver/driver96.h"
#include "console.h" #include "bs2/console.h"
#include "driver/driver96.h" #include "bs2/interpreter.h"
#include "interpreter.h"
namespace Sword2 { namespace Sword2 {

4
sword2/interpreter.h
View file

@ -20,8 +20,8 @@
#ifndef _INTERPRETER #ifndef _INTERPRETER
#define _INTERPRETER #define _INTERPRETER
#include "debug.h" #include "bs2/debug.h"
#include "header.h" #include "bs2/header.h"
namespace Sword2 { namespace Sword2 {

14
sword2/layers.cpp
View file

@ -26,13 +26,13 @@
// up to 2 foreground parallax layers // up to 2 foreground parallax layers
#include "stdafx.h" #include "stdafx.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "debug.h" #include "bs2/debug.h"
#include "header.h" #include "bs2/header.h"
#include "layers.h" #include "bs2/layers.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
#include "sound.h" // for Clear_fx_queue() called from FN_init_background() #include "bs2/sound.h" // for Clear_fx_queue() called from FN_init_background()
namespace Sword2 { namespace Sword2 {

2
sword2/layers.h
View file

@ -20,8 +20,6 @@
#ifndef _LAYERS #ifndef _LAYERS
#define _LAYERS #define _LAYERS
#include "memory.h"
namespace Sword2 { namespace Sword2 {
typedef struct { typedef struct {

16
sword2/logic.cpp
View file

@ -18,14 +18,14 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "console.h" #include "bs2/console.h"
#include "debug.h" #include "bs2/debug.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "logic.h" #include "bs2/logic.h"
#include "router.h" // for ClearWalkGridList() #include "bs2/router.h" // for ClearWalkGridList()
#include "sound.h" #include "bs2/sound.h"
#include "sync.h" #include "bs2/sync.h"
namespace Sword2 { namespace Sword2 {

4
sword2/logic.h
View file

@ -22,8 +22,8 @@
#ifndef _LOGIC #ifndef _LOGIC
#define _LOGIC #define _LOGIC
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
namespace Sword2 { namespace Sword2 {

22
sword2/maketext.cpp
View file

@ -50,19 +50,17 @@
#define LAST_CHAR 255 // last character in character set #define LAST_CHAR 255 // last character in character set
#define DUD 64 // the first "chequered flag" (dud) symbol in #define DUD 64 // the first "chequered flag" (dud) symbol in
// our character set is in the '@' position // our character set is in the '@' position
#include <string.h>
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "console.h" #include "bs2/console.h"
#include "debug.h" #include "bs2/debug.h"
#include "defs.h" // for SPEECH_FONT_ID & CONSOLE_FONT_ID #include "bs2/defs.h" // for SPEECH_FONT_ID & CONSOLE_FONT_ID
#include "header.h" #include "bs2/header.h"
#include "maketext.h" #include "bs2/maketext.h"
#include "memory.h" #include "bs2/memory.h"
#include "protocol.h" // for FetchFrameHeader() #include "bs2/protocol.h" // for FetchFrameHeader()
#include "resman.h" #include "bs2/resman.h"
#include "sword2.h" #include "bs2/sword2.h"
namespace Sword2 { namespace Sword2 {

8
sword2/maketext.h
View file

@ -57,7 +57,7 @@
#ifndef _MAKETEXT_H #ifndef _MAKETEXT_H
#define _MAKETEXT_H #define _MAKETEXT_H
#include "memory.h" #include "bs2/memory.h"
namespace Sword2 { namespace Sword2 {
@ -77,7 +77,7 @@ mem* MakeTextSprite(uint8 *sentence, uint16 maxWidth, uint8 pen, uint32 fontRes)
void Init_text_bloc_system(void); void Init_text_bloc_system(void);
void Kill_text_bloc(uint32 bloc_number); void Kill_text_bloc(uint32 bloc_number);
void Print_text_blocs(void); // Tony16Oct96 void Print_text_blocs(void);
uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen, uint32 type, uint32 fontRes, uint8 justification); uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen, uint32 type, uint32 fontRes, uint8 justification);
@ -85,9 +85,9 @@ uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen,
#define FINNISH_TEXT 1 #define FINNISH_TEXT 1
#define POLISH_TEXT 2 #define POLISH_TEXT 2
// this one works out the language from the text cluster (James31july97) // this one works out the language from the text cluster
void InitialiseFontResourceFlags(void); void InitialiseFontResourceFlags(void);
// this one allow you to select the fonts yourself (James31july97) // this one allow you to select the fonts yourself
void InitialiseFontResourceFlags(uint8 language); void InitialiseFontResourceFlags(uint8 language);
extern uint32 speech_font_id; extern uint32 speech_font_id;

10
sword2/mem_view.cpp
View file

@ -18,11 +18,11 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "console.h" #include "bs2/console.h"
#include "header.h" #include "bs2/header.h"
#include "memory.h" #include "bs2/memory.h"
#include "resman.h" #include "bs2/resman.h"
namespace Sword2 { namespace Sword2 {

8
sword2/memory.cpp
View file

@ -38,10 +38,10 @@
// MemMan v1.1 // MemMan v1.1
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "debug.h" #include "bs2/debug.h"
#include "memory.h" #include "bs2/memory.h"
#include "resman.h" #include "bs2/resman.h"
namespace Sword2 { namespace Sword2 {

2
sword2/memory.h
View file

@ -20,8 +20,6 @@
#ifndef MEMORY_H #ifndef MEMORY_H
#define MEMORY_H #define MEMORY_H
#include "common/scummsys.h"
namespace Sword2 { namespace Sword2 {
typedef struct { typedef struct {

32
sword2/mouse.cpp
View file

@ -18,22 +18,22 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "console.h" #include "bs2/console.h"
#include "controls.h" #include "bs2/controls.h"
#include "defs.h" #include "bs2/defs.h"
#include "events.h" #include "bs2/events.h"
#include "icons.h" #include "bs2/icons.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "layers.h" #include "bs2/layers.h"
#include "maketext.h" #include "bs2/maketext.h"
#include "mouse.h" #include "bs2/mouse.h"
#include "object.h" #include "bs2/object.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
#include "sound.h" #include "bs2/sound.h"
#include "sword2.h" #include "bs2/sword2.h"
namespace Sword2 { namespace Sword2 {

4
sword2/mouse.h
View file

@ -17,12 +17,10 @@
* $Header$ * $Header$
*/ */
//mouse stuff
#ifndef MOUSE_H #ifndef MOUSE_H
#define MOUSE_H #define MOUSE_H
#include "object.h" #include "bs2/object.h"
namespace Sword2 { namespace Sword2 {

2
sword2/object.h
View file

@ -20,8 +20,6 @@
#ifndef _SCRIPT_STRUCTURES #ifndef _SCRIPT_STRUCTURES
#define _SCRIPT_STRUCTURES #define _SCRIPT_STRUCTURES
#include "driver/driver96.h"
namespace Sword2 { namespace Sword2 {
// these structures represent the broken up compact components // these structures represent the broken up compact components

14
sword2/protocol.cpp
View file

@ -17,15 +17,13 @@
* $Header$ * $Header$
*/ */
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "console.h" #include "bs2/console.h"
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
#include "memory.h" #include "bs2/memory.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
namespace Sword2 { namespace Sword2 {

4
sword2/protocol.h
View file

@ -22,8 +22,8 @@
#ifndef _PROTOCOL #ifndef _PROTOCOL
#define _PROTOCOL #define _PROTOCOL
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "header.h" #include "bs2/header.h"
namespace Sword2 { namespace Sword2 {

40
sword2/resman.cpp
View file

@ -17,31 +17,23 @@
* $Header$ * $Header$
*/ */
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "stdafx.h" #include "stdafx.h"
#include "bs2/driver/driver96.h"
#include "base/engine.h" #include "bs2/build_display.h"
#include "common/file.h" #include "bs2/console.h"
#include "bs2/debug.h"
#include "driver/driver96.h" #include "bs2/defs.h"
#include "build_display.h" #include "bs2/function.h"
#include "console.h" #include "bs2/header.h"
#include "debug.h" #include "bs2/interpreter.h"
#include "defs.h" #include "bs2/maketext.h"
#include "function.h" #include "bs2/memory.h"
#include "header.h" #include "bs2/mouse.h" // for system Set_mouse & Set_luggage routines
#include "interpreter.h" #include "bs2/protocol.h"
#include "maketext.h" #include "bs2/resman.h"
#include "memory.h" #include "bs2/sound.h" // for Clear_fx_queue() called from cacheNewCluster()
#include "mouse.h" // for system Set_mouse & Set_luggage routines #include "bs2/sword2.h" // for CloseGame()
#include "protocol.h" #include "bs2/router.h"
#include "resman.h"
#include "sound.h" // for Clear_fx_queue() called from cacheNewCluster()
#include "sword2.h" // for CloseGame()
#include "router.h"
namespace Sword2 { namespace Sword2 {

2
sword2/resman.h
View file

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

20
sword2/router.cpp
View file

@ -78,16 +78,16 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "console.h" #include "bs2/console.h"
#include "debug.h" #include "bs2/debug.h"
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "memory.h" #include "bs2/memory.h"
#include "object.h" #include "bs2/object.h"
#include "resman.h" #include "bs2/resman.h"
#include "router.h" #include "bs2/router.h"
namespace Sword2 { namespace Sword2 {

4
sword2/router.h
View file

@ -20,8 +20,8 @@
#ifndef _ROUTER_H #ifndef _ROUTER_H
#define _ROUTER_H #define _ROUTER_H
#include "memory.h" #include "bs2/memory.h"
#include "object.h" #include "bs2/object.h"
namespace Sword2 { namespace Sword2 {

36
sword2/save_rest.cpp
View file

@ -26,26 +26,24 @@
// //
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "console.h" #include "bs2/console.h"
#include "defs.h" #include "bs2/defs.h"
#include "function.h" // for engine_logic, engine_graph, etc #include "bs2/function.h" // for engine_logic, engine_graph, etc
#include "interpreter.h" // for IR_CONT, etc #include "bs2/interpreter.h" // for IR_CONT, etc
#include "layers.h" #include "bs2/layers.h"
#include "logic.h" #include "bs2/logic.h"
#include "memory.h" #include "bs2/memory.h"
#include "object.h" #include "bs2/object.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "resman.h" #include "bs2/resman.h"
#include "router.h" #include "bs2/router.h"
#include "save_rest.h" #include "bs2/save_rest.h"
#include "scroll.h" // for Set_scrolling() #include "bs2/scroll.h" // for Set_scrolling()
#include "sound.h" #include "bs2/sound.h"
#include "sword2.h" #include "bs2/sword2.h"
#include "walker.h" #include "bs2/walker.h"
namespace Sword2 { namespace Sword2 {

2
sword2/save_rest.h
View file

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

14
sword2/scroll.cpp
View file

@ -18,13 +18,13 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "debug.h" #include "bs2/debug.h"
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "layers.h" #include "bs2/layers.h"
#include "scroll.h" #include "bs2/scroll.h"
namespace Sword2 { namespace Sword2 {

16
sword2/sound.cpp
View file

@ -27,16 +27,14 @@
// //
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "console.h" #include "bs2/console.h"
#include "defs.h" // for RESULT #include "bs2/defs.h" // for RESULT
#include "interpreter.h" #include "bs2/interpreter.h"
#include "protocol.h" // for FetchObjectName() for debugging FN_play_fx #include "bs2/protocol.h" // for FetchObjectName() for debugging FN_play_fx
#include "resman.h" #include "bs2/resman.h"
#include "sound.h" #include "bs2/sound.h"
#include "sword2.h" #include "bs2/sword2.h"
namespace Sword2 { namespace Sword2 {

2
sword2/sound.h
View file

@ -30,8 +30,6 @@
#ifndef SOUND_H #ifndef SOUND_H
#define SOUND_H #define SOUND_H
#include "common/scummsys.h"
namespace Sword2 { namespace Sword2 {
// fx types // fx types

42
sword2/speech.cpp
View file

@ -18,28 +18,26 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "bs2/anims.h"
#include "stdafx.h" #include "bs2/console.h"
#include "anims.h" #include "bs2/controls.h" // for 'subtitles' & 'speechSelected'
#include "console.h" #include "bs2/debug.h"
#include "controls.h" // for 'subtitles' & 'speechSelected' #include "bs2/defs.h"
#include "debug.h" #include "bs2/events.h"
#include "defs.h" #include "bs2/function.h"
#include "events.h" #include "bs2/interpreter.h"
#include "function.h" #include "bs2/layers.h" // for 'this_screen'
#include "interpreter.h" #include "bs2/logic.h"
#include "layers.h" // for 'this_screen' #include "bs2/maketext.h"
#include "logic.h" #include "bs2/memory.h"
#include "maketext.h" #include "bs2/mouse.h"
#include "memory.h" #include "bs2/object.h"
#include "mouse.h" #include "bs2/protocol.h"
#include "object.h" #include "bs2/resman.h"
#include "protocol.h" #include "bs2/sound.h"
#include "resman.h" #include "bs2/speech.h"
#include "sound.h" #include "bs2/sword2.h"
#include "speech.h" #include "bs2/walker.h"
#include "sword2.h"
#include "walker.h"
namespace Sword2 { namespace Sword2 {

2
sword2/speech.h
View file

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

38
sword2/startup.cpp
View file

@ -17,27 +17,25 @@
* $Header$ * $Header$
*/ */
#include <stdio.h>
#include "stdafx.h" #include "stdafx.h"
#include "build_display.h" #include "bs2/build_display.h"
#include "console.h" #include "bs2/console.h"
#include "debug.h" #include "bs2/debug.h"
#include "defs.h" #include "bs2/defs.h"
#include "header.h" #include "bs2/header.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "maketext.h" // for Kill_text_bloc() #include "bs2/maketext.h" // for Kill_text_bloc()
#include "memory.h" #include "bs2/memory.h"
#include "mouse.h" // for FN_add_human() #include "bs2/mouse.h" // for FN_add_human()
#include "object.h" #include "bs2/object.h"
#include "resman.h" #include "bs2/resman.h"
#include "router.h" #include "bs2/router.h"
#include "sound.h" #include "bs2/sound.h"
#include "speech.h" // for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script #include "bs2/speech.h" // for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script
#include "startup.h" #include "bs2/startup.h"
#include "sword2.h" // (James11aug97) for CloseGame() #include "bs2/sword2.h" // for CloseGame()
#include "sync.h" #include "bs2/sync.h"
#include "tony_gsdk.h" #include "bs2/tony_gsdk.h"
namespace Sword2 { namespace Sword2 {

3
sword2/sword2.cpp
View file

@ -18,12 +18,9 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "base/gameDetector.h" #include "base/gameDetector.h"
#include "base/plugins.h" #include "base/plugins.h"
#include "common/config-file.h" #include "common/config-file.h"
#include "bs2/build_display.h" #include "bs2/build_display.h"
#include "bs2/console.h" #include "bs2/console.h"
#include "bs2/controls.h" #include "bs2/controls.h"

7
sword2/sword2.h
View file

@ -20,7 +20,12 @@
#ifndef _SWORD2 #ifndef _SWORD2
#define _SWORD2 #define _SWORD2
#include "driver/d_sound.h" #include "base/engine.h"
#include "common/file.h"
#include "common/map.h"
#include "common/rect.h"
#include "common/str.h"
#include "bs2/driver/d_sound.h"
enum BSGameId { enum BSGameId {
GID_SWORD2 = GID_SWORD2_FIRST, GID_SWORD2 = GID_SWORD2_FIRST,

9
sword2/sync.cpp
View file

@ -18,10 +18,11 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "debug.h" #include "common/util.h"
#include "defs.h" #include "bs2/debug.h"
#include "interpreter.h" #include "bs2/defs.h"
#include "sync.h" #include "bs2/interpreter.h"
#include "bs2/sync.h"
namespace Sword2 { namespace Sword2 {

2
sword2/sync.h
View file

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

11
sword2/tony_gsdk.cpp
View file

@ -20,12 +20,11 @@
// general odds and ends // general odds and ends
#include "stdafx.h" #include "stdafx.h"
#include "driver/driver96.h" #include "bs2/driver/driver96.h"
#include "debug.h" #include "bs2/debug.h"
#include "memory.h" #include "bs2/memory.h"
#include "tony_gsdk.h" #include "bs2/tony_gsdk.h"
#include "sword2.h" #include "bs2/sword2.h"
#include "common/file.h"
namespace Sword2 { namespace Sword2 {

2
sword2/tony_gsdk.h
View file

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

20
sword2/walker.cpp
View file

@ -34,16 +34,16 @@
// FN_get_pos() // get details of another mega's position // FN_get_pos() // get details of another mega's position
#include "stdafx.h" #include "stdafx.h"
#include "console.h" #include "bs2/console.h"
#include "defs.h" #include "bs2/defs.h"
#include "events.h" #include "bs2/events.h"
#include "function.h" #include "bs2/function.h"
#include "interpreter.h" #include "bs2/interpreter.h"
#include "logic.h" // for FN_add_to_kill_list #include "bs2/logic.h" // for FN_add_to_kill_list
#include "object.h" #include "bs2/object.h"
#include "protocol.h" #include "bs2/protocol.h"
#include "router.h" #include "bs2/router.h"
#include "sync.h" #include "bs2/sync.h"
namespace Sword2 { namespace Sword2 {