immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* minor changes to control.cpp to compile it without errors

dev-ui
erihel 2012-08-18 11:30:29 +02:00
parent c02ac93379
commit 48ad79a03c
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# CBot shared library is built separately
add_subdirectory(CBot)
add_subdirectory(CBot)
# Configure options
@ -61,9 +61,9 @@ common/image.cpp
common/logger.cpp
common/iman.cpp
# common/metafile.cpp
# common/misc.cpp
common/misc.cpp
# common/modfile.cpp
# common/profile.cpp
common/profile.cpp
# common/restext.cpp
common/stringutils.cpp
graphics/core/color.cpp
@ -149,7 +149,7 @@ graphics/opengl/gldevice.cpp
# ui/check.cpp
# ui/color.cpp
# ui/compass.cpp
# ui/control.cpp
ui/control.cpp
# ui/displayinfo.cpp
# ui/displaytext.cpp
# ui/edit.cpp
@ -159,7 +159,7 @@ graphics/opengl/gldevice.cpp
# ui/image.cpp
# ui/interface.cpp
# ui/key.cpp
# ui/label.cpp
ui/label.cpp
# ui/list.cpp
# ui/maindialog.cpp
# ui/mainmap.cpp
@ -190,6 +190,7 @@ ${SDL_IMAGE_INCLUDE_DIR}
${SDLTTF_INCLUDE_DIR}
${PNG_INCLUDE_DIRS}
${OPTIONAL_INCLUDE_DIRS}
..
)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot)

4
src/ui/control.cpp
View File

@ -43,9 +43,9 @@
// Object's constructor.
CControl::CControl(CInstanceManager* iMan)
CControl::CControl()
{
m_iMan = iMan;
m_iMan = CInstanceManager::GetInstancePointer();
m_engine = static_cast< Gfx::CEngine* > ( m_iMan->SearchInstance(CLASS_ENGINE) );
m_event = static_cast< CEventQueue* > ( m_iMan->SearchInstance(CLASS_EVENT) );

26
src/ui/control.h
View File

@ -20,18 +20,18 @@
//#include "old/text.h"
#include "common/struct.h"
#include "common/event.h"
#include "graphics/engine/engine.h"
#include "graphics/engine/text.h"
#include "graphics/engine/particle.h"
#include <common/struct.h>
#include <common/event.h>
#include "sound/sound.h"
#include <graphics/engine/engine.h>
#include <graphics/engine/text.h>
#include <graphics/engine/particle.h>
class CInstanceManager;
class CEvent;
#include <sound/sound.h>
// class CEvent;
//class Gfx::CEngine;
class CRobotMain;
// class CRobotMain;
//class Gfx::CParticle;
//class CSound;
@ -80,8 +80,8 @@ public:
virtual int GetState();
virtual void SetIcon(int icon);
virtual int GetIcon();
virtual void SetName(const char* name, bool bTooltip=true);
virtual const char* GetName();
virtual void SetName(char* name, bool bTooltip=true);
virtual char* GetName();
virtual void SetTextAlign(Gfx::TextAlign mode);
virtual int GetTextAlign();
virtual void SetFontSize(float size);
@ -90,8 +90,8 @@ public:
virtual float GetFontStretch();
virtual void SetFontType(Gfx::FontType font);
virtual Gfx::FontType GetFontType();
virtual bool SetTooltip(const char* name);
virtual bool GetTooltip(Math::Point pos, const char* name);
virtual bool SetTooltip(char* name);
virtual bool GetTooltip(Math::Point pos, char* name);
virtual void SetFocus(bool bFocus);
virtual bool GetFocus();