diff options
author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 22:07:14 +0200 |
---|---|---|
committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 22:07:14 +0200 |
commit | 2847aad51fb8165d3ad6fab3ddb1f0275a6f0815 (patch) | |
tree | ea75eb3bf362fb1b6f122cb7ebf3978fecb1675c /src/object/robotmain.h | |
parent | c439964d281f55ce66e4efa6e51239ebb112c65e (diff) | |
parent | 8ad15c0ef7d06d80abfa736295fbec3c5b005183 (diff) | |
download | colobot-2847aad51fb8165d3ad6fab3ddb1f0275a6f0815.tar.gz colobot-2847aad51fb8165d3ad6fab3ddb1f0275a6f0815.tar.bz2 colobot-2847aad51fb8165d3ad6fab3ddb1f0275a6f0815.zip |
Merge branch 'dev' of github.com:adiblol/colobot into dev
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r-- | src/object/robotmain.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index fead48d..db96016 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -309,7 +309,7 @@ protected: void HiliteClear(); void HiliteObject(Math::Point pos); void HiliteFrame(float rTime); - void CreateTooltip(Math::Point pos, char* text); + void CreateTooltip(Math::Point pos, const char* text); void ClearTooltip(); CObject* DetectObject(Math::Point pos); void ChangeCamera(); |