diff options
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/ui/control.cpp | 4 | ||||
| -rw-r--r-- | src/ui/control.h | 26 |
3 files changed, 21 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b998d19..8870f21 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 61fd6dd..9893fc8 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -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) ); diff --git a/src/ui/control.h b/src/ui/control.h index d336ede..dcae4f2 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -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(); |