diff options
Diffstat (limited to 'src/ui/displaytext.cpp')
| -rw-r--r-- | src/ui/displaytext.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index 3fe8cdb..aa51653 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -18,29 +18,26 @@ // displaytext.cpp -//#include <windows.h> -//#include <stdio.h> -//#include <d3d.h> +#include "displaytext.h" + +#include "interface.h" +#include "button.h" +#include "label.h" +#include "window.h" +#include "group.h" -//#include "common/struct.h" -//#include "old/d3dengine.h" -#include "graphics/engine/engine.h" #include "common/event.h" +#include "common/iman.h" #include "common/misc.h" #include "common/restext.h" -#include "common/iman.h" + +#include "graphics/engine/engine.h" + #include "object/object.h" #include "object/motion/motion.h" #include "object/motion/motiontoto.h" -#include "ui/interface.h" -#include "ui/button.h" -#include "ui/label.h" -#include "ui/window.h" -#include "ui/group.h" -//#include "old/text.h" -//#include "old/sound.h" -//#include "sound/sound.h" -#include "ui/displaytext.h" + + namespace Ui { @@ -183,7 +180,7 @@ void CDisplayText::DisplayError(Error err, Math::Vector goal, float height, // Displays text. -void CDisplayText::DisplayText(const char *text, CObject* pObj, +void CDisplayText::DisplayText(char *text, CObject* pObj, float time, TextType type) { Math::Vector pos; @@ -199,7 +196,7 @@ void CDisplayText::DisplayText(const char *text, CObject* pObj, // Displays text. -void CDisplayText::DisplayText(const char *text, Math::Vector goal, float height, +void CDisplayText::DisplayText(char *text, Math::Vector goal, float height, float dist, float time, TextType type) { CObject* toto; |