summaryrefslogtreecommitdiff
path: root/openttd-git
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-07-31 00:51:43 +0200
committerErich Eckner <git@eckner.net>2021-07-31 00:51:43 +0200
commit9bcb465482522c50a0e4cc8a9dfa2face0544eb7 (patch)
tree328f7e4d88293daf0a1e8fc60e17e1bb6ddda0a1 /openttd-git
parentb7ac3695b16647771524fffdf64357aee4f6a6f8 (diff)
downloadarchlinuxewe-9bcb465482522c50a0e4cc8a9dfa2face0544eb7.tar.xz
openttd-git: fix loading of old safegames
Diffstat (limited to 'openttd-git')
-rw-r--r--openttd-git/PKGBUILD4
-rw-r--r--openttd-git/underground.patch12
2 files changed, 14 insertions, 2 deletions
diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD
index c5ddda9eb..56ab76301 100644
--- a/openttd-git/PKGBUILD
+++ b/openttd-git/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=openttd-git
pkgver=31095.dea999566
_commit=${pkgver#*.}
-pkgrel=1
+pkgrel=2
pkgdesc="A FOSS clone of Transport Tycoon Deluxe."
arch=('x86_64' 'i686' 'pentium4')
url="http://www.openttd.org"
@@ -53,7 +53,7 @@ source=(
sha512sums=('SKIP'
'27c225bc25cec6f4924deb02af7cd80e69f410d0fe2b9999db3d804651516fb8d006a4081fbd47feddc640621d3bac6b4866b4bd23831859e3b298f352ba018b'
'85db3cbceeb0a985e3c8dbd7714331e33852e1548cc957f222c35cf46db0c12f839eb63e073c37b3d95e490fb9d41571a39a0d36572a5e089d0185a15d4ba059'
- '1fa21ea1aa8cac4e26b1817bbeff3642cf00538e7819fcc8d6f40d7a7cb67a8ce744d8a76329460db13c12b195adc465b34ba80488dbef045b1cd680ca757de9'
+ 'd213cab6b7be313203509f16f6c98cb4c0b203ba87ef4abae495a48f4913ad2e32b169fb77aeddcaba2d373260acb39e1bcc9c01db352d70bd08870208c9d429'
'a3fd5b230b7cdd67a1b6607887433c0cb85ba1dfd30cedfddf573a58b23ccce7c470a22cf7f65a29c173bba12976c5889482cef24f49c8c0a829883a71bcd87d')
pkgver() {
diff --git a/openttd-git/underground.patch b/openttd-git/underground.patch
index 99209d981..ecca3e9ca 100644
--- a/openttd-git/underground.patch
+++ b/openttd-git/underground.patch
@@ -2082,6 +2082,18 @@ index 70a014434..649c4a56a 100644
return cost;
}
+diff --git a/src/saveload/compat/map_sl_compat.h b/src/saveload/compat/map_sl_compat.h
+index 84cfb2865..87ff25630 100644
+--- a/src/saveload/compat/map_sl_compat.h
++++ b/src/saveload/compat/map_sl_compat.h
+@@ -16,6 +16,7 @@
+ const SaveLoadCompat _map_sl_compat[] = {
+ SLC_VAR("dim_x"),
+ SLC_VAR("dim_y"),
++ SLC_VAR("layer_count"),
+ };
+
+ #endif /* SAVELOAD_COMPAT_MAP_H */
diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp
index 07a36d6a3..b86328de8 100644
--- a/src/saveload/map_sl.cpp