Commit abb7b08b authored by Gerhard Stein's avatar Gerhard Stein

Move of CInput now applied to the header files where needed

parent 27df44b5
......@@ -15,7 +15,7 @@
#include "CGame.h"
#include "CLogFile.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CTimer.h"
#include "sdl/sound/CSound.h"
#include "common/CSettings.h"
......
......@@ -9,7 +9,7 @@
#include "CLogFile.h"
#include "gui/CGUIText.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "graphics/CGfxEngine.h"
#include "gui/CGUITextSelectionList.h"
#include "StringUtils.h"
......
......@@ -13,7 +13,7 @@
#include "options.h"
#include "CObject.h"
#include "Menu/CBaseMenu.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "fileio/CSavedGame.h"
#include "fileio/CExeFile.h"
#include "common/CBehaviorEngine.h"
......
......@@ -12,7 +12,7 @@
#include "CPlayer.h"
#include "sdl/CInput.h"
#include "sdl/input/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/CInput.h"
#include "sdl/input/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/CInput.h"
#include "sdl/input/CInput.h"
///
// Process Part
......
......@@ -6,7 +6,7 @@
*/
#include "CAudioSettings.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "common/CSettings.h"
#include "sdl/sound/CSound.h"
......
......@@ -5,7 +5,7 @@
* Author: gerstrong
*/
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "CBaseMenu.h"
CBaseMenu::CBaseMenu(Uint8 dlg_theme) :
......
......@@ -10,7 +10,7 @@
#include "CControlsettings.h"
#include "common/CBehaviorEngine.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
const std::string actionsnames[MAX_COMMANDS] =
......
......@@ -6,7 +6,7 @@
*/
#include "COptions.h"
#include "sdl/CInput.h"
#include "sdl/input/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/CInput.h"
#include "sdl/input/CInput.h"
#include <ctime>
......
......@@ -5,7 +5,7 @@
* Author: gerstrong
*/
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CTimer.h"
#include "StringUtils.h"
#include "CVideoSettings.h"
......
......@@ -10,7 +10,7 @@
#include "CBaseMenu.h"
#include "CVolumeSettings.h"
#include "sdl/sound/CSound.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
CVolumeSettings::CVolumeSettings(Uint8 dlg_theme) :
CBaseMenu(dlg_theme)
......
......@@ -8,7 +8,7 @@
#include "StringUtils.h"
#include "CLogFile.h"
#include "sdl/CTimer.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "sdl/sound/CSound.h"
#include "graphics/CGfxEngine.h"
......
......@@ -7,7 +7,7 @@
#include "CMessageBox.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "graphics/CGfxEngine.h"
#include "StringUtils.h"
......
......@@ -11,7 +11,7 @@
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CTimer.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
CTextBox::CTextBox(int y, int h, const std::string& message) :
m_tw_waittime(0)
......
......@@ -7,7 +7,7 @@
#include <fstream>
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "CTextViewer.h"
#include "graphics/CGfxEngine.h"
......
......@@ -12,7 +12,7 @@
#include "CCamera.h"
#include "CLogFile.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "engine/spritedefines.h"
CCamera::CCamera(CMap *pmap, Uint32 x, Uint32 y, CObject *p_attacher) :
......
......@@ -6,7 +6,7 @@
*/
#include "CIntro.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CTimer.h"
......
......@@ -7,7 +7,7 @@
#include "CLevelPlay.h"
#include "CMapLoaderGalaxy.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "sdl/music/CMusic.h"
#include "dialog/CMessageBoxBitmapGalaxy.h"
......
......@@ -19,7 +19,7 @@
#include "engine/galaxy/dialog/CMessageBoxGalaxy.h"
#include "common/CBehaviorEngine.h"
#include "CMapLoaderGalaxy.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "sdl/music/CMusic.h"
#include "StringUtils.h"
......
......@@ -9,7 +9,7 @@
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
namespace galaxy
{
......
......@@ -11,7 +11,7 @@
#include "graphics/effects/CPixelate.h"
#include "graphics/effects/CColorMerge.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
namespace galaxy
......
......@@ -12,7 +12,7 @@
#include "dialog/CMessageBoxBitmapGalaxy.h"
#include "dialog/CMessageBoxSelection.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
#include "sdl/music/CMusic.h"
#include "StringUtils.h"
......
......@@ -7,7 +7,7 @@
#include "CPlayerBase.h"
#include "CItemEffect.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
namespace galaxy {
......
......@@ -9,7 +9,7 @@
#include "CBullet.h"
#include "common/CBehaviorEngine.h"
#include "platform/CPlatform.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
#include "CVec.h"
#include "CLogFile.h"
......
......@@ -10,7 +10,7 @@
#include "CPlayerWM.h"
#include "engine/galaxy/ai/CFlag.h"
#include "common/CBehaviorEngine.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
#include "CVec.h"
......
......@@ -6,7 +6,7 @@
*/
#include "CPlayerDive.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "CBubbles.h"
......
......@@ -9,7 +9,7 @@
#include "CMessageBoxGalaxy.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "graphics/CGfxEngine.h"
const int FONT_ID = 0;
......
......@@ -7,7 +7,7 @@
#include "CMessageBoxSelection.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "graphics/CGfxEngine.h"
const int FONT_ID = 0;
......
......@@ -7,7 +7,7 @@
#include "CAbout.h"
#include "FindFile.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "CLogFile.h"
#include "fileio/CExeFile.h"
#include "graphics/CGfxEngine.h"
......
......@@ -6,7 +6,7 @@
*/
#include "CCredits.h"
#include "../../sdl/CInput.h"
#include "../../sdl/input/CInput.h"
#include "../../sdl/CVideoDriver.h"
#include "../../graphics/CGfxEngine.h"
#include "../../common/CMapLoader.h"
......
......@@ -14,7 +14,7 @@
#include "../../common/CMapLoader.h"
#include "../../graphics/CGfxEngine.h"
#include "../../sdl/CVideoDriver.h"
#include "../../sdl/CInput.h"
#include "../../sdl/input/CInput.h"
#include "../../FindFile.h"
CHelp::CHelp(CExeFile &ExeFile, const std::string &type) :
......
......@@ -10,7 +10,7 @@
#include <string>
#include "CHighScores.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "graphics/CGfxEngine.h"
#include "StringUtils.h"
#include "FindFile.h"
......
......@@ -6,7 +6,7 @@
*/
#include "COrderingInfo.h"
#include "../../sdl/CInput.h"
#include "../../sdl/input/CInput.h"
#include "../../CLogFile.h"
#include "../../fileio/CExeFile.h"
#include "../../graphics/CGfxEngine.h"
......
......@@ -10,7 +10,7 @@
#include "common/CBehaviorEngine.h"
#include "FindFile.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "StringUtils.h"
#include "common/CMapLoader.h"
......
......@@ -14,7 +14,7 @@
#include "fileio/CExeFile.h"
#include "graphics/CGfxEngine.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "FindFile.h"
CStory::CStory(CExeFile &ExeFile)
......
......@@ -12,7 +12,7 @@
#include "common/CMapLoader.h"
#include "common/CTileProperties.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
namespace vorticon
{
......
......@@ -7,7 +7,7 @@
#include "CMessageBoxVort.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "graphics/CGfxEngine.h"
CMessageBoxVort::CMessageBoxVort(const std::string& Text, bool lower, bool keymsg, bool leftbound) :
......
......@@ -8,7 +8,7 @@
#include "CEndingEp1.h"
#include "StringUtils.h"
#include "sdl/CTimer.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "common/CMapLoader.h"
......
......@@ -8,7 +8,7 @@
#include "CEndingEp2.h"
#include "StringUtils.h"
#include "sdl/CTimer.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
#include "common/CMapLoader.h"
......
......@@ -7,7 +7,7 @@
#include "CEndingEp3.h"
#include "StringUtils.h"
#include "sdl/CInput.h"
#include "sdl/input/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/CInput.h"
#include "sdl/input/CInput.h"
#include "common/CMapLoader.h"
#include "engine/vorticon/ai/CRay.h"
......
......@@ -10,7 +10,7 @@
#include "sdl/CTimer.h"
#include "sdl/CVideoDriver.h"
#include "sdl/sound/CSound.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "common/CMapLoader.h"
#include "graphics/CGfxEngine.h"
#include "StringUtils.h"
......
......@@ -7,7 +7,7 @@
#include "CPlayGameVorticon.h"
#include "sdl/CTimer.h"
#include "sdl/CInput.h"
#include "sdl/input/CInput.h"
#include "sdl/sound/CSound.h"
#include "sdl/CVideoDriver.h"
#include "graphics/CGfxEngine.h"
......
......@@ -7,7 +7,7 @@
#include "CGfxEngine.h"
#include "../sdl/CInput.h"
#include "../sdl/input/CInput.h"
#define SAFE_DELETE(x) if(x){ delete x; x=NULL;}
......
......@@ -11,7 +11,7 @@
#include "CPixelate.h"
#include "../../sdl/CVideoDriver.h"
#include "../../sdl/CInput.h"
#include "../../sdl/input/CInput.h"
CPixelate::CPixelate(unsigned short speed) :
mp_OldSurface(NULL),
......
......@@ -17,6 +17,8 @@ void CGUITextSelectionList::addText(const std::string &text)
void CGUITextSelectionList::processLogic()
{
// Here we check if the mouse-cursor/Touch entry clicked on something!!
}
......
......@@ -9,7 +9,7 @@
* The Rendering itself is performed under COpenGL or CSDLVideo Class depending on what is enabled.
*/
#include "CVideoDriver.h"
#include "CInput.h"
#include "input/CInput.h"
#include "CTimer.h"
#include "video/CSDLVideo.h"
......
......@@ -9,7 +9,7 @@
#include <stdio.h>
#include "CInput.h"
#include "CVideoDriver.h"
#include "sdl/CVideoDriver.h"
#include "CLogFile.h"
#include "FindFile.h"
#include "StringUtils.h"
......
......@@ -8,7 +8,7 @@
#include "COpenGL.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h" // for CInput::renderOverlay
#include "sdl/input/CInput.h" // for CInput::renderOverlay
#include "graphics/CGfxEngine.h"
#include "CLogFile.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