diff options
| author | Strangerke | 2015-12-07 18:02:29 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:54 +0100 |
| commit | 80592779289461d42e166a40f8a1204e6159e62b (patch) | |
| tree | 26aa322ac033d501cec39bfbb3ea25179838ba65 | |
| parent | 743b492ac796b1c3048a611681e21e7040dc1c0c (diff) | |
| download | scummvm-rg350-80592779289461d42e166a40f8a1204e6159e62b.tar.gz scummvm-rg350-80592779289461d42e166a40f8a1204e6159e62b.tar.bz2 scummvm-rg350-80592779289461d42e166a40f8a1204e6159e62b.zip | |
LAB: remove some useless forward references and includes
| -rw-r--r-- | engines/lab/labfun.h | 8 | ||||
| -rw-r--r-- | engines/lab/music.h | 1 | ||||
| -rw-r--r-- | engines/lab/parsetypes.h | 2 | ||||
| -rw-r--r-- | engines/lab/processroom.cpp | 1 | ||||
| -rw-r--r-- | engines/lab/resource.h | 1 |
5 files changed, 1 insertions, 12 deletions
diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h index 80291f617b..e67d0f786a 100644 --- a/engines/lab/labfun.h +++ b/engines/lab/labfun.h @@ -34,11 +34,6 @@ #include "common/events.h" #include "lab/parsetypes.h" -// For the Music class - TODO: Move to another header file -#include "audio/mixer.h" -#include "audio/audiostream.h" -#include "audio/decoders/raw.h" - #include "common/file.h" #include "common/savefile.h" @@ -54,9 +49,6 @@ class LabEngine; #define EAST 2 #define WEST 3 -struct TextFont; -struct Gadget; - struct SaveGameHeader { byte _version; SaveStateDescriptor _descr; diff --git a/engines/lab/music.h b/engines/lab/music.h index 942f7372ce..3114817ba3 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -33,7 +33,6 @@ #include "common/events.h" -// For the Music class - TODO: Move to another header file #include "audio/mixer.h" #include "audio/audiostream.h" #include "audio/decoders/raw.h" diff --git a/engines/lab/parsetypes.h b/engines/lab/parsetypes.h index 42c7269d7c..c7780ae09a 100644 --- a/engines/lab/parsetypes.h +++ b/engines/lab/parsetypes.h @@ -35,8 +35,6 @@ namespace Lab { -#define MAXFILELEN 31 - /*------------------------------- Action types ------------------------------*/ #define PLAYSOUND 1 #define PLAYSOUNDCONT 2 diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index b033c69945..7acf683247 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -41,7 +41,6 @@ namespace Lab { /* Global parser data */ - #define NOFILE "no file" /*****************************************************************************/ diff --git a/engines/lab/resource.h b/engines/lab/resource.h index e050a156cb..cf7f3505ec 100644 --- a/engines/lab/resource.h +++ b/engines/lab/resource.h @@ -32,6 +32,7 @@ #define LAB_RESOURCE_H #include "lab/labfun.h" +#include "lab/graphics.h" namespace Lab { |