summaryrefslogtreecommitdiffstats
path: root/src/object/robotmain.h
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-18 00:01:00 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-18 00:01:00 +0200
commita397922e8d53c6f7ff469d38e5139fd003c705b5 (patch)
tree8f6e92a0ac59d655e5fcc48bd198aa1bae25f0db /src/object/robotmain.h
parent844e11db4f394004258cdca8f8fd8bc95c41a985 (diff)
downloadcolobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.tar.gz
colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.tar.bz2
colobot-a397922e8d53c6f7ff469d38e5139fd003c705b5.zip
warnings fight in progress.
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r--src/object/robotmain.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index db96016..96fdc51 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -201,7 +201,7 @@ public:
void FlushDisplayInfo();
void StartDisplayInfo(int index, bool movie);
- void StartDisplayInfo(char *filename, int index);
+ void StartDisplayInfo(const char *filename, int index);
void StopDisplayInfo();
char* GetDisplayInfoName(int index);
int GetDisplayInfoPosition(int index);
@@ -287,7 +287,7 @@ public:
bool IsBusy();
bool IOWriteScene(char *filename, char *filecbot, char *info);
CObject* IOReadScene(char *filename, char *filecbot);
- void IOWriteObject(FILE *file, CObject* pObj, char *cmd);
+ void IOWriteObject(FILE *file, CObject* pObj, const char *cmd);
CObject* IOReadObject(char *line, char* filename, int objRank);
int CreateSpot(Math::Vector pos, Gfx::Color color);
@@ -314,7 +314,7 @@ protected:
CObject* DetectObject(Math::Point pos);
void ChangeCamera();
void RemoteCamera(float pan, float zoom, float rTime);
- void KeyCamera(EventType event, long key);
+ void KeyCamera(EventType event, unsigned int key);
void AbortMovie();
bool IsSelectable(CObject* pObj);
void SelectOneObject(CObject* pObj, bool displayError=true);
@@ -446,8 +446,8 @@ protected:
char m_gamerName[100];
- long m_freeBuild; // constructible buildings
- long m_freeResearch; // researches possible
+ int m_freeBuild; // constructible buildings
+ int m_freeResearch; // researches possible
ShowLimit m_showLimit[MAXSHOWLIMIT];