diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
commit | ad6bc13dc2b70741ee3f006e321ba46dd421b9b5 (patch) | |
tree | 72540c0d47f5501f6080f7b03de600daed0a029a /src/object/robotmain.cpp | |
parent | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (diff) | |
parent | 94e7fd920353c39471d8836a8bf87ffb113f1349 (diff) | |
download | colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.gz colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.bz2 colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.zip |
Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
Diffstat (limited to 'src/object/robotmain.cpp')
-rw-r--r-- | src/object/robotmain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 3f7ad9e..b521862 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -2760,7 +2760,7 @@ void CRobotMain::HiliteFrame(float rTime) } //! Creates a tooltip -void CRobotMain::CreateTooltip(Math::Point pos, char* text) +void CRobotMain::CreateTooltip(Math::Point pos, const char* text) { Math::Point corner; corner.x = pos.x+0.022f; @@ -6193,7 +6193,7 @@ Error CRobotMain::CheckEndMission(bool frame) } //! Checks if the mission is finished after displaying a message -void CRobotMain::CheckEndMessage(char *message) +void CRobotMain::CheckEndMessage(const char* message) { for (int t = 0; t < m_endTakeTotal; t++) { @@ -6222,7 +6222,7 @@ char* CRobotMain::GetObligatoryToken(int i) } //! Checks if an instruction is part of the obligatory list -int CRobotMain::IsObligatoryToken(char *token) +int CRobotMain::IsObligatoryToken(const char* token) { for (int i = 0; i < m_obligatoryTotal; i++) { @@ -6233,7 +6233,7 @@ int CRobotMain::IsObligatoryToken(char *token) } //! Checks if an instruction is not part of the banned list -bool CRobotMain::IsProhibitedToken(char *token) +bool CRobotMain::IsProhibitedToken(const char* token) { for (int i = 0; i < m_prohibitedTotal; i++) { |