diff options
| author | Torbjörn Andersson | 2003-09-20 16:39:17 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-20 16:39:17 +0000 |
| commit | a412dd9fcb28b1cb878be695f5653cc98805a301 (patch) | |
| tree | 478acac75c35ee9b3ebfafd1921cae9350a335a3 /sword2 | |
| parent | 4eca44704bb8d19f6d2279b83d2ebfa9778ac054 (diff) | |
| download | scummvm-rg350-a412dd9fcb28b1cb878be695f5653cc98805a301.tar.gz scummvm-rg350-a412dd9fcb28b1cb878be695f5653cc98805a301.tar.bz2 scummvm-rg350-a412dd9fcb28b1cb878be695f5653cc98805a301.zip | |
cleanup
svn-id: r10337
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/controls.cpp | 11 | ||||
| -rw-r--r-- | sword2/controls.h | 19 |
2 files changed, 11 insertions, 19 deletions
diff --git a/sword2/controls.cpp b/sword2/controls.cpp index a9f8abb139..5730736fda 100644 --- a/sword2/controls.cpp +++ b/sword2/controls.cpp @@ -17,28 +17,23 @@ * $Header$ */ -// FIXME: Are all of these includes really needed? - #include "stdafx.h" +#include "driver/driver96.h" #include "build_display.h" #include "console.h" #include "controls.h" -#include "debug.h" #include "defs.h" #include "header.h" #include "interpreter.h" #include "layers.h" #include "logic.h" -#include "maketext.h" // for font resource variables -#include "mem_view.h" -#include "memory.h" +#include "maketext.h" // for font resource variables #include "mouse.h" #include "protocol.h" #include "resman.h" #include "router.h" #include "save_rest.h" -#include "sound.h" // for FN_stop_music() -#include "startup.h" +#include "sound.h" // for FN_stop_music() #include "sword2.h" #define MAX_STRING_LEN 64 // 20 was too low; better to be safe ;) diff --git a/sword2/controls.h b/sword2/controls.h index 535ff1e1ea..b1416bd27e 100644 --- a/sword2/controls.h +++ b/sword2/controls.h @@ -20,18 +20,15 @@ #ifndef _CONTROL_S #define _CONTROL_S -#include "common/scummsys.h" -//#include "src\driver96.h" +uint32 Restore_control(void); +void Save_control(void); +void Quit_control(void); +void Restart_control(void); +void Option_control(void); +int32 ReadOptionSettings(void); +void UpdateGraphicsLevel(uint8 newLevel); -uint32 Restore_control(void); //Tony20Mar97 -void Save_control(void); //Tony1Apr97 -void Quit_control(void); //Tony2Apr97 -void Restart_control(void); //Tony4Apr97 -void Option_control(void); //Pete5Jun97 -int32 ReadOptionSettings(void); //Pete10Jun97 -void UpdateGraphicsLevel(uint8 newLevel); // (James13jun97) - -extern uint8 subtitles; // text selected +extern uint8 subtitles; // text selected extern uint8 speechSelected; extern uint8 current_graphics_level; |