diff options
| author | Erich Eckner <git@eckner.net> | 2016-06-20 07:01:16 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2016-06-20 07:05:58 +0200 |
| commit | 738b12814b940b9f598bb1231f85503df2499106 (patch) | |
| tree | a9325d45a93f0ecf3a9949b20457177bf06b1a1e /openttd-svn/everything.patch | |
| parent | cc4ca3872a4763f01b96dc53127b44e48d24eb90 (diff) | |
| download | archlinuxewe.git.save-738b12814b940b9f598bb1231f85503df2499106.tar.xz | |
openttd-svn 27600 -> 27602
Diffstat (limited to 'openttd-svn/everything.patch')
| -rw-r--r-- | openttd-svn/everything.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openttd-svn/everything.patch b/openttd-svn/everything.patch index 8a8895c0..fc667133 100644 --- a/openttd-svn/everything.patch +++ b/openttd-svn/everything.patch @@ -14001,10 +14001,10 @@ index 7ca9bd7..9dbc7bf 100644 /** * Make the given tile an oilrig tile. diff --git a/src/strings.cpp b/src/strings.cpp -index d2ce762..1e3b9b4 100644 +index 8cd071d..21f99d3 100644 --- a/src/strings.cpp +++ b/src/strings.cpp -@@ -1154,6 +1154,8 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg +@@ -1156,6 +1156,8 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg const CargoSpec *cs; FOR_ALL_SORTED_CARGOSPECS(cs) { @@ -14013,7 +14013,7 @@ index d2ce762..1e3b9b4 100644 if (!HasBit(cmask, cs->Index())) continue; if (buff >= last - 2) break; // ',' and ' ' -@@ -1167,6 +1169,20 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg +@@ -1169,6 +1171,20 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg } buff = GetStringWithArgs(buff, cs->name, args, last, next_substr_case_index, game_script); |