Commit 11a78eff authored by Gerhard Stein's avatar Gerhard Stein

More cleanups

parent 9c52f02e
......@@ -9,7 +9,7 @@
#include <lib/base/GsLogging.h>
#include "gui/CGUIText.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "gui/CGUITextSelectionList.h"
#include "gui/CGUIBanner.h"
#include "gui/CGUIButton.h"
......
......@@ -12,7 +12,7 @@
#include "CPlayer.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
......
......@@ -12,7 +12,7 @@
#include "engine/vorticon/ai/CBridges.h"
#include "engine/spritedefines.h"
#include "sdl/sound/CSound.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/music/CMusic.h"
#include "graphics/CGfxEngine.h"
#include "CPhysicsSettings.h"
......
......@@ -8,7 +8,7 @@
#include "CPlayer.h"
#include "engine/vorticon/ai/CMessie.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
///
// Process Part
......
......@@ -5,7 +5,7 @@
* Author: gerstrong
*/
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "CBaseMenu.h"
#include "common/Menu/CMenuController.h"
#include "gui/CGUIBitmap.h"
......
......@@ -10,7 +10,7 @@
#include "CControlsettings.h"
#include "common/CBehaviorEngine.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
......
......@@ -9,7 +9,7 @@
#include "common/CBehaviorEngine.h"
#include "common/Menu/CControlsettings.h"
#include "common/Menu/CMainMenu.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/music/CMusic.h"
......
......@@ -6,7 +6,7 @@
*/
#include "COptions.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "common/CSettings.h"
......
......@@ -8,7 +8,7 @@
#include "CSaveMenu.h"
#include "CBaseMenu.h"
#include "CConfirmMenu.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "gui/CGUIInputText.h"
#include "fileio/CSaveGameController.h"
#include "common/CBehaviorEngine.h"
......
......@@ -8,7 +8,7 @@
#include "hardware/Configurator.h"
#include "common/CSettings.h"
#include "CCameraSettings.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include <lib/base/GsTimer.h>
#include "sdl/resolutionlist.h"
#include "CVideoSettings.h"
......
......@@ -13,7 +13,7 @@
#include "common/Menu/CMenuController.h"
#include "common/Menu/CSelectionMenu.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "common/Menu/CMainMenu.h"
#include "common/Menu/CHelpMenu.h"
......
......@@ -7,7 +7,7 @@
#include "CMessageBox.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "graphics/CGfxEngine.h"
#include "StringUtils.h"
......
......@@ -7,7 +7,7 @@
#include <fstream>
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "CTextViewer.h"
#include "graphics/CGfxEngine.h"
#include "sdl/extensions.h"
......
......@@ -12,7 +12,7 @@
#include "CCamera.h"
#include <lib/base/GsLogging.h>
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "engine/spritedefines.h"
int CCamera::mCamlead = 0;
......
......@@ -6,7 +6,7 @@
*/
#include "CIntro.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include <lib/base/GsTimer.h>
......
......@@ -14,7 +14,7 @@
#include "graphics/effects/CColorMerge.h"
#include "graphics/effects/CPixelate.h"
#include "common/Menu/CMenuController.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
////
// Creation Routine
......
......@@ -10,7 +10,7 @@
#include "CLevelPlay.h"
#include "ep4/CMapLoaderGalaxyEp4.h"
#include "ep5/CMapLoaderGalaxyEp5.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "sdl/music/CMusic.h"
#include "graphics/effects/CDimDark.h"
......
......@@ -20,7 +20,7 @@
#include "ep4/CMapLoaderGalaxyEp4.h"
#include "ep5/CMapLoaderGalaxyEp5.h"
#include "ep6/CMapLoaderGalaxyEp6.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "sdl/music/CMusic.h"
#include "core/LogicDrawSplitter.h"
......
......@@ -10,7 +10,7 @@
#include "graphics/CGfxEngine.h"
#include "graphics/effects/CPixelate.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/extensions.h"
#include "core/CGameLauncherMenu.h"
#include "common/Menu/CMenuController.h"
......
......@@ -12,7 +12,7 @@
#include "common/dialog/CMessageBoxBitmapGalaxy.h"
#include "common/dialog/CMessageBoxSelection.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
#include "sdl/music/CMusic.h"
#include "StringUtils.h"
......
......@@ -9,7 +9,7 @@
#include "common/CBehaviorEngine.h"
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "graphics/effects/CScrollEffect.h"
......
......@@ -8,7 +8,7 @@
#include "CPlayerBase.h"
#include "CItemEffect.h"
#include "CSpriteItem.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
namespace galaxy {
......
......@@ -10,7 +10,7 @@
#include "common/CBehaviorEngine.h"
#include "platform/CPlatform.h"
#include <engine/galaxy/ep5/ai/CSecurityDoor.h>
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/music/CMusic.h"
#include "sdl/sound/CSound.h"
#include "graphics/effects/CColorMerge.h"
......
......@@ -11,7 +11,7 @@
#include "engine/galaxy/common/ai/CFlag.h"
#include <engine/galaxy/ep6/ai/CRope.h>
#include "common/CBehaviorEngine.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
#include "CVec.h"
......
......@@ -11,7 +11,7 @@
#include "CMessageBoxGalaxy.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "graphics/CGfxEngine.h"
#include "sdl/extensions.h"
#include "StringUtils.h"
......
......@@ -7,7 +7,7 @@
#include "CMessageBoxSelection.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "graphics/CGfxEngine.h"
#include "common/CBehaviorEngine.h"
#include "StringUtils.h"
......
......@@ -6,7 +6,7 @@
*/
#include "CPlayerDive.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "CBubbles.h"
......
......@@ -7,7 +7,7 @@
#include "CAbout.h"
#include <base/FindFile.h>
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include <lib/base/GsLogging.h>
#include "fileio/CExeFile.h"
#include "graphics/CGfxEngine.h"
......
......@@ -6,7 +6,7 @@
*/
#include "CCredits.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "common/CVorticonMapLoader.h"
......
......@@ -13,7 +13,7 @@
#include "common/CVorticonMapLoader.h"
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include <base/FindFile.h>
#include <fstream>
......
......@@ -10,7 +10,7 @@
#include <string>
#include "CHighScores.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "graphics/CGfxEngine.h"
#include "StringUtils.h"
#include <base/FindFile.h>
......
......@@ -6,7 +6,7 @@
*/
#include "COrderingInfo.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include <lib/base/GsLogging.h>
#include "fileio/CExeFile.h"
#include "graphics/CGfxEngine.h"
......
......@@ -10,7 +10,7 @@
#include "common/CBehaviorEngine.h"
#include <base/FindFile.h>
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "StringUtils.h"
#include "common/CVorticonMapLoader.h"
#include "sdl/extensions.h"
......
......@@ -14,7 +14,7 @@
#include "fileio/CExeFile.h"
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include <base/FindFile.h>
......
......@@ -11,7 +11,7 @@
#include "common/CVorticonMapLoader.h"
#include "common/CTileProperties.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/extensions.h"
#include "core/mode/CGameMode.h"
......
#include "CMessie.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
// Nessie (in ep3) (on the world map)
enum nessie_actions{
......
......@@ -7,7 +7,7 @@
#include "CMessageBoxVort.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "graphics/CGfxEngine.h"
#include "sdl/extensions.h"
#include "gui/CGUIBitmap.h"
......
......@@ -8,7 +8,7 @@
#include "CEndingEp1.h"
#include "StringUtils.h"
#include <lib/base/GsTimer.h>
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "common/CVorticonMapLoader.h"
......
......@@ -8,7 +8,7 @@
#include "CEndingEp2.h"
#include "StringUtils.h"
#include <lib/base/GsTimer.h>
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "common/CVorticonMapLoader.h"
......
......@@ -7,7 +7,7 @@
#include "CEndingEp3.h"
#include "StringUtils.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/CVideoDriver.h"
#include "graphics/effects/CFlash.h"
#include "graphics/CGfxEngine.h"
......
......@@ -9,7 +9,7 @@
#include "graphics/effects/CVibrate.h"
#include "graphics/CGfxEngine.h"
#include "sdl/sound/CSound.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "common/CVorticonMapLoader.h"
#include "engine/vorticon/ai/CRay.h"
......
......@@ -10,7 +10,7 @@
#include <lib/base/GsTimer.h>
#include "sdl/CVideoDriver.h"
#include "sdl/sound/CSound.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "core/mode/CGameMode.h"
#include "common/CVorticonMapLoader.h"
#include "graphics/CGfxEngine.h"
......
......@@ -7,7 +7,7 @@
#include "CPlayGameVorticon.h"
#include <lib/base/GsTimer.h>
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
......
......@@ -9,7 +9,7 @@
#include <lib/base/GsLogging.h>
#include "StringUtils.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
///
// Creation Routines
......
......@@ -11,7 +11,7 @@
#include "CPixelate.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include <lib/base/GsTimer.h>
#include "graphics/CGfxEngine.h"
......
......@@ -7,8 +7,8 @@
#include "CGUIButton.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/CInput.h"
#include "sdl/input/InputEvents.h"
#include <base/CInput.h>
//#include "sdl/input/InputEvents.h"
#include "sdl/CVideoDriver.h"
#include "core/mode/CGameMode.h"
#include <lib/base/GsTimer.h>
......
......@@ -7,8 +7,8 @@
#include "CGUIComboSelection.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/CInput.h"
#include "sdl/input/InputEvents.h"
#include <base/CInput.h>
//#include "sdl/input/InputEvents.h"
#include "sdl/CVideoDriver.h"
#include "common/CBehaviorEngine.h"
#include "core/mode/CGameMode.h"
......
......@@ -8,8 +8,8 @@
#include "CGUIControl.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/CInput.h"
#include "sdl/input/InputEvents.h"
#include <base/CInput.h>
//#include "sdl/input/InputEvents.h"
#include "sdl/CVideoDriver.h"
#include <lib/base/GsTimer.h>
......
......@@ -11,7 +11,7 @@
#define CGUICONTROL_H_
#include "utils/Geometry.h"
#include "sdl/input/InputEvents.h"
#include <base/InputEvents.h>
class CGUIControl
{
......
......@@ -11,7 +11,7 @@
#include "CGUIButton.h"
#include "CGUIInputText.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/extensions.h"
#include "graphics/CGfxEngine.h"
#include "common/CBehaviorEngine.h"
......
......@@ -7,8 +7,8 @@
#include "CGUIInputText.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/CInput.h"
#include "sdl/input/InputEvents.h"
#include <base/CInput.h>
//#include "sdl/input/InputEvents.h"
#include "sdl/CVideoDriver.h"
#include "common/CBehaviorEngine.h"
#include "core/mode/CGameMode.h"
......
......@@ -7,8 +7,8 @@
#include "CGUINumberControl.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/CInput.h"
#include "sdl/input/InputEvents.h"
#include <base/CInput.h>
//#include "sdl/input/InputEvents.h"
#include "sdl/CVideoDriver.h"
#include "common/CBehaviorEngine.h"
#include "core/mode/CGameMode.h"
......
......@@ -9,8 +9,8 @@
#include "common/CBehaviorEngine.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "sdl/input/InputEvents.h"
#include "sdl/input/CInput.h"
//#include "sdl/input/InputEvents.h"
#include <base/CInput.h>
#include <lib/base/PointDevice.h>
......
......@@ -13,7 +13,9 @@
#include <list>
#include "utils/Geometry.h"
#include "engine/CEventContainer.h"
#include "InputEvents.h"
#include <base/GsEvent.h>
#include <base/InputEvents.h>
//#include "InputEvents.h"
#include "CSingleton.h"
#define g_pInput CInput::Get()
......
......@@ -9,4 +9,5 @@ add_library(GsKit_base GsApp.cpp
GsAppState.cpp
GsLogging.cpp
GsTimer.cpp
GsEvent.h)
GsEvent.h
CInput.cpp)
......@@ -16,7 +16,8 @@
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "sdl/sound/CSound.h"
#include "common/CSettings.h"
#include "common/Menu/CMenuController.h"
......@@ -40,7 +41,6 @@ mAppState(m_firsttime)
*/
GsApp::~GsApp()
{
//gpMenuController->emptyMenuStack();
g_pInput->Del();
g_pSound->destroy();
g_pVideoDriver->Del();
......@@ -162,7 +162,7 @@ void GsApp::run()
g_pInput->pollEvents();
// Process App Events
g_pBehaviorEngine->EventList().processSinks();
gEventManager.processSinks();
// Ponder Game Control
mAppState.ponder();
......
......@@ -20,7 +20,7 @@
#include "core/mode/CGamePassiveMode.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h"
#include <base/CInput.h>
#include "core/CGameMain.h"
......
......@@ -8,7 +8,7 @@
* The Rendering itself is performed under COpenGL or CSDLVideo Class depending on what is enabled.
*/
#include "CVideoDriver.h"
#include "input/CInput.h"
//#include "input/CInput.h"
//#include <lib/base/GsTimer.h>
#include "video/CSDLVideo.h"
......
......@@ -10,7 +10,7 @@
#include "COpenGL.h"
#include "sdl/CVideoDriver.h"
#include "sdl/input/CInput.h" // for CInput::renderOverlay
#include <base/CInput.h> // for CInput::renderOverlay
#include "graphics/CGfxEngine.h"
#include <lib/base/GsLogging.h>
#include "graphics/PerSurfaceAlpha.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment