diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:35:48 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:35:48 +0200 |
| commit | d439f4fa93eb45175dcdfa773af8f68efa1bad9d (patch) | |
| tree | a2620bee6aae9ee49726892c5d1ebe717ad88e33 /src/ui/displaytext.h | |
| parent | e57be247c2ddce796fd64e9f3c1b3bfa4759b74a (diff) | |
| parent | e9fcec9de52471508933c9d90cc6041ce0af9752 (diff) | |
| download | colobot-d439f4fa93eb45175dcdfa773af8f68efa1bad9d.tar.gz colobot-d439f4fa93eb45175dcdfa773af8f68efa1bad9d.tar.bz2 colobot-d439f4fa93eb45175dcdfa773af8f68efa1bad9d.zip | |
Merge branch 'dev-ui' into dev
Conflicts:
src/CMakeLists.txt
src/common/misc.cpp
src/common/misc.h
src/object/robotmain.cpp
src/object/robotmain.h
src/script/cbottoken.cpp
src/script/cbottoken.h
src/ui/button.cpp
src/ui/button.h
src/ui/check.cpp
src/ui/check.h
src/ui/color.cpp
src/ui/color.h
src/ui/compass.cpp
src/ui/compass.h
src/ui/control.cpp
src/ui/control.h
src/ui/displayinfo.cpp
src/ui/displayinfo.h
src/ui/displaytext.cpp
src/ui/displaytext.h
src/ui/edit.cpp
src/ui/edit.h
src/ui/gauge.cpp
src/ui/gauge.h
src/ui/interface.cpp
src/ui/interface.h
src/ui/key.cpp
src/ui/map.h
src/ui/shortcut.h
src/ui/slider.h
src/ui/target.cpp
src/ui/target.h
src/ui/window.cpp
src/ui/window.h
Diffstat (limited to 'src/ui/displaytext.h')
| -rw-r--r-- | src/ui/displaytext.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h index 9268088..b8af97e 100644 --- a/src/ui/displaytext.h +++ b/src/ui/displaytext.h @@ -22,8 +22,9 @@ #include "common/event.h" #include "common/misc.h" + #include "sound/sound.h" -//#include "old/d3dengine.h" + class CInstanceManager; @@ -31,6 +32,10 @@ class CInstanceManager; class CObject; class CSound; +namespace Gfx { + class CEngine; +} + namespace Ui {; class CInterface; @@ -59,8 +64,8 @@ public: void DisplayError(Error err, CObject* pObj, float time=10.0f); void DisplayError(Error err, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f); - void DisplayText(const char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO); - void DisplayText(const char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO); + void DisplayText(char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO); + void DisplayText(char *text, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO); void HideText(bool bHide); void ClearText(); bool ClearLastText(); |