openttd updated to 1.5.0-beta2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: script_text.hpp 25488 2013-06-27 19:57:41Z rubidium $ */
/* $Id: script_text.hpp 27102 2015-01-01 20:50:43Z rubidium $ */
/*
* This file is part of OpenTTD.
@@ -42,9 +42,8 @@ public:
*/
class RawText : public Text {
public:
RawText(const char *text) :
text(strdup(text)) {}
~RawText() { free(this->text); }
RawText(const char *text);
~RawText();
/* virtual */ const char *GetEncodedText() { return this->text; }
private:
@@ -130,7 +129,7 @@ public:
private:
StringID string;
char *params[SCRIPT_TEXT_MAX_PARAMETERS];
int parami[SCRIPT_TEXT_MAX_PARAMETERS];
int64 parami[SCRIPT_TEXT_MAX_PARAMETERS];
ScriptText *paramt[SCRIPT_TEXT_MAX_PARAMETERS];
int paramc;