summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-16 07:57:35 +0200
committerErich Eckner <git@eckner.net>2018-06-16 07:57:35 +0200
commit52108327dcc03b92d2f47cabb7b9dadcf7888cdd (patch)
treefa5cbc0bcfd82fc3f58578938037794e5d5f5e23
parent1511364a4b08bd9babaee9377f98eb0621ddc312 (diff)
downloadarchlinuxewe-52108327dcc03b92d2f47cabb7b9dadcf7888cdd.tar.xz
openttd-git: 28140.c2a772808-1 -> 28146.5ab06ef8a-1
-rwxr-xr-xopenttd-git/PKGBUILD4
-rw-r--r--openttd-git/everything.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD
index 51a7afec4..28fe70282 100755
--- a/openttd-git/PKGBUILD
+++ b/openttd-git/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Erich Eckner <arch at eckner dot net>
pkgname=openttd-git
-pkgver=28140.c2a772808
+pkgver=28146.5ab06ef8a
_commit=${pkgver#*.}
pkgrel=1
pkgdesc="A FOSS clone of Transport Tycoon Deluxe."
@@ -37,7 +37,7 @@ source=(
"clipboard.grf"
)
sha512sums=('SKIP'
- 'c42f1eb6b252d2b810c12a06cd5f95755bd5e54b2a3e02e12f6713f34cb02cf5959af3dc51e63c164be1c2ffe230e92d258c5f5fbfb3b5720c94ea9304d0897f'
+ 'c7c53ce5e091c1f99c0e30051ed765b0628de7748a253e1cf91f2865e87f261b34d17a3d15f8fadf16a7966f25a608f52cdfe292a1d59ffddada535226fe9c1c'
'aa1f5d5c4fd9ff487bc03ed5c10701e99ae9fd29ae0cd65a06171486298558d1c26ced49ac8687acc5b1003a6538f6c83917992348cbd2b7426afdf0759cb1a5')
pkgver() {
diff --git a/openttd-git/everything.patch b/openttd-git/everything.patch
index e34a71d67..b38e5b7f0 100644
--- a/openttd-git/everything.patch
+++ b/openttd-git/everything.patch
@@ -5401,7 +5401,7 @@ index 79eaa89b1..3d370711e 100644
/* Determine the watery part of the dock. */
DiagDirection dir = GetInclinedSlopeDirection(GetTileSlope(tile));
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
-index 359709e36..896ecd921 100644
+index 04eea8e66..534d89c0b 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -20,6 +20,7 @@
@@ -5449,7 +5449,7 @@ index 359709e36..896ecd921 100644
for (uint i = MIN_MAP_SIZE_BITS; i <= MAX_MAP_SIZE_BITS; i++) {
- DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false);
+ DropDownListParamStringItem *item = new DropDownListParamStringItem((i + other_dimension > MAX_MAP_TILES_BITS) ? STR_RED_INT : STR_JUST_INT, i, false);
- item->SetParam(0, 1 << i);
+ item->SetParam(0, 1LL << i);
*list->Append() = item;
}
@@ -315,6 +341,14 @@ struct GenerateLandscapeWindow : public Window {