diff options
| author | erihel <erihel@gmail.com> | 2012-09-11 12:49:41 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-09-11 12:49:41 +0200 |
| commit | 01cc0fbc49696a19a56dfdd8359d4bb77e868925 (patch) | |
| tree | 81d0674e4b54e95dad5508948491a26d9d5522da /src/ui/target.cpp | |
| parent | 5903e400d476c2cf62c146643a0693c4fc29d68a (diff) | |
| download | colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.tar.gz colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.tar.bz2 colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.zip | |
* latest changes
* all files except studio, map and maindialog should compile
* did some code cleanup
Diffstat (limited to 'src/ui/target.cpp')
| -rw-r--r-- | src/ui/target.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 9ffcfb9..f0ae70e 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -17,21 +17,7 @@ // target.cpp -//#include <windows.h> -//#include <stdio.h> -//#include <d3d.h> - -//#include "common/struct.h" -//#include "old/d3dengine.h" -//#include "old/math3d.h" -#include "graphics/engine/engine.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "object/robotmain.h" -#include "object/object.h" -#include "common/restext.h" -#include "ui/target.h" +#include <ui/target.h> @@ -162,7 +148,7 @@ void CTarget::Draw() // Returns the tooltip. -bool CTarget::GetTooltip(Math::Point pos, char* name) +bool CTarget::GetTooltip(Math::Point pos, std::string &name) { #if 0 if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window? @@ -183,7 +169,7 @@ bool CTarget::GetTooltip(Math::Point pos, char* name) //? if ( pObj == 0 ) if ( !m_main->GetFriendAim() ) { - strcpy(name, m_tooltip); + m_tooltip = name; return true; // does not detect objects below! } } |