openrct2: Update to 0.4.5 upstream changes: ----------------- 0.4.5 (2023-05-08) ------------------------------------------------------------------------ - Feature: [#18713] Block brakes have speed control and brakes slower than adjacent block brakes copy block brake speed when block brake open. - Feature: [#19276] Add Powered Lifthill to Giga Coaster. - Feature: [#19305] Add new Reversed Trains ride setting to run trains backwards, granting a bonus to ride ratings. - Feature: [#19305] [Plugin] Add ���Car.isReversed��� to allow individual ride vehicles to run backwards. - Feature: [#19446] Add new color options to color dropdown. - Feature: [#19547] Add large sloped turns to hybrid coaster and single rail coaster. - Feature: [#19930] Add plugin APIs for research. - Feature: [OpenMusic#25] Added Prehistoric ride music style. - Feature: [OpenMusic#26] Fairground Organ style 2 with new recordings from Herman's 35er Voigt (Previously known as Bressingham Voigt). - Feature: [OpenMusic#28] Add Ragtime style 2 ride music. - Improved: [#17739] Raise water and land height limits to 254 units/182m/600ft. - Improved: [#18490] Reduce guests walking through trains on level crossing next to station. - Improved: [#18996] When marketing campaigns are disabled, disable the Marketing tab in the Finances window. - Improved: [#19764] Miscellaneous scenery tab now grouped next to the all-scenery tab. - Improved: [#19830] ���Highlight path issues��� will now hide wall elements. - Improved: [#19905] Add prompt before resetting shortcut keys. - Improved: [#19952] Add colour preset to Spiral Slide using the new colour options. - Improved: [#19953] Add keyboard shortcut to Keyboard Shortcuts window. - Improved: [#20055] Performance improvement for the software renderer. - Change: [OpenSFX#17] Update Hybrid RC lifthill loop. - Fix: [#12598] Number of holes is not set correctly when saving track designs. - Fix: [#13130] Android always defaulting to UK locale for language, currency and temperature. - Fix: [#13397] Ride simulation causes strange station behaviour and makes the ride unusable in some cases. - Fix: [#16791] Rotodrop top piece replicates when walls are placed around it and clearance checks are disabled (original bug). - Fix: [#18583] Land dropdown is incorrect if there are surface entry index holes. - Fix: [#18895] Responding mechanic blocked at level crossing. - Fix: [#19231] Crash due to null pointer to previously deleted banner in tile copy/paste functionality. - Fix: [#19296] Crash due to a race condition for parallel object loading. - Fix: [#19733] Favorite ride of X guests integer overflow. - Fix: [#19756] Crash with title sequences containing no commands. - Fix: [#19767] No message when path is not connected to ride exit and is therefore unreachable for mechanics. - Fix: [#19800] Crash when displaying station stats with more than 62 stations. - Fix: [#19801] The in-game load/save window cannot be resized anymore. - Fix: [#19854] Looping Coaster trains clipping through steep quarter turns down. - Fix: [#19858] Issue drawing simulate flag icon on alternate colour palettes. - Fix: [#19901] Random shop colours never assigning last colour. - Fix: [#19911] Guests stuck at certain railway crossings. - Fix: [#19924] Destructible cheat does not allow partial ride modification. - Fix: [#19950] Mine train block brake supports drawn incorrectly. - Fix: [#19955] Mine Train Roller Coaster has incorrect supports on the sloped left small turn (original bug). - Fix: [#19987] [Plugin] ���SetCheatAction��� has wrong ID in plugin API. - Fix: [#20016] The group box for small scenery details in the Tile Inspector window has unused empty space. - Fix: [#20018] Shops not calculating up-keep cost. - Fix: [#20033] Asset packs cannot reference game data. - Fix: [#20104] [Plugin] Some network APIs use player index and group index. - Fix: [#20099] Some scrollbar is glitched or have incorrect size when open window for the first time - Fix: [#20134] Grass length being updated for tiles in the void, causing unneccesary drawing operations.diff -r1.45 -r1.46 pkgsrc/games/openrct2/Makefile
(triaxx)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.45 2023/09/03 07:05:36 triaxx Exp $ | 1 | # $NetBSD: Makefile,v 1.46 2023/09/03 12:14:30 triaxx Exp $ | |
2 | 2 | |||
3 | DISTNAME= openrct2-0.4.4 | 3 | DISTNAME= openrct2-0.4.5 | |
4 | CATEGORIES= games | 4 | CATEGORIES= games | |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenRCT2/} | |
6 | GITHUB_PROJECT= OpenRCT2 | 6 | GITHUB_PROJECT= OpenRCT2 | |
7 | GITHUB_TAG= v${PKGVERSION_NOREV} | 7 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://github.com/OpenRCT2/OpenRCT2/ | 10 | HOMEPAGE= https://github.com/OpenRCT2/OpenRCT2/ | |
11 | COMMENT= Open source reimplementation of RollerCoaster Tycoon 2 | 11 | COMMENT= Open source reimplementation of RollerCoaster Tycoon 2 | |
12 | LICENSE= gnu-gpl-v3 | 12 | LICENSE= gnu-gpl-v3 | |
13 | 13 | |||
14 | USE_CMAKE= yes | 14 | USE_CMAKE= yes | |
15 | USE_TOOLS+= pkg-config | 15 | USE_TOOLS+= pkg-config | |
16 | USE_LANGUAGES= c c++17 | 16 | USE_LANGUAGES= c c++17 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.14 2023/09/03 07:05:36 triaxx Exp $ | 1 | @comment $NetBSD: PLIST,v 1.15 2023/09/03 12:14:30 triaxx Exp $ | |
2 | bin/openrct2 | 2 | bin/openrct2 | |
3 | bin/openrct2-cli | 3 | bin/openrct2-cli | |
4 | lib/libopenrct2.a | 4 | lib/libopenrct2.a | |
5 | man/man6/openrct2-cli.6 | 5 | man/man6/openrct2-cli.6 | |
6 | man/man6/openrct2.6 | 6 | man/man6/openrct2.6 | |
7 | share/applications/openrct2-savegame.desktop | 7 | share/applications/openrct2-savegame.desktop | |
8 | share/applications/openrct2-scenario.desktop | 8 | share/applications/openrct2-scenario.desktop | |
9 | share/applications/openrct2-uri.desktop | 9 | share/applications/openrct2-uri.desktop | |
10 | share/applications/openrct2.desktop | 10 | share/applications/openrct2.desktop | |
11 | share/doc/openrct2/changelog.txt | 11 | share/doc/openrct2/changelog.txt | |
12 | share/doc/openrct2/contributors.md | 12 | share/doc/openrct2/contributors.md | |
13 | share/doc/openrct2/licence.txt | 13 | share/doc/openrct2/licence.txt | |
14 | share/doc/openrct2/openrct2.d.ts | 14 | share/doc/openrct2/openrct2.d.ts | |
@@ -16,26 +16,27 @@ share/doc/openrct2/readme.txt | @@ -16,26 +16,27 @@ share/doc/openrct2/readme.txt | |||
16 | share/doc/openrct2/scripting.md | 16 | share/doc/openrct2/scripting.md | |
17 | share/icons/hicolor/128x128/apps/openrct2.png | 17 | share/icons/hicolor/128x128/apps/openrct2.png | |
18 | share/icons/hicolor/16x16/apps/openrct2.png | 18 | share/icons/hicolor/16x16/apps/openrct2.png | |
19 | share/icons/hicolor/24x24/apps/openrct2.png | 19 | share/icons/hicolor/24x24/apps/openrct2.png | |
20 | share/icons/hicolor/256x256/apps/openrct2.png | 20 | share/icons/hicolor/256x256/apps/openrct2.png | |
21 | share/icons/hicolor/32x32/apps/openrct2.png | 21 | share/icons/hicolor/32x32/apps/openrct2.png | |
22 | share/icons/hicolor/48x48/apps/openrct2.png | 22 | share/icons/hicolor/48x48/apps/openrct2.png | |
23 | share/icons/hicolor/64x64/apps/openrct2.png | 23 | share/icons/hicolor/64x64/apps/openrct2.png | |
24 | share/icons/hicolor/96x96/apps/openrct2.png | 24 | share/icons/hicolor/96x96/apps/openrct2.png | |
25 | share/icons/hicolor/scalable/apps/openrct2.svg | 25 | share/icons/hicolor/scalable/apps/openrct2.svg | |
26 | share/metainfo/openrct2.appdata.xml | 26 | share/metainfo/openrct2.appdata.xml | |
27 | share/mime/packages/openrct2.xml | 27 | share/mime/packages/openrct2.xml | |
28 | share/openrct2/assetpack/openrct2.music.alternative.parkap | 28 | share/openrct2/assetpack/openrct2.music.alternative.parkap | |
29 | share/openrct2/assetpack/openrct2.music.cover.parkap | |||
29 | share/openrct2/assetpack/openrct2.sound.parkap | 30 | share/openrct2/assetpack/openrct2.sound.parkap | |
30 | share/openrct2/g2.dat | 31 | share/openrct2/g2.dat | |
31 | share/openrct2/language/ar-EG.txt | 32 | share/openrct2/language/ar-EG.txt | |
32 | share/openrct2/language/ca-ES.txt | 33 | share/openrct2/language/ca-ES.txt | |
33 | share/openrct2/language/cs-CZ.txt | 34 | share/openrct2/language/cs-CZ.txt | |
34 | share/openrct2/language/da-DK.txt | 35 | share/openrct2/language/da-DK.txt | |
35 | share/openrct2/language/de-DE.txt | 36 | share/openrct2/language/de-DE.txt | |
36 | share/openrct2/language/en-GB.txt | 37 | share/openrct2/language/en-GB.txt | |
37 | share/openrct2/language/en-US.txt | 38 | share/openrct2/language/en-US.txt | |
38 | share/openrct2/language/eo-ZZ.txt | 39 | share/openrct2/language/eo-ZZ.txt | |
39 | share/openrct2/language/es-ES.txt | 40 | share/openrct2/language/es-ES.txt | |
40 | share/openrct2/language/fi-FI.txt | 41 | share/openrct2/language/fi-FI.txt | |
41 | share/openrct2/language/fr-CA.txt | 42 | share/openrct2/language/fr-CA.txt | |
@@ -54,27 +55,30 @@ share/openrct2/language/tr-TR.txt | @@ -54,27 +55,30 @@ share/openrct2/language/tr-TR.txt | |||
54 | share/openrct2/language/vi-VN.txt | 55 | share/openrct2/language/vi-VN.txt | |
55 | share/openrct2/language/zh-CN.txt | 56 | share/openrct2/language/zh-CN.txt | |
56 | share/openrct2/language/zh-TW.txt | 57 | share/openrct2/language/zh-TW.txt | |
57 | share/openrct2/object/objects.zip.zipversion | 58 | share/openrct2/object/objects.zip.zipversion | |
58 | share/openrct2/object/official/audio/openrct2.audio.additional.parkobj | 59 | share/openrct2/object/official/audio/openrct2.audio.additional.parkobj | |
59 | share/openrct2/object/official/footpath_item/rct2dlc.footpath_item.litterpa.parkobj | 60 | share/openrct2/object/official/footpath_item/rct2dlc.footpath_item.litterpa.parkobj | |
60 | share/openrct2/object/official/footpath_railings/openrct2.footpath_railings.invisible.json | 61 | share/openrct2/object/official/footpath_railings/openrct2.footpath_railings.invisible.json | |
61 | share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.invisible.json | 62 | share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.invisible.json | |
62 | share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.queue_invisible.json | 63 | share/openrct2/object/official/footpath_surface/openrct2.footpath_surface.queue_invisible.json | |
63 | share/openrct2/object/official/music/openrct2.music.acid.parkobj | 64 | share/openrct2/object/official/music/openrct2.music.acid.parkobj | |
64 | share/openrct2/object/official/music/openrct2.music.blizzard.parkobj | 65 | share/openrct2/object/official/music/openrct2.music.blizzard.parkobj | |
65 | share/openrct2/object/official/music/openrct2.music.dodgems.parkobj | 66 | share/openrct2/object/official/music/openrct2.music.dodgems.parkobj | |
66 | share/openrct2/object/official/music/openrct2.music.extraterrestrial.parkobj | 67 | share/openrct2/object/official/music/openrct2.music.extraterrestrial.parkobj | |
68 | share/openrct2/object/official/music/openrct2.music.fairground2.parkobj | |||
67 | share/openrct2/object/official/music/openrct2.music.galaxy.parkobj | 69 | share/openrct2/object/official/music/openrct2.music.galaxy.parkobj | |
70 | share/openrct2/object/official/music/openrct2.music.prehistoric.parkobj | |||
71 | share/openrct2/object/official/music/openrct2.music.ragtime2.parkobj | |||
68 | share/openrct2/object/official/ride/openrct2.ride.alpine_coaster.parkobj | 72 | share/openrct2/object/official/ride/openrct2.ride.alpine_coaster.parkobj | |
69 | share/openrct2/object/official/ride/openrct2.ride.hybrid_coaster.parkobj | 73 | share/openrct2/object/official/ride/openrct2.ride.hybrid_coaster.parkobj | |
70 | share/openrct2/object/official/ride/openrct2.ride.single_rail_coaster.parkobj | 74 | share/openrct2/object/official/ride/openrct2.ride.single_rail_coaster.parkobj | |
71 | share/openrct2/object/official/ride/rct2dlc.ride.zpanda.parkobj | 75 | share/openrct2/object/official/ride/rct2dlc.ride.zpanda.parkobj | |
72 | share/openrct2/object/official/scenery_group/rct2dlc.scenery_group.scgpanda.parkobj | 76 | share/openrct2/object/official/scenery_group/rct2dlc.scenery_group.scgpanda.parkobj | |
73 | share/openrct2/object/official/scenery_small/rct2dlc.scenery_small.bigpanda.parkobj | 77 | share/openrct2/object/official/scenery_small/rct2dlc.scenery_small.bigpanda.parkobj | |
74 | share/openrct2/object/official/scenery_small/rct2dlc.scenery_small.pandagr.parkobj | 78 | share/openrct2/object/official/scenery_small/rct2dlc.scenery_small.pandagr.parkobj | |
75 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf02.parkobj | 79 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf02.parkobj | |
76 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf03.parkobj | 80 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf03.parkobj | |
77 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf04.parkobj | 81 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf04.parkobj | |
78 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf07.parkobj | 82 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf07.parkobj | |
79 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf08.parkobj | 83 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf08.parkobj | |
80 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttrfgl01.parkobj | 84 | share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttrfgl01.parkobj |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.22 2023/09/03 07:05:36 triaxx Exp $ | 1 | $NetBSD: distinfo,v 1.23 2023/09/03 12:14:30 triaxx Exp $ | |
2 | 2 | |||
3 | BLAKE2s (openrct2-0.4.4.tar.gz) = 6cfc0e2d7bddd7965a93d409c18a585779674d8489fa24eb7e17c2bd82755b9b | 3 | BLAKE2s (openrct2-0.4.5.tar.gz) = be628d86e0a73a97a2bba1bcff8f9fc878b5e5d410d5a4e9d9bd52611840f97d | |
4 | SHA512 (openrct2-0.4.4.tar.gz) = 8e969e08023a6232dfffa31593cfacedafdf5eb778d1c1471deb095b3d056006ea0c1b219c9042f9fe94118fcbde219580ba2fca29d70a042a016a7fde0abdc9 | 4 | SHA512 (openrct2-0.4.5.tar.gz) = fa2b6ba2d059f42e6b1fae8db7049b04a3bac7e9dc387a4f3c6bea0711309ab9ea6f298094a709cdff06a74bbc0cb571ace25f562687298b3a8bfd4a47a95b3b | |
5 | Size (openrct2-0.4.4.tar.gz) = 16554655 bytes | 5 | Size (openrct2-0.4.5.tar.gz) = 16809101 bytes | |
6 | SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa | 6 | SHA1 (patch-src_openrct2-ui_title_TitleSequencePlayer.cpp) = 35a4ee2a47fe6f5bfd536e199a369361cb1b12fa | |
7 | SHA1 (patch-src_openrct2_CMakeLists.txt) = be08c09024889c1cc52ef7e53c911f6746171370 | 7 | SHA1 (patch-src_openrct2_CMakeLists.txt) = be08c09024889c1cc52ef7e53c911f6746171370 | |
8 | SHA1 (patch-src_openrct2_common.h) = 63f887123a93baf2214192f938f0289c228ebdbf | 8 | SHA1 (patch-src_openrct2_common.h) = 5e2cf2e34f9dcea27581e1cce05dcb551795b674 | |
9 | SHA1 (patch-src_openrct2_platform_Platform.Posix.cpp) = 9c052c55489cd2bb4e0f50a71c7cd48f29d3887b | 9 | SHA1 (patch-src_openrct2_platform_Platform.Posix.cpp) = 9c052c55489cd2bb4e0f50a71c7cd48f29d3887b | |
10 | SHA1 (patch-src_openrct2_platform_Platform.h) = 3d8a91ef4c5240c54181a6e3776a0878ca721bc8 | 10 | SHA1 (patch-src_openrct2_platform_Platform.h) = 07725c608d003a48aafce21d7853631a4f223c3c | |
11 | SHA1 (patch-src_openrct2_platform_Platform.macOS.mm) = 2e2f9bdc9fad87f95a55975556b9b11677a1bed2 | 11 | SHA1 (patch-src_openrct2_platform_Platform.macOS.mm) = 4b71726422af272e29ae42b7411c2738e88ec70f | |
12 | SHA1 (patch-src_openrct2_util_Util.cpp) = 0acc8469a7b81b3259d891e8b559b64f6e6e842d | 12 | SHA1 (patch-src_openrct2_util_Util.cpp) = 0acc8469a7b81b3259d891e8b559b64f6e6e842d |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-src_openrct2_platform_Platform.h,v 1.3 2023/09/03 07:05:36 triaxx Exp $ | 1 | $NetBSD: patch-src_openrct2_platform_Platform.h,v 1.4 2023/09/03 12:14:30 triaxx Exp $ | |
2 | 2 | |||
3 | Support NetBSD. | 3 | Support NetBSD. | |
4 | 4 | |||
5 | --- src/openrct2/platform/Platform.h.orig 2022-04-25 17:21:38.000000000 +0000 | 5 | --- src/openrct2/platform/Platform.h.orig 2022-04-25 17:21:38.000000000 +0000 | |
6 | +++ src/openrct2/platform/Platform.h | 6 | +++ src/openrct2/platform/Platform.h | |
7 | @@ -88,7 +88,7 @@ namespace Platform | 7 | @@ -82,7 +82,7 @@ namespace Platform | |
8 | std::string GetUsername(); | 8 | std::string GetUsername(); | |
9 | 9 | |||
10 | std::string GetSteamPath(); | 10 | std::string GetSteamPath(); | |
11 | -#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) | 11 | -#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) | |
12 | +#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__) | 12 | +#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__) | |
13 | std::string GetEnvironmentPath(const char* name); | 13 | std::string GetEnvironmentPath(const char* name); | |
14 | std::string GetHomePath(); | 14 | std::string GetHomePath(); | |
15 | #endif | 15 | #endif |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-src_openrct2_platform_Platform.macOS.mm,v 1.3 2023/09/02 07:30:35 triaxx Exp $ | 1 | $NetBSD: patch-src_openrct2_platform_Platform.macOS.mm,v 1.4 2023/09/03 12:14:30 triaxx Exp $ | |
2 | 2 | |||
3 | Support pkgsrc. | 3 | Support pkgsrc. | |
4 | 4 | |||
5 | --- src/openrct2/platform/Platform.macOS.mm.orig 2021-03-13 11:17:05.000000000 +0000 | 5 | --- src/openrct2/platform/Platform.macOS.mm.orig 2021-03-13 11:17:05.000000000 +0000 | |
6 | +++ src/openrct2/platform/Platform.macOS.mm | 6 | +++ src/openrct2/platform/Platform.macOS.mm | |
7 | @@ -94,21 +94,7 @@ namespace Platform | 7 | @@ -96,21 +96,7 @@ namespace Platform | |
8 | } | 8 | } | |
9 | else | 9 | else | |
10 | { | 10 | { | |
11 | - // this is not in an app bundle | 11 | - // this is not in an app bundle | |
12 | - auto exePath = GetCurrentExecutablePath(); | 12 | - auto exePath = GetCurrentExecutablePath(); | |
13 | - auto exeDirectory = Path::GetDirectory(exePath); | 13 | - auto exeDirectory = Path::GetDirectory(exePath); | |
14 | - | 14 | - | |
15 | - // check build and install paths | 15 | - // check build and install paths | |
16 | - NSArray *dataSearchLocations = @[@"data", @"../share/openrct2"]; | 16 | - NSArray *dataSearchLocations = @[@"data", @"../share/openrct2"]; | |
17 | - | 17 | - | |
18 | - for (NSString *searchLocation in dataSearchLocations) { | 18 | - for (NSString *searchLocation in dataSearchLocations) { | |
19 | - path = Path::Combine(exeDirectory, [searchLocation UTF8String]); | 19 | - path = Path::Combine(exeDirectory, [searchLocation UTF8String]); | |
20 | - NSString* nsPath = [NSString stringWithUTF8String:path.c_str()]; | 20 | - NSString* nsPath = [NSString stringWithUTF8String:path.c_str()]; |