From 738b12814b940b9f598bb1231f85503df2499106 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 20 Jun 2016 07:01:16 +0200 Subject: openttd-svn 27600 -> 27602 --- openttd-svn/PKGBUILD | 4 ++-- openttd-svn/everything.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openttd-svn/PKGBUILD b/openttd-svn/PKGBUILD index 454e7f578..363010681 100755 --- a/openttd-svn/PKGBUILD +++ b/openttd-svn/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Erich Eckner pkgname=openttd-svn -pkgver=27600 +pkgver=27602 pkgrel=1 pkgdesc="A FOSS clone of Transport Tycoon Deluxe." arch=('x86_64' 'i686') @@ -35,7 +35,7 @@ source=( "clipboard.grf" ) sha512sums=('SKIP' - 'a245fd926b7a168a32e0cc7e8faaa7a05105a3beda4d36723dc31e7481d857b742c7453fbf560d2c2fd09d45fe17c0ceb28b2bddd21f4b02f729cc7674f16853' + 'c105b7dd98e466b140e71820e805f10b67cfe22d61b50e3fa48e1800e9bec9b641f7517bd0c5220e52d67188a8e5bdb89f6b01d6de761d84041fa4e434e08f2c' '69ac38abc75d728ae3a4b131e819223f496f3e6554d2e8e35e6950c6ceb41a293af2aec6df2ef4b82a9e5d12ed87026e85e181adb0fc142407da94ad4d70d2b6' 'aa1f5d5c4fd9ff487bc03ed5c10701e99ae9fd29ae0cd65a06171486298558d1c26ced49ac8687acc5b1003a6538f6c83917992348cbd2b7426afdf0759cb1a5') diff --git a/openttd-svn/everything.patch b/openttd-svn/everything.patch index 8a8895c0c..fc6671331 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); -- cgit v1.2.3-54-g00ecf