On Sun, May 05, 2024 at 08:29:17PM GMT, Brian Callahan wrote:
> On 5/5/2024 3:54 PM, Solene Rapenne wrote:
> > new version was released 54 minutes ago, here is the update
> >
>
> You're going to have to give me more than 54 minutes to look at all this!
>
> > I had to update all distfiles, games starts with GOG files
> >
>
> Not unusual; this one in my experience was a bit of a pain to update...
> but glad to see it looked (relatively) painless for you.
>
> > however, I have an issue when trying to start a game, it
> > complains that musics are missing from the scenario. I am
> > not sure if it is a bug, a packaging issue or something wrong
> > on my side (or gog side?), testing would be appreciated :)
> >
>
> Not sure why the music isn't working right. I'll have to find my copies
> of the games and let you know. Is it just RCT2 you're using or RCT1 as well?
>
> ~Brian
game works fine with this diff, the music files were not put at the right
place.
ok?
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index 12b8dae5e7e..e840dd10af2 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -1,12 +1,12 @@
# "#error Unknown endianess!" in src/openrct2/common.h
NOT_FOR_ARCHS = ${BE_ARCHS}
-V = 0.4.5
-TITLE_V = 0.4.0
-OBJECTS_V = 1.3.11
-OPENSFX_V = 1.0.3
-OPENMSX_V = 1.3.0
-REPLAYS_V = 0.0.78
+V = 0.4.11
+TITLE_V = 0.4.6
+OBJECTS_V = 1.4.4
+OPENSFX_V = 1.0.5
+OPENMSX_V = 1.5
+REPLAYS_V = 0.0.79
COMMENT = open source re-implementation of RollerCoaster Tycoon 2
DISTFILES = openrct2-${V}{v${V}}.tar.gz
DISTFILES.a = title-sequences-${TITLE_V}{title-sequences}.zip
@@ -68,6 +68,7 @@ CONFIGURE_ARGS = -DDOWNLOAD_OBJECTS=OFF \
-DDOWNLOAD_OPENSFX=OFF \
-DDOWNLOAD_REPLAYS=OFF \
-DDOWNLOAD_TITLE_SEQUENCES=OFF \
+ -DDISABLE_DISCORD_RPC=ON \
-DOPENRCT2_BRANCH=master \
-DOPENRCT2_COMMIT_SHA1_SHORT="76ca840"
@@ -85,9 +86,9 @@ post-extract:
unzip -q ${FULLDISTDIR}/objects-${OBJECTS_V}.zip -d \
${WRKSRC}/data/object
unzip -q ${FULLDISTDIR}/opensfx-${OPENSFX_V}.zip -d \
- ${WRKSRC}/data/assetpack
+ ${WRKSRC}/data/object
unzip -q ${FULLDISTDIR}/openmsx-${OPENMSX_V}.zip -d \
- ${WRKSRC}/data/assetpack
+ ${WRKSRC}/data/object
unzip -q ${FULLDISTDIR}/replays-${REPLAYS_V}.zip -d \
${WRKSRC}/testdata/replays
diff --git a/games/openrct2/distinfo b/games/openrct2/distinfo
index 2e493b7bd44..48913bb60a4 100644
--- a/games/openrct2/distinfo
+++ b/games/openrct2/distinfo
@@ -1,12 +1,12 @@
-SHA256 (openrct2/objects-1.3.11.zip) =
v4XYjk+xHKLlkVVnOQiYdH3CRZs8egV73DK4KckXgLQ=
-SHA256 (openrct2/openmsx-1.3.0.zip) =
s0I/V0qWlHnVHfpU8E7b4lV/N4EkCam15eUuWfcfT7g=
-SHA256 (openrct2/openrct2-0.4.5.tar.gz) =
654g3A3L8QsCtfM0oCmYOgorQ9kx+VogiKZOiyZXurE=
-SHA256 (openrct2/opensfx-1.0.3.zip) =
cL4bb/jMJK2AMaLgzdRFtd08UsiGqOX3BAH3UVLkrmw=
-SHA256 (openrct2/replays-0.0.78.zip) =
pr39zH2RbOBglhxf576vQ2efv62YOM/b0GdheuCsDd8=
-SHA256 (openrct2/title-sequences-0.4.0.zip) =
bnx7VUcXByv8esuW/QEB3I5/DqDqMWNnoFwukpUMkCk=
-SIZE (openrct2/objects-1.3.11.zip) = 4705861
-SIZE (openrct2/openmsx-1.3.0.zip) = 36477799
-SIZE (openrct2/openrct2-0.4.5.tar.gz) = 16809101
-SIZE (openrct2/opensfx-1.0.3.zip) = 3820122
-SIZE (openrct2/replays-0.0.78.zip) = 1829988
-SIZE (openrct2/title-sequences-0.4.0.zip) = 7945853
+SHA256 (openrct2/objects-1.4.4.zip) =
2gF7kKOHBknLT/IuFO38dGJZrwSJZzEdETPPTINq5aA=
+SHA256 (openrct2/openmsx-1.5.zip) =
w/rEyqkDmKK0xbsy4N0PRAcwhv4WEh09xJs8oSBHQGg=
+SHA256 (openrct2/openrct2-0.4.11.tar.gz) =
1iEdyWUbQzFcXSLjCqQeWCu4YdJUG4K7Zd6PT5Xwze8=
+SHA256 (openrct2/opensfx-1.0.5.zip) =
qVIUi+FkwSjk/TrqloIuXwUe3ZoLHyyE3n92KM47Lhg=
+SHA256 (openrct2/replays-0.0.79.zip) =
BF2h34aX4tM/8zs0AI8i52mCgKpGOa/Rsfw8WQ1emVY=
+SHA256 (openrct2/title-sequences-0.4.6.zip) =
JKGJza8fePttbK7ejxqzzt+KufgZzSJgoJsszkxxDZg=
+SIZE (openrct2/objects-1.4.4.zip) = 5392108
+SIZE (openrct2/openmsx-1.5.zip) = 40548101
+SIZE (openrct2/openrct2-0.4.11.tar.gz) = 21842033
+SIZE (openrct2/opensfx-1.0.5.zip) = 4012384
+SIZE (openrct2/replays-0.0.79.zip) = 1934633
+SIZE (openrct2/title-sequences-0.4.6.zip) = 2547725
diff --git a/games/openrct2/patches/patch-CMakeLists_txt
b/games/openrct2/patches/patch-CMakeLists_txt
deleted file mode 100644
index 767961e3860..00000000000
--- a/games/openrct2/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Don't download anything.
-Don't try to execute git.
-Remove -Werror.
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -160,12 +160,6 @@ if (MACOS_USE_DEPENDENCIES)
- endif ()
- endif ()
-
--# If OS is Linux, import OpenSoundEffects and OpenMusic
--if(UNIX AND NOT APPLE)
-- set(DOWNLOAD_OPENMSX ON)
-- set(DOWNLOAD_OPENSFX ON)
--endif()
--
- # LIST of supported flags, use SET_CHECK_CXX_FLAGS() to apply to target.
- # Use ADD_CHECK_CXX_COMPILER_FLAG() to add to list.
- set(SUPPORTED_CHECK_CXX_COMPILER_FLAGS "")
-@@ -184,25 +178,6 @@ execute_process(
- ERROR_QUIET
- )
-
--# Define current git branch
--execute_process(
-- COMMAND git rev-parse --abbrev-ref HEAD
-- WORKING_DIRECTORY ${ROOT_DIR}
-- OUTPUT_VARIABLE OPENRCT2_BRANCH
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- ERROR_QUIET
--)
--
--# Define short commit hash
--execute_process(
-- COMMAND git rev-parse --short HEAD
-- WORKING_DIRECTORY ${ROOT_DIR}
-- OUTPUT_VARIABLE OPENRCT2_COMMIT_SHA1_SHORT
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- ERROR_QUIET
--)
--
--
- if (NOT DISABLE_DISCORD_RPC)
- if (UNIX AND NOT APPLE)
- find_package(DiscordRPC)
-@@ -332,7 +307,7 @@ else ()
-
- # Compiler flags
- set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use
value in range 0–3.")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Werror -Wundef
-Wmissing-declarations -Winit-self -Wall -Wextra -Wshadow")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Wundef
-Wmissing-declarations -Winit-self -Wall -Wextra -Wshadow")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas
-Wno-missing-braces -Wno-comment -Wnonnull -Wno-unused-parameter
-Wno-attributes")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
-
diff --git a/games/openrct2/patches/patch-src_openrct2_core_String_cpp
b/games/openrct2/patches/patch-src_openrct2_core_String_cpp
new file mode 100644
index 00000000000..a67f3643ffe
--- /dev/null
+++ b/games/openrct2/patches/patch-src_openrct2_core_String_cpp
@@ -0,0 +1,12 @@
+Index: src/openrct2/core/String.cpp
+--- src/openrct2/core/String.cpp.orig
++++ src/openrct2/core/String.cpp
+@@ -15,7 +15,7 @@
+ #include <stdexcept>
+ #include <vector>
+ #ifndef _WIN32
+-# ifndef __FreeBSD__
++# ifndef __OpenBSD__
+ # include <alloca.h>
+ # endif
+ # include <unicode/ucnv.h>
diff --git a/games/openrct2/pkg/PLIST b/games/openrct2/pkg/PLIST
index 8fe0d93683d..d91e7979da6 100644
--- a/games/openrct2/pkg/PLIST
+++ b/games/openrct2/pkg/PLIST
@@ -28,24 +28,6 @@ share/metainfo/
share/metainfo/openrct2.appdata.xml
share/mime/packages/openrct2.xml
share/openrct2/
-share/openrct2/assetpack/
-share/openrct2/assetpack/assetpack/
-share/openrct2/assetpack/assetpack/openrct2.music.alternative.parkap
-share/openrct2/assetpack/assetpack/openrct2.music.cover.parkap
-share/openrct2/assetpack/assetpack/openrct2.sound.parkap
-share/openrct2/assetpack/object/
-share/openrct2/assetpack/object/official/
-share/openrct2/assetpack/object/official/audio/
-share/openrct2/assetpack/object/official/audio/openrct2.audio.additional.parkobj
-share/openrct2/assetpack/object/official/music/
-share/openrct2/assetpack/object/official/music/openrct2.music.acid.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.blizzard.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.dodgems.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.extraterrestrial.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.fairground2.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.galaxy.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.prehistoric.parkobj
-share/openrct2/assetpack/object/official/music/openrct2.music.ragtime2.parkobj
share/openrct2/g2.dat
share/openrct2/language/
share/openrct2/language/ar-EG.txt
@@ -71,10 +53,31 @@ share/openrct2/language/pt-BR.txt
share/openrct2/language/ru-RU.txt
share/openrct2/language/sv-SE.txt
share/openrct2/language/tr-TR.txt
+share/openrct2/language/uk-UA.txt
share/openrct2/language/vi-VN.txt
share/openrct2/language/zh-CN.txt
share/openrct2/language/zh-TW.txt
share/openrct2/object/
+share/openrct2/object/assetpack/
+share/openrct2/object/assetpack/openrct2.music.alternative.parkap
+share/openrct2/object/assetpack/openrct2.music.cover.parkap
+share/openrct2/object/assetpack/openrct2.sound.parkap
+share/openrct2/object/object/
+share/openrct2/object/object/official/
+share/openrct2/object/object/official/audio/
+share/openrct2/object/object/official/audio/openrct2.audio.additional.parkobj
+share/openrct2/object/object/official/music/
+share/openrct2/object/object/official/music/openrct2.audio.title.parkobj
+share/openrct2/object/object/official/music/openrct2.music.acid.parkobj
+share/openrct2/object/object/official/music/openrct2.music.blizzard.parkobj
+share/openrct2/object/object/official/music/openrct2.music.dodgems.parkobj
+share/openrct2/object/object/official/music/openrct2.music.extraterrestrial.parkobj
+share/openrct2/object/object/official/music/openrct2.music.fairground2.parkobj
+share/openrct2/object/object/official/music/openrct2.music.galaxy.parkobj
+share/openrct2/object/object/official/music/openrct2.music.mystic.parkobj
+share/openrct2/object/object/official/music/openrct2.music.prehistoric.parkobj
+share/openrct2/object/object/official/music/openrct2.music.ragtime2.parkobj
+share/openrct2/object/object/official/music/openrct2.music.rock4.parkobj
share/openrct2/object/official/
share/openrct2/object/official/footpath_item/
share/openrct2/object/official/footpath_item/rct2dlc.footpath_item.litterpa.parkobj
@@ -91,6 +94,7 @@
share/openrct2/object/official/ride/rct2dlc.ride.zpanda.parkobj
share/openrct2/object/official/scenery_group/
share/openrct2/object/official/scenery_group/rct2dlc.scenery_group.scgpanda.parkobj
share/openrct2/object/official/scenery_small/
+share/openrct2/object/official/scenery_small/official.scenery_small.support_structure_half.parkobj
share/openrct2/object/official/scenery_small/rct2dlc.scenery_small.bigpanda.parkobj
share/openrct2/object/official/scenery_small/rct2dlc.scenery_small.pandagr.parkobj
share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttpirf02.parkobj
@@ -114,17 +118,24 @@
share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttrfwd06.p
share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttrfwd07.parkobj
share/openrct2/object/official/scenery_small/toontowner.scenery_small.ttrfwd08.parkobj
share/openrct2/object/official/scenery_small/toontowner.scenery_small.xxbbbr01.parkobj
+share/openrct2/object/official/scenery_small/toontowner.scenery_small.xxbbbr01_fix.parkobj
share/openrct2/object/official/scenery_wall/
share/openrct2/object/official/scenery_wall/couger.scenery_wall.acww33.parkobj
share/openrct2/object/official/scenery_wall/couger.scenery_wall.acwwf32.parkobj
share/openrct2/object/official/scenery_wall/mamabear.scenery_wall.mg-prar.parkobj
+share/openrct2/object/official/scenery_wall/official.scenery_wall.post_flipped.json
+share/openrct2/object/official/scenery_wall/official.scenery_wall.support_structure_full.parkobj
+share/openrct2/object/official/scenery_wall/official.scenery_wall.support_structure_half.parkobj
share/openrct2/object/official/station/
share/openrct2/object/official/station/openrct2.station.noentrance.json
share/openrct2/object/official/station/openrct2.station.noplatformnoentrance.json
share/openrct2/object/official/terrain_edge/
share/openrct2/object/official/terrain_edge/official.terrain_edge.void.parkobj
+share/openrct2/object/official/terrain_edge/rct1beta.terrain_edge.brick.parkobj
+share/openrct2/object/official/terrain_edge/rct1beta.terrain_edge.rock.parkobj
share/openrct2/object/official/terrain_surface/
share/openrct2/object/official/terrain_surface/openrct2.terrain_surface.void.parkobj
+share/openrct2/object/official/terrain_surface/rct1beta.terrain_surface.wildflowers.parkobj
share/openrct2/object/official/water/
share/openrct2/object/official/water/rct2dlc.water.wtrpink.json
share/openrct2/object/rct1/
@@ -137,6 +148,7 @@ share/openrct2/object/rct1/footpath_surface/
share/openrct2/object/rct1/footpath_surface/rct1.footpath_surface.crazy_paving.parkobj
share/openrct2/object/rct1/footpath_surface/rct1.footpath_surface.dirt.parkobj
share/openrct2/object/rct1/footpath_surface/rct1.footpath_surface.queue_blue.parkobj
+share/openrct2/object/rct1/footpath_surface/rct1.footpath_surface.road.parkobj
share/openrct2/object/rct1/footpath_surface/rct1.footpath_surface.tarmac.parkobj
share/openrct2/object/rct1/footpath_surface/rct1.footpath_surface.tiles_brown.parkobj
share/openrct2/object/rct1/footpath_surface/rct1aa.footpath_surface.ash.parkobj
@@ -150,20 +162,84 @@
share/openrct2/object/rct1/footpath_surface/rct1aa.footpath_surface.tiles_grey.p
share/openrct2/object/rct1/footpath_surface/rct1ll.footpath_surface.tiles_green.parkobj
share/openrct2/object/rct1/footpath_surface/rct1ll.footpath_surface.tiles_red.parkobj
share/openrct2/object/rct1/ride/
+share/openrct2/object/rct1/ride/rct1.ride.bobsleigh_trains.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.bumper_boats.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.cat_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.chairlift_cars.parkobj
share/openrct2/object/rct1/ride/rct1.ride.corkscrew_trains.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.dinghies.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.dodgems.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.fruity_ices_stall.parkobj
share/openrct2/object/rct1/ride/rct1.ride.go_karts.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.horses.parkobj
share/openrct2/object/rct1/ride/rct1.ride.inverted_trains.parkobj
share/openrct2/object/rct1/ride/rct1.ride.ladybird_trains.parkobj
share/openrct2/object/rct1/ride/rct1.ride.log_trains.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.logs.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.mine_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.mine_trains.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.motorbikes.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.mouse_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.pickup_trucks.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.racing_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.reverse_freefall_car.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.river_rapids_boats.parkobj
share/openrct2/object/rct1/ride/rct1.ride.rocket_cars.parkobj
share/openrct2/object/rct1/ride/rct1.ride.single_person_swinging_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.small_monorail_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.sports_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.stand_up_trains.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.steam_trains.parkobj
share/openrct2/object/rct1/ride/rct1.ride.steel_rc_trains.parkobj
share/openrct2/object/rct1/ride/rct1.ride.steel_rc_trains_reversed.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.streamlined_monorail_trains.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.suspended_swinging_aeroplane_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.suspended_swinging_cars.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.swinging_lay_down_cars.parkobj
share/openrct2/object/rct1/ride/rct1.ride.toilets.parkobj
+share/openrct2/object/rct1/ride/rct1.ride.vertical_drop_trains.parkobj
share/openrct2/object/rct1/ride/rct1.ride.wooden_rc_trains.parkobj
share/openrct2/object/rct1/ride/rct1.ride.wooden_rc_trains_reversed.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.bicycles.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.floorless_twister_trains.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.flying_saucers.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.ghost_train_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.heartline_twister_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.hyper_twister_trains.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.mini_helicopters.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.reverser_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.side_friction_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.ski_lift_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.splash_boats.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.stand_up_twister_trains.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.steam_trains_covered.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.steel_wild_mouse_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.suspended_monorail_trains.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.twister_trains.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.vintage_cars.parkobj
+share/openrct2/object/rct1/ride/rct1aa.ride.virginia_reel_tubs.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.4_across_inverted_trains.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.air_powered_trains.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.coaster_boats.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.face_off_cars.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.hypercoaster_trains.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.inverted_hairpin_cars.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.jet_skis.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.rafts.parkobj
+share/openrct2/object/rct1/ride/rct1ll.ride.steam_trains_american.parkobj
share/openrct2/object/rct1/scenery_wall/
+share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.playing_card_wall_1.json
+share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.playing_card_wall_2.json
+share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.roman_column_wall.json
+share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_brown.json
+share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_brown_gate.json
share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_red.json
+share/openrct2/object/rct1/scenery_wall/rct1.scenery_wall.wooden_fence_white.json
+share/openrct2/object/rct1/scenery_wall/rct1aa.scenery_wall.glass_wall.parkobj
+share/openrct2/object/rct1/scenery_wall/rct1aa.scenery_wall.wooden_post_wall_1.json
+share/openrct2/object/rct1/scenery_wall/rct1aa.scenery_wall.wooden_post_wall_2.json
+share/openrct2/object/rct1/scenery_wall/rct1ll.scenery_wall.medieval_wooden_fence.json
+share/openrct2/object/rct1/scenery_wall/rct1ll.scenery_wall.wooden_fence_brown_snow.json
share/openrct2/object/rct1/terrain_edge/
share/openrct2/object/rct1/terrain_edge/rct1.terrain_edge.brick.parkobj
share/openrct2/object/rct1/terrain_edge/rct1.terrain_edge.iron.parkobj
@@ -183,7 +259,7 @@
share/openrct2/object/rct1/terrain_surface/rct1ll.terrain_surface.rust.parkobj
share/openrct2/object/rct1/terrain_surface/rct1ll.terrain_surface.wood.parkobj
share/openrct2/object/rct2/
share/openrct2/object/rct2/audio/
-share/openrct2/object/rct2/audio/rct2.audio.base.json
+share/openrct2/object/rct2/audio/rct2.audio.base.rct2.json
share/openrct2/object/rct2/audio/rct2.audio.base.rctc.json
share/openrct2/object/rct2/audio/rct2.audio.circus.json
share/openrct2/object/rct2/audio/rct2.audio.title.json
@@ -844,25 +920,25 @@
share/openrct2/object/rct2/scenery_small/rct2.scenery_small.whoriz.json
share/openrct2/object/rct2/scenery_small/rct2.scenery_small.wspout.json
share/openrct2/object/rct2/scenery_wall/
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbadm.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb32.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb32.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb33.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb34.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb8.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbr16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbr32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbr8.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbb8.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbr16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbr32.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbr8.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbrdr.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallbrwn.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcb16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcb32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcb8.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcb16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcb32.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcb8.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcbdr.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcbpc.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcbwn.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcf16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcf32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcf8.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcf16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcf32.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcf8.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcfar.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcfdr.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcfpc.json
@@ -875,13 +951,13 @@
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallcz32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallgl16.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallgl32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallgl8.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallig16.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallig16.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallig24.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.walljb16.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.walljn32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.walllt32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallmm16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallmm17.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallmm16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallmm17.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallmn32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallnt32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallnt33.json
@@ -891,35 +967,35 @@
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallpr32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallpr33.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallpr34.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallpr35.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrh32.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrh32.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrk32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrs16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrs32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrs8.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrs16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrs32.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallrs8.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallsc16.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallsign.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallsk16.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallsk32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallsp32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallst16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallst32.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallst8.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallst16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallst32.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallst8.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallstfn.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallstwn.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.walltn32.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.walltn32.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.walltxgt.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallu132.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallu232.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd16.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd32.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd16.parkobj
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd32.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd33.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd8.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwd8.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwdps.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wallwf32.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr1.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr1a.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr1a.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr2.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr2a.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr2a.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbr3.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbrg.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wbw.json
@@ -929,7 +1005,7 @@
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc11.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc12.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc13.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc14.json
-share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc15.json
+share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc15.parkobj
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc16.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc17.json
share/openrct2/object/rct2/scenery_wall/rct2.scenery_wall.wc18.json
@@ -1762,6 +1838,7 @@
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.circus.json
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.cowboy01.json
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.cowboy02.json
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.damtower.json
+share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.damtower_fix.json
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.easerlnd.json
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.eiffel.json
share/openrct2/object/rct2ww/scenery_large/rct2ww.scenery_large.evilsam.json
