diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-02 22:17:30 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-02 22:17:30 +0200 |
| commit | 3f7f013168e62693601ab57108d329ffaa924439 (patch) | |
| tree | 97c55730d6ffb96dccfde35a01308fa4f2c8f6ef /src/ui/maindialog.h | |
| parent | ba3dce3aed8ade76901dc0cbf228b5cb81d8c2a5 (diff) | |
| parent | 4b7ca3f26254f6692d1b17eb0df151382bb3b851 (diff) | |
| download | colobot-3f7f013168e62693601ab57108d329ffaa924439.tar.gz colobot-3f7f013168e62693601ab57108d329ffaa924439.tar.bz2 colobot-3f7f013168e62693601ab57108d329ffaa924439.zip | |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/ui/maindialog.h')
| -rw-r--r-- | src/ui/maindialog.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index c67ca37..51c6f2e 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -78,7 +78,7 @@ public: std::string & GetStackRead(); char* GetSceneName(); int GetSceneRank(); - char* GetSceneDir(); + const char* GetSceneDir(); bool GetSceneSoluce(); std::string & GetSavegameDir(); std::string & GetPublicDir(); @@ -215,7 +215,8 @@ protected: bool m_bDeleteGamer; int m_userTotal; - char m_userList[USERLISTMAX][100]; + + std::vector<std::string> m_userList; int m_shotDelay; // number of frames before copy std::string m_shotName; // generate a file name |