Skip to content

Commit

Permalink
openttd: updated to 1.8.0
Browse files Browse the repository at this point in the history
1.8.0:
(None)

1.8.0-RC1:
- Feature: [GFX] Climate-specific Action5 extra airport sprites
- Feature: Draw vertical separators at tile distance in the train depot GUI
- Feature: [Build] MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled
- Feature: [Build] Project file generator for kdevelop 4/5
- Feature: Add option to close windows with right click
- Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list
- Feature: Display aircraft type in vehicle preview/purchase/detail windows
- Change: [NewGRF] Various performance improvements to resolving VA2
- Change: [NewGRF] Increase maximum allowed vehicle sprite size to reduce clipping of ships
- Change: Check companies for bankruptcy before subtracting reoccuring monthly costs
- Change: [GFX] Replace the office building sprite on various toyland airports with a better fitting sprite
- Change: [GFX] The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version
- Change: Reword texts in industry view, when stockpiling is used
- Change: Remove the gap between windows when positioning them after opening
- Change: [Build] Enable usage of static_assert for MSVC
- Change: [Build] Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file
- Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking
- Change: Parse extmidi command string for parameters to pass on
- Change: Draw images in centre of buttons
- Fix: Store the map variety setting in the savegame like the other mapgen settings, so restarting maps considers it
- Fix: Hair selection was missing one option
- Fix: Avoid tile operations outside map border when building lock
- Fix: Catenary sprites got mixed up for depots
- Fix: Make automatic window-positioning RTL-aware
- Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values
- Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers
- Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shared triggers
- Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry
- Fix: [NPF] Reserved track bits were not accounted for when trying to find any safe position
- Fix: Do not modify argv[0]
- Fix: Do not search directories when opening ini files as we already have their full path
- Fix: Road tunnel/bridge heads have no trackbits wrt. catenary drawing
  • Loading branch information
adam committed Jul 7, 2018
1 parent b4742ac commit 8234e8b
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 9 deletions.
5 changes: 2 additions & 3 deletions games/openttd/Makefile
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.72 2018/04/14 07:34:22 adam Exp $
# $NetBSD: Makefile,v 1.73 2018/07/07 11:57:33 adam Exp $

DISTNAME= openttd-1.7.1-source
DISTNAME= openttd-1.8.0-source
PKGNAME= ${DISTNAME:S/-source//}
PKGREVISION= 4
CATEGORIES= games x11
MASTER_SITES= http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.xz
Expand Down
4 changes: 3 additions & 1 deletion games/openttd/PLIST
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.23 2017/06/28 18:18:36 adam Exp $
@comment $NetBSD: PLIST,v 1.24 2018/07/07 11:57:33 adam Exp $
bin/openttd
man/man6/openttd.6
share/applications/openttd.desktop
Expand All @@ -22,6 +22,7 @@ share/openttd/ai/compat_1.4.nut
share/openttd/ai/compat_1.5.nut
share/openttd/ai/compat_1.6.nut
share/openttd/ai/compat_1.7.nut
share/openttd/ai/compat_1.8.nut
share/openttd/baseset/no_music.obm
share/openttd/baseset/no_sound.obs
share/openttd/baseset/openttd.grf
Expand All @@ -39,6 +40,7 @@ share/openttd/game/compat_1.4.nut
share/openttd/game/compat_1.5.nut
share/openttd/game/compat_1.6.nut
share/openttd/game/compat_1.7.nut
share/openttd/game/compat_1.8.nut
share/openttd/lang/afrikaans.lng
share/openttd/lang/arabic_egypt.lng
share/openttd/lang/basque.lng
Expand Down
12 changes: 7 additions & 5 deletions games/openttd/distinfo
@@ -1,8 +1,10 @@
$NetBSD: distinfo,v 1.28 2017/06/28 18:18:36 adam Exp $
$NetBSD: distinfo,v 1.29 2018/07/07 11:57:33 adam Exp $

SHA1 (openttd-1.7.1-source.tar.xz) = a24a2a33cefd8d192fd4f6584f142a4b9d10338b
RMD160 (openttd-1.7.1-source.tar.xz) = 7ed0fc3b1c62cdcc11093c3fe3945b7a8fd0f292
SHA512 (openttd-1.7.1-source.tar.xz) = ac3115538174801dc14f63065408e31ef9f60fe4a695d382bdccdd82c547d36e358c2109031289bd19114810a9db6add2662aa09e868ca40ea87ae500b7bca02
Size (openttd-1.7.1-source.tar.xz) = 6517328 bytes
SHA1 (openttd-1.8.0-source.tar.xz) = fd6c90f04c4cbd626751acb9bf8a47a9f2b31520
RMD160 (openttd-1.8.0-source.tar.xz) = a607e955189561cc980dffc50dec57fc9ea9b9fb
SHA512 (openttd-1.8.0-source.tar.xz) = a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a
Size (openttd-1.8.0-source.tar.xz) = 6521016 bytes
SHA1 (patch-config.lib) = 4d3d7d9cc917163c728a51c17efa7f6b2e100913
SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1
SHA1 (patch-src_language.h) = 162b798adb6a78172f2191633f44c7e59506f129
SHA1 (patch-src_strings.cpp) = 75dd2a6672fa0b49ae724820f899f8b7f9260a56
16 changes: 16 additions & 0 deletions games/openttd/patches/patch-src_language.h
@@ -0,0 +1,16 @@
$NetBSD: patch-src_language.h,v 1.1 2018/07/07 11:57:34 adam Exp $

Fix for ICU 61.
https://github.com/OpenTTD/OpenTTD/issues/6690

--- src/language.h.orig 2018-07-07 11:12:28.000000000 +0000
+++ src/language.h
@@ -105,7 +105,7 @@ extern LanguageList _languages;
extern const LanguageMetadata *_current_language;

#ifdef WITH_ICU_SORT
-extern Collator *_current_collator;
+extern icu::Collator *_current_collator;
#endif /* WITH_ICU_SORT */

bool ReadLanguagePack(const LanguageMetadata *lang);
25 changes: 25 additions & 0 deletions games/openttd/patches/patch-src_strings.cpp
@@ -0,0 +1,25 @@
$NetBSD: patch-src_strings.cpp,v 1.1 2018/07/07 11:57:34 adam Exp $

Fix for ICU 61.
https://github.com/OpenTTD/OpenTTD/issues/6690

--- src/strings.cpp.orig 2018-07-07 11:13:01.000000000 +0000
+++ src/strings.cpp
@@ -52,7 +52,7 @@ const LanguageMetadata *_current_languag
TextDirection _current_text_dir; ///< Text direction of the currently selected language.

#ifdef WITH_ICU_SORT
-Collator *_current_collator = NULL; ///< Collator for the language currently in use.
+icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use.
#endif /* WITH_ICU_SORT */

static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam.
@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMeta

/* Create a collator instance for our current locale. */
UErrorCode status = U_ZERO_ERROR;
- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status);
+ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status);
/* Sort number substrings by their numerical value. */
if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
/* Avoid using the collator if it is not correctly set. */

0 comments on commit 8234e8b

Please sign in to comment.