diff options
author | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
commit | 2e136acd34c45e5e6d105cabf91c67e5865c38fe (patch) | |
tree | 8561603160cce0b41ba31250539a22d37a2951de /src/common/restext.h | |
parent | 562be6fe765d7742f7c38fbd82f8cc26369e238b (diff) | |
parent | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (diff) | |
download | colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.gz colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.bz2 colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.zip |
Merge tag 'colobot-gold-0.1.3-alpha' into debian
Diffstat (limited to 'src/common/restext.h')
-rw-r--r-- | src/common/restext.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/common/restext.h b/src/common/restext.h index e4659e2..cde7203 100644 --- a/src/common/restext.h +++ b/src/common/restext.h @@ -66,7 +66,6 @@ enum ResTextType RT_TITLE_DEFI = 43, RT_TITLE_MISSION = 44, RT_TITLE_FREE = 45, - RT_TITLE_PROTO = 46, RT_TITLE_SETUP = 47, RT_TITLE_NAME = 48, RT_TITLE_PERSO = 49, @@ -79,12 +78,10 @@ enum ResTextType RT_PLAY_CHAPd = 61, RT_PLAY_CHAPm = 62, RT_PLAY_CHAPf = 63, - RT_PLAY_CHAPp = 64, RT_PLAY_LISTt = 65, RT_PLAY_LISTd = 66, RT_PLAY_LISTm = 67, RT_PLAY_LISTf = 68, - RT_PLAY_LISTp = 69, RT_PLAY_RESUME = 70, RT_PLAY_CHAPu = 71, RT_PLAY_LISTu = 72, @@ -157,5 +154,5 @@ void InitializeRestext(); void SetGlobalGamerName(std::string name); bool SearchKey(const char *cmd, InputSlot& slot); -bool GetResource(ResType type, int num, char* text); +bool GetResource(ResType type, int num, std::string& text); |