From cde66b249fc9044be27b10843b2ef1b395a1fa12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Mon, 24 Jan 2011 01:15:58 +0100 Subject: [PATCH] C4Include.h: Do not include C4Gui.h The two dialogs in headers included in C4Game.h are only used by classes in those headers, and do not need to be defined in the headers. --- src/C4Prototypes.h | 6 ++++- src/config/C4Reloc.cpp | 2 ++ src/editor/C4EditCursor.h | 1 + src/game/landscape/C4PXS.cpp | 1 + src/game/landscape/C4Particles.cpp | 1 + src/game/landscape/C4Scenario.cpp | 3 ++- src/game/landscape/C4Weather.cpp | 1 + src/game/object/C4Def.cpp | 1 + src/game/object/C4Sector.h | 1 + src/game/script/C4Effect.cpp | 1 + src/gui/C4KeyboardInput.cpp | 2 +- src/gui/C4Scoreboard.cpp | 28 +++++++++++++++++++ src/gui/C4Scoreboard.h | 28 ------------------- src/platform/C4GamePadCon.cpp | 1 + src/platform/C4SoundLoaders.cpp | 2 ++ src/platform/C4SoundLoaders.h | 1 + src/platform/C4VideoPlayback.cpp | 43 ++++++++++++++++++++++++++++++ src/platform/C4VideoPlayback.h | 42 ----------------------------- src/platform/StdDDraw2.cpp | 1 + src/platform/StdGLCtx.cpp | 1 + src/platform/StdGtkWindow.cpp | 4 ++- src/platform/StdSDLWindow.cpp | 1 + src/platform/StdSurface2.cpp | 1 + src/platform/StdWindow.cpp | 4 ++- src/script/C4AulParse.cpp | 1 + 25 files changed, 103 insertions(+), 75 deletions(-) diff --git a/src/C4Prototypes.h b/src/C4Prototypes.h index 3fca796bd..91dbb57a5 100644 --- a/src/C4Prototypes.h +++ b/src/C4Prototypes.h @@ -132,7 +132,11 @@ class CStdApp; class CStdWindow; class CSurface; -namespace C4GUI { class Screen; } +namespace C4GUI +{ + class Screen; + class Dialog; +} typedef C4GUI::Screen C4GUIScreen; #endif // INC_C4Prototypes diff --git a/src/config/C4Reloc.cpp b/src/config/C4Reloc.cpp index b1789c43c..0dabb32f2 100644 --- a/src/config/C4Reloc.cpp +++ b/src/config/C4Reloc.cpp @@ -18,6 +18,8 @@ #include #include +#include + C4Reloc Reloc; // singleton void C4Reloc::Init() diff --git a/src/editor/C4EditCursor.h b/src/editor/C4EditCursor.h index 235bf1396..f4f02a3d7 100644 --- a/src/editor/C4EditCursor.h +++ b/src/editor/C4EditCursor.h @@ -26,6 +26,7 @@ #include "C4ObjectList.h" #include "C4Control.h" +#include "C4Rect.h" #ifdef WITH_DEVELOPER_MODE #include diff --git a/src/game/landscape/C4PXS.cpp b/src/game/landscape/C4PXS.cpp index 73aecd846..3c1bc1bf0 100644 --- a/src/game/landscape/C4PXS.cpp +++ b/src/game/landscape/C4PXS.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/src/game/landscape/C4Particles.cpp b/src/game/landscape/C4Particles.cpp index 88656a635..553a24474 100644 --- a/src/game/landscape/C4Particles.cpp +++ b/src/game/landscape/C4Particles.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff --git a/src/game/landscape/C4Scenario.cpp b/src/game/landscape/C4Scenario.cpp index 90b243e58..8229a3527 100644 --- a/src/game/landscape/C4Scenario.cpp +++ b/src/game/landscape/C4Scenario.cpp @@ -24,8 +24,9 @@ #include #include -#include +#include +#include #include #include #include diff --git a/src/game/landscape/C4Weather.cpp b/src/game/landscape/C4Weather.cpp index b64be8524..5b1750b0e 100644 --- a/src/game/landscape/C4Weather.cpp +++ b/src/game/landscape/C4Weather.cpp @@ -28,6 +28,7 @@ #include #include #include +#include C4Weather::C4Weather() { diff --git a/src/game/object/C4Def.cpp b/src/game/object/C4Def.cpp index 3c627fb3f..7465772e0 100644 --- a/src/game/object/C4Def.cpp +++ b/src/game/object/C4Def.cpp @@ -40,6 +40,7 @@ #include #include "C4Network2Res.h" #include +#include //--------------------------------- C4DefCore ---------------------------------------------- diff --git a/src/game/object/C4Sector.h b/src/game/object/C4Sector.h index 9e64bb3aa..3191831b9 100644 --- a/src/game/object/C4Sector.h +++ b/src/game/object/C4Sector.h @@ -23,6 +23,7 @@ #define INC_C4Sector #include +#include // class predefs class C4LSector; diff --git a/src/game/script/C4Effect.cpp b/src/game/script/C4Effect.cpp index 741277ba5..8f0293379 100644 --- a/src/game/script/C4Effect.cpp +++ b/src/game/script/C4Effect.cpp @@ -34,6 +34,7 @@ #include #include #include +#include void C4Effect::AssignCallbackFunctions() { diff --git a/src/gui/C4KeyboardInput.cpp b/src/gui/C4KeyboardInput.cpp index 1cf7cfacf..89bdceddc 100644 --- a/src/gui/C4KeyboardInput.cpp +++ b/src/gui/C4KeyboardInput.cpp @@ -240,7 +240,7 @@ const C4KeyCodeMapEntry KeyCodeMap [] = { VK_F23 , "F23" , NULL }, { VK_F24 , "F24" , NULL }, { VK_NUMLOCK , "NumLock" , "NLock" }, - { K_SCROLL , "Scroll" , NULL }, + { VK_SCROLL , "Scroll" , NULL }, { VK_PROCESSKEY , "PROCESSKEY" , NULL }, diff --git a/src/gui/C4Scoreboard.cpp b/src/gui/C4Scoreboard.cpp index c69b5ba5f..1a8c8cbc6 100644 --- a/src/gui/C4Scoreboard.cpp +++ b/src/gui/C4Scoreboard.cpp @@ -29,6 +29,34 @@ #include "C4GameOverDlg.h" #include + +class C4ScoreboardDlg : public C4GUI::Dialog +{ +private: + int32_t *piColWidths; + C4Scoreboard *pBrd; + + enum { XIndent = 4, YIndent = 4, XMargin = 3, YMargin = 3 }; + +public: + C4ScoreboardDlg(C4Scoreboard *pForScoreboard); + ~C4ScoreboardDlg(); + +protected: + void InvalidateRows() { delete [] piColWidths; piColWidths = NULL; } + void Update(); // update row widths and own size and caption + + virtual bool DoPlacement(C4GUI::Screen *pOnScreen, const C4Rect &rPreferredDlgRect); + virtual void Draw(C4TargetFacet &cgo); + virtual void DrawElement(C4TargetFacet &cgo); + + virtual const char *GetID() { return "Scoreboard"; } + + virtual bool IsMouseControlled() { return false; } + + friend class C4Scoreboard; +}; + // ************************************************ // *** C4Scoreboard diff --git a/src/gui/C4Scoreboard.h b/src/gui/C4Scoreboard.h index 89ed9c544..6d4bd3c9b 100644 --- a/src/gui/C4Scoreboard.h +++ b/src/gui/C4Scoreboard.h @@ -21,7 +21,6 @@ #define INC_C4Scoreboard #include -#include "C4Gui.h" class C4Scoreboard { @@ -93,32 +92,5 @@ public: void CompileFunc(StdCompiler *pComp); }; -class C4ScoreboardDlg : public C4GUI::Dialog -{ -private: - int32_t *piColWidths; - C4Scoreboard *pBrd; - - enum { XIndent = 4, YIndent = 4, XMargin = 3, YMargin = 3 }; - -public: - C4ScoreboardDlg(C4Scoreboard *pForScoreboard); - ~C4ScoreboardDlg(); - -protected: - void InvalidateRows() { delete [] piColWidths; piColWidths = NULL; } - void Update(); // update row widths and own size and caption - - virtual bool DoPlacement(C4GUI::Screen *pOnScreen, const C4Rect &rPreferredDlgRect); - virtual void Draw(C4TargetFacet &cgo); - virtual void DrawElement(C4TargetFacet &cgo); - - virtual const char *GetID() { return "Scoreboard"; } - - virtual bool IsMouseControlled() { return false; } - - friend class C4Scoreboard; -}; - #endif // INC_C4Scoreboard diff --git a/src/platform/C4GamePadCon.cpp b/src/platform/C4GamePadCon.cpp index c7b0abcf1..8aa0c0053 100644 --- a/src/platform/C4GamePadCon.cpp +++ b/src/platform/C4GamePadCon.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/src/platform/C4SoundLoaders.cpp b/src/platform/C4SoundLoaders.cpp index b3273ff42..86802ad99 100644 --- a/src/platform/C4SoundLoaders.cpp +++ b/src/platform/C4SoundLoaders.cpp @@ -23,6 +23,8 @@ #include #include "C4SoundLoaders.h" +#include + #if defined(USE_OPEN_AL) && defined(__APPLE__) #import #import diff --git a/src/platform/C4SoundLoaders.h b/src/platform/C4SoundLoaders.h index 35ad732ec..46f4f9ae7 100644 --- a/src/platform/C4SoundLoaders.h +++ b/src/platform/C4SoundLoaders.h @@ -21,6 +21,7 @@ #endif #include +#include namespace C4SoundLoaders { diff --git a/src/platform/C4VideoPlayback.cpp b/src/platform/C4VideoPlayback.cpp index 0dd7bed06..dbb568ab8 100644 --- a/src/platform/C4VideoPlayback.cpp +++ b/src/platform/C4VideoPlayback.cpp @@ -23,6 +23,7 @@ #include #include +#include "C4Gui.h" #include #ifdef HAVE_LIBSMPEG @@ -31,6 +32,48 @@ #include #endif // HAVE_LIBSMPEG + +// playback dialog +class C4VideoShowDialog : public C4GUI::FullscreenDialog +{ +private: +#ifdef _WIN32 + CStdAVIFile AVIFile; + C4SoundEffect *pAudioTrack; +#endif +#ifdef HAVE_LIBSDL_MIXER + SMPEG * mpeg; + SMPEG_Info * mpeg_info; + SDL_Surface * surface; +#endif + C4FacetSurface fctBuffer; + time_t iStartFrameTime; + +protected: + virtual int32_t GetZOrdering() { return C4GUI_Z_VIDEO; } + virtual bool IsExclusiveDialog() { return true; } + + void VideoDone(); // mark video done + +public: + C4VideoShowDialog() : C4GUI::FullscreenDialog(NULL, NULL) +#ifdef _WIN32 + , pAudioTrack(NULL) +#endif +#ifdef HAVE_LIBSDL_MIXER + , mpeg(0) + , mpeg_info(0) + , surface(0) +#endif + {} + ~C4VideoShowDialog(); + + bool LoadVideo(C4VideoFile *pVideoFile); + + virtual void DrawElement(C4TargetFacet &cgo); // draw current video frame +}; + + void C4VideoFile::Clear() { if (sFilename.getLength()) diff --git a/src/platform/C4VideoPlayback.h b/src/platform/C4VideoPlayback.h index 63612f159..37ed866db 100644 --- a/src/platform/C4VideoPlayback.h +++ b/src/platform/C4VideoPlayback.h @@ -21,7 +21,6 @@ #ifndef INC_C4VideoPlayback #define INC_C4VideoPlayback -#include "C4Gui.h" #include typedef struct _SMPEG SMPEG; @@ -51,47 +50,6 @@ public: void SetNext(C4VideoFile *pNewNext) { pNext = pNewNext; } }; - -// playback dialog -class C4VideoShowDialog : public C4GUI::FullscreenDialog -{ -private: -#ifdef _WIN32 - CStdAVIFile AVIFile; - C4SoundEffect *pAudioTrack; -#endif -#ifdef HAVE_LIBSDL_MIXER - SMPEG * mpeg; - SMPEG_Info * mpeg_info; - SDL_Surface * surface; -#endif - C4FacetSurface fctBuffer; - time_t iStartFrameTime; - -protected: - virtual int32_t GetZOrdering() { return C4GUI_Z_VIDEO; } - virtual bool IsExclusiveDialog() { return true; } - - void VideoDone(); // mark video done - -public: - C4VideoShowDialog() : C4GUI::FullscreenDialog(NULL, NULL) -#ifdef _WIN32 - , pAudioTrack(NULL) -#endif -#ifdef HAVE_LIBSDL_MIXER - , mpeg(0) - , mpeg_info(0) - , surface(0) -#endif - {} - ~C4VideoShowDialog(); - - bool LoadVideo(C4VideoFile *pVideoFile); - - virtual void DrawElement(C4TargetFacet &cgo); // draw current video frame -}; - // main playback class (C4Game member) class C4VideoPlayer { diff --git a/src/platform/StdDDraw2.cpp b/src/platform/StdDDraw2.cpp index 851b45169..0ae38a5d6 100644 --- a/src/platform/StdDDraw2.cpp +++ b/src/platform/StdDDraw2.cpp @@ -32,6 +32,7 @@ #include #include #include "C4Rect.h" +#include #include "StdMesh.h" #include diff --git a/src/platform/StdGLCtx.cpp b/src/platform/StdGLCtx.cpp index 9f2572643..cddb0875f 100644 --- a/src/platform/StdGLCtx.cpp +++ b/src/platform/StdGLCtx.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #ifdef USE_GL diff --git a/src/platform/StdGtkWindow.cpp b/src/platform/StdGtkWindow.cpp index 236dbb56b..c6b882f7b 100644 --- a/src/platform/StdGtkWindow.cpp +++ b/src/platform/StdGtkWindow.cpp @@ -22,13 +22,15 @@ #include #include +#include "C4Version.h" +#include "C4Config.h" + #include #include #include #include #include -#include "C4Version.h" /* CStdGtkWindow */ diff --git a/src/platform/StdSDLWindow.cpp b/src/platform/StdSDLWindow.cpp index fa48c2fa3..bf0837ec2 100644 --- a/src/platform/StdSDLWindow.cpp +++ b/src/platform/StdSDLWindow.cpp @@ -28,6 +28,7 @@ #include #include "C4Version.h" +#include /* CStdWindow */ diff --git a/src/platform/StdSurface2.cpp b/src/platform/StdSurface2.cpp index 53546f84a..5f5ff9e22 100644 --- a/src/platform/StdSurface2.cpp +++ b/src/platform/StdSurface2.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #ifdef HAVE_IO_H diff --git a/src/platform/StdWindow.cpp b/src/platform/StdWindow.cpp index 6e17da161..75540fc88 100644 --- a/src/platform/StdWindow.cpp +++ b/src/platform/StdWindow.cpp @@ -25,14 +25,16 @@ /* A wrapper class to OS dependent event and window interfaces, WIN32 version */ #include "C4Include.h" +#include + #include +#include #ifdef USE_GL #include #endif #ifdef USE_DIRECTX #include #endif -#include #include #include #include diff --git a/src/script/C4AulParse.cpp b/src/script/C4AulParse.cpp index a9548891d..380149d2e 100644 --- a/src/script/C4AulParse.cpp +++ b/src/script/C4AulParse.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #define DEBUG_BYTECODE_DUMP 0