diff options
Diffstat (limited to 'sword2/driver')
-rw-r--r-- | sword2/driver/_console.cpp | 5 | ||||
-rw-r--r-- | sword2/driver/_console.h | 14 | ||||
-rw-r--r-- | sword2/driver/d_draw.cpp | 9 | ||||
-rw-r--r-- | sword2/driver/d_sound.cpp | 6 | ||||
-rw-r--r-- | sword2/driver/driver96.h | 4 | ||||
-rw-r--r-- | sword2/driver/keyboard.h | 14 | ||||
-rw-r--r-- | sword2/driver/menu.cpp | 2 | ||||
-rw-r--r-- | sword2/driver/menu.h | 17 | ||||
-rw-r--r-- | sword2/driver/palette.cpp | 2 | ||||
-rw-r--r-- | sword2/driver/palette.h | 14 | ||||
-rw-r--r-- | sword2/driver/rdwin.cpp | 2 | ||||
-rw-r--r-- | sword2/driver/render.h | 13 | ||||
-rw-r--r-- | sword2/driver/sprite.cpp | 12 |
13 files changed, 17 insertions, 97 deletions
diff --git a/sword2/driver/_console.cpp b/sword2/driver/_console.cpp index 82672f7bc9..34c9db0c18 100644 --- a/sword2/driver/_console.cpp +++ b/sword2/driver/_console.cpp @@ -43,15 +43,10 @@ // //============================================================================= - -//#include "ddraw.h" - #include "stdafx.h" #include "bs2/driver/driver96.h" - #include "bs2/driver/d_draw.h" - namespace Sword2 { uint8 consoleStatus = 0; // 1 - console display diff --git a/sword2/driver/_console.h b/sword2/driver/_console.h index ed88fb6403..a327cd95c1 100644 --- a/sword2/driver/_console.h +++ b/sword2/driver/_console.h @@ -17,19 +17,6 @@ * $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 #define DRIVER_CONSOLE_H @@ -39,5 +26,4 @@ extern void DisplayConsole(void); } // End of namespace Sword2 - #endif diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp index 74abb18fa0..cba4bb1e6d 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/driver/d_draw.cpp @@ -17,17 +17,16 @@ * $Header$ */ -#include <stdio.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 "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" namespace Sword2 { diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 66435dedcc..eb160b7e27 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -33,12 +33,12 @@ // opinions on this? #include "stdafx.h" -#include "bs2/driver/driver96.h" -#include "bs2/driver/d_sound.h" -#include "bs2/sword2.h" #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" namespace Sword2 { diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index 051ffa1046..ac07508df3 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -20,10 +20,6 @@ #ifndef DRIVER96_H #define DRIVER96_H -#include <limits.h> -#include <stdio.h> -#include <string.h> - #include "common/scummsys.h" #include "base/engine.h" // for warning() #include "common/system.h" diff --git a/sword2/driver/keyboard.h b/sword2/driver/keyboard.h index 9758b56d50..e08e892d85 100644 --- a/sword2/driver/keyboard.h +++ b/sword2/driver/keyboard.h @@ -17,20 +17,6 @@ * $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 #define KEYBOARD_H diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp index a83cb2ae2d..4f03aa3e9b 100644 --- a/sword2/driver/menu.cpp +++ b/sword2/driver/menu.cpp @@ -18,11 +18,11 @@ */ #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 "common/rect.h" namespace Sword2 { diff --git a/sword2/driver/menu.h b/sword2/driver/menu.h index 8e44d9a28f..6c5c7f1b86 100644 --- a/sword2/driver/menu.h +++ b/sword2/driver/menu.h @@ -17,25 +17,14 @@ * $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 #define MENU_H +namespace Sword2 { #define MENUDEEP 40 +} // End of namespace Sword2 + #endif diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp index 47000f84cb..fe10ce31c0 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/driver/palette.cpp @@ -18,8 +18,6 @@ */ #include "stdafx.h" -#include <stdio.h> - #include "common/util.h" #include "base/engine.h" #include "bs2/driver/d_draw.h" diff --git a/sword2/driver/palette.h b/sword2/driver/palette.h index cf66427597..705cbe9030 100644 --- a/sword2/driver/palette.h +++ b/sword2/driver/palette.h @@ -17,20 +17,6 @@ * $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 #define PALETTE_H diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp index 88b870bee9..95a5e12efc 100644 --- a/sword2/driver/rdwin.cpp +++ b/sword2/driver/rdwin.cpp @@ -20,9 +20,7 @@ #include "common/stdafx.h" #include "base/engine.h" #include "common/timer.h" - #include "bs2/driver/driver96.h" - #include "bs2/driver/_mouse.h" #include "bs2/driver/keyboard.h" #include "bs2/driver/rdwin.h" diff --git a/sword2/driver/render.h b/sword2/driver/render.h index 034eb1e936..f438ede23c 100644 --- a/sword2/driver/render.h +++ b/sword2/driver/render.h @@ -17,19 +17,6 @@ * $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 #define RENDER_H diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp index de2c59fadb..c2da022430 100644 --- a/sword2/driver/sprite.cpp +++ b/sword2/driver/sprite.cpp @@ -18,12 +18,12 @@ */ #include "stdafx.h" -#include "driver96.h" -#include "d_draw.h" -#include "render.h" -#include "menu.h" -#include "palette.h" -#include "rdwin.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" namespace Sword2 { |