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/object/robotmain.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/object/robotmain.h')
| -rw-r--r-- | src/object/robotmain.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 1370cd6..c649aab 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -300,9 +300,9 @@ protected: Math::Vector LookatPoint( Math::Vector eye, float angleH, float angleV, float length ); CObject* CreateObject(Math::Vector pos, float angle, float zoom, float height, ObjectType type, float power=1.0f, bool bTrainer=false, bool bToy=false, int option=0); int CreateLight(Math::Vector direction, Gfx::Color color); - void HiliteClear(); - void HiliteObject(Math::Point pos); - void HiliteFrame(float rTime); + void HighlightClear(); + void HighlightObject(Math::Point pos); + void HighlightFrame(float rTime); void CreateTooltip(Math::Point pos, char* text); void ClearTooltip(); CObject* DetectObject(Math::Point pos); @@ -379,7 +379,7 @@ protected: bool m_bEditLock; // edition in progress? bool m_bEditFull; // edition in full screen? bool m_bPause; // simulation paused - bool m_bHilite; + bool m_bHighlight; bool m_bTrainerPilot; // remote trainer? bool m_bSuspend; bool m_bFriendAim; |