From 60603ae10a055c3316b28e697b5fe2c79917acd8 Mon Sep 17 00:00:00 2001 From: Broxzier Date: Wed, 4 Jan 2017 22:17:08 +0100 Subject: [PATCH 1/6] Use types from common.h --- src/openrct2/FileClassifier.cpp | 6 +- src/openrct2/OpenRCT2.cpp | 4 +- src/openrct2/OpenRCT2.h | 10 +- src/openrct2/PlatformEnvironment.cpp | 2 +- src/openrct2/PlatformEnvironment.h | 4 +- src/openrct2/audio/AudioChannel.cpp | 26 +- src/openrct2/audio/AudioChannel.h | 16 +- src/openrct2/audio/AudioFormat.h | 8 +- src/openrct2/audio/AudioMixer.cpp | 76 +- src/openrct2/audio/AudioMixer.h | 24 +- src/openrct2/audio/MemoryAudioSource.cpp | 2 +- src/openrct2/audio/audio.c | 50 +- src/openrct2/audio/audio.h | 14 +- src/openrct2/cheats.c | 38 +- src/openrct2/cheats.h | 4 +- src/openrct2/cmdline/CommandLine.cpp | 4 +- src/openrct2/cmdline/CommandLine.hpp | 4 +- src/openrct2/cmdline/RootCommands.cpp | 4 +- src/openrct2/cmdline/ScreenshotCommands.cpp | 4 +- src/openrct2/cmdline/SpriteCommands.cpp | 6 +- src/openrct2/cmdline_sprite.c | 66 +- src/openrct2/cmdline_sprite.h | 2 +- src/openrct2/common.h | 32 +- src/openrct2/config.c | 74 +- src/openrct2/core/FileScanner.cpp | 8 +- src/openrct2/core/FileStream.hpp | 6 +- src/openrct2/core/Guard.cpp | 2 +- src/openrct2/core/IStream.hpp | 2 +- src/openrct2/core/Memory.hpp | 2 +- src/openrct2/core/MemoryStream.cpp | 2 +- src/openrct2/core/MemoryStream.h | 2 +- src/openrct2/core/String.cpp | 4 +- src/openrct2/core/StringBuilder.hpp | 2 +- src/openrct2/core/Zip.cpp | 4 +- src/openrct2/drawing/NewDrawing.cpp | 18 +- src/openrct2/drawing/NewDrawing.h | 2 +- src/openrct2/drawing/Rain.cpp | 16 +- src/openrct2/drawing/drawing.c | 30 +- src/openrct2/drawing/drawing.h | 98 +- src/openrct2/drawing/drawing_fast.cpp | 58 +- .../drawing/engines/SoftwareDrawingEngine.cpp | 62 +- .../drawing/engines/opengl/DrawImageShader.h | 10 +- .../drawing/engines/opengl/FillRectShader.cpp | 2 +- .../drawing/engines/opengl/FillRectShader.h | 2 +- .../engines/opengl/OpenGLDrawingEngine.cpp | 12 +- .../drawing/engines/opengl/TextureCache.cpp | 8 +- .../drawing/engines/opengl/TextureCache.h | 40 +- src/openrct2/drawing/font.c | 26 +- src/openrct2/drawing/font.h | 24 +- src/openrct2/drawing/lightfx.c | 42 +- src/openrct2/drawing/line.c | 26 +- src/openrct2/drawing/rect.c | 2 +- src/openrct2/drawing/scrolling_text.c | 44 +- src/openrct2/drawing/sprite.c | 64 +- src/openrct2/drawing/string.c | 222 ++--- src/openrct2/editor.c | 42 +- src/openrct2/editor.h | 4 +- src/openrct2/game.c | 74 +- src/openrct2/game.h | 22 +- src/openrct2/input.c | 182 ++-- src/openrct2/input.h | 4 +- src/openrct2/interface/Cursors.cpp | 4 +- src/openrct2/interface/Cursors.h | 4 +- src/openrct2/interface/Theme.cpp | 4 +- src/openrct2/interface/chat.c | 58 +- src/openrct2/interface/chat.h | 6 +- src/openrct2/interface/colour.c | 2 +- src/openrct2/interface/console.c | 166 ++-- src/openrct2/interface/console.h | 4 +- src/openrct2/interface/graph.c | 28 +- src/openrct2/interface/graph.h | 4 +- src/openrct2/interface/keyboard_shortcut.c | 16 +- src/openrct2/interface/keyboard_shortcut.h | 6 +- src/openrct2/interface/screenshot.c | 52 +- src/openrct2/interface/screenshot.h | 8 +- src/openrct2/interface/viewport.c | 120 +-- src/openrct2/interface/viewport.h | 40 +- src/openrct2/interface/viewport_interaction.c | 62 +- src/openrct2/interface/widget.c | 262 +++--- src/openrct2/interface/widget.h | 18 +- src/openrct2/interface/window.c | 264 +++--- src/openrct2/interface/window.h | 174 ++-- src/openrct2/intro.c | 4 +- src/openrct2/localisation/LanguagePack.cpp | 30 +- src/openrct2/localisation/convert.c | 18 +- src/openrct2/localisation/currency.h | 2 +- src/openrct2/localisation/date.c | 6 +- src/openrct2/localisation/date.h | 6 +- src/openrct2/localisation/format_codes.c | 6 +- src/openrct2/localisation/language.cpp | 14 +- src/openrct2/localisation/language.h | 12 +- src/openrct2/localisation/localisation.c | 56 +- src/openrct2/localisation/localisation.h | 18 +- src/openrct2/localisation/user.c | 10 +- src/openrct2/localisation/utf8.c | 34 +- src/openrct2/management/award.c | 88 +- src/openrct2/management/award.h | 2 +- src/openrct2/management/finance.c | 10 +- src/openrct2/management/finance.h | 4 +- src/openrct2/management/marketing.c | 28 +- src/openrct2/management/marketing.h | 10 +- src/openrct2/management/news_item.c | 32 +- src/openrct2/management/news_item.h | 10 +- src/openrct2/management/research.c | 114 +-- src/openrct2/management/research.h | 14 +- src/openrct2/network/NetworkAction.cpp | 8 +- src/openrct2/network/NetworkAction.h | 6 +- src/openrct2/network/NetworkConnection.cpp | 2 +- src/openrct2/network/NetworkConnection.h | 2 +- src/openrct2/network/NetworkGroup.cpp | 6 +- src/openrct2/network/NetworkGroup.h | 2 +- src/openrct2/network/NetworkKey.cpp | 30 +- src/openrct2/network/NetworkPlayer.h | 4 +- .../network/NetworkServerAdvertiser.cpp | 12 +- src/openrct2/network/TcpSocket.cpp | 28 +- src/openrct2/network/http.cpp | 8 +- src/openrct2/network/http.h | 2 +- src/openrct2/network/network.cpp | 232 ++--- src/openrct2/network/network.h | 90 +- src/openrct2/network/twitch.cpp | 6 +- src/openrct2/object.h | 10 +- src/openrct2/object/ObjectManager.cpp | 14 +- src/openrct2/object/ObjectRepository.cpp | 30 +- src/openrct2/object/RideObject.cpp | 28 +- src/openrct2/object_list.c | 6 +- src/openrct2/paint/map_element/banner.c | 2 +- src/openrct2/paint/map_element/entrance.c | 8 +- src/openrct2/paint/map_element/fence.c | 4 +- src/openrct2/paint/map_element/map_element.c | 44 +- src/openrct2/paint/map_element/map_element.h | 16 +- src/openrct2/paint/map_element/path.c | 14 +- src/openrct2/paint/map_element/scenery.c | 30 +- .../paint/map_element/scenery_multiple.c | 52 +- src/openrct2/paint/map_element/surface.c | 50 +- src/openrct2/paint/paint.c | 14 +- src/openrct2/paint/sprite/litter.c | 2 +- src/openrct2/paint/sprite/misc.c | 4 +- src/openrct2/paint/sprite/peep.c | 2 +- src/openrct2/paint/sprite/sprite.c | 2 +- src/openrct2/paint/sprite/sprite.h | 6 +- src/openrct2/paint/supports.c | 48 +- src/openrct2/paint/supports.h | 12 +- src/openrct2/peep/peep.c | 562 +++++------ src/openrct2/peep/peep.h | 34 +- src/openrct2/peep/staff.c | 118 +-- src/openrct2/peep/staff.h | 26 +- src/openrct2/platform/linux.c | 30 +- src/openrct2/platform/platform.h | 62 +- src/openrct2/platform/posix.c | 90 +- src/openrct2/platform/shared.c | 126 +-- src/openrct2/platform/windows.c | 50 +- src/openrct2/rct1.c | 4 +- src/openrct2/rct1.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 108 +-- src/openrct2/rct2.c | 28 +- src/openrct2/rct2.h | 14 +- src/openrct2/rct2/S6Exporter.cpp | 12 +- src/openrct2/rct2/S6Exporter.h | 4 +- src/openrct2/rct2/S6Importer.cpp | 8 +- src/openrct2/rct2/addresses.c | 10 +- src/openrct2/rct2/addresses.h | 4 +- src/openrct2/rct2/hook.c | 14 +- src/openrct2/rct2/interop.c | 14 +- src/openrct2/ride/cable_lift.c | 10 +- src/openrct2/ride/cable_lift.h | 4 +- .../coaster/air_powered_vertical_coaster.c | 38 +- src/openrct2/ride/coaster/bobsleigh_coaster.c | 86 +- .../ride/coaster/bolliger_mabillard_track.c | 356 +++---- .../ride/coaster/bolliger_mabillard_track.h | 356 +++---- .../ride/coaster/compact_inverted_coaster.c | 222 ++--- .../ride/coaster/corkscrew_roller_coaster.c | 218 ++--- .../ride/coaster/flying_roller_coaster.c | 286 +++--- src/openrct2/ride/coaster/giga_coaster.c | 276 +++--- .../ride/coaster/heartline_twister_coaster.c | 38 +- .../ride/coaster/inverted_hairpin_coaster.c | 58 +- .../ride/coaster/inverted_impulse_coaster.c | 50 +- .../ride/coaster/inverted_roller_coaster.c | 290 +++--- .../ride/coaster/junior_roller_coaster.c | 300 +++--- .../ride/coaster/lay_down_roller_coaster.c | 218 ++--- .../coaster/lim_launched_roller_coaster.c | 52 +- .../ride/coaster/looping_roller_coaster.c | 270 +++--- src/openrct2/ride/coaster/mine_ride.c | 142 +-- .../ride/coaster/mine_train_coaster.c | 186 ++-- .../ride/coaster/mini_roller_coaster.c | 270 +++--- .../ride/coaster/mini_suspended_coaster.c | 52 +- .../coaster/multi_dimension_roller_coaster.c | 198 ++-- .../ride/coaster/reverse_freefall_coaster.c | 2 +- .../ride/coaster/reverser_roller_coaster.c | 38 +- .../coaster/side_friction_roller_coaster.c | 54 +- .../ride/coaster/stand_up_roller_coaster.c | 202 ++-- src/openrct2/ride/coaster/steeplechase.c | 56 +- .../ride/coaster/suspended_swinging_coaster.c | 104 +-- .../ride/coaster/twister_roller_coaster.c | 358 +++---- .../coaster/vertical_drop_roller_coaster.c | 358 +++---- src/openrct2/ride/coaster/virginia_reel.c | 42 +- src/openrct2/ride/coaster/wild_mouse.c | 72 +- .../ride/coaster/wooden_roller_coaster.c | 286 +++--- src/openrct2/ride/coaster/wooden_wild_mouse.c | 48 +- src/openrct2/ride/gentle/car_ride.c | 44 +- src/openrct2/ride/gentle/circus_show.c | 8 +- src/openrct2/ride/gentle/crooked_house.c | 10 +- src/openrct2/ride/gentle/dodgems.c | 8 +- src/openrct2/ride/gentle/ferris_wheel.c | 10 +- src/openrct2/ride/gentle/flying_saucers.c | 6 +- src/openrct2/ride/gentle/ghost_train.c | 34 +- src/openrct2/ride/gentle/haunted_house.c | 8 +- src/openrct2/ride/gentle/maze.c | 8 +- src/openrct2/ride/gentle/merry_go_round.c | 10 +- src/openrct2/ride/gentle/mini_golf.c | 42 +- src/openrct2/ride/gentle/mini_helicopters.c | 26 +- src/openrct2/ride/gentle/monorail_cycles.c | 22 +- src/openrct2/ride/gentle/observation_tower.c | 16 +- src/openrct2/ride/gentle/space_rings.c | 12 +- src/openrct2/ride/gentle/spiral_slide.c | 14 +- src/openrct2/ride/ride.c | 884 +++++++++--------- src/openrct2/ride/ride.h | 186 ++-- src/openrct2/ride/ride_data.c | 2 +- src/openrct2/ride/ride_data.h | 2 +- src/openrct2/ride/ride_ratings.c | 218 ++--- src/openrct2/ride/shops/facility.c | 10 +- src/openrct2/ride/shops/shop.c | 4 +- src/openrct2/ride/station.c | 50 +- src/openrct2/ride/station.h | 2 +- src/openrct2/ride/thrill/3d_cinema.c | 8 +- src/openrct2/ride/thrill/enterprise.c | 10 +- src/openrct2/ride/thrill/go_karts.c | 22 +- src/openrct2/ride/thrill/launched_freefall.c | 16 +- src/openrct2/ride/thrill/magic_carpet.c | 4 +- src/openrct2/ride/thrill/motion_simulator.c | 8 +- src/openrct2/ride/thrill/pirate_ship.c | 10 +- src/openrct2/ride/thrill/roto_drop.c | 22 +- .../ride/thrill/swinging_inverter_ship.c | 4 +- src/openrct2/ride/thrill/top_spin.c | 10 +- src/openrct2/ride/thrill/twist.c | 8 +- src/openrct2/ride/track.c | 122 +-- src/openrct2/ride/track.h | 28 +- src/openrct2/ride/track_design.c | 72 +- src/openrct2/ride/track_design.h | 10 +- src/openrct2/ride/track_design_save.c | 96 +- src/openrct2/ride/track_paint.c | 76 +- src/openrct2/ride/track_paint.h | 188 ++-- src/openrct2/ride/transport/chairlift.c | 34 +- src/openrct2/ride/transport/lift.c | 12 +- .../ride/transport/miniature_railway.c | 66 +- src/openrct2/ride/transport/monorail.c | 82 +- .../ride/transport/suspended_monorail.c | 52 +- src/openrct2/ride/vehicle.c | 300 +++--- src/openrct2/ride/vehicle.h | 14 +- src/openrct2/ride/vehicle_data.c | 2 +- src/openrct2/ride/vehicle_data.h | 2 +- src/openrct2/ride/vehicle_paint.c | 514 +++++----- src/openrct2/ride/vehicle_paint.h | 26 +- src/openrct2/ride/water/boat_ride.c | 10 +- src/openrct2/ride/water/dingy_slide.c | 84 +- src/openrct2/ride/water/log_flume.c | 30 +- src/openrct2/ride/water/river_rafts.c | 22 +- src/openrct2/ride/water/river_rapids.c | 48 +- src/openrct2/ride/water/splash_boats.c | 28 +- src/openrct2/ride/water/submarine_ride.c | 24 +- src/openrct2/ride/water/water_coaster.c | 72 +- src/openrct2/scenario/ScenarioRepository.cpp | 6 +- src/openrct2/scenario/scenario.c | 52 +- src/openrct2/scenario/scenario.h | 14 +- src/openrct2/title/TitleScreen.cpp | 8 +- src/openrct2/title/TitleScreen.h | 4 +- src/openrct2/title/TitleSequence.cpp | 20 +- src/openrct2/util/sawyercoding.c | 12 +- src/openrct2/util/sawyercoding.h | 8 +- src/openrct2/util/util.c | 62 +- src/openrct2/util/util.h | 24 +- src/openrct2/windows/about.c | 6 +- src/openrct2/windows/banner.c | 40 +- src/openrct2/windows/changelog.c | 38 +- src/openrct2/windows/cheats.c | 40 +- src/openrct2/windows/clear_scenery.c | 16 +- src/openrct2/windows/custom_currency.c | 20 +- src/openrct2/windows/debug_paint.c | 4 +- src/openrct2/windows/demolish_ride_prompt.c | 10 +- src/openrct2/windows/dropdown.c | 60 +- src/openrct2/windows/dropdown.h | 26 +- src/openrct2/windows/editor_bottom_toolbar.c | 32 +- src/openrct2/windows/editor_inventions_list.c | 74 +- .../windows/editor_object_selection.c | 200 ++-- .../windows/editor_objective_options.c | 66 +- .../windows/editor_scenario_options.c | 44 +- src/openrct2/windows/error.c | 4 +- src/openrct2/windows/finances.c | 90 +- src/openrct2/windows/footpath.c | 124 +-- src/openrct2/windows/game_bottom_toolbar.c | 56 +- src/openrct2/windows/guest.c | 230 ++--- src/openrct2/windows/guest_list.c | 78 +- src/openrct2/windows/install_track.c | 22 +- src/openrct2/windows/land.c | 30 +- src/openrct2/windows/land_rights.c | 16 +- src/openrct2/windows/loadsave.c | 92 +- src/openrct2/windows/map.c | 130 +-- src/openrct2/windows/map_tooltip.c | 10 +- src/openrct2/windows/mapgen.c | 92 +- src/openrct2/windows/maze_construction.c | 32 +- src/openrct2/windows/multiplayer.c | 140 +-- src/openrct2/windows/music_credits.c | 20 +- src/openrct2/windows/network_status.c | 12 +- src/openrct2/windows/new_campaign.c | 30 +- src/openrct2/windows/new_ride.c | 98 +- src/openrct2/windows/news.c | 36 +- src/openrct2/windows/news_options.c | 32 +- src/openrct2/windows/options.c | 90 +- src/openrct2/windows/park.c | 106 +-- src/openrct2/windows/player.c | 60 +- src/openrct2/windows/publisher_credits.c | 20 +- src/openrct2/windows/research.c | 56 +- src/openrct2/windows/ride.c | 456 ++++----- src/openrct2/windows/ride_construction.c | 256 ++--- src/openrct2/windows/ride_list.c | 70 +- src/openrct2/windows/save_prompt.c | 10 +- src/openrct2/windows/scenery.c | 136 +-- src/openrct2/windows/server_list.c | 134 +-- src/openrct2/windows/server_start.c | 10 +- src/openrct2/windows/shortcut_key_change.c | 10 +- src/openrct2/windows/shortcut_keys.c | 34 +- src/openrct2/windows/sign.c | 60 +- src/openrct2/windows/staff.c | 150 +-- src/openrct2/windows/staff_fire_prompt.c | 8 +- src/openrct2/windows/staff_list.c | 72 +- src/openrct2/windows/text_input.c | 40 +- src/openrct2/windows/themes.c | 82 +- src/openrct2/windows/tile_inspector.c | 138 +-- src/openrct2/windows/title_command_editor.c | 48 +- src/openrct2/windows/title_editor.c | 100 +- src/openrct2/windows/title_exit.c | 4 +- src/openrct2/windows/title_logo.c | 4 +- src/openrct2/windows/title_menu.c | 20 +- src/openrct2/windows/title_options.c | 4 +- src/openrct2/windows/title_scenarioselect.c | 98 +- src/openrct2/windows/tooltip.c | 22 +- src/openrct2/windows/tooltip.h | 6 +- src/openrct2/windows/top_toolbar.c | 160 ++-- src/openrct2/windows/track_list.c | 52 +- src/openrct2/windows/track_manage.c | 12 +- src/openrct2/windows/track_place.c | 52 +- src/openrct2/windows/viewport.c | 12 +- src/openrct2/windows/water.c | 16 +- src/openrct2/world/balloon.c | 12 +- src/openrct2/world/banner.c | 26 +- src/openrct2/world/banner.h | 8 +- src/openrct2/world/climate.c | 34 +- src/openrct2/world/climate.h | 4 +- src/openrct2/world/duck.c | 38 +- src/openrct2/world/footpath.c | 220 ++--- src/openrct2/world/footpath.h | 36 +- src/openrct2/world/fountain.c | 66 +- src/openrct2/world/fountain.h | 4 +- src/openrct2/world/map.c | 654 ++++++------- src/openrct2/world/map.h | 174 ++-- src/openrct2/world/map_animation.c | 62 +- src/openrct2/world/map_animation.h | 2 +- src/openrct2/world/map_helpers.c | 20 +- src/openrct2/world/map_helpers.h | 2 +- src/openrct2/world/mapgen.c | 152 +-- src/openrct2/world/mapgen.h | 18 +- src/openrct2/world/money_effect.c | 8 +- src/openrct2/world/park.c | 130 +-- src/openrct2/world/park.h | 34 +- src/openrct2/world/particle.c | 4 +- src/openrct2/world/scenery.c | 20 +- src/openrct2/world/scenery.h | 16 +- src/openrct2/world/sprite.c | 42 +- src/openrct2/world/sprite.h | 20 +- 368 files changed, 10839 insertions(+), 10839 deletions(-) diff --git a/src/openrct2/FileClassifier.cpp b/src/openrct2/FileClassifier.cpp index f3b122aae9..b3b64bdf01 100644 --- a/src/openrct2/FileClassifier.cpp +++ b/src/openrct2/FileClassifier.cpp @@ -95,11 +95,11 @@ static bool TryClassifyAsS4(IStream * stream, ClassifiedFile * result) size_t dataLength = (size_t)stream->GetLength(); uint8 * data = stream->ReadArray(dataLength); stream->SetPosition(originalPosition); - int fileTypeVersion = sawyercoding_detect_file_type(data, dataLength); + sint32 fileTypeVersion = sawyercoding_detect_file_type(data, dataLength); Memory::Free(data); - int type = fileTypeVersion & FILE_TYPE_MASK; - int version = fileTypeVersion & FILE_VERSION_MASK; + sint32 type = fileTypeVersion & FILE_TYPE_MASK; + sint32 version = fileTypeVersion & FILE_VERSION_MASK; if (type == FILE_TYPE_SV4) { diff --git a/src/openrct2/OpenRCT2.cpp b/src/openrct2/OpenRCT2.cpp index d1587d5eb6..506da03804 100644 --- a/src/openrct2/OpenRCT2.cpp +++ b/src/openrct2/OpenRCT2.cpp @@ -52,8 +52,8 @@ constexpr uint32 UPDATE_TIME_MS = 25; extern "C" { - int gExitCode; - int gOpenRCT2StartupAction = STARTUP_ACTION_TITLE; + sint32 gExitCode; + sint32 gOpenRCT2StartupAction = STARTUP_ACTION_TITLE; utf8 gOpenRCT2StartupActionPath[512] = { 0 }; utf8 gExePath[MAX_PATH]; utf8 gCustomUserDataPath[MAX_PATH] = { 0 }; diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h index b52494aeb3..ecfc7fb6e6 100644 --- a/src/openrct2/OpenRCT2.h +++ b/src/openrct2/OpenRCT2.h @@ -57,9 +57,9 @@ extern "C" #endif /** The exit code for OpenRCT2 when it exits. */ - extern int gExitCode; + extern sint32 gExitCode; - extern int gOpenRCT2StartupAction; + extern sint32 gOpenRCT2StartupAction; extern utf8 gOpenRCT2StartupActionPath[512]; extern utf8 gExePath[MAX_PATH]; extern utf8 gCustomUserDataPath[MAX_PATH]; @@ -74,9 +74,9 @@ extern "C" #endif // DISABLE_NETWORK #ifndef DISABLE_NETWORK - extern int gNetworkStart; + extern sint32 gNetworkStart; extern char gNetworkStartHost[128]; - extern int gNetworkStartPort; + extern sint32 gNetworkStartPort; #endif void openrct2_write_full_version_info(utf8 * buffer, size_t bufferSize); @@ -85,7 +85,7 @@ extern "C" void openrct2_dispose(); void openrct2_finish(); - int cmdline_run(const char * * argv, int argc); + sint32 cmdline_run(const char * * argv, sint32 argc); #ifdef __WINDOWS__ int RunOpenRCT2(int argc, char * * argv); diff --git a/src/openrct2/PlatformEnvironment.cpp b/src/openrct2/PlatformEnvironment.cpp index 1cc549916f..63da8406ec 100644 --- a/src/openrct2/PlatformEnvironment.cpp +++ b/src/openrct2/PlatformEnvironment.cpp @@ -33,7 +33,7 @@ private: public: PlatformEnvironment(DIRBASE_VALUES basePaths) { - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) { _basePath[i] = basePaths[i]; } diff --git a/src/openrct2/PlatformEnvironment.h b/src/openrct2/PlatformEnvironment.h index 8fa0cb11f9..b4eb820b9e 100644 --- a/src/openrct2/PlatformEnvironment.h +++ b/src/openrct2/PlatformEnvironment.h @@ -19,14 +19,14 @@ #include #include "common.h" -enum class DIRBASE : int +enum class DIRBASE : sint32 { RCT1, // Base directory for original RollerCoaster Tycoon 1 content. RCT2, // Base directory for original RollerCoaster Tycoon 2 content. OPENRCT2, // Base directory for OpenRCT2 installation. USER, // Base directory for OpenRCT2 user content. }; -constexpr int DIRBASE_COUNT = 4; +constexpr sint32 DIRBASE_COUNT = 4; using DIRBASE_VALUES = std::string[DIRBASE_COUNT]; enum class DIRID diff --git a/src/openrct2/audio/AudioChannel.cpp b/src/openrct2/audio/AudioChannel.cpp index 3e27bb671f..c646d334dc 100644 --- a/src/openrct2/audio/AudioChannel.cpp +++ b/src/openrct2/audio/AudioChannel.cpp @@ -26,17 +26,17 @@ private: IAudioSource * _source = nullptr; SpeexResamplerState * _resampler = nullptr; - int _group = MIXER_GROUP_SOUND; + sint32 _group = MIXER_GROUP_SOUND; double _rate = 0; uint64 _offset = 0; - int _loop = 0; + sint32 _loop = 0; - int _volume = 1; + sint32 _volume = 1; float _volume_l = 0.f; float _volume_r = 0.f; float _oldvolume_l = 0.f; float _oldvolume_r = 0.f; - int _oldvolume = 0; + sint32 _oldvolume = 0; float _pan = 0; bool _stopping = false; @@ -80,12 +80,12 @@ public: _resampler = value; } - int GetGroup() const override + sint32 GetGroup() const override { return _group; } - void SetGroup(int group) override + void SetGroup(sint32 group) override { _group = group; } @@ -110,24 +110,24 @@ public: if (_source != nullptr && offset < _source->GetLength()) { AudioFormat format = _source->GetFormat(); - int samplesize = format.channels * format.BytesPerSample(); + sint32 samplesize = format.channels * format.BytesPerSample(); _offset = (offset / samplesize) * samplesize; return true; } return false; } - virtual int GetLoop() const override + virtual sint32 GetLoop() const override { return _loop; } - virtual void SetLoop(int value) override + virtual void SetLoop(sint32 value) override { _loop = value; } - int GetVolume() const override + sint32 GetVolume() const override { return _volume; } @@ -152,12 +152,12 @@ public: return _oldvolume_r; } - int GetOldVolume() const override + sint32 GetOldVolume() const override { return _oldvolume; } - void SetVolume(int volume) override + void SetVolume(sint32 volume) override { _volume = Math::Clamp(0, volume, SDL_MIX_MAXVOLUME); } @@ -224,7 +224,7 @@ public: return !_done; } - void Play(IAudioSource * source, int loop) override + void Play(IAudioSource * source, sint32 loop) override { _source = source; _loop = loop; diff --git a/src/openrct2/audio/AudioChannel.h b/src/openrct2/audio/AudioChannel.h index 1b85e7217d..33ee733c61 100644 --- a/src/openrct2/audio/AudioChannel.h +++ b/src/openrct2/audio/AudioChannel.h @@ -36,8 +36,8 @@ interface IAudioChannel virtual SpeexResamplerState * GetResampler() const abstract; virtual void SetResampler(SpeexResamplerState * value) abstract; - virtual int GetGroup() const abstract; - virtual void SetGroup(int group) abstract; + virtual sint32 GetGroup() const abstract; + virtual void SetGroup(sint32 group) abstract; virtual double GetRate() const abstract; virtual void SetRate(double rate) abstract; @@ -45,16 +45,16 @@ interface IAudioChannel virtual uint64 GetOffset() const abstract; virtual bool SetOffset(uint64 offset) abstract; - virtual int GetLoop() const abstract; - virtual void SetLoop(int value) abstract; + virtual sint32 GetLoop() const abstract; + virtual void SetLoop(sint32 value) abstract; - virtual int GetVolume() const abstract; + virtual sint32 GetVolume() const abstract; virtual float GetVolumeL() const abstract; virtual float GetVolumeR() const abstract; virtual float GetOldVolumeL() const abstract; virtual float GetOldVolumeR() const abstract; - virtual int GetOldVolume() const abstract; - virtual void SetVolume(int volume) abstract; + virtual sint32 GetOldVolume() const abstract; + virtual void SetVolume(sint32 volume) abstract; virtual float GetPan() const abstract; virtual void SetPan(float pan) abstract; @@ -72,7 +72,7 @@ interface IAudioChannel virtual bool IsPlaying() const abstract; - virtual void Play(IAudioSource * source, int loop = MIXER_LOOP_NONE) abstract; + virtual void Play(IAudioSource * source, sint32 loop = MIXER_LOOP_NONE) abstract; virtual void UpdateOldVolume() abstract; virtual AudioFormat GetFormat() const abstract; diff --git a/src/openrct2/audio/AudioFormat.h b/src/openrct2/audio/AudioFormat.h index ab52f2ed60..839e3b1a6e 100644 --- a/src/openrct2/audio/AudioFormat.h +++ b/src/openrct2/audio/AudioFormat.h @@ -25,16 +25,16 @@ */ struct AudioFormat { - int freq; + sint32 freq; SDL_AudioFormat format; - int channels; + sint32 channels; - int BytesPerSample() const + sint32 BytesPerSample() const { return (SDL_AUDIO_BITSIZE(format)) / 8; } - int GetByteRate() const + sint32 GetByteRate() const { return BytesPerSample() * channels; } diff --git a/src/openrct2/audio/AudioMixer.cpp b/src/openrct2/audio/AudioMixer.cpp index d0b06e7dd4..981d45c0ed 100644 --- a/src/openrct2/audio/AudioMixer.cpp +++ b/src/openrct2/audio/AudioMixer.cpp @@ -110,7 +110,7 @@ public: want.format = AUDIO_S16SYS; want.channels = 2; want.samples = 1024; - want.callback = [](void * arg, uint8 * dst, int length) -> void + want.callback = [](void * arg, uint8 * dst, sint32 length) -> void { auto mixer = static_cast(arg); mixer->GetNextAudioChunk(dst, (size_t)length); @@ -173,7 +173,7 @@ public: SDL_UnlockAudioDevice(_deviceId); } - IAudioChannel * Play(IAudioSource * source, int loop, bool deleteondone, bool deletesourceondone) override + IAudioChannel * Play(IAudioSource * source, sint32 loop, bool deleteondone, bool deletesourceondone) override { Lock(); IAudioChannel * channel = AudioChannel::Create(); @@ -203,7 +203,7 @@ public: IAudioSource * source = _musicSources[pathId]; if (source == nullptr) { - const utf8 * path = get_file_path((int)pathId); + const utf8 * path = get_file_path((sint32)pathId); source = AudioSource::CreateMemoryFromWAV(path, &_format); if (source == nullptr) { @@ -221,12 +221,12 @@ public: _volume = volume; } - IAudioSource * GetSoundSource(int id) override + IAudioSource * GetSoundSource(sint32 id) override { return _css1Sources[id]; } - IAudioSource * GetMusicSource(int id) override + IAudioSource * GetMusicSource(sint32 id) override { return _musicSources[id]; } @@ -259,7 +259,7 @@ private: { IAudioChannel * channel = *it; - int group = channel->GetGroup(); + sint32 group = channel->GetGroup(); if (group != MIXER_GROUP_SOUND || gConfigSound.sound_enabled) { MixChannel(channel, dst, length); @@ -293,8 +293,8 @@ private: void MixChannel(IAudioChannel * channel, uint8 * data, size_t length) { - int byteRate = _format.GetByteRate(); - int numSamples = (int)(length / byteRate); + sint32 byteRate = _format.GetByteRate(); + sint32 numSamples = (sint32)(length / byteRate); double rate = 1; if (_format.format == AUDIO_S16SYS) { @@ -316,7 +316,7 @@ private: } // Read raw PCM from channel - int readSamples = (int)(numSamples * rate); + sint32 readSamples = (sint32)(numSamples * rate); size_t readLength = (size_t)(readSamples / cvt.len_ratio) * byteRate; _channelBuffer.EnsureCapacity(readLength); size_t bytesRead = channel->Read(_channelBuffer.GetData(), readLength); @@ -345,15 +345,15 @@ private: // Apply effects if (rate != 1) { - int srcSamples = (int)(bufferLen / byteRate); - int dstSamples = numSamples; + sint32 srcSamples = (sint32)(bufferLen / byteRate); + sint32 dstSamples = numSamples; bufferLen = ApplyResample(channel, buffer, srcSamples, dstSamples); buffer = _effectBuffer.GetData(); } // Apply panning and volume ApplyPan(channel, buffer, bufferLen, byteRate); - int mixVolume = ApplyVolume(channel, buffer, bufferLen); + sint32 mixVolume = ApplyVolume(channel, buffer, bufferLen); // Finally mix on to destination buffer size_t dstLength = Math::Min(length, bufferLen); @@ -366,9 +366,9 @@ private: * Resample the given buffer into _effectBuffer. * Assumes that srcBuffer is the same format as _format. */ - size_t ApplyResample(IAudioChannel * channel, const void * srcBuffer, int srcSamples, int dstSamples) + size_t ApplyResample(IAudioChannel * channel, const void * srcBuffer, sint32 srcSamples, sint32 dstSamples) { - int byteRate = _format.GetByteRate(); + sint32 byteRate = _format.GetByteRate(); // Create resampler SpeexResamplerState * resampler = channel->GetResampler(); @@ -401,16 +401,16 @@ private: { switch (_format.format) { case AUDIO_S16SYS: - EffectPanS16(channel, (sint16 *)buffer, (int)(len / sampleSize)); + EffectPanS16(channel, (sint16 *)buffer, (sint32)(len / sampleSize)); break; case AUDIO_U8: - EffectPanU8(channel, (uint8 *)buffer, (int)(len / sampleSize)); + EffectPanU8(channel, (uint8 *)buffer, (sint32)(len / sampleSize)); break; } } } - int ApplyVolume(const IAudioChannel * channel, void * buffer, size_t len) + sint32 ApplyVolume(const IAudioChannel * channel, void * buffer, size_t len) { float volumeAdjust = _volume; volumeAdjust *= (gConfigSound.master_volume / 100.0f); @@ -429,21 +429,21 @@ private: break; } - int startVolume = (int)(channel->GetOldVolume() * volumeAdjust); - int endVolume = (int)(channel->GetVolume() * volumeAdjust); + sint32 startVolume = (sint32)(channel->GetOldVolume() * volumeAdjust); + sint32 endVolume = (sint32)(channel->GetVolume() * volumeAdjust); if (channel->IsStopping()) { endVolume = 0; } - int mixVolume = (int)(channel->GetVolume() * volumeAdjust); + sint32 mixVolume = (sint32)(channel->GetVolume() * volumeAdjust); if (startVolume != endVolume) { // Set to max since we are adjusting the volume ourselves mixVolume = SDL_MIX_MAXVOLUME; // Fade between volume levels to smooth out sound and minimize clicks from sudden volume changes - int fadeLength = (int)len / _format.BytesPerSample(); + sint32 fadeLength = (sint32)len / _format.BytesPerSample(); switch (_format.format) { case AUDIO_S16SYS: EffectFadeS16((sint16 *)buffer, fadeLength, startVolume, endVolume); @@ -456,7 +456,7 @@ private: return mixVolume; } - static void EffectPanS16(const IAudioChannel * channel, sint16 * data, int length) + static void EffectPanS16(const IAudioChannel * channel, sint16 * data, sint32 length) { const float dt = 1.0f / (length * 2); float volumeL = channel->GetOldVolumeL(); @@ -464,7 +464,7 @@ private: const float d_left = dt * (channel->GetVolumeL() - channel->GetOldVolumeL()); const float d_right = dt * (channel->GetVolumeR() - channel->GetOldVolumeR()); - for (int i = 0; i < length * 2; i += 2) + for (sint32 i = 0; i < length * 2; i += 2) { data[i] = (sint16)(data[i] * volumeL); data[i + 1] = (sint16)(data[i + 1] * volumeR); @@ -473,14 +473,14 @@ private: } } - static void EffectPanU8(const IAudioChannel * channel, uint8 * data, int length) + static void EffectPanU8(const IAudioChannel * channel, uint8 * data, sint32 length) { float volumeL = channel->GetVolumeL(); float volumeR = channel->GetVolumeR(); float oldVolumeL = channel->GetOldVolumeL(); float oldVolumeR = channel->GetOldVolumeR(); - for (int i = 0; i < length * 2; i += 2) + for (sint32 i = 0; i < length * 2; i += 2) { float t = (float)i / (length * 2); data[i] = (uint8)(data[i] * ((1.0 - t) * oldVolumeL + t * volumeL)); @@ -488,22 +488,22 @@ private: } } - static void EffectFadeS16(sint16 * data, int length, int startvolume, int endvolume) + static void EffectFadeS16(sint16 * data, sint32 length, sint32 startvolume, sint32 endvolume) { float startvolume_f = (float)startvolume / SDL_MIX_MAXVOLUME; float endvolume_f = (float)endvolume / SDL_MIX_MAXVOLUME; - for (int i = 0; i < length; i++) + for (sint32 i = 0; i < length; i++) { float t = (float)i / length; data[i] = (sint16)(data[i] * ((1 - t) * startvolume_f + t * endvolume_f)); } } - static void EffectFadeU8(uint8* data, int length, int startvolume, int endvolume) + static void EffectFadeU8(uint8* data, sint32 length, sint32 startvolume, sint32 endvolume) { float startvolume_f = (float)startvolume / SDL_MIX_MAXVOLUME; float endvolume_f = (float)endvolume / SDL_MIX_MAXVOLUME; - for (int i = 0; i < length; i++) + for (sint32 i = 0; i < length; i++) { float t = (float)i / length; data[i] = (uint8)(data[i] * ((1 - t) * startvolume_f + t * endvolume_f)); @@ -520,7 +520,7 @@ private: _convertBuffer.EnsureCapacity(reqConvertBufferCapacity); Memory::Copy(_convertBuffer.GetData(), src, len); - cvt->len = (int)len; + cvt->len = (sint32)len; cvt->buf = (uint8 *)_convertBuffer.GetData(); if (SDL_ConvertAudio(cvt) >= 0) { @@ -540,7 +540,7 @@ void Mixer_Init(const char * device) } } -void * Mixer_Play_Effect(size_t id, int loop, int volume, float pan, double rate, int deleteondone) +void * Mixer_Play_Effect(size_t id, sint32 loop, sint32 volume, float pan, double rate, sint32 deleteondone) { IAudioChannel * channel = nullptr; if (!gOpenRCT2Headless && gConfigSound.sound_enabled) @@ -553,7 +553,7 @@ void * Mixer_Play_Effect(size_t id, int loop, int volume, float pan, double rate { IAudioMixer * mixer = gMixer; mixer->Lock(); - IAudioSource * source = mixer->GetSoundSource((int)id); + IAudioSource * source = mixer->GetSoundSource((sint32)id); channel = mixer->Play(source, loop, deleteondone != 0, false); if (channel != nullptr) { @@ -575,7 +575,7 @@ void Mixer_Stop_Channel(void * channel) } } -void Mixer_Channel_Volume(void * channel, int volume) +void Mixer_Channel_Volume(void * channel, sint32 volume) { if (!gOpenRCT2Headless) { @@ -605,7 +605,7 @@ void Mixer_Channel_Rate(void* channel, double rate) } } -int Mixer_Channel_IsPlaying(void * channel) +sint32 Mixer_Channel_IsPlaying(void * channel) { bool isPlaying = false; if (!gOpenRCT2Headless) @@ -625,9 +625,9 @@ uint64 Mixer_Channel_GetOffset(void * channel) return offset; } -int Mixer_Channel_SetOffset(void * channel, uint64 offset) +sint32 Mixer_Channel_SetOffset(void * channel, uint64 offset) { - int result = 0; + sint32 result = 0; if (!gOpenRCT2Headless) { result = static_cast(channel)->SetOffset(offset); @@ -635,7 +635,7 @@ int Mixer_Channel_SetOffset(void * channel, uint64 offset) return result; } -void Mixer_Channel_SetGroup(void * channel, int group) +void Mixer_Channel_SetGroup(void * channel, sint32 group) { if (!gOpenRCT2Headless) { @@ -643,7 +643,7 @@ void Mixer_Channel_SetGroup(void * channel, int group) } } -void * Mixer_Play_Music(int pathId, int loop, int streaming) +void * Mixer_Play_Music(sint32 pathId, sint32 loop, sint32 streaming) { IAudioChannel * channel = nullptr; if (!gOpenRCT2Headless) diff --git a/src/openrct2/audio/AudioMixer.h b/src/openrct2/audio/AudioMixer.h index e8f7c9ce57..c27e17de22 100644 --- a/src/openrct2/audio/AudioMixer.h +++ b/src/openrct2/audio/AudioMixer.h @@ -56,13 +56,13 @@ interface IAudioMixer virtual void Close() abstract; virtual void Lock() abstract; virtual void Unlock() abstract; - virtual IAudioChannel * Play(IAudioSource * source, int loop, bool deleteondone, bool deletesourceondone) abstract; + virtual IAudioChannel * Play(IAudioSource * source, sint32 loop, bool deleteondone, bool deletesourceondone) abstract; virtual void Stop(IAudioChannel * channel) abstract; virtual bool LoadMusic(size_t pathid) abstract; virtual void SetVolume(float volume) abstract; - virtual IAudioSource * GetSoundSource(int id) abstract; - virtual IAudioSource * GetMusicSource(int id) abstract; + virtual IAudioSource * GetSoundSource(sint32 id) abstract; + virtual IAudioSource * GetMusicSource(sint32 id) abstract; }; extern "C" @@ -77,21 +77,21 @@ extern "C" #endif void Mixer_Init(const char* device); -void* Mixer_Play_Effect(size_t id, int loop, int volume, float pan, double rate, int deleteondone); +void* Mixer_Play_Effect(size_t id, sint32 loop, sint32 volume, float pan, double rate, sint32 deleteondone); void Mixer_Stop_Channel(void* channel); -void Mixer_Channel_Volume(void* channel, int volume); +void Mixer_Channel_Volume(void* channel, sint32 volume); void Mixer_Channel_Pan(void* channel, float pan); void Mixer_Channel_Rate(void* channel, double rate); -int Mixer_Channel_IsPlaying(void* channel); +sint32 Mixer_Channel_IsPlaying(void* channel); uint64 Mixer_Channel_GetOffset(void* channel); -int Mixer_Channel_SetOffset(void* channel, uint64 offset); -void Mixer_Channel_SetGroup(void* channel, int group); -void* Mixer_Play_Music(int pathId, int loop, int streaming); +sint32 Mixer_Channel_SetOffset(void* channel, uint64 offset); +void Mixer_Channel_SetGroup(void* channel, sint32 group); +void* Mixer_Play_Music(sint32 pathId, sint32 loop, sint32 streaming); void Mixer_SetVolume(float volume); -static inline int DStoMixerVolume(int volume) { return (int)(SDL_MIX_MAXVOLUME * (SDL_pow(10, (float)volume / 2000))); } -static inline float DStoMixerPan(int pan) { return (((float)pan + -DSBPAN_LEFT) / DSBPAN_RIGHT) / 2; } -static inline double DStoMixerRate(int frequency) { return (double)frequency / 22050; } +static inline sint32 DStoMixerVolume(sint32 volume) { return (sint32)(SDL_MIX_MAXVOLUME * (SDL_pow(10, (float)volume / 2000))); } +static inline float DStoMixerPan(sint32 pan) { return (((float)pan + -DSBPAN_LEFT) / DSBPAN_RIGHT) / 2; } +static inline double DStoMixerRate(sint32 frequency) { return (double)frequency / 22050; } #ifdef __cplusplus } diff --git a/src/openrct2/audio/MemoryAudioSource.cpp b/src/openrct2/audio/MemoryAudioSource.cpp index 0c80304adb..18a2099e18 100644 --- a/src/openrct2/audio/MemoryAudioSource.cpp +++ b/src/openrct2/audio/MemoryAudioSource.cpp @@ -164,7 +164,7 @@ public: SDL_AudioCVT cvt; if (SDL_BuildAudioCVT(&cvt, _format.format, _format.channels, _format.freq, format->format, format->channels, format->freq) >= 0) { - cvt.len = (int)_length; + cvt.len = (sint32)_length; cvt.buf = new uint8[cvt.len * cvt.len_mult]; Memory::Copy(cvt.buf, _data, _length); if (SDL_ConvertAudio(&cvt) >= 0) diff --git a/src/openrct2/audio/audio.c b/src/openrct2/audio/audio.c index 773d5f821f..675662b7c8 100644 --- a/src/openrct2/audio/audio.c +++ b/src/openrct2/audio/audio.c @@ -26,13 +26,13 @@ typedef struct rct_audio_params { bool in_range; - int volume; - int pan; + sint32 volume; + sint32 pan; } rct_audio_params; audio_device *gAudioDevices = NULL; -int gAudioDeviceCount; -int gAudioCurrentDevice = -1; +sint32 gAudioDeviceCount; +sint32 gAudioCurrentDevice = -1; void *gCrowdSoundChannel = 0; bool gGameSoundsOff = false; void *gRainSoundChannel = 0; @@ -43,9 +43,9 @@ void *gTitleMusicChannel = 0; rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; rct_vehicle_sound_params gVehicleSoundParamsList[AUDIO_MAX_VEHICLE_SOUNDS]; rct_vehicle_sound_params *gVehicleSoundParamsListEnd; -int gVolumeAdjustZoom = 0; +sint32 gVolumeAdjustZoom = 0; -int _volumeAdjust[SOUND_MAXID] = { +sint32 _volumeAdjust[SOUND_MAXID] = { 0, // SOUND_LIFT_1 0, // SOUND_TRACK_FRICTION_1 0, // SOUND_LIFT_2 @@ -111,12 +111,12 @@ int _volumeAdjust[SOUND_MAXID] = { -700 // SOUND_62 }; -rct_audio_params audio_get_params_from_location(int soundId, const rct_xyz16 *location); +rct_audio_params audio_get_params_from_location(sint32 soundId, const rct_xyz16 *location); void audio_stop_channel(void **channel); void audio_init() { - int result = SDL_Init(SDL_INIT_AUDIO); + sint32 result = SDL_Init(SDL_INIT_AUDIO); if (result < 0) { log_error("SDL_Init %s", SDL_GetError()); return; @@ -127,7 +127,7 @@ void audio_init() gAudioCurrentDevice = 0; } else { Mixer_Init(gConfigSound.device); - for (int i = 0; i < gAudioDeviceCount; i++) { + for (sint32 i = 0; i < gAudioDeviceCount; i++) { if (strcmp(gAudioDevices[i].name, gConfigSound.device) == 0) { gAudioCurrentDevice = i; } @@ -150,7 +150,7 @@ void audio_populate_devices() return; audio_device *systemAudioDevices = malloc(gAudioDeviceCount * sizeof(audio_device)); - for (int i = 0; i < gAudioDeviceCount; i++) { + for (sint32 i = 0; i < gAudioDeviceCount; i++) { const char *utf8Name = SDL_GetAudioDeviceName(i, SDL_FALSE); if (utf8Name == NULL) utf8Name = language_get_string(STR_OPTIONS_SOUND_VALUE_UNKNOWN); @@ -170,7 +170,7 @@ void audio_populate_devices() free(systemAudioDevices); } -int audio_play_sound_panned(int soundId, int pan, sint16 x, sint16 y, sint16 z) +sint32 audio_play_sound_panned(sint32 soundId, sint32 pan, sint16 x, sint16 y, sint16 z) { if (pan == AUDIO_PLAY_AT_LOCATION) return audio_play_sound_at_location(soundId, x, y, z); @@ -178,7 +178,7 @@ int audio_play_sound_panned(int soundId, int pan, sint16 x, sint16 y, sint16 z) return audio_play_sound(soundId, 0, pan); } -int audio_play_sound_at_location(int soundId, sint16 x, sint16 y, sint16 z) +sint32 audio_play_sound_at_location(sint32 soundId, sint16 x, sint16 y, sint16 z) { if (gGameSoundsOff) return 0; @@ -201,9 +201,9 @@ int audio_play_sound_at_location(int soundId, sint16 x, sint16 y, sint16 z) * @param location The location at which the sound effect is to be played. * @return The audio parameters to be used when playing this sound effect. */ -rct_audio_params audio_get_params_from_location(int soundId, const rct_xyz16 *location) +rct_audio_params audio_get_params_from_location(sint32 soundId, const rct_xyz16 *location) { - int volumeDown = 0; + sint32 volumeDown = 0; rct_audio_params params; params.in_range = true; params.volume = 0; @@ -239,14 +239,14 @@ rct_audio_params audio_get_params_from_location(int soundId, const rct_xyz16 *lo return params; } -int audio_play_sound(int soundId, int volume, int pan) +sint32 audio_play_sound(sint32 soundId, sint32 volume, sint32 pan) { if (gGameSoundsOff) return 0; - int mixerPan = 0; + sint32 mixerPan = 0; if (pan != AUDIO_PLAY_AT_CENTRE) { - int x2 = pan << 16; + sint32 x2 = pan << 16; uint16 screenWidth = max(64, gScreenWidth); mixerPan = ((x2 / screenWidth) - 0x8000) >> 4; } @@ -265,7 +265,7 @@ void audio_start_title_music() if (gTitleMusicChannel) return; - int pathId; + sint32 pathId; switch (gConfigSound.title_music) { case 1: pathId = PATH_ID_CSS50; @@ -291,7 +291,7 @@ void audio_start_title_music() void audio_stop_ride_music() { - for (int i = 0; i < AUDIO_MAX_RIDE_MUSIC; i++) { + for (sint32 i = 0; i < AUDIO_MAX_RIDE_MUSIC; i++) { rct_ride_music *rideMusic = &gRideMusicList[i]; if (rideMusic->ride_id == (uint8)-1) continue; @@ -342,10 +342,10 @@ void audio_stop_channel(void **channel) void audio_init_ride_sounds_and_info() { - int deviceNum = 0; + sint32 deviceNum = 0; audio_init_ride_sounds(deviceNum); - for (int m = 0; m < countof(gRideMusicInfoList); m++) { + for (sint32 m = 0; m < countof(gRideMusicInfoList); m++) { rct_ride_music_info *rideMusicInfo = gRideMusicInfoList[m]; const utf8 *path = get_file_path(rideMusicInfo->path_id); SDL_RWops *file = SDL_RWFromFile(path, "rb"); @@ -360,17 +360,17 @@ void audio_init_ride_sounds_and_info() } } -void audio_init_ride_sounds(int device) +void audio_init_ride_sounds(sint32 device) { audio_close(); - for (int i = 0; i < AUDIO_MAX_VEHICLE_SOUNDS; i++) { + for (sint32 i = 0; i < AUDIO_MAX_VEHICLE_SOUNDS; i++) { rct_vehicle_sound *vehicleSound = &gVehicleSoundList[i]; vehicleSound->id = -1; } gAudioCurrentDevice = device; config_save_default(); - for (int i = 0; i < AUDIO_MAX_RIDE_MUSIC; i++) { + for (sint32 i = 0; i < AUDIO_MAX_RIDE_MUSIC; i++) { rct_ride_music *rideMusic = &gRideMusicList[i]; rideMusic->ride_id = -1; } @@ -414,7 +414,7 @@ void audio_stop_vehicle_sounds() if (gOpenRCT2Headless || gAudioCurrentDevice == -1) return; - for (int i = 0; i < countof(gVehicleSoundList); i++) { + for (sint32 i = 0; i < countof(gVehicleSoundList); i++) { rct_vehicle_sound *vehicleSound = &gVehicleSoundList[i]; if (vehicleSound->id == 0xFFFF) continue; diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index 77a289a3a9..86e3c9fcd1 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -161,8 +161,8 @@ typedef enum RCT2_SOUND { } RCT2_SOUND; extern audio_device *gAudioDevices; -extern int gAudioDeviceCount; -extern int gAudioCurrentDevice; +extern sint32 gAudioDeviceCount; +extern sint32 gAudioCurrentDevice; extern void *gCrowdSoundChannel; extern bool gGameSoundsOff; extern void *gRainSoundChannel; @@ -174,7 +174,7 @@ extern void *gTitleMusicChannel; extern rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS]; extern rct_vehicle_sound_params gVehicleSoundParamsList[AUDIO_MAX_VEHICLE_SOUNDS]; extern rct_vehicle_sound_params *gVehicleSoundParamsListEnd; -extern int gVolumeAdjustZoom; +extern sint32 gVolumeAdjustZoom; /** * Deregisters the audio device. @@ -194,7 +194,7 @@ void audio_init_ride_sounds_and_info(); * Loads the ride sounds. * rct2: 0x006BA9B5 */ -void audio_init_ride_sounds(int device); +void audio_init_ride_sounds(sint32 device); /** * Temporarily stops playing sounds until audio_unpause_sounds() is called. * rct2: 0x006BABB4 @@ -208,7 +208,7 @@ void audio_pause_sounds(); * sound at a position relative to the centre of the viewport. * @return 0 if the sound was not out of range; otherwise, soundId. */ -int audio_play_sound(int soundId, int volume, int pan); +sint32 audio_play_sound(sint32 soundId, sint32 volume, sint32 pan); /** * Plays the specified sound at a virtual location. * @param soundId The sound effect to play. @@ -217,7 +217,7 @@ int audio_play_sound(int soundId, int volume, int pan); * @param z The z coordinate of the location. * @return 0 if the sound was not out of range; otherwise, soundId. */ -int audio_play_sound_at_location(int soundId, sint16 x, sint16 y, sint16 z); +sint32 audio_play_sound_at_location(sint32 soundId, sint16 x, sint16 y, sint16 z); /** * rct2: 0x006BB76E * @deprecated Use audio_play_sound_at_location or audio_play_sound instead. @@ -231,7 +231,7 @@ int audio_play_sound_at_location(int soundId, sint16 x, sint16 y, sint16 z); * @param z (bp) The z coordinate of the location. * @return 0 if the sound was not out of range; otherwise, soundId. */ -int audio_play_sound_panned(int soundId, int pan, sint16 x, sint16 y, sint16 z); +sint32 audio_play_sound_panned(sint32 soundId, sint32 pan, sint16 x, sint16 y, sint16 z); /** * Populates the gAudioDevices array with the available audio devices. */ diff --git a/src/openrct2/cheats.c b/src/openrct2/cheats.c index d71df8c7d5..76233ab2e3 100644 --- a/src/openrct2/cheats.c +++ b/src/openrct2/cheats.c @@ -45,13 +45,13 @@ bool gCheatsDisablePlantAging = false; bool gCheatsEnableChainLiftOnAllTrack = false; bool gCheatsAllowArbitraryRideTypeChanges = false; -int park_rating_spinner_value; +sint32 park_rating_spinner_value; #pragma region Cheat functions -static void cheat_set_grass_length(int length) +static void cheat_set_grass_length(sint32 length) { - int x, y; + sint32 x, y; rct_map_element *mapElement; for (y = 0; y < 256; y++) { @@ -138,7 +138,7 @@ static void cheat_remove_litter() static void cheat_fix_rides() { - int rideIndex; + sint32 rideIndex; rct_ride *ride; rct_peep *mechanic; @@ -160,7 +160,7 @@ static void cheat_fix_rides() static void cheat_renew_rides() { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) @@ -175,7 +175,7 @@ static void cheat_renew_rides() static void cheat_make_destructible() { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { @@ -189,7 +189,7 @@ static void cheat_make_destructible() static void cheat_reset_crash_status() { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride){ @@ -204,7 +204,7 @@ static void cheat_reset_crash_status() static void cheat_10_minute_inspections() { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { @@ -275,9 +275,9 @@ static void cheat_clear_loan() game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, newLoan, GAME_COMMAND_SET_CURRENT_LOAN, 0, 0); } -static void cheat_generate_guests(int count) +static void cheat_generate_guests(sint32 count) { - int i; + sint32 i; for (i = 0; i < count; i++) generate_new_guest(); @@ -285,9 +285,9 @@ static void cheat_generate_guests(int count) window_invalidate_by_class(WC_BOTTOM_TOOLBAR); } -static void cheat_set_guest_parameter(int parameter, int value) +static void cheat_set_guest_parameter(sint32 parameter, sint32 value) { - int spriteIndex; + sint32 spriteIndex; rct_peep *peep; FOR_ALL_GUESTS(spriteIndex, peep) { @@ -328,9 +328,9 @@ static void cheat_set_guest_parameter(int parameter, int value) } -static void cheat_give_all_guests(int object) +static void cheat_give_all_guests(sint32 object) { - int spriteIndex; + sint32 spriteIndex; rct_peep *peep; FOR_ALL_GUESTS(spriteIndex, peep) { @@ -370,7 +370,7 @@ static void cheat_remove_all_guests() } } - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) @@ -378,7 +378,7 @@ static void cheat_remove_all_guests() ride_clear_for_construction(i); ride_set_status(i, RIDE_STATUS_CLOSED); - for(int j = 0; j < 4; j++) { + for (size_t j = 0; j < 4; j++) { ride->queue_length[j] = 0; ride->last_peep_in_queue[j] = SPRITE_INDEX_NULL; } @@ -389,7 +389,7 @@ static void cheat_remove_all_guests() static void cheat_explode_guests() { - int sprite_index; + sint32 sprite_index; rct_peep *peep; FOR_ALL_GUESTS(sprite_index, peep) { @@ -422,9 +422,9 @@ static void cheat_set_staff_speed(uint8 value) #pragma endregion -void game_command_cheat(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_cheat(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int cheat = *ecx; + sint32 cheat = *ecx; if (*ebx & GAME_COMMAND_FLAG_APPLY) { switch (cheat) { case CHEAT_SANDBOXMODE: gCheatsSandboxMode = *edx != 0; window_invalidate_by_class(WC_MAP); window_invalidate_by_class(WC_FOOTPATH); break; diff --git a/src/openrct2/cheats.h b/src/openrct2/cheats.h index bd3fc77221..c44421c6c2 100644 --- a/src/openrct2/cheats.h +++ b/src/openrct2/cheats.h @@ -108,9 +108,9 @@ enum { #define CHEATS_MONEY_INCREMENT MONEY(5000,00) #define CHEATS_TRAM_INCREMENT 250 -extern int park_rating_spinner_value; +extern sint32 park_rating_spinner_value; -void game_command_cheat(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void game_command_cheat(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); void cheats_reset(); diff --git a/src/openrct2/cmdline/CommandLine.cpp b/src/openrct2/cmdline/CommandLine.cpp index 2b53576c70..2337744927 100644 --- a/src/openrct2/cmdline/CommandLine.cpp +++ b/src/openrct2/cmdline/CommandLine.cpp @@ -29,7 +29,7 @@ extern "C" #pragma region CommandLineArgEnumerator -CommandLineArgEnumerator::CommandLineArgEnumerator(const char * const * arguments, int count) +CommandLineArgEnumerator::CommandLineArgEnumerator(const char * const * arguments, sint32 count) { _arguments = arguments; _count = count; @@ -560,7 +560,7 @@ namespace CommandLine extern "C" { - int cmdline_run(const char * * argv, int argc) + sint32 cmdline_run(const char * * argv, sint32 argc) { auto argEnumerator = CommandLineArgEnumerator(argv, argc); diff --git a/src/openrct2/cmdline/CommandLine.hpp b/src/openrct2/cmdline/CommandLine.hpp index 10c1365eed..21463f9467 100644 --- a/src/openrct2/cmdline/CommandLine.hpp +++ b/src/openrct2/cmdline/CommandLine.hpp @@ -37,7 +37,7 @@ public: uint16 GetCount() const { return _count; } uint16 GetIndex() const { return _index; } - CommandLineArgEnumerator(const char * const * arguments, int count); + CommandLineArgEnumerator(const char * const * arguments, sint32 count); void Reset(); bool Backtrack(); @@ -47,7 +47,7 @@ public: bool TryPopString(const char * * result); }; -typedef int exitcode_t; +typedef sint32 exitcode_t; typedef exitcode_t (*CommandLineFunc)(CommandLineArgEnumerator *); enum diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp index 0fe7173b17..9872b91f71 100644 --- a/src/openrct2/cmdline/RootCommands.cpp +++ b/src/openrct2/cmdline/RootCommands.cpp @@ -40,9 +40,9 @@ extern "C" #endif // USE_BREAKPAD #ifndef DISABLE_NETWORK -int gNetworkStart = NETWORK_MODE_NONE; +sint32 gNetworkStart = NETWORK_MODE_NONE; char gNetworkStartHost[128]; -int gNetworkStartPort = NETWORK_DEFAULT_PORT; +sint32 gNetworkStartPort = NETWORK_DEFAULT_PORT; static uint32 _port = 0; #endif diff --git a/src/openrct2/cmdline/ScreenshotCommands.cpp b/src/openrct2/cmdline/ScreenshotCommands.cpp index cbe000a6d5..53bfc12c50 100644 --- a/src/openrct2/cmdline/ScreenshotCommands.cpp +++ b/src/openrct2/cmdline/ScreenshotCommands.cpp @@ -34,8 +34,8 @@ const CommandLineCommand CommandLine::ScreenshotCommands[] static exitcode_t HandleScreenshot(CommandLineArgEnumerator *argEnumerator) { const char * * argv = (const char * *)argEnumerator->GetArguments() + argEnumerator->GetIndex(); - int argc = argEnumerator->GetCount() - argEnumerator->GetIndex(); - int result = cmdline_for_screenshot(argv, argc); + sint32 argc = argEnumerator->GetCount() - argEnumerator->GetIndex(); + sint32 result = cmdline_for_screenshot(argv, argc); if (result < 0) { return EXITCODE_FAIL; } diff --git a/src/openrct2/cmdline/SpriteCommands.cpp b/src/openrct2/cmdline/SpriteCommands.cpp index d2d4b6ad78..c83beb853c 100644 --- a/src/openrct2/cmdline/SpriteCommands.cpp +++ b/src/openrct2/cmdline/SpriteCommands.cpp @@ -24,7 +24,7 @@ extern "C" { - int gSpriteMode = 0; + sint32 gSpriteMode = 0; } static const char * _mode; @@ -53,8 +53,8 @@ static exitcode_t HandleSprite(CommandLineArgEnumerator *argEnumerator) Memory::Free(_mode); const char * * argv = (const char * *)argEnumerator->GetArguments() + argEnumerator->GetIndex() - 1; - int argc = argEnumerator->GetCount() - argEnumerator->GetIndex() + 1; - int result = cmdline_for_sprite(argv, argc); + sint32 argc = argEnumerator->GetCount() - argEnumerator->GetIndex() + 1; + sint32 result = cmdline_for_sprite(argv, argc); if (result < 0) { return EXITCODE_FAIL; } diff --git a/src/openrct2/cmdline_sprite.c b/src/openrct2/cmdline_sprite.c index 4d6f33a5f7..261789bee1 100644 --- a/src/openrct2/cmdline_sprite.c +++ b/src/openrct2/cmdline_sprite.c @@ -25,7 +25,7 @@ #define MODE_CLOSEST 1 #define MODE_DITHERING 2 -extern int gSpriteMode; +extern sint32 gSpriteMode; #pragma pack(push, 1) @@ -58,10 +58,10 @@ rct_sprite_file_header spriteFileHeader; rct_g1_element *spriteFileEntries; uint8 *spriteFileData; -static void sprite_file_load_palette(int spriteIndex) +static void sprite_file_load_palette(sint32 spriteIndex) { rct_g1_element *g1 = &spriteFileEntries[spriteIndex]; - int numPaletteEntries = g1->width; + sint32 numPaletteEntries = g1->width; uint8* src = g1->offset; rct_sprite_file_palette_entry *destPaletteEntry = &spriteFilePalette[g1->x_offset]; for (; numPaletteEntries > 0; numPaletteEntries--) { @@ -99,7 +99,7 @@ static bool sprite_file_open(const utf8 *path) } if (spriteFileHeader.num_entries > 0) { - int openEntryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element_32bit); + sint32 openEntryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element_32bit); rct_g1_element_32bit * openElements = (rct_g1_element_32bit *)malloc(openEntryTableSize); if (openElements == NULL) { SDL_RWclose(file); @@ -120,7 +120,7 @@ static bool sprite_file_open(const utf8 *path) return false; } - int entryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element); + sint32 entryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element); spriteFileEntries = malloc(entryTableSize); for (uint32 i = 0; i < spriteFileHeader.num_entries; i++) { rct_g1_element_32bit * inElement = &openElements[i]; @@ -154,7 +154,7 @@ static bool sprite_file_save(const char *path) } if (spriteFileHeader.num_entries > 0) { - int saveEntryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element_32bit); + sint32 saveEntryTableSize = spriteFileHeader.num_entries * sizeof(rct_g1_element_32bit); rct_g1_element_32bit * saveElements = (rct_g1_element_32bit *)malloc(saveEntryTableSize); if (saveElements == NULL) { SDL_RWclose(file); @@ -197,12 +197,12 @@ static void sprite_file_close() SafeFree(spriteFileData); } -static bool sprite_file_export(int spriteIndex, const char *outPath) +static bool sprite_file_export(sint32 spriteIndex, const char *outPath) { rct_g1_element *spriteHeader; rct_drawpixelinfo dpi; uint8 *pixels; - int pixelBufferSize; + sint32 pixelBufferSize; spriteHeader = &spriteFileEntries[spriteIndex]; pixelBufferSize = spriteHeader->width * spriteHeader->height; @@ -233,7 +233,7 @@ static bool is_transparent_pixel(sint16 *colour){ } // Returns true if pixel index is an index not used for remapping -static bool is_changable_pixel(int palette_index) { +static bool is_changable_pixel(sint32 palette_index) { if (palette_index == -1) return true; if (palette_index == 0) @@ -249,11 +249,11 @@ static bool is_changable_pixel(int palette_index) { return true; } -static int get_closest_palette_index(sint16 *colour){ +static sint32 get_closest_palette_index(sint16 *colour){ uint32 smallest_error = -1; - int best_match = -1; + sint32 best_match = -1; - for (int x = 0; x < 256; x++){ + for (sint32 x = 0; x < 256; x++){ if (is_changable_pixel(x)){ uint32 error = ((sint16)(spriteFilePalette[x].r) - colour[0]) * ((sint16)(spriteFilePalette[x].r) - colour[0]) + @@ -269,12 +269,12 @@ static int get_closest_palette_index(sint16 *colour){ return best_match; } -static int get_palette_index(sint16 *colour) +static sint32 get_palette_index(sint16 *colour) { if (is_transparent_pixel(colour)) return -1; - for (int i = 0; i < 256; i++) { + for (sint32 i = 0; i < 256; i++) { if ((sint16)(spriteFilePalette[i].r) != colour[0]) continue; if ((sint16)(spriteFilePalette[i].g) != colour[1]) continue; if ((sint16)(spriteFilePalette[i].b) != colour[2]) continue; @@ -284,7 +284,7 @@ static int get_palette_index(sint16 *colour) return -1; } -static bool sprite_file_import(const char *path, rct_g1_element *outElement, uint8 **outBuffer, int *outBufferLength, int mode) +static bool sprite_file_import(const char *path, rct_g1_element *outElement, uint8 **outBuffer, sint32 *outBufferLength, sint32 mode) { uint8 *pixels; uint32 width, height; @@ -314,7 +314,7 @@ static bool sprite_file_import(const char *path, rct_g1_element *outElement, uin uint8 *dst = buffer + (height * 2); - for (unsigned int y = 0; y < height; y++) { + for (uint32 y = 0; y < height; y++) { rle_code *previousCode, *currentCode; yOffsets[y] = (uint16)(dst - buffer); @@ -322,11 +322,11 @@ static bool sprite_file_import(const char *path, rct_g1_element *outElement, uin previousCode = NULL; currentCode = (rle_code*)dst; dst += 2; - int startX = 0; - int npixels = 0; + sint32 startX = 0; + sint32 npixels = 0; bool pushRun = false; - for (unsigned int x = 0; x < width; x++) { - int paletteIndex = get_palette_index(src); + for (uint32 x = 0; x < width; x++) { + sint32 paletteIndex = get_palette_index(src); if (mode == MODE_CLOSEST || mode == MODE_DITHERING) if (paletteIndex == -1 && !is_transparent_pixel(src)) @@ -421,7 +421,7 @@ static bool sprite_file_import(const char *path, rct_g1_element *outElement, uin free(pixels); free(src_orig); - int bufferLength = (int)(dst - buffer); + sint32 bufferLength = (sint32)(dst - buffer); buffer = realloc(buffer, bufferLength); outElement->offset = buffer; @@ -437,7 +437,7 @@ static bool sprite_file_import(const char *path, rct_g1_element *outElement, uin return true; } -int cmdline_for_sprite(const char **argv, int argc) +sint32 cmdline_for_sprite(const char **argv, sint32 argc) { gOpenRCT2Headless = true; if (argc == 0) @@ -462,14 +462,14 @@ int cmdline_for_sprite(const char **argv, int argc) return 1; } else { const char *spriteFilePath = argv[1]; - int spriteIndex = atoi(argv[2]); + sint32 spriteIndex = atoi(argv[2]); if (!sprite_file_open(spriteFilePath)) { fprintf(stderr, "Unable to open input sprite file.\n"); return -1; } - if (spriteIndex < 0 || spriteIndex >= (int)spriteFileHeader.num_entries) { + if (spriteIndex < 0 || spriteIndex >= (sint32)spriteFileHeader.num_entries) { sprite_file_close(); fprintf(stderr, "Sprite #%d does not exist in sprite file.\n", spriteIndex); return -1; @@ -492,7 +492,7 @@ int cmdline_for_sprite(const char **argv, int argc) } const char *spriteFilePath = argv[1]; - int spriteIndex = atoi(argv[2]); + sint32 spriteIndex = atoi(argv[2]); const char *outputPath = argv[3]; if (!sprite_file_open(spriteFilePath)) { @@ -500,7 +500,7 @@ int cmdline_for_sprite(const char **argv, int argc) return -1; } - if (spriteIndex < 0 || spriteIndex >= (int)spriteFileHeader.num_entries) { + if (spriteIndex < 0 || spriteIndex >= (sint32)spriteFileHeader.num_entries) { fprintf(stderr, "Sprite #%d does not exist in sprite file.\n", spriteIndex); return -1; } @@ -533,8 +533,8 @@ int cmdline_for_sprite(const char **argv, int argc) } - int maxIndex = (int)spriteFileHeader.num_entries; - int numbers = (int)floor(log(maxIndex)); + sint32 maxIndex = (sint32)spriteFileHeader.num_entries; + sint32 numbers = (sint32)floor(log(maxIndex)); safe_strcpy(outputPath, argv[2], MAX_PATH); size_t pathLen = strlen(outputPath); @@ -544,12 +544,12 @@ int cmdline_for_sprite(const char **argv, int argc) return -1; } - for (int x = 0; x < numbers; x++){ + for (sint32 x = 0; x < numbers; x++){ outputPath[pathLen + x] = '0'; } safe_strcpy(outputPath + pathLen + numbers, ".png", MAX_PATH - pathLen - numbers); - for (int spriteIndex = 0; spriteIndex < maxIndex; spriteIndex++){ + for (sint32 spriteIndex = 0; spriteIndex < maxIndex; spriteIndex++){ if (spriteIndex % 100 == 99){ // Status indicator @@ -600,7 +600,7 @@ int cmdline_for_sprite(const char **argv, int argc) rct_g1_element spriteElement; uint8 *buffer; - int bufferLength; + sint32 bufferLength; if (!sprite_file_import(imagePath, &spriteElement, &buffer, &bufferLength, gSpriteMode)) return -1; @@ -645,7 +645,7 @@ int cmdline_for_sprite(const char **argv, int argc) sprite_file_save(spriteFilePath); fprintf(stdout, "Building: %s\n", spriteFilePath); - int i = 0; + sint32 i = 0; do { // Create image path safe_strcpy(imagePath, resourcePath, MAX_PATH); @@ -660,7 +660,7 @@ int cmdline_for_sprite(const char **argv, int argc) SDL_RWclose(file); rct_g1_element spriteElement; uint8 *buffer; - int bufferLength; + sint32 bufferLength; if (!sprite_file_import(imagePath, &spriteElement, &buffer, &bufferLength, gSpriteMode)) { fprintf(stderr, "Could not import image file: %s\nCanceling\n", imagePath); return -1; diff --git a/src/openrct2/cmdline_sprite.h b/src/openrct2/cmdline_sprite.h index 8c77b3ab85..8c0f5d2623 100644 --- a/src/openrct2/cmdline_sprite.h +++ b/src/openrct2/cmdline_sprite.h @@ -22,7 +22,7 @@ extern "C" { #endif -int cmdline_for_sprite(const char **argv, int argc); +sint32 cmdline_for_sprite(const char **argv, sint32 argc); #ifdef __cplusplus } diff --git a/src/openrct2/common.h b/src/openrct2/common.h index de9842f7f9..15ffd8f000 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -98,7 +98,7 @@ typedef uint8 colour_t; * e.g. in a structure initializer (or where-ever else comma expressions * aren't permitted). */ -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) +#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { sint32:-!!(e); })) /* &a[0] degrades to a pointer: a different type from an array */ #define __must_be_array(a) \ @@ -177,7 +177,7 @@ typedef fixed32_1dp money32; #define MONEY32_UNDEFINED ((money32)0x80000000) typedef void (EMPTY_ARGS_VOID_POINTER)(); -typedef unsigned short rct_string_id; +typedef uint16 rct_string_id; #define SafeFree(x) do { free(x); (x) = NULL; } while (0) @@ -254,48 +254,48 @@ typedef unsigned short rct_string_id; #pragma pack(push, 1) typedef struct registers { union { - int eax; - short ax; + sint32 eax; + sint16 ax; struct { char al; char ah; }; }; union { - int ebx; - short bx; + sint32 ebx; + sint16 bx; struct { char bl; char bh; }; }; union { - int ecx; - short cx; + sint32 ecx; + sint16 cx; struct { char cl; char ch; }; }; union { - int edx; - short dx; + sint32 edx; + sint16 dx; struct { char dl; char dh; }; }; union { - int esi; - short si; + sint32 esi; + sint16 si; }; union { - int edi; - short di; + sint32 edi; + sint16 di; }; union { - int ebp; - short bp; + sint32 ebp; + sint16 bp; }; } registers; assert_struct_size(registers, 7 * 4); diff --git a/src/openrct2/config.c b/src/openrct2/config.c index eca974cceb..f3528216e6 100644 --- a/src/openrct2/config.c +++ b/src/openrct2/config.c @@ -83,7 +83,7 @@ typedef struct config_section_definition { void *base_address; const_utf8string section_name; config_property_definition *property_definitions; - int property_definitions_count; + sint32 property_definitions_count; } config_section_definition; #pragma region Enum definitions @@ -340,15 +340,15 @@ static bool config_open(const utf8string path); static bool config_save(const utf8string path); static void config_read_properties(config_section_definition **currentSection, const_utf8string line); static void config_save_property_value(SDL_RWops *file, uint8 type, value_union *value); -static bool config_read_enum(void *dest, int destSize, const utf8 *key, int keySize, config_enum_definition *enumDefinitions); +static bool config_read_enum(void *dest, sint32 destSize, const utf8 *key, sint32 keySize, config_enum_definition *enumDefinitions); static void config_write_enum(SDL_RWops *file, uint8 type, value_union *value, config_enum_definition *enumDefinitions); static void utf8_skip_whitespace(utf8 **outch); static void utf8_skip_non_whitespace(utf8 **outch); -static int rwopsreadc(SDL_RWops *file) +static sint32 rwopsreadc(SDL_RWops *file) { - int c = 0; + sint32 c = 0; if (SDL_RWread(file, &c, 1, 1) != 1) c = EOF; return c; @@ -383,14 +383,14 @@ static void rwopswritenewline(SDL_RWops *file) } static void rwopswritestresc(SDL_RWops *file, const char *str) { - int length = 0; + sint32 length = 0; for (const char *c = str; *c != '\0'; ++c) { if (*c == '\\') length += 2; else ++length; } char *escaped = malloc(length + 1); - int j=0; + sint32 j=0; for (const char *c = str; *c != '\0'; ++c) { if (*c == '\\') escaped[j++] = '\\'; escaped[j++] = *c; @@ -403,7 +403,7 @@ static void rwopswritestresc(SDL_RWops *file, const char *str) { void config_set_defaults() { - int i, j; + sint32 i, j; for (i = 0; i < countof(_sectionDefinitions); i++) { config_section_definition *section = &_sectionDefinitions[i]; @@ -454,9 +454,9 @@ void config_set_defaults() void config_release() { - for (int i = 0; i < countof(_sectionDefinitions); i++) { + for (sint32 i = 0; i < countof(_sectionDefinitions); i++) { config_section_definition *section = &_sectionDefinitions[i]; - for (int j = 0; j < section->property_definitions_count; j++) { + for (sint32 j = 0; j < section->property_definitions_count; j++) { config_property_definition *property = §ion->property_definitions[j]; value_union *destValue = (value_union*)((size_t)section->base_address + (size_t)property->offset); if (property->type == CONFIG_VALUE_TYPE_STRING) { @@ -504,7 +504,7 @@ bool config_open(const utf8string path) utf8string lineBuffer; size_t lineBufferCapacity; size_t lineLength; - int c; + sint32 c; config_section_definition *currentSection; file = SDL_RWFromFile(path, "rb"); @@ -549,7 +549,7 @@ bool config_open(const utf8string path) bool config_save(const utf8string path) { SDL_RWops *file; - int i, j; + sint32 i, j; value_union *value; file = SDL_RWFromFile(path, "wb"); @@ -627,10 +627,10 @@ static void config_save_property_value(SDL_RWops *file, uint8 type, value_union } } -static bool config_get_section(const utf8string line, const utf8 **sectionName, int *sectionNameSize) +static bool config_get_section(const utf8string line, const utf8 **sectionName, sint32 *sectionNameSize) { utf8 *ch; - int c; + sint32 c; ch = line; utf8_skip_whitespace(&ch); @@ -644,14 +644,14 @@ static bool config_get_section(const utf8string line, const utf8 **sectionName, if (c == ']') break; } - *sectionNameSize = (int)(ch - *sectionName - 1); + *sectionNameSize = (sint32)(ch - *sectionName - 1); return true; } -static bool config_get_property_name_value(const utf8string line, utf8 **propertyName, int *propertyNameSize, utf8 **value, int *valueSize) +static bool config_get_property_name_value(const utf8string line, utf8 **propertyName, sint32 *propertyNameSize, utf8 **value, sint32 *valueSize) { utf8 *ch, *clast; - int c; + sint32 c; bool quotes; ch = line; @@ -664,7 +664,7 @@ static bool config_get_property_name_value(const utf8string line, utf8 **propert while ((c = utf8_get_next(ch, (const utf8**)&ch)) != 0) { if (isspace(c) || c == '=') { if (c == '=') equals = true; - *propertyNameSize = (int)(ch - *propertyName - 1); + *propertyNameSize = (sint32)(ch - *propertyName - 1); break; } else if (c == '#') { return false; @@ -695,19 +695,19 @@ static bool config_get_property_name_value(const utf8string line, utf8 **propert if (c != ' ') clast = ch; } } - if (!quotes) *valueSize = (int)(clast - *value); - else *valueSize = (int)(ch - *value - 1); + if (!quotes) *valueSize = (sint32)(clast - *value); + else *valueSize = (sint32)(ch - *value - 1); if (quotes) (*valueSize)--; return true; } -static config_section_definition *config_get_section_def(const utf8 *name, int size) +static config_section_definition *config_get_section_def(const utf8 *name, sint32 size) { - int i; + sint32 i; for (i = 0; i < countof(_sectionDefinitions); i++) { const_utf8string sectionName = _sectionDefinitions[i].section_name; - int sectionNameSize = (int)strnlen(sectionName, size); + sint32 sectionNameSize = (sint32)strnlen(sectionName, size); if (sectionNameSize == size && sectionName[size] == 0 && _strnicmp(sectionName, name, size) == 0) return &_sectionDefinitions[i]; } @@ -715,13 +715,13 @@ static config_section_definition *config_get_section_def(const utf8 *name, int s return NULL; } -static config_property_definition *config_get_property_def(config_section_definition *section, const utf8 *name, int size) +static config_property_definition *config_get_property_def(config_section_definition *section, const utf8 *name, sint32 size) { - int i; + sint32 i; for (i = 0; i < section->property_definitions_count; i++) { const_utf8string propertyName = section->property_definitions[i].property_name; - int propertyNameSize = (int)strnlen(propertyName, size); + sint32 propertyNameSize = (sint32)strnlen(propertyName, size); if (propertyNameSize == size && propertyName[size] == 0 && _strnicmp(propertyName, name, size) == 0) { return §ion->property_definitions[i]; @@ -731,10 +731,10 @@ static config_property_definition *config_get_property_def(config_section_defini return NULL; } -static utf8string escape_string(const utf8 *value, int valueSize) { - int length = 0; +static utf8string escape_string(const utf8 *value, sint32 valueSize) { + sint32 length = 0; bool backslash = false; - for (int i=0; i < valueSize; ++i) { + for (sint32 i=0; i < valueSize; ++i) { if (value[i] == '\\') { if (backslash) backslash = false; else ++length, backslash = true; @@ -742,9 +742,9 @@ static utf8string escape_string(const utf8 *value, int valueSize) { } utf8string escaped = malloc(length + 1); - int j=0; + sint32 j=0; backslash = false; - for (int i=0; i < valueSize; ++i) { + for (sint32 i=0; i < valueSize; ++i) { if (value[i] == '\\') { if (backslash) backslash = false; else escaped[j++] = value[i], backslash = true; @@ -755,12 +755,12 @@ static utf8string escape_string(const utf8 *value, int valueSize) { return escaped; } -static void config_set_property(const config_section_definition *section, const config_property_definition *property, const utf8 *value, int valueSize) +static void config_set_property(const config_section_definition *section, const config_property_definition *property, const utf8 *value, sint32 valueSize) { value_union *destValue = (value_union*)((size_t)section->base_address + (size_t)property->offset); if (property->enum_definitions != NULL) - if (config_read_enum(destValue, (int)_configValueTypeSize[property->type], value, valueSize, property->enum_definitions)) + if (config_read_enum(destValue, (sint32)_configValueTypeSize[property->type], value, valueSize, property->enum_definitions)) return; switch (property->type) { @@ -807,13 +807,13 @@ static void config_read_properties(config_section_definition **currentSection, c if (*ch == '[') { const utf8 *sectionName; - int sectionNameSize; + sint32 sectionNameSize; if (config_get_section(ch, §ionName, §ionNameSize)) *currentSection = config_get_section_def(sectionName, sectionNameSize); } else { if (*currentSection != NULL) { utf8 *propertyName, *value; - int propertyNameSize = 0, valueSize; + sint32 propertyNameSize = 0, valueSize; if (config_get_property_name_value(ch, &propertyName, &propertyNameSize, &value, &valueSize)) { config_property_definition *property; property = config_get_property_def(*currentSection, propertyName, propertyNameSize); @@ -824,7 +824,7 @@ static void config_read_properties(config_section_definition **currentSection, c } } -static bool config_read_enum(void *dest, int destSize, const utf8 *key, int keySize, config_enum_definition *enumDefinitions) +static bool config_read_enum(void *dest, sint32 destSize, const utf8 *key, sint32 keySize, config_enum_definition *enumDefinitions) { while (enumDefinitions->key != NULL) { if (strlen(enumDefinitions->key) == (size_t)keySize && _strnicmp(enumDefinitions->key, key, keySize) == 0) { @@ -898,7 +898,7 @@ static config_line *_configLines = NULL; */ static bool config_find_rct2_path(utf8 *resultPath) { - int i; + sint32 i; log_verbose("searching common installation locations."); @@ -1053,7 +1053,7 @@ bool config_shortcut_keys_load() if (file != NULL) { result = SDL_RWread(file, &version, sizeof(version), 1) == 1; if (result && version == SHORTCUT_FILE_VERSION) { - for (int i = 0; i < SHORTCUT_COUNT; i++) { + for (sint32 i = 0; i < SHORTCUT_COUNT; i++) { if (SDL_RWread(file, &gShortcutKeys[i], sizeof(uint16), 1) != 1) { break; } diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index 6dd175a983..2189d15106 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -302,10 +302,10 @@ protected: void GetDirectoryChildren(std::vector &children, const std::string &path) override { struct dirent * * namelist; - int count = scandir(path.c_str(), &namelist, FilterFunc, alphasort); + sint32 count = scandir(path.c_str(), &namelist, FilterFunc, alphasort); if (count > 0) { - for (int i = 0; i < count; i++) + for (sint32 i = 0; i < count; i++) { const struct dirent * node = namelist[i]; if (!String::Equals(node->d_name, ".") && @@ -321,7 +321,7 @@ protected: } private: - static int FilterFunc(const struct dirent * d) + static sint32 FilterFunc(const struct dirent * d) { return 1; } @@ -345,7 +345,7 @@ private: Path::Append(path, pathSize, node->d_name); struct stat statInfo; - int statRes = stat(path, &statInfo); + sint32 statRes = stat(path, &statInfo); if (statRes != -1) { result.Size = statInfo.st_size; diff --git a/src/openrct2/core/FileStream.hpp b/src/openrct2/core/FileStream.hpp index 1b3dfd56e2..f9a0660e0b 100644 --- a/src/openrct2/core/FileStream.hpp +++ b/src/openrct2/core/FileStream.hpp @@ -40,12 +40,12 @@ private: uint64 _fileSize; public: - FileStream(const std::string &path, int fileMode) : + FileStream(const std::string &path, sint32 fileMode) : FileStream(path.c_str(), fileMode) { } - FileStream(const utf8 * path, int fileMode) + FileStream(const utf8 * path, sint32 fileMode) { const char * mode; switch (fileMode) { @@ -93,7 +93,7 @@ public: Seek(position, STREAM_SEEK_BEGIN); } - void Seek(sint64 offset, int origin) override + void Seek(sint64 offset, sint32 origin) override { switch (origin) { case STREAM_SEEK_BEGIN: diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp index daa4bceb4d..746c1a0780 100644 --- a/src/openrct2/core/Guard.cpp +++ b/src/openrct2/core/Guard.cpp @@ -83,7 +83,7 @@ namespace Guard abort(); #else // Show message box if we are not building for testing - int result = MessageBoxA(nullptr, buffer, OPENRCT2_NAME, MB_ABORTRETRYIGNORE | MB_ICONEXCLAMATION); + sint32 result = MessageBoxA(nullptr, buffer, OPENRCT2_NAME, MB_ABORTRETRYIGNORE | MB_ICONEXCLAMATION); if (result == IDABORT) { #ifdef USE_BREAKPAD diff --git a/src/openrct2/core/IStream.hpp b/src/openrct2/core/IStream.hpp index b942c660f0..fa3f795d67 100644 --- a/src/openrct2/core/IStream.hpp +++ b/src/openrct2/core/IStream.hpp @@ -43,7 +43,7 @@ interface IStream virtual uint64 GetLength() const abstract; virtual uint64 GetPosition() const abstract; virtual void SetPosition(uint64 position) abstract; - virtual void Seek(sint64 offset, int origin) abstract; + virtual void Seek(sint64 offset, sint32 origin) abstract; virtual void Read(void * buffer, uint64 length) abstract; virtual void Write(const void * buffer, uint64 length) abstract; diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp index 168851ff44..d4a29992bf 100644 --- a/src/openrct2/core/Memory.hpp +++ b/src/openrct2/core/Memory.hpp @@ -123,7 +123,7 @@ namespace Memory template static T * Set(T * dst, uint8 value, size_t size) { - return (T*)memset((void*)dst, (int)value, size); + return (T*)memset((void*)dst, (sint32)value, size); } template diff --git a/src/openrct2/core/MemoryStream.cpp b/src/openrct2/core/MemoryStream.cpp index e4b2db9e07..43da9fb47a 100644 --- a/src/openrct2/core/MemoryStream.cpp +++ b/src/openrct2/core/MemoryStream.cpp @@ -99,7 +99,7 @@ void MemoryStream::SetPosition(uint64 position) Seek(position, STREAM_SEEK_BEGIN); } -void MemoryStream::Seek(sint64 offset, int origin) +void MemoryStream::Seek(sint64 offset, sint32 origin) { uint64 newPosition; switch (origin) { diff --git a/src/openrct2/core/MemoryStream.h b/src/openrct2/core/MemoryStream.h index 7575bcc773..5ff48e2d9e 100644 --- a/src/openrct2/core/MemoryStream.h +++ b/src/openrct2/core/MemoryStream.h @@ -58,7 +58,7 @@ public: uint64 GetLength() const override; uint64 GetPosition() const override; void SetPosition(uint64 position) override; - void Seek(sint64 offset, int origin) override; + void Seek(sint64 offset, sint32 origin) override; void Read(void * buffer, uint64 length) override; void Write(const void * buffer, uint64 length) override; diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 0c6777cd92..a3c627a3ee 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -206,7 +206,7 @@ namespace String utf8 * buffer = Memory::Allocate(bufferSize); // Start with initial buffer - int len = vsnprintf(buffer, bufferSize, format, args); + sint32 len = vsnprintf(buffer, bufferSize, format, args); if (len < 0) { Memory::Free(buffer); @@ -307,7 +307,7 @@ namespace String const utf8 * SkipBOM(const utf8 * buffer) { - if ((unsigned char)buffer[0] == 0xEF && (unsigned char)buffer[1] == 0xBB && (unsigned char)buffer[2] == 0xBF) + if ((uint8)buffer[0] == 0xEF && (uint8)buffer[1] == 0xBB && (uint8)buffer[2] == 0xBF) { return buffer + 3; } diff --git a/src/openrct2/core/StringBuilder.hpp b/src/openrct2/core/StringBuilder.hpp index 4dd2f2aac4..d34430b3d5 100644 --- a/src/openrct2/core/StringBuilder.hpp +++ b/src/openrct2/core/StringBuilder.hpp @@ -40,7 +40,7 @@ public: Memory::Free(_buffer); } - void Append(int codepoint) + void Append(sint32 codepoint) { Append((codepoint_t)codepoint); } diff --git a/src/openrct2/core/Zip.cpp b/src/openrct2/core/Zip.cpp index 98a5f9252b..cb98bb4851 100644 --- a/src/openrct2/core/Zip.cpp +++ b/src/openrct2/core/Zip.cpp @@ -27,13 +27,13 @@ private: public: ZipArchive(const utf8 * path, ZIP_ACCESS access) { - int zipOpenMode = ZIP_RDONLY; + sint32 zipOpenMode = ZIP_RDONLY; if (access == ZIP_ACCESS_WRITE) { zipOpenMode = ZIP_CREATE; } - int error; + sint32 error; _zip = zip_open(path, zipOpenMode, &error); if (_zip == nullptr) { diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index bc7561e369..93422d74e5 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -135,7 +135,7 @@ extern "C" _drawingEngine->Draw(); } - void drawing_engine_copy_rect(int x, int y, int width, int height, int dx, int dy) + void drawing_engine_copy_rect(sint32 x, sint32 y, sint32 width, sint32 height, sint32 dx, sint32 dy) { if (_drawingEngine != nullptr) { @@ -202,7 +202,7 @@ extern "C" } } - void gfx_fill_rect(rct_drawpixelinfo * dpi, int left, int top, int right, int bottom, int colour) + void gfx_fill_rect(rct_drawpixelinfo * dpi, sint32 left, sint32 top, sint32 right, sint32 bottom, sint32 colour) { if (_drawingEngine != nullptr) { @@ -211,7 +211,7 @@ extern "C" } } - void gfx_filter_rect(rct_drawpixelinfo * dpi, int left, int top, int right, int bottom, FILTER_PALETTE_ID palette) + void gfx_filter_rect(rct_drawpixelinfo * dpi, sint32 left, sint32 top, sint32 right, sint32 bottom, FILTER_PALETTE_ID palette) { if (_drawingEngine != nullptr) { @@ -220,7 +220,7 @@ extern "C" } } - void gfx_draw_line(rct_drawpixelinfo *dpi, int x1, int y1, int x2, int y2, int colour) + void gfx_draw_line(rct_drawpixelinfo *dpi, sint32 x1, sint32 y1, sint32 x2, sint32 y2, sint32 colour) { if (_drawingEngine != nullptr) { @@ -229,7 +229,7 @@ extern "C" } } - void FASTCALL gfx_draw_sprite(rct_drawpixelinfo * dpi, int image, int x, int y, uint32 tertiary_colour) + void FASTCALL gfx_draw_sprite(rct_drawpixelinfo * dpi, sint32 image, sint32 x, sint32 y, uint32 tertiary_colour) { if (_drawingEngine != nullptr) { @@ -238,7 +238,7 @@ extern "C" } } - void FASTCALL gfx_draw_glpyh(rct_drawpixelinfo * dpi, int image, int x, int y, uint8 * palette) + void FASTCALL gfx_draw_glpyh(rct_drawpixelinfo * dpi, sint32 image, sint32 x, sint32 y, uint8 * palette) { if (_drawingEngine != nullptr) { @@ -247,7 +247,7 @@ extern "C" } } - void FASTCALL gfx_draw_sprite_raw_masked(rct_drawpixelinfo * dpi, int x, int y, int maskImage, int colourImage) + void FASTCALL gfx_draw_sprite_raw_masked(rct_drawpixelinfo * dpi, sint32 x, sint32 y, sint32 maskImage, sint32 colourImage) { if (_drawingEngine != nullptr) { @@ -256,7 +256,7 @@ extern "C" } } - void FASTCALL gfx_draw_sprite_solid(rct_drawpixelinfo * dpi, int image, int x, int y, uint8 colour) + void FASTCALL gfx_draw_sprite_solid(rct_drawpixelinfo * dpi, sint32 image, sint32 x, sint32 y, uint8 colour) { if (_drawingEngine != nullptr) { @@ -265,7 +265,7 @@ extern "C" } } - int screenshot_dump() + sint32 screenshot_dump() { if (_drawingEngine != nullptr) { diff --git a/src/openrct2/drawing/NewDrawing.h b/src/openrct2/drawing/NewDrawing.h index f79e3a232c..3ddc1bc335 100644 --- a/src/openrct2/drawing/NewDrawing.h +++ b/src/openrct2/drawing/NewDrawing.h @@ -33,7 +33,7 @@ void drawing_engine_init(); void drawing_engine_resize(); void drawing_engine_set_palette(SDL_Color * colours); void drawing_engine_draw(); -void drawing_engine_copy_rect(int x, int y, int width, int height, int dx, int dy); +void drawing_engine_copy_rect(sint32 x, sint32 y, sint32 width, sint32 height, sint32 dx, sint32 dy); void drawing_engine_dispose(); rct_drawpixelinfo * drawing_engine_get_dpi(); diff --git a/src/openrct2/drawing/Rain.cpp b/src/openrct2/drawing/Rain.cpp index e8c5e00631..b73e64ed43 100644 --- a/src/openrct2/drawing/Rain.cpp +++ b/src/openrct2/drawing/Rain.cpp @@ -189,14 +189,14 @@ void DrawRain(rct_drawpixelinfo * dpi, IRainDrawer * rainDrawer) */ static void DrawLightRain(IRainDrawer * rainDrawer, sint32 left, sint32 top, sint32 width, sint32 height) { - int x_start = -(int)gScenarioTicks + 8; - int y_start = (gScenarioTicks * 3) + 7; + sint32 x_start = -(sint32)gScenarioTicks + 8; + sint32 y_start = (gScenarioTicks * 3) + 7; y_start = -y_start; x_start += left; y_start += top; rainDrawer->Draw(left, top, width, height, x_start, y_start); - x_start = -(int)gScenarioTicks + 0x18; + x_start = -(sint32)gScenarioTicks + 0x18; y_start = (gScenarioTicks * 4) + 0x0D; y_start = -y_start; x_start += left; @@ -210,28 +210,28 @@ static void DrawLightRain(IRainDrawer * rainDrawer, sint32 left, sint32 top, sin */ static void DrawHeavyRain(IRainDrawer * rainDrawer, sint32 left, sint32 top, sint32 width, sint32 height) { - int x_start = -(int)gScenarioTicks; - int y_start = gScenarioTicks * 5; + sint32 x_start = -(sint32)gScenarioTicks; + sint32 y_start = gScenarioTicks * 5; y_start = -y_start; x_start += left; y_start += top; rainDrawer->Draw(left, top, width, height, x_start, y_start); - x_start = -(int)gScenarioTicks + 0x10; + x_start = -(sint32)gScenarioTicks + 0x10; y_start = (gScenarioTicks * 6) + 5; y_start = -y_start; x_start += left; y_start += top; rainDrawer->Draw(left, top, width, height, x_start, y_start); - x_start = -(int)gScenarioTicks + 8; + x_start = -(sint32)gScenarioTicks + 8; y_start = (gScenarioTicks * 3) + 7; y_start = -y_start; x_start += left; y_start += top; rainDrawer->Draw(left, top, width, height, x_start, y_start); - x_start = -(int)gScenarioTicks + 0x18; + x_start = -(sint32)gScenarioTicks + 0x18; y_start = (gScenarioTicks * 4) + 0x0D; y_start = -y_start; x_start += left; diff --git a/src/openrct2/drawing/drawing.c b/src/openrct2/drawing/drawing.c index 290ac27b99..76058568d3 100644 --- a/src/openrct2/drawing/drawing.c +++ b/src/openrct2/drawing/drawing.c @@ -24,8 +24,8 @@ #include "drawing.h" // HACK These were originally passed back through registers -int gLastDrawStringX; -int gLastDrawStringY; +sint32 gLastDrawStringX; +sint32 gLastDrawStringY; sint16 gCurrentFontSpriteBase; uint16 gCurrentFontFlags; @@ -475,12 +475,12 @@ const translucent_window_palette TranslucentWindowPalettes[COLOUR_COUNT] = { {PALETTE_TRANSLUCENT_LIGHT_PINK, PALETTE_TRANSLUCENT_LIGHT_PINK_HIGHLIGHT, PALETTE_TRANSLUCENT_LIGHT_PINK_SHADOW}, }; -void gfx_draw_pixel(rct_drawpixelinfo *dpi, int x, int y, int colour) +void gfx_draw_pixel(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 colour) { gfx_fill_rect(dpi, x, y, x, y, colour); } -void gfx_filter_pixel(rct_drawpixelinfo *dpi, int x, int y, FILTER_PALETTE_ID palette) +void gfx_filter_pixel(rct_drawpixelinfo *dpi, sint32 x, sint32 y, FILTER_PALETTE_ID palette) { gfx_filter_rect(dpi, x, y, x, y, palette); } @@ -491,11 +491,11 @@ void gfx_filter_pixel(rct_drawpixelinfo *dpi, int x, int y, FILTER_PALETTE_ID pa * a1 (ebx) * product (cl) */ -void gfx_transpose_palette(int pal, unsigned char product) +void gfx_transpose_palette(sint32 pal, uint8 product) { rct_g1_element g1 = g1Elements[pal]; - int width = g1.width; - int x = g1.x_offset; + sint32 width = g1.width; + sint32 x = g1.x_offset; uint8* dest_pointer = &gGamePalette[x * 4]; uint8* source_pointer = g1.offset; @@ -523,8 +523,8 @@ void load_palette(){ } rct_g1_element g1 = g1Elements[palette]; - int width = g1.width; - int x = g1.x_offset; + sint32 width = g1.width; + sint32 x = g1.x_offset; uint8* dest_pointer = &gGamePalette[x * 4]; uint8* source_pointer = g1.offset; @@ -555,7 +555,7 @@ void gfx_invalidate_screen() * right (dx) * bottom (bp) */ -void window_draw_all(rct_drawpixelinfo *dpi, short left, short top, short right, short bottom) +void window_draw_all(rct_drawpixelinfo *dpi, sint16 left, sint16 top, sint16 right, sint16 bottom) { rct_drawpixelinfo windowDPI; windowDPI.bits = dpi->bits + left + ((dpi->width + dpi->pitch) * top); @@ -584,10 +584,10 @@ void window_draw_all(rct_drawpixelinfo *dpi, short left, short top, short right, * height (dx) * drawpixelinfo (edi) */ -bool clip_drawpixelinfo(rct_drawpixelinfo *dst, rct_drawpixelinfo *src, int x, int y, int width, int height) +bool clip_drawpixelinfo(rct_drawpixelinfo *dst, rct_drawpixelinfo *src, sint32 x, sint32 y, sint32 width, sint32 height) { - int right = x + width; - int bottom = y + height; + sint32 right = x + width; + sint32 bottom = y + height; dst->bits = src->bits; dst->x = src->x; @@ -605,7 +605,7 @@ bool clip_drawpixelinfo(rct_drawpixelinfo *dst, rct_drawpixelinfo *src, int x, i dst->bits += clippedFromLeft; } - int stickOutWidth = dst->x + dst->width - right; + sint32 stickOutWidth = dst->x + dst->width - right; if (stickOutWidth > 0) { dst->width -= stickOutWidth; dst->pitch += stickOutWidth; @@ -619,7 +619,7 @@ bool clip_drawpixelinfo(rct_drawpixelinfo *dst, rct_drawpixelinfo *src, int x, i dst->bits += bitsPlus; } - int bp = dst->y + dst->height - bottom; + sint32 bp = dst->y + dst->height - bottom; if (bp > 0) { dst->height -= bp; } diff --git a/src/openrct2/drawing/drawing.h b/src/openrct2/drawing/drawing.h index 9a4d9c53bb..07f59bca8f 100644 --- a/src/openrct2/drawing/drawing.h +++ b/src/openrct2/drawing/drawing.h @@ -47,11 +47,11 @@ assert_struct_size(rct_g1_element, 0x10); // Size: 0x10 typedef struct rct_drawpixelinfo { uint8* bits; // 0x00 - short x; // 0x04 - short y; // 0x06 - short width; // 0x08 - short height; // 0x0A - short pitch; // 0x0C note: this is actually (pitch - width) + sint16 x; // 0x04 + sint16 y; // 0x06 + sint16 width; // 0x08 + sint16 height; // 0x0A + sint16 pitch; // 0x0C note: this is actually (pitch - width) uint16 zoom_level; // 0x0E } rct_drawpixelinfo; #ifdef PLATFORM_32BIT @@ -262,8 +262,8 @@ extern uint8 gOtherPalette[256]; extern uint8 text_palette[]; extern const translucent_window_palette TranslucentWindowPalettes[COLOUR_COUNT]; -extern int gLastDrawStringX; -extern int gLastDrawStringY; +extern sint32 gLastDrawStringX; +extern sint32 gLastDrawStringY; extern uint32 gPickupPeepImage; extern sint32 gPickupPeepX; @@ -285,75 +285,75 @@ extern rct_drawpixelinfo *unk_140E9A8; #endif // -bool clip_drawpixelinfo(rct_drawpixelinfo *dst, rct_drawpixelinfo *src, int x, int y, int width, int height); +bool clip_drawpixelinfo(rct_drawpixelinfo *dst, rct_drawpixelinfo *src, sint32 x, sint32 y, sint32 width, sint32 height); void gfx_set_dirty_blocks(sint16 left, sint16 top, sint16 right, sint16 bottom); void gfx_draw_all_dirty_blocks(); void gfx_invalidate_screen(); // palette -void gfx_transpose_palette(int pal, unsigned char product); +void gfx_transpose_palette(sint32 pal, uint8 product); void load_palette(); // other void gfx_clear(rct_drawpixelinfo *dpi, uint8 paletteIndex); -void gfx_draw_pixel(rct_drawpixelinfo *dpi, int x, int y, int colour); -void gfx_filter_pixel(rct_drawpixelinfo *dpi, int x, int y, FILTER_PALETTE_ID palette); +void gfx_draw_pixel(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 colour); +void gfx_filter_pixel(rct_drawpixelinfo *dpi, sint32 x, sint32 y, FILTER_PALETTE_ID palette); void gfx_invalidate_pickedup_peep(); void gfx_draw_pickedup_peep(rct_drawpixelinfo *dpi); // line -void gfx_draw_line(rct_drawpixelinfo *dpi, int x1, int y1, int x2, int y2, int colour); -void gfx_draw_line_software(rct_drawpixelinfo *dpi, int x1, int y1, int x2, int y2, int colour); +void gfx_draw_line(rct_drawpixelinfo *dpi, sint32 x1, sint32 y1, sint32 x2, sint32 y2, sint32 colour); +void gfx_draw_line_software(rct_drawpixelinfo *dpi, sint32 x1, sint32 y1, sint32 x2, sint32 y2, sint32 colour); // rect -void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bottom, int colour); -void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, short left, short top, short right, short bottom, int colour, uint8 flags); -void gfx_filter_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bottom, FILTER_PALETTE_ID palette); +void gfx_fill_rect(rct_drawpixelinfo *dpi, sint32 left, sint32 top, sint32 right, sint32 bottom, sint32 colour); +void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, sint16 left, sint16 top, sint16 right, sint16 bottom, sint32 colour, uint8 flags); +void gfx_filter_rect(rct_drawpixelinfo *dpi, sint32 left, sint32 top, sint32 right, sint32 bottom, FILTER_PALETTE_ID palette); // sprite bool gfx_load_g1(); bool gfx_load_g2(); void gfx_unload_g1(); void gfx_unload_g2(); -rct_g1_element* gfx_get_g1_element(int image_id); +rct_g1_element* gfx_get_g1_element(sint32 image_id); uint32 gfx_object_allocate_images(const rct_g1_element * images, uint32 count); void gfx_object_free_images(uint32 baseImageId, uint32 count); void gfx_object_check_all_images_freed(); void sub_68371D(); -void FASTCALL gfx_rle_sprite_to_buffer(const uint8* RESTRICT source_bits_pointer, uint8* RESTRICT dest_bits_pointer, const uint8* RESTRICT palette_pointer, const rct_drawpixelinfo * RESTRICT dpi, int image_type, int source_y_start, int height, int source_x_start, int width); -void FASTCALL gfx_draw_sprite(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint32 tertiary_colour); -void FASTCALL gfx_draw_glpyh(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint8 * palette); -void FASTCALL gfx_draw_sprite_raw_masked(rct_drawpixelinfo *dpi, int x, int y, int maskImage, int colourImage); -void FASTCALL gfx_draw_sprite_solid(rct_drawpixelinfo * dpi, int image, int x, int y, uint8 colour); +void FASTCALL gfx_rle_sprite_to_buffer(const uint8* RESTRICT source_bits_pointer, uint8* RESTRICT dest_bits_pointer, const uint8* RESTRICT palette_pointer, const rct_drawpixelinfo * RESTRICT dpi, sint32 image_type, sint32 source_y_start, sint32 height, sint32 source_x_start, sint32 width); +void FASTCALL gfx_draw_sprite(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint32 tertiary_colour); +void FASTCALL gfx_draw_glpyh(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint8 * palette); +void FASTCALL gfx_draw_sprite_raw_masked(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 maskImage, sint32 colourImage); +void FASTCALL gfx_draw_sprite_solid(rct_drawpixelinfo * dpi, sint32 image, sint32 x, sint32 y, uint8 colour); -void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint32 tertiary_colour); -uint8* FASTCALL gfx_draw_sprite_get_palette(int image_id, uint32 tertiary_colour); -void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint8* palette_pointer, uint8* unknown_pointer); -void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, int x, int y, int maskImage, int colourImage); +void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint32 tertiary_colour); +uint8* FASTCALL gfx_draw_sprite_get_palette(sint32 image_id, uint32 tertiary_colour); +void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint8* palette_pointer, uint8* unknown_pointer); +void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 maskImage, sint32 colourImage); // string -int clip_text(char *buffer, int width); -int gfx_wrap_string(char* buffer, int width, int* num_lines, int* font_height); -int gfx_get_string_width(char *buffer); -int gfx_get_string_width_new_lined(char* buffer); -void gfx_draw_string(rct_drawpixelinfo *dpi, char *buffer, int colour, int x, int y); -void gfx_draw_string_left(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y); -void gfx_draw_string_left_clipped(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y, int width); -int gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int y, int width, rct_string_id format, int colour); -void draw_string_left_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y); -void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y); -void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, int x, int y, int colour, void *args); -void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y, int width); -void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y); -int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int y, int width, rct_string_id format, int colour); -void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines, char *text); -void gfx_draw_string_right(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y); -void draw_string_right_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y); -int string_get_height_raw(char *buffer); -void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, int x, int y, int width, int colour, rct_string_id format, void *args, int ticks); -void gfx_draw_string_with_y_offsets(rct_drawpixelinfo *dpi, const utf8 *text, int colour, int x, int y, const sint8 *yOffsets, bool forceSpriteFont); -int gfx_clip_string(char* buffer, int width); -void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, int availableWidth); +sint32 clip_text(char *buffer, sint32 width); +sint32 gfx_wrap_string(char* buffer, sint32 width, sint32* num_lines, sint32* font_height); +sint32 gfx_get_string_width(char *buffer); +sint32 gfx_get_string_width_new_lined(char* buffer); +void gfx_draw_string(rct_drawpixelinfo *dpi, char *buffer, sint32 colour, sint32 x, sint32 y); +void gfx_draw_string_left(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y); +void gfx_draw_string_left_clipped(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y, sint32 width); +sint32 gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, sint32 x, sint32 y, sint32 width, rct_string_id format, sint32 colour); +void draw_string_left_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y); +void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y); +void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, sint32 x, sint32 y, sint32 colour, void *args); +void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y, sint32 width); +void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y); +sint32 gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, sint32 x, sint32 y, sint32 width, rct_string_id format, sint32 colour); +void draw_string_centred_raw(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 numLines, char *text); +void gfx_draw_string_right(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y); +void draw_string_right_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y); +sint32 string_get_height_raw(char *buffer); +void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 width, sint32 colour, rct_string_id format, void *args, sint32 ticks); +void gfx_draw_string_with_y_offsets(rct_drawpixelinfo *dpi, const utf8 *text, sint32 colour, sint32 x, sint32 y, const sint8 *yOffsets, bool forceSpriteFont); +sint32 gfx_clip_string(char* buffer, sint32 width); +void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, sint32 availableWidth); #ifndef NO_TTF SDL_Surface *ttf_surface_cache_get_or_add(TTF_Font *font, const utf8 *text); TTFFontDescriptor *ttf_get_font_from_sprite_base(uint16 spriteBase); @@ -364,7 +364,7 @@ void ttf_dispose(); // scrolling text void scrolling_text_initialise_bitmaps(); -int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrollingMode); +sint32 scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrollingMode); void rct2_draw(rct_drawpixelinfo *dpi); diff --git a/src/openrct2/drawing/drawing_fast.cpp b/src/openrct2/drawing/drawing_fast.cpp index 516ef0a45b..6e9576a033 100644 --- a/src/openrct2/drawing/drawing_fast.cpp +++ b/src/openrct2/drawing/drawing_fast.cpp @@ -26,30 +26,30 @@ extern "C" // sar eax, 0x1f (arithmetic shift right by 31) #define less_or_equal_zero_mask(val) (((val - 1) >> (sizeof(val) * 8 - 1))) -template +template static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer, uint8* RESTRICT dest_bits_pointer, const uint8* RESTRICT palette_pointer, const rct_drawpixelinfo *RESTRICT dpi, - int source_y_start, - int height, - int source_x_start, - int width) + sint32 source_y_start, + sint32 height, + sint32 source_x_start, + sint32 width) { - int zoom_amount = 1 << zoom_level; - int zoom_mask = 0xFFFFFFFF << zoom_level; + sint32 zoom_amount = 1 << zoom_level; + sint32 zoom_mask = 0xFFFFFFFF << zoom_level; uint8* next_dest_pointer = dest_bits_pointer; - int line_width = (dpi->width >> zoom_level) + dpi->pitch; + sint32 line_width = (dpi->width >> zoom_level) + dpi->pitch; - const int source_y_start_mask = less_or_equal_zero_mask(source_y_start + 1); + const sint32 source_y_start_mask = less_or_equal_zero_mask(source_y_start + 1); source_y_start += zoom_amount & source_y_start_mask; next_dest_pointer += line_width & source_y_start_mask; height -= zoom_amount & source_y_start_mask; //For every line in the image - for (int i = 0; i < height; i += zoom_amount) { - int y = source_y_start + i; + for (sint32 i = 0; i < height; i += zoom_amount) { + sint32 y = source_y_start + i; uint8 i2 = i >> zoom_level; //The first part of the source pointer is a list of offsets to different lines @@ -64,7 +64,7 @@ static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer, const uint8* source_pointer = next_source_pointer; uint8* dest_pointer = loop_dest_pointer; - int no_pixels = *source_pointer++; + sint32 no_pixels = *source_pointer++; //gap_size is the number of non drawn pixels you require to //jump over on your destination uint8 gap_size = *source_pointer++; @@ -76,16 +76,16 @@ static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer, next_source_pointer = source_pointer + no_pixels; //Calculates the start point of the image - int x_start = gap_size - source_x_start; - const int x_diff = x_start & ~zoom_mask; - const int x_mask = ~less_or_equal_zero_mask(x_diff); + sint32 x_start = gap_size - source_x_start; + const sint32 x_diff = x_start & ~zoom_mask; + const sint32 x_mask = ~less_or_equal_zero_mask(x_diff); no_pixels -= x_diff; x_start += ~zoom_mask & x_mask; source_pointer += (x_start&~zoom_mask) & x_mask; // This will have -1 (0xffffffff) for (x_start <= 0), 0 otherwise - int sign = less_or_equal_zero_mask(x_start); + sint32 sign = less_or_equal_zero_mask(x_start); dest_pointer += (x_start >> zoom_level) & ~sign; @@ -97,10 +97,10 @@ static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer, //Reset the start position to zero as we have taken into account all moves x_start &= ~sign; - int x_end = x_start + no_pixels; + sint32 x_end = x_start + no_pixels; //If the end position is further out than the whole image //end position then we need to shorten the line again - const int pixels_till_end = x_end - width; + const sint32 pixels_till_end = x_end - width; //Shorten the line no_pixels -= pixels_till_end & ~(less_or_equal_zero_mask(pixels_till_end)); @@ -143,17 +143,17 @@ static void FASTCALL DrawRLESprite2(const uint8* RESTRICT source_bits_pointer, #define DrawRLESpriteHelper2(image_type, zoom_level) \ DrawRLESprite2(source_bits_pointer, dest_bits_pointer, palette_pointer, dpi, source_y_start, height, source_x_start, width) -template +template static void FASTCALL DrawRLESprite1(const uint8* source_bits_pointer, uint8* dest_bits_pointer, const uint8* palette_pointer, const rct_drawpixelinfo *dpi, - int source_y_start, - int height, - int source_x_start, - int width) + sint32 source_y_start, + sint32 height, + sint32 source_x_start, + sint32 width) { - int zoom_level = dpi->zoom_level; + sint32 zoom_level = dpi->zoom_level; switch (zoom_level) { case 0: DrawRLESpriteHelper2(image_type, 0); break; case 1: DrawRLESpriteHelper2(image_type, 1); break; @@ -177,11 +177,11 @@ extern "C" uint8* RESTRICT dest_bits_pointer, const uint8* RESTRICT palette_pointer, const rct_drawpixelinfo * RESTRICT dpi, - int image_type, - int source_y_start, - int height, - int source_x_start, - int width) + sint32 image_type, + sint32 source_y_start, + sint32 height, + sint32 source_x_start, + sint32 width) { if (image_type & IMAGE_TYPE_REMAP) { diff --git a/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp index 4a016c0801..f5c234749c 100644 --- a/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp @@ -315,7 +315,7 @@ public: #ifdef __ENABLE_LIGHTFX__ const SDL_Color * lightPalette = lightfx_get_palette(); #endif - for (int i = 0; i < 256; i++) + for (sint32 i = 0; i < 256; i++) { _paletteHWMapped[i] = SDL_MapRGB(_screenTextureFormat, palette[i].r, palette[i].g, palette[i].b); #ifdef __ENABLE_LIGHTFX__ @@ -421,10 +421,10 @@ public: // NOTE: when zooming, there can be x, y, dx, dy combinations that go off the // screen; hence the checks. This code should ultimately not be called when // zooming because this function is specific to updating the screen on move - int lmargin = Math::Min(x - dx, 0); - int rmargin = Math::Min((sint32)_width - (x - dx + width), 0); - int tmargin = Math::Min(y - dy, 0); - int bmargin = Math::Min((sint32)_height - (y - dy + height), 0); + sint32 lmargin = Math::Min(x - dx, 0); + sint32 rmargin = Math::Min((sint32)_width - (x - dx + width), 0); + sint32 tmargin = Math::Min(y - dy, 0); + sint32 bmargin = Math::Min((sint32)_height - (y - dy + height), 0); x -= lmargin; y -= tmargin; width += lmargin + rmargin; @@ -443,7 +443,7 @@ public: } // Move bytes - for (int i = 0; i < height; i++) + for (sint32 i = 0; i < height; i++) { memmove(to, from, width); to += stride; @@ -720,7 +720,7 @@ private: void CopyBitsToTexture(SDL_Texture * texture, uint8 * src, sint32 width, sint32 height, uint32 * palette) { void * pixels; - int pitch; + sint32 pitch; if (SDL_LockTexture(texture, nullptr, &pixels, &pitch) == 0) { sint32 padding = pitch - (width * 4); @@ -833,11 +833,11 @@ void SoftwareDrawingContext::Clear(uint8 paletteIndex) { rct_drawpixelinfo * dpi = _dpi; - int w = dpi->width >> dpi->zoom_level; - int h = dpi->height >> dpi->zoom_level; + sint32 w = dpi->width >> dpi->zoom_level; + sint32 h = dpi->height >> dpi->zoom_level; uint8 * ptr = dpi->bits; - for (int y = 0; y < h; y++) + for (sint32 y = 0; y < h; y++) { Memory::Set(ptr, paletteIndex, w); ptr += w + dpi->pitch; @@ -903,40 +903,40 @@ void SoftwareDrawingContext::FillRect(uint32 colour, sint32 left, sint32 top, si uint16 crossPattern = 0; - int startX = left - dpi->x; + sint32 startX = left - dpi->x; if (startX < 0) { crossPattern ^= startX; startX = 0; } - int endX = right - dpi->x + 1; + sint32 endX = right - dpi->x + 1; if (endX > dpi->width) { endX = dpi->width; } - int startY = top - dpi->y; + sint32 startY = top - dpi->y; if (startY < 0) { crossPattern ^= startY; startY = 0; } - int endY = bottom - dpi->y + 1; + sint32 endY = bottom - dpi->y + 1; if (endY > dpi->height) { endY = dpi->height; } - int width = endX - startX; - int height = endY - startY; + sint32 width = endX - startX; + sint32 height = endY - startY; if (colour & 0x1000000) { // Cross hatching uint8 * dst = (startY * (dpi->width + dpi->pitch)) + startX + dpi->bits; - for (int i = 0; i < height; i++) + for (sint32 i = 0; i < height; i++) { uint8 * nextdst = dst + dpi->width + dpi->pitch; uint32 p = ror32(crossPattern, 1); @@ -966,21 +966,21 @@ void SoftwareDrawingContext::FillRect(uint32 colour, sint32 left, sint32 top, si // The pattern loops every 15 lines this is which // part the pattern is on. - int patternY = (startY + dpi->y) % 16; + sint32 patternY = (startY + dpi->y) % 16; // The pattern loops every 15 pixels this is which // part the pattern is on. - int startPatternX = (startX + dpi->x) % 16; - int patternX = startPatternX; + sint32 startPatternX = (startX + dpi->x) % 16; + sint32 patternX = startPatternX; const uint16 * patternsrc = Patterns[colour >> 28]; // or possibly uint8)[esi*4] ? - for (int numLines = height; numLines > 0; numLines--) + for (sint32 numLines = height; numLines > 0; numLines--) { uint8 * nextdst = dst + dpi->width + dpi->pitch; uint16 pattern = patternsrc[patternY]; - for (int numPixels = width; numPixels > 0; numPixels--) + for (sint32 numPixels = width; numPixels > 0; numPixels--) { if (pattern & (1 << patternX)) { @@ -997,7 +997,7 @@ void SoftwareDrawingContext::FillRect(uint32 colour, sint32 left, sint32 top, si else { uint8 * dst = startY * (dpi->width + dpi->pitch) + startX + dpi->bits; - for (int i = 0; i < height; i++) + for (sint32 i = 0; i < height; i++) { Memory::Set(dst, colour & 0xFF, width); dst += dpi->width + dpi->pitch; @@ -1016,32 +1016,32 @@ void SoftwareDrawingContext::FilterRect(FILTER_PALETTE_ID palette, sint32 left, if (bottom < dpi->y) return; if (top >= dpi->y + dpi->height) return; - int startX = left - dpi->x; + sint32 startX = left - dpi->x; if (startX < 0) { startX = 0; } - int endX = right - dpi->x + 1; + sint32 endX = right - dpi->x + 1; if (endX > dpi->width) { endX = dpi->width; } - int startY = top - dpi->y; + sint32 startY = top - dpi->y; if (startY < 0) { startY = 0; } - int endY = bottom - dpi->y + 1; + sint32 endY = bottom - dpi->y + 1; if (endY > dpi->height) { endY = dpi->height; } - int width = endX - startX; - int height = endY - startY; + sint32 width = endX - startX; + sint32 height = endY - startY; //0x2000000 @@ -1055,10 +1055,10 @@ void SoftwareDrawingContext::FilterRect(FILTER_PALETTE_ID palette, sint32 left, uint8 * g1Bits = g1Element->offset; // Fill the rectangle with the colours from the colour table - for (int i = 0; i < height >> dpi->zoom_level; i++) + for (sint32 i = 0; i < height >> dpi->zoom_level; i++) { uint8 * nextdst = dst + (dpi->width >> dpi->zoom_level) + dpi->pitch; - for (int j = 0; j < (width >> dpi->zoom_level); j++) + for (sint32 j = 0; j < (width >> dpi->zoom_level); j++) { *dst = g1Bits[*dst]; dst++; diff --git a/src/openrct2/drawing/engines/opengl/DrawImageShader.h b/src/openrct2/drawing/engines/opengl/DrawImageShader.h index 141b786518..84f287c243 100644 --- a/src/openrct2/drawing/engines/opengl/DrawImageShader.h +++ b/src/openrct2/drawing/engines/opengl/DrawImageShader.h @@ -24,16 +24,16 @@ // Per-instance data for images struct DrawImageInstance { vec4i clip; - int texColourAtlas; + sint32 texColourAtlas; vec4f texColourBounds; - int texMaskAtlas; + sint32 texMaskAtlas; vec4f texMaskBounds; - int texPaletteAtlas; + sint32 texPaletteAtlas; vec4f texPaletteBounds; - int flags; + sint32 flags; vec4f colour; vec4i bounds; - int mask; + sint32 mask; }; class DrawImageShader final : public OpenGLShaderProgram diff --git a/src/openrct2/drawing/engines/opengl/FillRectShader.cpp b/src/openrct2/drawing/engines/opengl/FillRectShader.cpp index c6fe3542d8..47b4e88f45 100644 --- a/src/openrct2/drawing/engines/opengl/FillRectShader.cpp +++ b/src/openrct2/drawing/engines/opengl/FillRectShader.cpp @@ -80,7 +80,7 @@ void FillRectShader::SetFlags(uint32 flags) glUniform1i(uFlags, flags); } -void FillRectShader::SetColour(int index, vec4f colour) +void FillRectShader::SetColour(sint32 index, vec4f colour) { glUniform4f(uColour[index], colour.r, colour.g, colour.b, colour.a); } diff --git a/src/openrct2/drawing/engines/opengl/FillRectShader.h b/src/openrct2/drawing/engines/opengl/FillRectShader.h index 63ba37a6be..5d54d3c428 100644 --- a/src/openrct2/drawing/engines/opengl/FillRectShader.h +++ b/src/openrct2/drawing/engines/opengl/FillRectShader.h @@ -46,7 +46,7 @@ public: void SetClip(sint32 left, sint32 top, sint32 right, sint32 bottom); void SetBounds(sint32 left, sint32 top, sint32 right, sint32 bottom); void SetFlags(uint32 flags); - void SetColour(int index, vec4f colour); + void SetColour(sint32 index, vec4f colour); void SetSourceFramebuffer(GLuint texture); void Draw(sint32 left, sint32 top, sint32 right, sint32 bottom); diff --git a/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 0055bc03ad..82bfa8a3f8 100644 --- a/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -307,7 +307,7 @@ public: void SetPalette(SDL_Color * palette) override { - for (int i = 0; i < 256; i++) + for (sint32 i = 0; i < 256; i++) { SDL_Color colour = palette[i]; colour.a = i == 0 ? 0 : 255; @@ -371,7 +371,7 @@ public: framebuffer->Bind(); void * pixels = framebuffer->GetPixels(); - int result = screenshot_dump_png_32bpp(_width, _height, pixels); + sint32 result = screenshot_dump_png_32bpp(_width, _height, pixels); Memory::Free(pixels); return result; } @@ -691,7 +691,7 @@ void OpenGLDrawingContext::DrawLine(uint32 colour, sint32 x1, sint32 y1, sint32 void OpenGLDrawingContext::DrawSprite(uint32 image, sint32 x, sint32 y, uint32 tertiaryColour) { - int g1Id = image & 0x7FFFF; + sint32 g1Id = image & 0x7FFFF; rct_g1_element * g1Element = gfx_get_g1_element(g1Id); if (_dpi->zoom_level != 0) @@ -726,7 +726,7 @@ void OpenGLDrawingContext::DrawSprite(uint32 image, sint32 x, sint32 y, uint32 t sint32 left = x + drawOffsetX; sint32 top = y + drawOffsetY; - int zoom_mask = 0xFFFFFFFF << _dpi->zoom_level; + sint32 zoom_mask = 0xFFFFFFFF << _dpi->zoom_level; if (_dpi->zoom_level && g1Element->flags & G1_FLAG_RLE_COMPRESSION){ top -= ~zoom_mask; } @@ -880,7 +880,7 @@ void OpenGLDrawingContext::DrawSpriteSolid(uint32 image, sint32 x, sint32 y, uin { vec4f paletteColour = _engine->GLPalette[colour & 0xFF]; - int g1Id = image & 0x7FFFF; + sint32 g1Id = image & 0x7FFFF; rct_g1_element * g1Element = gfx_get_g1_element(g1Id); auto texture = _textureCache->GetOrLoadImageTexture(image); @@ -932,7 +932,7 @@ void OpenGLDrawingContext::DrawSpriteSolid(uint32 image, sint32 x, sint32 y, uin void OpenGLDrawingContext::DrawGlyph(uint32 image, sint32 x, sint32 y, uint8 * palette) { - int g1Id = image & 0x7FFFF; + sint32 g1Id = image & 0x7FFFF; rct_g1_element * g1Element = gfx_get_g1_element(g1Id); auto texture = _textureCache->GetOrLoadGlyphTexture(image, palette); diff --git a/src/openrct2/drawing/engines/opengl/TextureCache.cpp b/src/openrct2/drawing/engines/opengl/TextureCache.cpp index 294612aa42..5a6cad5a05 100644 --- a/src/openrct2/drawing/engines/opengl/TextureCache.cpp +++ b/src/openrct2/drawing/engines/opengl/TextureCache.cpp @@ -219,7 +219,7 @@ void * TextureCache::GetImageAsARGB(uint32 image, uint32 tertiaryColour, uint32 return pixels32; } -CachedTextureInfo TextureCache::AllocateImage(int imageWidth, int imageHeight) +CachedTextureInfo TextureCache::AllocateImage(sint32 imageWidth, sint32 imageHeight) { CreateAtlasesTexture(); @@ -233,13 +233,13 @@ CachedTextureInfo TextureCache::AllocateImage(int imageWidth, int imageHeight) } // If there is no such atlas, then create a new one - if ((int) _atlases.size() >= _atlasesTextureIndicesLimit) + if ((sint32) _atlases.size() >= _atlasesTextureIndicesLimit) { throw std::runtime_error("more texture atlases required, but device limit reached!"); } - int atlasIndex = (int) _atlases.size(); - int atlasSize = (int) powf(2, (float) Atlas::CalculateImageSizeOrder(imageWidth, imageHeight)); + sint32 atlasIndex = (sint32) _atlases.size(); + sint32 atlasSize = (sint32) powf(2, (float) Atlas::CalculateImageSizeOrder(imageWidth, imageHeight)); #ifdef DEBUG log_verbose("new texture atlas #%d (size %d) allocated\n", atlasIndex, atlasSize); diff --git a/src/openrct2/drawing/engines/opengl/TextureCache.h b/src/openrct2/drawing/engines/opengl/TextureCache.h index e3c94f3beb..a569cc0516 100644 --- a/src/openrct2/drawing/engines/opengl/TextureCache.h +++ b/src/openrct2/drawing/engines/opengl/TextureCache.h @@ -54,11 +54,11 @@ struct GlyphId // This is the maximum width and height of each atlas, basically the // granularity at which new atlases are allocated (2048 -> 4 MB of VRAM) -constexpr int TEXTURE_CACHE_MAX_ATLAS_SIZE = 2048; +constexpr sint32 TEXTURE_CACHE_MAX_ATLAS_SIZE = 2048; // Pixel dimensions of smallest supported slots in texture atlases // Must be a power of 2! -constexpr int TEXTURE_CACHE_SMALLEST_SLOT = 32; +constexpr sint32 TEXTURE_CACHE_SMALLEST_SLOT = 32; // Location of an image (texture atlas index, slot and normalized coordinates) struct CachedTextureInfo @@ -76,20 +76,20 @@ class Atlas final { private: GLuint _index; - int _imageSize; - int _atlasWidth, _atlasHeight; + sint32 _imageSize; + sint32 _atlasWidth, _atlasHeight; std::vector _freeSlots; - int _cols, _rows; + sint32 _cols, _rows; public: - Atlas(GLuint index, int imageSize) + Atlas(GLuint index, sint32 imageSize) { _index = index; _imageSize = imageSize; } - void Initialise(int atlasWidth, int atlasHeight) + void Initialise(sint32 atlasWidth, sint32 atlasHeight) { _atlasWidth = atlasWidth; _atlasHeight = atlasHeight; @@ -104,7 +104,7 @@ public: } } - CachedTextureInfo Allocate(int actualWidth, int actualHeight) + CachedTextureInfo Allocate(sint32 actualWidth, sint32 actualHeight) { assert(_freeSlots.size() > 0); @@ -131,35 +131,35 @@ public: // Checks if specified image would be tightly packed in this atlas // by checking if it is within the right power of 2 range - bool IsImageSuitable(int actualWidth, int actualHeight) const + bool IsImageSuitable(sint32 actualWidth, sint32 actualHeight) const { - int imageOrder = CalculateImageSizeOrder(actualWidth, actualHeight); - int atlasOrder = (int) log2(_imageSize); + sint32 imageOrder = CalculateImageSizeOrder(actualWidth, actualHeight); + sint32 atlasOrder = (sint32) log2(_imageSize); return imageOrder == atlasOrder; } - int GetFreeSlots() const + sint32 GetFreeSlots() const { - return (int) _freeSlots.size(); + return (sint32) _freeSlots.size(); } - static int CalculateImageSizeOrder(int actualWidth, int actualHeight) + static sint32 CalculateImageSizeOrder(sint32 actualWidth, sint32 actualHeight) { - int actualSize = std::max(actualWidth, actualHeight); + sint32 actualSize = std::max(actualWidth, actualHeight); if (actualSize < TEXTURE_CACHE_SMALLEST_SLOT) { actualSize = TEXTURE_CACHE_SMALLEST_SLOT; } - return (int) ceil(log2f((float) actualSize)); + return (sint32) ceil(log2f((float) actualSize)); } private: - vec4i GetSlotCoordinates(GLuint slot, int actualWidth, int actualHeight) const + vec4i GetSlotCoordinates(GLuint slot, sint32 actualWidth, sint32 actualHeight) const { - int row = slot / _cols; - int col = slot % _cols; + sint32 row = slot / _cols; + sint32 col = slot % _cols; return vec4i { @@ -216,7 +216,7 @@ private: CachedTextureInfo LoadImageTexture(uint32 image); CachedTextureInfo LoadGlyphTexture(uint32 image, uint8 * palette); CachedTextureInfo LoadPaletteTexture(uint32 image, uint32 tertiaryColour, bool special); - CachedTextureInfo AllocateImage(int imageWidth, int imageHeight); + CachedTextureInfo AllocateImage(sint32 imageWidth, sint32 imageHeight); void * GetImageAsARGB(uint32 image, uint32 tertiaryColour, uint32 * outWidth, uint32 * outHeight); rct_drawpixelinfo * GetImageAsDPI(uint32 image, uint32 tertiaryColour); void * GetGlyphAsARGB(uint32 image, uint8 * palette, uint32 * outWidth, uint32 * outHeight); diff --git a/src/openrct2/drawing/font.c b/src/openrct2/drawing/font.c index 1638c7ce09..59fd17d2d6 100644 --- a/src/openrct2/drawing/font.c +++ b/src/openrct2/drawing/font.c @@ -20,7 +20,7 @@ #include "drawing.h" #include "font.h" -static const int SpriteFontLineHeight[] = { 6, 10, 10, 18 }; +static const sint32 SpriteFontLineHeight[] = { 6, 10, 10, 18 }; #ifdef NO_RCT2 static uint8 _spriteFontCharacterWidths[896]; @@ -39,12 +39,12 @@ TTFFontSetDescriptor *gCurrentTTFFontSet; void font_sprite_initialise_characters() { uint8* pCharacterWidth = _spriteFontCharacterWidths; - for (int fontSize = 0; fontSize < FONT_SIZE_COUNT; fontSize++) { - int glyphOffset = fontSize * FONT_SPRITE_GLYPH_COUNT; + for (sint32 fontSize = 0; fontSize < FONT_SIZE_COUNT; fontSize++) { + sint32 glyphOffset = fontSize * FONT_SPRITE_GLYPH_COUNT; for (uint8 glyphIndex = 0; glyphIndex < FONT_SPRITE_GLYPH_COUNT; glyphIndex++) { rct_g1_element g1 = g1Elements[glyphIndex + SPR_CHAR_START + glyphOffset]; - int width = fontSize == FONT_SIZE_BIG ? g1.width + 1 : g1.width - 1; + sint32 width = fontSize == FONT_SIZE_BIG ? g1.width + 1 : g1.width - 1; if (glyphIndex >= (FORMAT_ARGUMENT_CODE_START - 32) && glyphIndex < (FORMAT_COLOUR_CODE_END - 32)) { width = 0; } @@ -55,7 +55,7 @@ void font_sprite_initialise_characters() scrolling_text_initialise_bitmaps(); } -int font_sprite_get_codepoint_offset(int codepoint) +sint32 font_sprite_get_codepoint_offset(sint32 codepoint) { switch (codepoint) { case FORMAT_ENDQUOTES: return 34 - 32; @@ -99,17 +99,17 @@ int font_sprite_get_codepoint_offset(int codepoint) } } -int font_sprite_get_codepoint_width(int fontSpriteBase, int codepoint) +sint32 font_sprite_get_codepoint_width(sint32 fontSpriteBase, sint32 codepoint) { return _spriteFontCharacterWidths[fontSpriteBase + font_sprite_get_codepoint_offset(codepoint)]; } -int font_sprite_get_codepoint_sprite(int fontSpriteBase, int codepoint) +sint32 font_sprite_get_codepoint_sprite(sint32 fontSpriteBase, sint32 codepoint) { return SPR_CHAR_START + (IMAGE_TYPE_REMAP | (fontSpriteBase + font_sprite_get_codepoint_offset(codepoint))); } -int font_get_size_from_sprite_base(uint16 spriteBase) +sint32 font_get_size_from_sprite_base(uint16 spriteBase) { switch (spriteBase) { case FONT_SPRITE_BASE_TINY: @@ -124,9 +124,9 @@ int font_get_size_from_sprite_base(uint16 spriteBase) } } -int font_get_line_height(int fontSpriteBase) +sint32 font_get_line_height(sint32 fontSpriteBase) { - int fontSize = font_get_size_from_sprite_base(fontSpriteBase); + sint32 fontSize = font_get_size_from_sprite_base(fontSpriteBase); #ifndef NO_TTF if (gUseTrueTypeFont) { return gCurrentTTFFontSet->size[fontSize].line_height; @@ -138,7 +138,7 @@ int font_get_line_height(int fontSpriteBase) #endif // NO_TTF } -int font_get_line_height_small(int fontSpriteBase) +sint32 font_get_line_height_small(sint32 fontSpriteBase) { return font_get_line_height(fontSpriteBase) / 2; } @@ -194,7 +194,7 @@ bool font_supports_string_sprite(const utf8 *text) return true; } -bool font_supports_string_ttf(const utf8 *text, int fontSize) +bool font_supports_string_ttf(const utf8 *text, sint32 fontSize) { #ifndef NO_TTF const utf8 *src = text; @@ -216,7 +216,7 @@ bool font_supports_string_ttf(const utf8 *text, int fontSize) #endif // NO_TTF } -bool font_supports_string(const utf8 *text, int fontSize) +bool font_supports_string(const utf8 *text, sint32 fontSize) { if (gUseTrueTypeFont) { return font_supports_string_ttf(text, fontSize); diff --git a/src/openrct2/drawing/font.h b/src/openrct2/drawing/font.h index a1c86f07f9..69a4783c01 100644 --- a/src/openrct2/drawing/font.h +++ b/src/openrct2/drawing/font.h @@ -46,10 +46,10 @@ enum { typedef struct TTFFontDescriptor { const utf8 *filename; const utf8 *font_name; - int ptSize; - int offset_x; - int offset_y; - int line_height; + sint32 ptSize; + sint32 offset_x; + sint32 offset_y; + sint32 line_height; TTF_Font *font; } TTFFontDescriptor; @@ -61,14 +61,14 @@ extern TTFFontSetDescriptor *gCurrentTTFFontSet; #endif // NO_TTF void font_sprite_initialise_characters(); -int font_sprite_get_codepoint_offset(int codepoint); -int font_sprite_get_codepoint_width(int fontSpriteBase, int codepoint); -int font_sprite_get_codepoint_sprite(int fontSpriteBase, int codepoint); -int font_get_size_from_sprite_base(uint16 spriteBase); -int font_get_line_height(int fontSpriteBase); -int font_get_line_height_small(int fontSpriteBase); +sint32 font_sprite_get_codepoint_offset(sint32 codepoint); +sint32 font_sprite_get_codepoint_width(sint32 fontSpriteBase, sint32 codepoint); +sint32 font_sprite_get_codepoint_sprite(sint32 fontSpriteBase, sint32 codepoint); +sint32 font_get_size_from_sprite_base(uint16 spriteBase); +sint32 font_get_line_height(sint32 fontSpriteBase); +sint32 font_get_line_height_small(sint32 fontSpriteBase); bool font_supports_string_sprite(const utf8 *text); -bool font_supports_string_ttf(const utf8 *text, int fontSize); -bool font_supports_string(const utf8 *text, int fontSize); +bool font_supports_string_ttf(const utf8 *text, sint32 fontSize); +bool font_supports_string(const utf8 *text, sint32 fontSize); #endif diff --git a/src/openrct2/drawing/lightfx.c b/src/openrct2/drawing/lightfx.c index 149f4b6083..d30d0a8923 100644 --- a/src/openrct2/drawing/lightfx.c +++ b/src/openrct2/drawing/lightfx.c @@ -124,8 +124,8 @@ void lightfx_init() uint8 *parcer = _bakedLightTexture_lantern_3; - for (int y = 0; y < 256; y++) { - for (int x = 0; x < 256; x++) { + for (sint32 y = 0; y < 256; y++) { + for (sint32 x = 0; x < 256; x++) { *parcer = calc_light_intensity_lantern(x - 128, y - 128); parcer++; } @@ -133,8 +133,8 @@ void lightfx_init() parcer = _bakedLightTexture_spot_3; - for (int y = 0; y < 256; y++) { - for (int x = 0; x < 256; x++) { + for (sint32 y = 0; y < 256; y++) { + for (sint32 x = 0; x < 256; x++) { *parcer = calc_light_intensity_spot(x - 128, y - 128); parcer++; } @@ -249,28 +249,28 @@ void lightfx_prepare_light_list() break; } - int mapFrontDiv = 1 << _current_view_zoom_front; + sint32 mapFrontDiv = 1 << _current_view_zoom_front; static sint16 offsetPattern[26] = { 0, 0, -4, 0, 0, -3, 4, 0, 0, 3, -2, -1, -1, -1, 2, 1, 1, 1, -3, -2, -3, 2, 3, -2, 3, 2 }; #endif //LIGHTFX_UNKNOWN_PART_1 if (true) { - int totalSamplePoints = 5; - int startSamplePoint = 1; - int lastSampleCount = 0; + sint32 totalSamplePoints = 5; + sint32 startSamplePoint = 1; + sint32 lastSampleCount = 0; if ((entry->lightIDqualifier & 0xF) == LIGHTFX_LIGHT_QUALIFIER_MAP) { startSamplePoint = 0; totalSamplePoints = 1; } - for (int pat = startSamplePoint; pat < totalSamplePoints; pat++) { + for (sint32 pat = startSamplePoint; pat < totalSamplePoints; pat++) { rct_xy16 mapCoord = { 0 }; rct_map_element *mapElement = 0; - int interactionType = 0; + sint32 interactionType = 0; rct_window *w = window_get_main(); if (w != NULL) { @@ -306,12 +306,12 @@ void lightfx_prepare_light_list() //RCT2_GLOBAL(0x9AC148, uint8_t) = 0; //RCT2_GLOBAL(0x9AC138 + 4, int16_t) = screenX; //RCT2_GLOBAL(0x9AC138 + 6, int16_t) = screenY; - //if (screenX >= 0 && screenX < (int)myviewport->width && screenY >= 0 && screenY < (int)myviewport->height) + //if (screenX >= 0 && screenX < (sint32)myviewport->width && screenY >= 0 && screenY < (sint32)myviewport->height) //{ // screenX <<= myviewport->zoom; // screenY <<= myviewport->zoom; - // screenX += (int)myviewport->view_x; - // screenY += (int)myviewport->view_y; + // screenX += (sint32)myviewport->view_x; + // screenY += (sint32)myviewport->view_y; // RCT2_GLOBAL(RCT2_ADDRESS_VIEWPORT_ZOOM, uint16_t) = myviewport->zoom; // screenX &= (0xFFFF << myviewport->zoom) & 0xFFFF; // screenY &= (0xFFFF << myviewport->zoom) & 0xFFFF; @@ -378,7 +378,7 @@ void lightfx_prepare_light_list() break; if (_current_view_zoom_front > 0) break; - int newSampleCount = lightIntensityOccluded / 900; + sint32 newSampleCount = lightIntensityOccluded / 900; if (abs(newSampleCount - lastSampleCount) < 10) break; totalSamplePoints += 4; @@ -575,8 +575,8 @@ void lightfx_render_lights_to_frontbuffer() bufWriteSkip = _pixelInfo.width - bufWriteWidth; if (entry->lightIntensity == 0xFF) { - for (int y = 0; y < bufWriteHeight; y++) { - for (int x = 0; x < bufWriteWidth; x++) { + for (sint32 y = 0; y < bufWriteHeight; y++) { + for (sint32 x = 0; x < bufWriteWidth; x++) { *bufWriteBase = min(0xFF, *bufWriteBase + *bufReadBase); bufWriteBase++; bufReadBase++; @@ -587,8 +587,8 @@ void lightfx_render_lights_to_frontbuffer() } } else { - for (int y = 0; y < bufWriteHeight; y++) { - for (int x = 0; x < bufWriteWidth; x++) { + for (sint32 y = 0; y < bufWriteHeight; y++) { + for (sint32 x = 0; x < bufWriteWidth; x++) { *bufWriteBase = min(0xFF, *bufWriteBase + (((*bufReadBase) * (1 + entry->lightIntensity)) >> 8)); bufWriteBase++; bufReadBase++; @@ -967,8 +967,8 @@ static uint8 lerp(uint8 a, uint8 b, float t) if (t <= 0) return a; if (t >= 1) return b; - int range = b - a; - int amount = (int)(range * t); + sint32 range = b - a; + sint32 amount = (sint32)(range * t); return (uint8)(a + amount); } @@ -1007,7 +1007,7 @@ void lightfx_render_to_texture( uint8 * lightBits = (uint8 *)lightfx_get_front_buffer(); void * pixels; - int pitch; + sint32 pitch; if (SDL_LockTexture(texture, NULL, &pixels, &pitch) == 0) { for (uint32 y = 0; y < height; y++) { uintptr_t dstOffset = (uintptr_t)(y * pitch); diff --git a/src/openrct2/drawing/line.c b/src/openrct2/drawing/line.c index c1d8d71d15..ee5ec7439f 100644 --- a/src/openrct2/drawing/line.c +++ b/src/openrct2/drawing/line.c @@ -20,7 +20,7 @@ * Draws a horizontal line of specified colour to a buffer. * rct2: 0x0068474C */ -static void gfx_draw_line_on_buffer(rct_drawpixelinfo *dpi, char colour, int y, int x, int no_pixels) +static void gfx_draw_line_on_buffer(rct_drawpixelinfo *dpi, char colour, sint32 y, sint32 x, sint32 no_pixels) { y -= dpi->y; @@ -68,7 +68,7 @@ static void gfx_draw_line_on_buffer(rct_drawpixelinfo *dpi, char colour, int y, * y2 (dx) * colour (ebp) */ -void gfx_draw_line_software(rct_drawpixelinfo *dpi, int x1, int y1, int x2, int y2, int colour) +void gfx_draw_line_software(rct_drawpixelinfo *dpi, sint32 x1, sint32 y1, sint32 x2, sint32 y2, sint32 colour) { // Check to make sure the line is within the drawing area if ((x1 < dpi->x) && (x2 < dpi->x)){ @@ -90,10 +90,10 @@ void gfx_draw_line_software(rct_drawpixelinfo *dpi, int x1, int y1, int x2, int //Bresenhams algorithm //If vertical plot points upwards - int steep = abs(y2 - y1) > abs(x2 - x1); + sint32 steep = abs(y2 - y1) > abs(x2 - x1); if (steep){ - int temp_y2 = y2; - int temp_x2 = x2; + sint32 temp_y2 = y2; + sint32 temp_x2 = x2; y2 = x1; x2 = y1; y1 = temp_x2; @@ -102,25 +102,25 @@ void gfx_draw_line_software(rct_drawpixelinfo *dpi, int x1, int y1, int x2, int //If line is right to left swap direction if (x1 > x2){ - int temp_y2 = y2; - int temp_x2 = x2; + sint32 temp_y2 = y2; + sint32 temp_x2 = x2; y2 = y1; x2 = x1; y1 = temp_y2; x1 = temp_x2; } - int delta_x = x2 - x1; - int delta_y = abs(y2 - y1); - int error = delta_x / 2; - int y_step; - int y = y1; + sint32 delta_x = x2 - x1; + sint32 delta_y = abs(y2 - y1); + sint32 error = delta_x / 2; + sint32 y_step; + sint32 y = y1; //Direction of step if (y1 < y2)y_step = 1; else y_step = -1; - for (int x = x1, x_start = x1, no_pixels = 1; x < x2; ++x,++no_pixels){ + for (sint32 x = x1, x_start = x1, no_pixels = 1; x < x2; ++x,++no_pixels){ //Vertical lines are drawn 1 pixel at a time if (steep)gfx_draw_line_on_buffer(dpi, colour, x, y, 1); diff --git a/src/openrct2/drawing/rect.c b/src/openrct2/drawing/rect.c index 48e1a525b1..c6d2d583ad 100644 --- a/src/openrct2/drawing/rect.c +++ b/src/openrct2/drawing/rect.c @@ -31,7 +31,7 @@ * colour (ebp) * flags (si) */ -void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, short left, short top, short right, short bottom, int colour, uint8 flags) +void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, sint16 left, sint16 top, sint16 right, sint16 bottom, sint32 colour, uint8 flags) { uint8 shadow, fill, hilight; diff --git a/src/openrct2/drawing/scrolling_text.c b/src/openrct2/drawing/scrolling_text.c index 90f5e6c3ce..3334f6f2cb 100644 --- a/src/openrct2/drawing/scrolling_text.c +++ b/src/openrct2/drawing/scrolling_text.c @@ -41,8 +41,8 @@ static rct_draw_scroll_text _drawScrollTextList[MAX_SCROLLING_TEXT_ENTRIES]; static uint8 _characterBitmaps[224 * 8]; static uint32 _drawSCrollNextIndex = 0; -void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets); -void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets); +void scrolling_text_set_bitmap_for_sprite(utf8 *text, sint32 scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets); +void scrolling_text_set_bitmap_for_ttf(utf8 *text, sint32 scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets); void scrolling_text_initialise_bitmaps() { @@ -58,13 +58,13 @@ void scrolling_text_initialise_bitmaps() }; - for (int i = 0; i < 224; i++) { + for (sint32 i = 0; i < 224; i++) { memset(drawingSurface, 0, sizeof(drawingSurface)); gfx_draw_sprite_software(&dpi, SPR_CHAR_START + FONT_SPRITE_BASE_TINY + i, -1, 0, 0); - for (int x = 0; x < 8; x++) { + for (sint32 x = 0; x < 8; x++) { uint8 val = 0; - for (int y = 0; y < 8; y++) { + for (sint32 y = 0; y < 8; y++) { val >>= 1; if (dpi.bits[x + y * 8] == 1) { val |= 0x80; @@ -74,7 +74,7 @@ void scrolling_text_initialise_bitmaps() } } - for (int i = 0; i < MAX_SCROLLING_TEXT_ENTRIES; i++) { + for (sint32 i = 0; i < MAX_SCROLLING_TEXT_ENTRIES; i++) { rct_g1_element *g1 = &g1Elements[SPR_SCROLLING_TEXT_START + i]; g1->offset = _drawScrollTextList[i].bitmap; g1->width = 64; @@ -88,17 +88,17 @@ void scrolling_text_initialise_bitmaps() } } -static uint8 *font_sprite_get_codepoint_bitmap(int codepoint) +static uint8 *font_sprite_get_codepoint_bitmap(sint32 codepoint) { return &_characterBitmaps[font_sprite_get_codepoint_offset(codepoint) * 8]; } -static int scrolling_text_get_matching_or_oldest(rct_string_id stringId, uint16 scroll, uint16 scrollingMode) +static sint32 scrolling_text_get_matching_or_oldest(rct_string_id stringId, uint16 scroll, uint16 scrollingMode) { uint32 oldestId = 0xFFFFFFFF; - int scrollIndex = -1; - for (int i = 0; i < MAX_SCROLLING_TEXT_ENTRIES; i++) { + sint32 scrollIndex = -1; + for (sint32 i = 0; i < MAX_SCROLLING_TEXT_ENTRIES; i++) { rct_draw_scroll_text *scrollText = &_drawScrollTextList[i]; if (oldestId >= scrollText->id) { oldestId = scrollText->id; @@ -125,7 +125,7 @@ static int scrolling_text_get_matching_or_oldest(rct_string_id stringId, uint16 static uint8 scrolling_text_get_colour(uint32 character) { - int colour = character & 0x7F; + sint32 colour = character & 0x7F; if (character & COLOUR_FLAG_TRANSLUCENT) { return ColourMapA[colour].light; } else { @@ -1414,7 +1414,7 @@ static const sint16* _scrollPositions[MAX_SCROLLING_TEXT_MODES] = { * @param scrollingMode (bp) * @returns ebx */ -int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrollingMode) +sint32 scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrollingMode) { assert(scrollingMode < MAX_SCROLLING_TEXT_MODES); @@ -1424,7 +1424,7 @@ int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrolling _drawSCrollNextIndex++; - int scrollIndex = scrolling_text_get_matching_or_oldest(stringId, scroll, scrollingMode); + sint32 scrollIndex = scrolling_text_get_matching_or_oldest(stringId, scroll, scrollingMode); if (scrollIndex >= SPR_SCROLLING_TEXT_START) return scrollIndex; // Setup scrolling text @@ -1458,7 +1458,7 @@ int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrolling return imageId; } -void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets) +void scrolling_text_set_bitmap_for_sprite(utf8 *text, sint32 scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets) { uint8 characterColour = scrolling_text_get_colour(gCommonFormatArgs[7]); @@ -1482,7 +1482,7 @@ void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap, // If another type of control character ignore if (codepoint < 32) continue; - int characterWidth = font_sprite_get_codepoint_width(FONT_SPRITE_BASE_TINY, codepoint); + sint32 characterWidth = font_sprite_get_codepoint_width(FONT_SPRITE_BASE_TINY, codepoint); uint8 *characterBitmap = font_sprite_get_codepoint_bitmap(codepoint); for (; characterWidth != 0; characterWidth--, characterBitmap++) { // Skip any none displayed columns @@ -1507,7 +1507,7 @@ void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap, } } -void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets) +void scrolling_text_set_bitmap_for_ttf(utf8 *text, sint32 scroll, uint8 *bitmap, const sint16 *scrollPositionOffsets) { #ifndef NO_TTF TTFFontDescriptor *fontDesc = ttf_get_font_from_sprite_base(FONT_SPRITE_BASE_TINY); @@ -1521,7 +1521,7 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, co utf8 *dstCh = text; utf8 *ch = text; - int codepoint; + sint32 codepoint; while ((codepoint = utf8_get_next(ch, (const utf8**)&ch)) != 0) { if (utf8_is_format_code(codepoint)) { if (codepoint >= FORMAT_COLOUR_CODE_START && codepoint <= FORMAT_COLOUR_CODE_END) { @@ -1548,9 +1548,9 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, co return; } - int pitch = surface->pitch; - int width = surface->w; - int height = surface->h; + sint32 pitch = surface->pitch; + sint32 width = surface->w; + sint32 height = surface->h; uint8 *src = surface->pixels; // Offset @@ -1558,7 +1558,7 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, co src += 3 * pitch; height = min(height, 8); - int x = 0; + sint32 x = 0; while (true) { // Skip any none displayed columns if (scroll == 0) { @@ -1567,7 +1567,7 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, co if (scrollPosition > -1) { uint8 *dst = &bitmap[scrollPosition]; - for (int y = 0; y < height; y++) { + for (sint32 y = 0; y < height; y++) { if (src[y * pitch + x] != 0) *dst = colour; // Jump to next row diff --git a/src/openrct2/drawing/sprite.c b/src/openrct2/drawing/sprite.c index a9fde05ad3..229dc3726a 100644 --- a/src/openrct2/drawing/sprite.c +++ b/src/openrct2/drawing/sprite.c @@ -93,7 +93,7 @@ bool gfx_load_g1() SDL_RWclose(file); // Fix entry data offsets - for (unsigned int i = 0; i < header.num_entries; i++) + for (uint32 i = 0; i < header.num_entries; i++) g1Elements[i].offset += (uintptr_t)_g1Buffer; return true; @@ -144,7 +144,7 @@ bool gfx_load_g2() SDL_RWclose(file); // Fix entry data offsets - for (unsigned int i = 0; i < g2.header.num_entries; i++) + for (uint32 i = 0; i < g2.header.num_entries; i++) g2.elements[i].offset += (uintptr_t)g2.data; return true; @@ -165,7 +165,7 @@ bool gfx_load_g2() */ void sub_68371D() { - for (int i = 0; i < countof(fadeSprites); i++) { + for (sint32 i = 0; i < countof(fadeSprites); i++) { const uint32 spriteId = fadeSprites[i]; if (spriteId == SPR_NONE) { unk_9E3CE4[i] = NULL; @@ -180,7 +180,7 @@ void sub_68371D() * image. * rct2: 0x0067A690 */ -static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, uint8* source_pointer, uint8* dest_pointer, rct_g1_element* source_image, rct_drawpixelinfo *dest_dpi, int height, int width, int image_type){ +static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, uint8* source_pointer, uint8* dest_pointer, rct_g1_element* source_image, rct_drawpixelinfo *dest_dpi, sint32 height, sint32 width, sint32 image_type){ uint16 zoom_level = dest_dpi->zoom_level; uint8 zoom_amount = 1 << zoom_level; uint32 dest_line_width = (dest_dpi->width / zoom_amount) + dest_dpi->pitch; @@ -194,7 +194,7 @@ static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unk for (; height > 0; height -= zoom_amount){ uint8* next_source_pointer = source_pointer + source_line_width; uint8* next_dest_pointer = dest_pointer + dest_line_width; - for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){ + for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){ uint8 pixel = *source_pointer; pixel = palette_pointer[pixel]; if (pixel){ @@ -217,7 +217,7 @@ static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unk uint8* next_source_pointer = source_pointer + source_line_width; uint8* next_dest_pointer = dest_pointer + dest_line_width; - for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){ + for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){ uint8 pixel = *source_pointer; if (pixel){ pixel = *dest_pointer; @@ -238,7 +238,7 @@ static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unk uint8* next_source_pointer = source_pointer + source_line_width; uint8* next_dest_pointer = dest_pointer + dest_line_width; - for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){ + for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){ *dest_pointer = *source_pointer; } @@ -253,7 +253,7 @@ static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unk uint8* next_source_pointer = source_pointer + source_line_width; uint8* next_dest_pointer = dest_pointer + dest_line_width; - for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){ + for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){ uint8 pixel = *source_pointer; if (pixel){ *dest_pointer = pixel; @@ -265,8 +265,8 @@ static void FASTCALL gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unk return; } -uint8* FASTCALL gfx_draw_sprite_get_palette(int image_id, uint32 tertiary_colour) { - int image_type = (image_id & 0xE0000000); +uint8* FASTCALL gfx_draw_sprite_get_palette(sint32 image_id, uint32 tertiary_colour) { + sint32 image_type = (image_id & 0xE0000000); if (image_type == 0) return NULL; @@ -320,7 +320,7 @@ uint8* FASTCALL gfx_draw_sprite_get_palette(int image_id, uint32 tertiary_colour * dpi (esi) * tertiary_colour (ebp) */ -void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint32 tertiary_colour) +void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint32 tertiary_colour) { uint8* palette_pointer = gfx_draw_sprite_get_palette(image_id, tertiary_colour); if (image_id & IMAGE_TYPE_REMAP_2_PLUS) { @@ -340,10 +340,10 @@ void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int * x (cx) * y (dx) */ -void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint8* palette_pointer, uint8* unknown_pointer) +void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint8* palette_pointer, uint8* unknown_pointer) { - int image_element = image_id & 0x7FFFF; - int image_type = image_id & 0xE0000000; + sint32 image_element = image_id & 0x7FFFF; + sint32 image_type = image_id & 0xE0000000; rct_g1_element *g1_source = gfx_get_g1_element(image_element); @@ -366,8 +366,8 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i } //Its used super often so we will define it to a separate variable. - int zoom_level = dpi->zoom_level; - int zoom_mask = 0xFFFFFFFF << zoom_level; + sint32 zoom_level = dpi->zoom_level; + sint32 zoom_mask = 0xFFFFFFFF << zoom_level; if (zoom_level && g1_source->flags & G1_FLAG_RLE_COMPRESSION){ x -= ~zoom_mask; @@ -375,7 +375,7 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i } //This will be the height of the drawn image - int height = g1_source->height; + sint32 height = g1_source->height; //This is the start y coordinate on the destination sint16 dest_start_y = y + g1_source->y_offset; @@ -388,7 +388,7 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i dest_start_y = (dest_start_y&zoom_mask) - dpi->y; } //This is the start y coordinate on the source - int source_start_y = 0; + sint32 source_start_y = 0; if (dest_start_y < 0){ //If the destination y is negative reduce the height of the @@ -410,7 +410,7 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i } } - int dest_end_y = dest_start_y + height; + sint32 dest_end_y = dest_start_y + height; if (dest_end_y > dpi->height){ //If the destination y is outside of the drawing @@ -423,9 +423,9 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i dest_start_y >>= zoom_level; //This will be the width of the drawn image - int width = g1_source->width; + sint32 width = g1_source->width; //This is the source start x coordinate - int source_start_x = 0; + sint32 source_start_x = 0; //This is the destination start x coordinate sint16 dest_start_x = ((x + g1_source->x_offset + ~zoom_mask)&zoom_mask) - dpi->x; @@ -448,7 +448,7 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i } } - int dest_end_x = dest_start_x + width; + sint32 dest_end_x = dest_start_x + width; if (dest_end_x > dpi->width){ //If the destination x is outside of the drawing area @@ -486,9 +486,9 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, int i * * rct2: 0x00681DE2 */ -void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, int x, int y, int maskImage, int colourImage) +void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 maskImage, sint32 colourImage) { - int left, top, right, bottom, width, height; + sint32 left, top, right, bottom, width, height; rct_g1_element *imgMask = &g1Elements[maskImage & 0x7FFFF]; rct_g1_element *imgColour = &g1Elements[colourImage & 0x7FFFF]; @@ -517,18 +517,18 @@ void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, int x, if (width < 0 || height < 0) return; - int skipX = left - x; - int skipY = top - y; + sint32 skipX = left - x; + sint32 skipY = top - y; uint8 *maskSrc = imgMask->offset + (skipY * imgMask->width) + skipX; uint8 *colourSrc = imgColour->offset + (skipY * imgColour->width) + skipX; uint8 *dst = dpi->bits + (left - dpi->x) + ((top - dpi->y) * (dpi->width + dpi->pitch)); - int maskWrap = imgMask->width - width; - int colourWrap = imgColour->width - width; - int dstWrap = ((dpi->width + dpi->pitch) - width); - for (int yy = top; yy < bottom; yy++) { - for (int xx = left; xx < right; xx++) { + sint32 maskWrap = imgMask->width - width; + sint32 colourWrap = imgColour->width - width; + sint32 dstWrap = ((dpi->width + dpi->pitch) - width); + for (sint32 yy = top; yy < bottom; yy++) { + for (sint32 xx = left; xx < right; xx++) { uint8 colour = (*colourSrc) & (*maskSrc); if (colour != 0) { *dst = colour; @@ -544,7 +544,7 @@ void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, int x, } } -rct_g1_element *gfx_get_g1_element(int image_id) { +rct_g1_element *gfx_get_g1_element(sint32 image_id) { if (image_id < SPR_G2_BEGIN) { return &g1Elements[image_id]; } diff --git a/src/openrct2/drawing/string.c b/src/openrct2/drawing/string.c index 79b39825c6..7733a39ca6 100644 --- a/src/openrct2/drawing/string.c +++ b/src/openrct2/drawing/string.c @@ -32,8 +32,8 @@ enum { TEXT_DRAW_FLAG_NO_DRAW = 1u << 31 }; -static int ttf_get_string_width(const utf8 *text); -static void ttf_draw_string(rct_drawpixelinfo *dpi, char *buffer, int colour, int x, int y); +static sint32 ttf_get_string_width(const utf8 *text); +static void ttf_draw_string(rct_drawpixelinfo *dpi, char *buffer, sint32 colour, sint32 x, sint32 y); #ifndef NO_TTF static bool _ttfInitialised = false; @@ -49,9 +49,9 @@ typedef struct ttf_cache_entry { } ttf_cache_entry; static ttf_cache_entry _ttfSurfaceCache[TTF_SURFACE_CACHE_SIZE] = { 0 }; -static int _ttfSurfaceCacheCount = 0; -static int _ttfSurfaceCacheHitCount = 0; -static int _ttfSurfaceCacheMissCount = 0; +static sint32 _ttfSurfaceCacheCount = 0; +static sint32 _ttfSurfaceCacheHitCount = 0; +static sint32 _ttfSurfaceCacheMissCount = 0; typedef struct ttf_getwidth_cache_entry { uint32 width; @@ -61,24 +61,24 @@ typedef struct ttf_getwidth_cache_entry { } ttf_getwidth_cache_entry; static ttf_getwidth_cache_entry _ttfGetWidthCache[TTF_GETWIDTH_CACHE_SIZE] = { 0 }; -static int _ttfGetWidthCacheCount = 0; -static int _ttfGetWidthCacheHitCount = 0; -static int _ttfGetWidthCacheMissCount = 0; +static sint32 _ttfGetWidthCacheCount = 0; +static sint32 _ttfGetWidthCacheHitCount = 0; +static sint32 _ttfGetWidthCacheMissCount = 0; #endif // NO_TTF /** * * rct2: 0x006C23B1 */ -int gfx_get_string_width_new_lined(utf8 *text) +sint32 gfx_get_string_width_new_lined(utf8 *text) { utf8 *ch = text; utf8 *firstCh = text; utf8 *nextCh; utf8 backup; - int codepoint; + sint32 codepoint; - int maxWidth = 0; + sint32 maxWidth = 0; while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) { if (codepoint == FORMAT_NEWLINE || codepoint == FORMAT_NEWLINE_SMALLER) { backup = *nextCh; @@ -100,7 +100,7 @@ int gfx_get_string_width_new_lined(utf8 *text) * rct2: 0x006C2321 * buffer (esi) */ -int gfx_get_string_width(char* buffer) +sint32 gfx_get_string_width(char* buffer) { return ttf_get_string_width(buffer); } @@ -112,9 +112,9 @@ int gfx_get_string_width(char* buffer) * buffer (esi) * width (edi) */ -int gfx_clip_string(utf8 *text, int width) +sint32 gfx_clip_string(utf8 *text, sint32 width) { - int clippedWidth; + sint32 clippedWidth; if (width < 6) { *text = 0; @@ -130,7 +130,7 @@ int gfx_clip_string(utf8 *text, int width) utf8 *ch = text; utf8 *nextCh = text; utf8 *clipCh = text; - int codepoint; + sint32 codepoint; while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) { if (utf8_is_format_code(codepoint)) { ch = nextCh; @@ -138,21 +138,21 @@ int gfx_clip_string(utf8 *text, int width) continue; } - for (int i = 0; i < 4; i++) { backup[i] = nextCh[i]; }; - for (int i = 0; i < 3; i++) { nextCh[i] = '.'; } + for (sint32 i = 0; i < 4; i++) { backup[i] = nextCh[i]; }; + for (sint32 i = 0; i < 3; i++) { nextCh[i] = '.'; } nextCh[3] = 0; - int queryWidth = gfx_get_string_width(text); + sint32 queryWidth = gfx_get_string_width(text); if (queryWidth < width) { clipCh = nextCh; clippedWidth = queryWidth; } else { - for (int i = 0; i < 3; i++) { clipCh[i] = '.'; } + for (sint32 i = 0; i < 3; i++) { clipCh[i] = '.'; } clipCh[3] = 0; return clippedWidth; } - for (int i = 0; i < 4; i++) { nextCh[i] = backup[i]; }; + for (sint32 i = 0; i < 4; i++) { nextCh[i] = backup[i]; }; ch = nextCh; } return gfx_get_string_width(text); @@ -171,23 +171,23 @@ int gfx_clip_string(utf8 *text, int width) * num_lines (edi) - out * font_height (ebx) - out */ -int gfx_wrap_string(utf8 *text, int width, int *outNumLines, int *outFontHeight) +sint32 gfx_wrap_string(utf8 *text, sint32 width, sint32 *outNumLines, sint32 *outFontHeight) { - int lineWidth = 0; - int maxWidth = 0; + sint32 lineWidth = 0; + sint32 maxWidth = 0; *outNumLines = 0; // Pointer to the start of the current word utf8 *currentWord = NULL; // Width of line up to current word - int currentWidth = 0; + sint32 currentWidth = 0; utf8 *ch = text; utf8 *firstCh = text; utf8 *nextCh; - int codepoint; - int numCharactersOnLine = 0; + sint32 codepoint; + sint32 numCharactersOnLine = 0; while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) { if (codepoint == ' ') { currentWord = ch; @@ -254,7 +254,7 @@ int gfx_wrap_string(utf8 *text, int width, int *outNumLines, int *outFontHeight) * y (dx) * width (bp) */ -void gfx_draw_string_left_clipped(rct_drawpixelinfo* dpi, rct_string_id format, void* args, int colour, int x, int y, int width) +void gfx_draw_string_left_clipped(rct_drawpixelinfo* dpi, rct_string_id format, void* args, sint32 colour, sint32 x, sint32 y, sint32 width) { char* buffer = gCommonStringFormatBuffer; format_string(buffer, 256, format, args); @@ -279,7 +279,7 @@ void gfx_draw_string_left_clipped(rct_drawpixelinfo* dpi, rct_string_id format, * y (dx) * width (bp) */ -void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y, int width) +void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y, sint32 width) { char* buffer = gCommonStringFormatBuffer; format_string(buffer, 256, format, args); @@ -287,7 +287,7 @@ void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, rct_string_id forma gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; // Clip text - int text_width = gfx_clip_string(buffer, width); + sint32 text_width = gfx_clip_string(buffer, width); // Draw the text centred if (text_width <= 0xFFFF && text_width >= 0) { @@ -308,13 +308,13 @@ void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, rct_string_id forma * x (cx) * y (dx) */ -void gfx_draw_string_right(rct_drawpixelinfo* dpi, rct_string_id format, void* args, int colour, int x, int y) +void gfx_draw_string_right(rct_drawpixelinfo* dpi, rct_string_id format, void* args, sint32 colour, sint32 x, sint32 y) { char* buffer = gCommonStringFormatBuffer; format_string(buffer, 256, format, args); // Measure text width - short text_width = gfx_get_string_width(buffer); + sint16 text_width = gfx_get_string_width(buffer); // Draw the text right aligned x -= text_width; @@ -331,7 +331,7 @@ void gfx_draw_string_right(rct_drawpixelinfo* dpi, rct_string_id format, void* a * colour (al) * args (esi) */ -void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, int x, int y, int colour, void *args) +void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, sint32 x, sint32 y, sint32 colour, void *args) { gfx_draw_string_centred_wrapped(dpi, args, x, y, INT32_MAX, format, colour); } @@ -347,9 +347,9 @@ void gfx_draw_string_centred(rct_drawpixelinfo *dpi, rct_string_id format, int x * colour (al) * format (ebx) */ -int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int y, int width, rct_string_id format, int colour) +sint32 gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, sint32 x, sint32 y, sint32 width, rct_string_id format, sint32 colour) { - int font_height, line_height, line_y, num_lines; + sint32 font_height, line_height, line_y, num_lines; if (gCurrentFontSpriteBase >= 0) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -373,8 +373,8 @@ int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, i gCurrentFontFlags = 0; - for (int line = 0; line <= num_lines; ++line) { - int half_width = gfx_get_string_width(buffer) / 2; + for (sint32 line = 0; line <= num_lines; ++line) { + sint32 half_width = gfx_get_string_width(buffer) / 2; gfx_draw_string(dpi, buffer, TEXT_COLOUR_254, x - half_width, line_y); buffer = get_string_end(buffer) + 1; @@ -395,10 +395,10 @@ int gfx_draw_string_centred_wrapped(rct_drawpixelinfo *dpi, void *args, int x, i * format (bx) * colour (al) */ -int gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int y, int width, rct_string_id format, int colour) +sint32 gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, sint32 x, sint32 y, sint32 width, rct_string_id format, sint32 colour) { // font height might actually be something else - int fontSpriteBase, lineHeight, lineY, numLines; + sint32 fontSpriteBase, lineHeight, lineY, numLines; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -412,7 +412,7 @@ int gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int gCurrentFontFlags = 0; lineY = y; - for (int line = 0; line <= numLines; ++line) { + for (sint32 line = 0; line <= numLines; ++line) { gfx_draw_string(dpi, buffer, TEXT_COLOUR_254, x, lineY); buffer = get_string_end(buffer) + 1; lineY += lineHeight; @@ -430,7 +430,7 @@ int gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int * x (cx) * y (dx) */ -void gfx_draw_string_left(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y) +void gfx_draw_string_left(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y) { char* buffer = gCommonStringFormatBuffer; format_string(buffer, 256, format, args); @@ -441,12 +441,12 @@ void gfx_draw_string_left(rct_drawpixelinfo *dpi, rct_string_id format, void *ar /** * Draws text that is left aligned and vertically centred. */ -void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y) +void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; char *buffer = gCommonStringFormatBuffer; format_string(buffer, 256, format, args); - int height = string_get_height_raw(buffer); + sint32 height = string_get_height_raw(buffer); gfx_draw_string(dpi, buffer, colour, x, y - (height / 2)); } @@ -455,7 +455,7 @@ void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format, */ static void colour_char(uint8 colour, uint16* current_font_flags, uint8* palette_pointer) { - int eax; + sint32 eax; rct_g1_element g1_element = g1Elements[SPR_TEXT_PALETTE]; eax = ((uint32*)g1_element.offset)[colour & 0xFF]; @@ -477,7 +477,7 @@ static void colour_char(uint8 colour, uint16* current_font_flags, uint8* palette */ static void colour_char_window(uint8 colour, uint16* current_font_flags,uint8* palette_pointer) { - int eax; + sint32 eax; colour = NOT_TRANSLUCENT(colour); eax = ColourMapA[colour].colour_11; @@ -501,15 +501,15 @@ static void colour_char_window(uint8 colour, uint16* current_font_flags,uint8* p * x (cx) * y (dx) */ -void gfx_draw_string(rct_drawpixelinfo *dpi, char *buffer, int colour, int x, int y) +void gfx_draw_string(rct_drawpixelinfo *dpi, char *buffer, sint32 colour, sint32 x, sint32 y) { ttf_draw_string(dpi, buffer, colour, x, y); } -void draw_string_left_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y) +void draw_string_left_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y) { char buffer[128]; - int width; + sint32 width; format_string(buffer, 128, format, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -520,10 +520,10 @@ void draw_string_left_underline(rct_drawpixelinfo *dpi, rct_string_id format, vo gfx_fill_rect(dpi, x + 1, y + 12, x + width + 1, y + 12, text_palette[2]); } -void draw_string_right_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y) +void draw_string_right_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y) { char buffer[128]; - int width; + sint32 width; format_string(buffer, 128, format, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -535,10 +535,10 @@ void draw_string_right_underline(rct_drawpixelinfo *dpi, rct_string_id format, v gfx_fill_rect(dpi, x + 1, y + 12, x + width + 1, y + 12, text_palette[2]); } -void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y) +void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format, void *args, sint32 colour, sint32 x, sint32 y) { char buffer[128]; - int width; + sint32 width; format_string(buffer, 128, format, args); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -560,19 +560,19 @@ void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format, * text : esi * dpi : edi */ -void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines, char *text) +void draw_string_centred_raw(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 numLines, char *text) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gfx_draw_string(dpi, "", COLOUR_BLACK, dpi->x, dpi->y); gCurrentFontFlags = 0; - for (int i = 0; i <= numLines; i++) { - int width = gfx_get_string_width(text); + for (sint32 i = 0; i <= numLines; i++) { + sint32 width = gfx_get_string_width(text); gfx_draw_string(dpi, text, TEXT_COLOUR_254, x - (width / 2), y); const utf8 *ch = text; const utf8 *nextCh = 0; - int codepoint = 0; + sint32 codepoint = 0; while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) { ch = nextCh; @@ -583,11 +583,11 @@ void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines, } } -int string_get_height_raw(char *buffer) +sint32 string_get_height_raw(char *buffer) { uint16 fontBase = gCurrentFontSpriteBase; - int height = 0; + sint32 height = 0; if (fontBase <= FONT_SPRITE_BASE_MEDIUM) height += 10; else if (fontBase == FONT_SPRITE_BASE_TINY) @@ -659,9 +659,9 @@ int string_get_height_raw(char *buffer) * width : bp * ticks : ebp >> 16 */ -void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, int x, int y, int width, int colour, rct_string_id format, void *args, int ticks) +void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 width, sint32 colour, rct_string_id format, void *args, sint32 ticks) { - int numLines, fontSpriteBase, lineHeight, lineY; + sint32 numLines, fontSpriteBase, lineHeight, lineY; utf8 *buffer = gCommonStringFormatBuffer; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -673,17 +673,17 @@ void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, int x, int gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase); lineHeight = font_get_line_height(fontSpriteBase); - int numCharactersDrawn = 0; - int numCharactersToDraw = ticks; + sint32 numCharactersDrawn = 0; + sint32 numCharactersToDraw = ticks; gCurrentFontFlags = 0; lineY = y - ((numLines * lineHeight) / 2); - for (int line = 0; line <= numLines; line++) { - int halfWidth = gfx_get_string_width(buffer) / 2; + for (sint32 line = 0; line <= numLines; line++) { + sint32 halfWidth = gfx_get_string_width(buffer) / 2; utf8 *ch = buffer; utf8 *nextCh; - int codepoint; + sint32 codepoint; while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) { if (!utf8_is_format_code(codepoint)) { numCharactersDrawn++; @@ -730,7 +730,7 @@ static void _ttf_surface_cache_dispose(ttf_cache_entry *entry) static void _ttf_surface_cache_dispose_all() { - for (int i = 0; i < TTF_SURFACE_CACHE_SIZE; i++) { + for (sint32 i = 0; i < TTF_SURFACE_CACHE_SIZE; i++) { _ttf_surface_cache_dispose(&_ttfSurfaceCache[i]); _ttfSurfaceCacheCount--; } @@ -741,8 +741,8 @@ SDL_Surface *ttf_surface_cache_get_or_add(TTF_Font *font, const utf8 *text) ttf_cache_entry *entry; uint32 hash = _ttf_surface_cache_hash(font, text); - int index = hash % TTF_SURFACE_CACHE_SIZE; - for (int i = 0; i < TTF_SURFACE_CACHE_SIZE; i++) { + sint32 index = hash % TTF_SURFACE_CACHE_SIZE; + for (sint32 i = 0; i < TTF_SURFACE_CACHE_SIZE; i++) { entry = &_ttfSurfaceCache[index]; // Check if entry is a hit @@ -796,7 +796,7 @@ static void _ttf_getwidth_cache_dispose(ttf_getwidth_cache_entry *entry) static void _ttf_getwidth_cache_dispose_all() { - for (int i = 0; i < TTF_GETWIDTH_CACHE_SIZE; i++) { + for (sint32 i = 0; i < TTF_GETWIDTH_CACHE_SIZE; i++) { _ttf_getwidth_cache_dispose(&_ttfGetWidthCache[i]); _ttfGetWidthCacheCount--; } @@ -807,8 +807,8 @@ static uint32 _ttf_getwidth_cache_get_or_add(TTF_Font *font, const utf8 *text) ttf_getwidth_cache_entry *entry; uint32 hash = _ttf_surface_cache_hash(font, text); - int index = hash % TTF_GETWIDTH_CACHE_SIZE; - for (int i = 0; i < TTF_GETWIDTH_CACHE_SIZE; i++) { + sint32 index = hash % TTF_GETWIDTH_CACHE_SIZE; + for (sint32 i = 0; i < TTF_GETWIDTH_CACHE_SIZE; i++) { entry = &_ttfGetWidthCache[index]; // Check if entry is a hit @@ -832,7 +832,7 @@ static uint32 _ttf_getwidth_cache_get_or_add(TTF_Font *font, const utf8 *text) entry = &_ttfGetWidthCache[index]; _ttf_getwidth_cache_dispose(entry); - int width, height; + sint32 width, height; TTF_SizeUTF8(font, text, &width, &height); _ttfGetWidthCacheMissCount++; @@ -852,7 +852,7 @@ bool ttf_initialise() return false; } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { TTFFontDescriptor *fontDesc = &(gCurrentTTFFontSet->size[i]); utf8 fontPath[MAX_PATH]; @@ -881,7 +881,7 @@ void ttf_dispose() _ttf_surface_cache_dispose_all(); _ttf_getwidth_cache_dispose_all(); - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { TTFFontDescriptor *fontDesc = &(gCurrentTTFFontSet->size[i]); if (fontDesc->font != NULL) { TTF_CloseFont(fontDesc->font); @@ -907,28 +907,28 @@ void ttf_dispose() {} #endif // NO_TTF typedef struct text_draw_info { - int startX; - int startY; - int x; - int y; - int maxX; - int maxY; - int flags; + sint32 startX; + sint32 startY; + sint32 x; + sint32 y; + sint32 maxX; + sint32 maxY; + sint32 flags; uint8 palette[8]; uint16 font_sprite_base; const sint8 *y_offset; } text_draw_info; -static void ttf_draw_character_sprite(rct_drawpixelinfo *dpi, int codepoint, text_draw_info *info) +static void ttf_draw_character_sprite(rct_drawpixelinfo *dpi, sint32 codepoint, text_draw_info *info) { - int characterWidth = font_sprite_get_codepoint_width(info->font_sprite_base, codepoint); - int sprite = font_sprite_get_codepoint_sprite(info->font_sprite_base, codepoint); + sint32 characterWidth = font_sprite_get_codepoint_width(info->font_sprite_base, codepoint); + sint32 sprite = font_sprite_get_codepoint_sprite(info->font_sprite_base, codepoint); if (!(info->flags & TEXT_DRAW_FLAG_NO_DRAW)) { unk_9ABDA4 = &info->palette; - int x = info->x; - int y = info->y; + sint32 x = info->x; + sint32 y = info->y; if (info->flags & TEXT_DRAW_FLAG_Y_OFFSET_EFFECT) { y += *info->y_offset++; } @@ -941,7 +941,7 @@ static void ttf_draw_character_sprite(rct_drawpixelinfo *dpi, int codepoint, tex static void ttf_draw_string_raw_sprite(rct_drawpixelinfo *dpi, const utf8 *text, text_draw_info *info) { const utf8 *ch = text; - int codepoint; + sint32 codepoint; while (!utf8_is_format_code(codepoint = utf8_get_next(ch, &ch))) { ttf_draw_character_sprite(dpi, codepoint, info); @@ -975,17 +975,17 @@ static void ttf_draw_string_raw_ttf(rct_drawpixelinfo *dpi, const utf8 *text, te } } - int drawX = info->x + fontDesc->offset_x; - int drawY = info->y + fontDesc->offset_y; - int width = surface->w; - int height = surface->h; + sint32 drawX = info->x + fontDesc->offset_x; + sint32 drawY = info->y + fontDesc->offset_y; + sint32 width = surface->w; + sint32 height = surface->h; - int overflowX = (dpi->x + dpi->width) - (drawX + width); - int overflowY = (dpi->y + dpi->height) - (drawY + height); + sint32 overflowX = (dpi->x + dpi->width) - (drawX + width); + sint32 overflowY = (dpi->y + dpi->height) - (drawY + height); if (overflowX < 0) width += overflowX; if (overflowY < 0) height += overflowY; - int skipX = drawX - dpi->x; - int skipY = drawY - dpi->y; + sint32 skipX = drawX - dpi->x; + sint32 skipY = drawY - dpi->y; info->x += width; uint8 *src = surface->pixels; @@ -1005,15 +1005,15 @@ static void ttf_draw_string_raw_ttf(rct_drawpixelinfo *dpi, const utf8 *text, te dst += skipX; dst += skipY * (dpi->width + dpi->pitch); - int srcScanSkip = surface->pitch - width; - int dstScanSkip = dpi->width + dpi->pitch - width; + sint32 srcScanSkip = surface->pitch - width; + sint32 dstScanSkip = dpi->width + dpi->pitch - width; uint8 *dst_orig = dst; uint8 *src_orig = src; // Draw shadow/outline if (info->flags & TEXT_DRAW_FLAG_OUTLINE) { - for (int yy = 0; yy < height - 0; yy++) { - for (int xx = 0; xx < width - 0; xx++) { + for (sint32 yy = 0; yy < height - 0; yy++) { + for (sint32 xx = 0; xx < width - 0; xx++) { if (*src != 0) { *(dst + 1) = info->palette[3]; // right *(dst - 1) = info->palette[3]; // left @@ -1031,8 +1031,8 @@ static void ttf_draw_string_raw_ttf(rct_drawpixelinfo *dpi, const utf8 *text, te { dst = dst_orig; src = src_orig; - for (int yy = 0; yy < height; yy++) { - for (int xx = 0; xx < width; xx++) { + for (sint32 yy = 0; yy < height; yy++) { + for (sint32 xx = 0; xx < width; xx++) { if (*src != 0) { if (info->flags & TEXT_DRAW_FLAG_INSET) { *(dst + width + dstScanSkip + 1) = info->palette[3]; @@ -1070,7 +1070,7 @@ static void ttf_draw_string_raw(rct_drawpixelinfo *dpi, const utf8 *text, text_d static const utf8 *ttf_process_format_code(rct_drawpixelinfo *dpi, const utf8 *text, text_draw_info *info) { const utf8 *nextCh; - int codepoint; + sint32 codepoint; codepoint = utf8_get_next(text, &nextCh); switch (codepoint) { @@ -1176,7 +1176,7 @@ static const utf8 *ttf_process_glyph_run(rct_drawpixelinfo *dpi, const utf8 *tex utf8 buffer[512]; const utf8 *ch = text; const utf8 *lastCh; - int codepoint; + sint32 codepoint; #ifndef NO_TTF bool isTTF = info->flags & TEXT_DRAW_FLAG_TTF; @@ -1205,7 +1205,7 @@ static void ttf_process_string(rct_drawpixelinfo *dpi, const utf8 *text, text_dr { const utf8 *ch = text; const utf8 *nextCh; - int codepoint; + sint32 codepoint; #ifndef NO_TTF bool isTTF = info->flags & TEXT_DRAW_FLAG_TTF; @@ -1227,7 +1227,7 @@ static void ttf_process_string(rct_drawpixelinfo *dpi, const utf8 *text, text_dr } } -static void ttf_process_initial_colour(int colour, text_draw_info *info) +static void ttf_process_initial_colour(sint32 colour, text_draw_info *info) { if (colour != TEXT_COLOUR_254 && colour != TEXT_COLOUR_255) { info->flags &= ~(TEXT_DRAW_FLAG_INSET | TEXT_DRAW_FLAG_OUTLINE | TEXT_DRAW_FLAG_DARK | TEXT_DRAW_FLAG_EXTRA_DARK); @@ -1279,7 +1279,7 @@ static void ttf_process_initial_colour(int colour, text_draw_info *info) } } -static void ttf_draw_string(rct_drawpixelinfo *dpi, char *text, int colour, int x, int y) +static void ttf_draw_string(rct_drawpixelinfo *dpi, char *text, sint32 colour, sint32 x, sint32 y) { if (text == NULL) return; @@ -1307,7 +1307,7 @@ static void ttf_draw_string(rct_drawpixelinfo *dpi, char *text, int colour, int gLastDrawStringY = info.y; } -static int ttf_get_string_width(const utf8 *text) +static sint32 ttf_get_string_width(const utf8 *text) { text_draw_info info; info.font_sprite_base = gCurrentFontSpriteBase; @@ -1333,7 +1333,7 @@ static int ttf_get_string_width(const utf8 *text) * * rct2: 0x00682F28 */ -void gfx_draw_string_with_y_offsets(rct_drawpixelinfo *dpi, const utf8 *text, int colour, int x, int y, const sint8 *yOffsets, bool forceSpriteFont) +void gfx_draw_string_with_y_offsets(rct_drawpixelinfo *dpi, const utf8 *text, sint32 colour, sint32 x, sint32 y, const sint8 *yOffsets, bool forceSpriteFont) { text_draw_info info; info.font_sprite_base = gCurrentFontSpriteBase; @@ -1364,7 +1364,7 @@ void gfx_draw_string_with_y_offsets(rct_drawpixelinfo *dpi, const utf8 *text, in gLastDrawStringY = info.y; } -void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, int availableWidth) +void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, sint32 availableWidth) { size_t length = strlen(path); @@ -1375,7 +1375,7 @@ void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, int availab } // Count path separators - int path_separators = 0; + sint32 path_separators = 0; for (size_t x = 0; x < length; x++) { if (path[x] == *PATH_SEPARATOR) { path_separators++; @@ -1386,8 +1386,8 @@ void shorten_path(utf8 *buffer, size_t bufferSize, const utf8 *path, int availab safe_strcpy(buffer, "...", bufferSize); // Abreviate beginning with xth separator - int begin = -1; - for (int x = 0; x < path_separators; x++){ + sint32 begin = -1; + for (sint32 x = 0; x < path_separators; x++){ do { begin++; } while (path[begin] != *PATH_SEPARATOR); diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c index a2279770c5..9ed2979aab 100644 --- a/src/openrct2/editor.c +++ b/src/openrct2/editor.c @@ -68,12 +68,12 @@ uint8 * gEditorSelectedObjects[OBJECT_ENTRY_GROUP_COUNT] = { _editorSelectedStexs, }; -static void editor_convert_save_to_scenario_callback(int result, const utf8 * path); +static void editor_convert_save_to_scenario_callback(sint32 result, const utf8 * path); static void set_all_land_owned(); -static int editor_load_landscape_from_sv4(const char *path); -static int editor_load_landscape_from_sc4(const char *path); +static sint32 editor_load_landscape_from_sv4(const char *path); +static sint32 editor_load_landscape_from_sc4(const char *path); static void editor_finalise_main_view(); -static int editor_read_s6(const char *path); +static sint32 editor_read_s6(const char *path); static void editor_clear_map_for_editing(bool fromSave); /** @@ -130,7 +130,7 @@ void editor_convert_save_to_scenario() gLoadSaveCallback = editor_convert_save_to_scenario_callback; } -static void editor_convert_save_to_scenario_callback(int result, const utf8 * path) +static void editor_convert_save_to_scenario_callback(sint32 result, const utf8 * path) { if (result != MODAL_RESULT_OK) { return; @@ -252,7 +252,7 @@ void trackmanager_load() */ static void set_all_land_owned() { - int mapSize = gMapSize; + sint32 mapSize = gMapSize; game_do_command(64, 1, 64, 2, GAME_COMMAND_SET_LAND_OWNERSHIP, (mapSize - 3) * 32, (mapSize - 3) * 32); } @@ -285,7 +285,7 @@ bool editor_load_landscape(const utf8 *path) * * rct2: 0x006A2B02 */ -static int editor_load_landscape_from_sv4(const char *path) +static sint32 editor_load_landscape_from_sv4(const char *path) { rct1_load_saved_game(path); editor_clear_map_for_editing(true); @@ -299,7 +299,7 @@ static int editor_load_landscape_from_sv4(const char *path) return 1; } -static int editor_load_landscape_from_sc4(const char *path) +static sint32 editor_load_landscape_from_sc4(const char *path) { rct1_load_scenario(path); editor_clear_map_for_editing(false); @@ -317,7 +317,7 @@ static int editor_load_landscape_from_sc4(const char *path) * * rct2: 0x006758FE */ -static int editor_read_s6(const char *path) +static sint32 editor_read_s6(const char *path) { bool loadResult = false; const char *extension = path_get_extension(path); @@ -346,7 +346,7 @@ static void editor_clear_map_for_editing(bool fromSave) map_remove_all_rides(); // - for (int i = 0; i < MAX_BANNERS; i++) { + for (sint32 i = 0; i < MAX_BANNERS; i++) { if (gBanners[i].type == 255) { gBanners[i].flags &= ~BANNER_FLAG_2; } @@ -354,7 +354,7 @@ static void editor_clear_map_for_editing(bool fromSave) // { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { user_string_free(ride->name); @@ -364,7 +364,7 @@ static void editor_clear_map_for_editing(bool fromSave) ride_init_all(); // - for (int i = 0; i < MAX_SPRITES; i++) { + for (sint32 i = 0; i < MAX_SPRITES; i++) { rct_sprite *sprite = get_sprite(i); user_string_free(sprite->unknown.name_string_idx); } @@ -471,7 +471,7 @@ static void editor_finalise_main_view() w->saved_view_y = gSavedViewY; gCurrentRotation = gSavedViewRotation; - int zoom_difference = gSavedViewZoom - viewport->zoom; + sint32 zoom_difference = gSavedViewZoom - viewport->zoom; viewport->zoom = gSavedViewZoom; if (zoom_difference != 0) { if (zoom_difference >= 0) { @@ -500,7 +500,7 @@ static void editor_finalise_main_view() * * rct2: 0x006AB9B8 */ -int editor_check_object_selection() +sint32 editor_check_object_selection() { bool isTrackDesignerManager = gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER); @@ -538,13 +538,13 @@ int editor_check_object_selection() */ bool editor_check_park() { - int parkSize = park_calculate_size(); + sint32 parkSize = park_calculate_size(); if (parkSize == 0) { gGameCommandErrorText = STR_PARK_MUST_OWN_SOME_LAND; return false; } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (gParkEntranceX[i] != MAP_LOCATION_NULL) break; @@ -554,14 +554,14 @@ bool editor_check_park() } } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (gParkEntranceX[i] == MAP_LOCATION_NULL) continue; - int x = gParkEntranceX[i]; - int y = gParkEntranceY[i]; - int z = gParkEntranceZ[i] / 8; - int direction = gParkEntranceDirection[i] ^ 2; + sint32 x = gParkEntranceX[i]; + sint32 y = gParkEntranceY[i]; + sint32 z = gParkEntranceZ[i] / 8; + sint32 direction = gParkEntranceDirection[i] ^ 2; switch (footpath_is_connected_to_map_edge(x, y, z, direction, 0)) { case FOOTPATH_SEARCH_NOT_FOUND: diff --git a/src/openrct2/editor.h b/src/openrct2/editor.h index db319e3aa3..7466c0264c 100644 --- a/src/openrct2/editor.h +++ b/src/openrct2/editor.h @@ -42,8 +42,8 @@ bool editor_load_landscape(const utf8 *path); void editor_open_windows_for_current_step(); bool editor_check_park(); -int editor_check_object_selection(); +sint32 editor_check_object_selection(); -bool editor_check_object_group_at_least_one_selected(int objectType); +bool editor_check_object_group_at_least_one_selected(sint32 objectType); #endif diff --git a/src/openrct2/game.c b/src/openrct2/game.c index 2fbd75a583..9bf66a7670 100644 --- a/src/openrct2/game.c +++ b/src/openrct2/game.c @@ -60,10 +60,10 @@ uint16 gTicksSinceLastUpdate; uint32 gLastTickCount; uint8 gGamePaused = 0; -int gGameSpeed = 1; +sint32 gGameSpeed = 1; float gDayNightCycle = 0; bool gInUpdateCode = false; -int gGameCommandNestLevel; +sint32 gGameCommandNestLevel; bool gGameCommandIsNetworked; uint8 gUnk13CA740; @@ -86,16 +86,16 @@ GAME_COMMAND_CALLBACK_POINTER* game_command_callback_table[] = { game_command_callback_pickup_guest, game_command_callback_pickup_staff, }; -int game_command_playerid = -1; +sint32 game_command_playerid = -1; rct_string_id gGameCommandErrorTitle; rct_string_id gGameCommandErrorText; uint8 gErrorType; rct_string_id gErrorStringId; -int game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback) +sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback) { - for (int i = 0; i < countof(game_command_callback_table); i++ ) { + for (sint32 i = 0; i < countof(game_command_callback_table); i++ ) { if (game_command_callback_table[i] == callback) { return i; } @@ -103,7 +103,7 @@ int game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback) return 0; } -GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(int index) +GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(sint32 index) { if (index < countof(game_command_callback_table)) { return game_command_callback_table[index]; @@ -162,16 +162,16 @@ void update_palette_effects() if (gClimateLightningFlash == 1) { // change palette to lighter colour during lightning - int palette = SPR_GAME_PALETTE_DEFAULT; + sint32 palette = SPR_GAME_PALETTE_DEFAULT; if ((intptr_t)water_type != -1) { palette = water_type->image_id; } rct_g1_element g1_element = g1Elements[palette]; - int xoffset = g1_element.x_offset; + sint32 xoffset = g1_element.x_offset; xoffset = xoffset * 4; uint8 *paletteOffset = gGamePalette + xoffset; - for (int i = 0; i < g1_element.width; i++) { + for (sint32 i = 0; i < g1_element.width; i++) { paletteOffset[(i * 4) + 0] = -((0xFF - g1_element.offset[(i * 3) + 0]) / 2) - 1; paletteOffset[(i * 4) + 1] = -((0xFF - g1_element.offset[(i * 3) + 1]) / 2) - 1; paletteOffset[(i * 4) + 2] = -((0xFF - g1_element.offset[(i * 3) + 2]) / 2) - 1; @@ -181,17 +181,17 @@ void update_palette_effects() } else { if (gClimateLightningFlash == 2) { // change palette back to normal after lightning - int palette = SPR_GAME_PALETTE_DEFAULT; + sint32 palette = SPR_GAME_PALETTE_DEFAULT; if ((intptr_t)water_type != -1) { palette = water_type->image_id; } rct_g1_element g1_element = g1Elements[palette]; - int xoffset = g1_element.x_offset; + sint32 xoffset = g1_element.x_offset; xoffset = xoffset * 4; uint8 *paletteOffset = gGamePalette + xoffset; - for (int i = 0; i < g1_element.width; i++) { + for (sint32 i = 0; i < g1_element.width; i++) { paletteOffset[(i * 4) + 0] = g1_element.offset[(i * 3) + 0]; paletteOffset[(i * 4) + 1] = g1_element.offset[(i * 3) + 1]; paletteOffset[(i * 4) + 2] = g1_element.offset[(i * 3) + 2]; @@ -199,7 +199,7 @@ void update_palette_effects() } // animate the water/lava/chain movement palette - int q = 0; + sint32 q = 0; if (gConfigGeneral.render_weather_gloom) { uint8 gloom = gClimateCurrentWeatherGloom; if (gloom != 0) { @@ -212,15 +212,15 @@ void update_palette_effects() } uint32 j = gPaletteEffectFrame; j = (((uint16)((~j / 2) * 128) * 15) >> 16); - int p = SPR_GAME_PALETTE_WATER; + sint32 p = SPR_GAME_PALETTE_WATER; if ((intptr_t)water_type != -1) { p = water_type->var_06; } rct_g1_element g1_element = g1Elements[q + p]; uint8* vs = &g1_element.offset[j * 3]; uint8* vd = &gGamePalette[230 * 4]; - int n = 5; - for (int i = 0; i < n; i++) { + sint32 n = 5; + for (sint32 i = 0; i < n; i++) { vd[0] = vs[0]; vd[1] = vs[1]; vd[2] = vs[2]; @@ -238,7 +238,7 @@ void update_palette_effects() g1_element = g1Elements[q + p]; vs = &g1_element.offset[j * 3]; n = 5; - for (int i = 0; i < n; i++) { + for (sint32 i = 0; i < n; i++) { vd[0] = vs[0]; vd[1] = vs[1]; vd[2] = vs[2]; @@ -255,7 +255,7 @@ void update_palette_effects() vs = &g1_element.offset[j * 3]; vd += 12; n = 3; - for (int i = 0; i < n; i++) { + for (sint32 i = 0; i < n; i++) { vd[0] = vs[0]; vd[1] = vs[1]; vd[2] = vs[2]; @@ -276,7 +276,7 @@ void update_palette_effects() void game_update() { - int i, numUpdates; + sint32 i, numUpdates; // 0x006E3AEC // screen_game_process_mouse_input(); screenshot_check(); @@ -435,7 +435,7 @@ void game_logic_update() * * @param cost (ebp) */ -static int game_check_affordability(int cost) +static sint32 game_check_affordability(sint32 cost) { if (cost <= 0)return cost; if (gUnk141F568 & 0xF0) return cost; @@ -454,7 +454,7 @@ static int game_check_affordability(int cost) * @param flags (ebx) * @param command (esi) */ -int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +sint32 game_do_command(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { return game_do_command_p(esi, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); } @@ -466,10 +466,10 @@ int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int eb * @param flags (ebx) * @param command (esi) */ -int game_do_command_p(int command, int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +sint32 game_do_command_p(sint32 command, sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { - int cost, flags; - int original_ebx, original_edx, original_esi, original_edi, original_ebp; + sint32 cost, flags; + sint32 original_ebx, original_edx, original_esi, original_edi, original_ebp; *esi = command; original_ebx = *ebx; @@ -514,7 +514,7 @@ int game_do_command_p(int command, int *eax, int *ebx, int *ecx, int *edx, int * if (cost != MONEY32_UNDEFINED) { // Check funds - int insufficientFunds = 0; + sint32 insufficientFunds = 0; if (gGameCommandNestLevel == 1 && !(flags & GAME_COMMAND_FLAG_2) && !(flags & GAME_COMMAND_FLAG_5) && cost != 0) insufficientFunds = game_check_affordability(cost); @@ -631,7 +631,7 @@ bool game_is_not_paused() * * rct2: 0x00667C15 */ -void game_pause_toggle(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_pause_toggle(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { if (*ebx & GAME_COMMAND_FLAG_APPLY) pause_toggle(); @@ -643,7 +643,7 @@ void game_pause_toggle(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *ed * * rct2: 0x0066DB5F */ -static void game_load_or_quit(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +static void game_load_or_quit(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { if (*ebx & GAME_COMMAND_FLAG_APPLY) { switch (*edx & 0xFF) { @@ -720,7 +720,7 @@ void game_convert_strings_to_utf8() rct2_to_utf8_self(gScenarioDetails, 256); // User strings - for (int i = 0; i < MAX_USER_STRINGS; i++) { + for (sint32 i = 0; i < MAX_USER_STRINGS; i++) { utf8 *userString = &gUserStrings[i * USER_STRING_MAX_LENGTH]; if (!str_is_null_or_empty(userString)) { @@ -730,7 +730,7 @@ void game_convert_strings_to_utf8() } // News items - for (int i = 0; i < MAX_NEWS_ITEMS; i++) { + for (sint32 i = 0; i < MAX_NEWS_ITEMS; i++) { rct_news_item *newsItem = news_item_get(i); if (!str_is_null_or_empty(newsItem->text)) { @@ -750,7 +750,7 @@ void game_convert_strings_to_rct2(rct_s6_data *s6) utf8_to_rct2_self(s6->scenario_description, sizeof(s6->scenario_description)); // User strings - for (int i = 0; i < MAX_USER_STRINGS; i++) { + for (sint32 i = 0; i < MAX_USER_STRINGS; i++) { char *userString = &s6->custom_strings[i * USER_STRING_MAX_LENGTH]; if (!str_is_null_or_empty(userString)) { @@ -759,7 +759,7 @@ void game_convert_strings_to_rct2(rct_s6_data *s6) } // News items - for (int i = 0; i < MAX_NEWS_ITEMS; i++) { + for (sint32 i = 0; i < MAX_NEWS_ITEMS; i++) { rct_news_item *newsItem = &s6->news_items[i]; if (!str_is_null_or_empty(newsItem->text)) { @@ -786,8 +786,8 @@ void game_fix_save_vars() { peep_sort(); // Fixes broken saves where a surface element could be null - for (int y = 0; y < 256; y++) { - for (int x = 0; x < 256; x++) { + for (sint32 y = 0; y < 256; y++) { + for (sint32 x = 0; x < 256; x++) { rct_map_element *mapElement = map_get_surface_element_at(x, y); if (mapElement == NULL) @@ -803,7 +803,7 @@ void game_fix_save_vars() { } // Fix invalid research items - for (int i = 0; i < 500; i++) { + for (sint32 i = 0; i < 500; i++) { rct_research_item *researchItem = &gResearchItems[i]; if (researchItem->entryIndex == RESEARCHED_ITEMS_SEPARATOR) continue; if (researchItem->entryIndex == RESEARCHED_ITEMS_END) continue; @@ -965,13 +965,13 @@ void save_game_as() window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, name); } -static int compare_autosave_file_paths (const void * a, const void * b ) { +static sint32 compare_autosave_file_paths (const void * a, const void * b ) { return strcmp(*(char **)a, *(char **)b); } static void limit_autosave_count(const size_t numberOfFilesToKeep) { - int fileEnumHandle = 0; + sint32 fileEnumHandle = 0; size_t autosavesCount = 0; size_t numAutosavesToDelete = 0; @@ -1121,7 +1121,7 @@ bool game_load_save_or_scenario(const utf8 * path) return false; } -static void game_load_or_quit_no_save_prompt_callback(int result, const utf8 * path) +static void game_load_or_quit_no_save_prompt_callback(sint32 result, const utf8 * path) { if (result == MODAL_RESULT_OK && game_load_save_or_scenario(path)) { gFirstTimeSave = 0; diff --git a/src/openrct2/game.h b/src/openrct2/game.h index 0602a56180..1a19167f5d 100644 --- a/src/openrct2/game.h +++ b/src/openrct2/game.h @@ -119,14 +119,14 @@ enum { ERROR_TYPE_FILE_LOAD = 255 }; -typedef void (GAME_COMMAND_POINTER)(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +typedef void (GAME_COMMAND_POINTER)(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); -typedef void (GAME_COMMAND_CALLBACK_POINTER)(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); +typedef void (GAME_COMMAND_CALLBACK_POINTER)(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); extern GAME_COMMAND_CALLBACK_POINTER* game_command_callback; -int game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback); -GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(int index); -extern int game_command_playerid; +sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback); +GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(sint32 index); +extern sint32 game_command_playerid; extern rct_string_id gGameCommandErrorTitle; extern rct_string_id gGameCommandErrorText; @@ -144,10 +144,10 @@ extern uint32 gCurrentTicks; extern uint16 gTicksSinceLastUpdate; extern uint32 gLastTickCount; extern uint8 gGamePaused; -extern int gGameSpeed; +extern sint32 gGameSpeed; extern float gDayNightCycle; extern bool gInUpdateCode; -extern int gGameCommandNestLevel; +extern sint32 gGameCommandNestLevel; extern bool gGameCommandIsNetworked; extern uint8 gUnk13CA740; @@ -162,16 +162,16 @@ void game_logic_update(); void reset_all_sprite_quadrant_placements(); void update_palette_effects(); -int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -int game_do_command_p(int command, int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +sint32 game_do_command(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +sint32 game_do_command_p(sint32 command, sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); void game_load_or_quit_no_save_prompt(); bool game_load_sv6_path(const char * path); bool game_load_sv6(SDL_RWops* rw); -int game_load_network(SDL_RWops* rw); +sint32 game_load_network(SDL_RWops* rw); bool game_load_save(const utf8 *path); void game_load_init(); -void game_pause_toggle(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +void game_pause_toggle(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); void pause_toggle(); bool game_is_paused(); bool game_is_not_paused(); diff --git a/src/openrct2/input.c b/src/openrct2/input.c index 4546abe69b..cf7a199b34 100644 --- a/src/openrct2/input.c +++ b/src/openrct2/input.c @@ -79,41 +79,41 @@ widget_ref gCurrentToolWidget; static sint16 _clickRepeatTicks; -static int game_get_next_input(int *x, int *y); -static void input_widget_over(int x, int y, rct_window *w, int widgetIndex); -static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, int widgetIndex); +static sint32 game_get_next_input(sint32 *x, sint32 *y); +static void input_widget_over(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex); +static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, sint32 widgetIndex); static void input_widget_over_flatbutton_invalidate(); -void process_mouse_over(int x, int y); -void process_mouse_tool(int x, int y); +void process_mouse_over(sint32 x, sint32 y); +void process_mouse_tool(sint32 x, sint32 y); void invalidate_scroll(); static rct_mouse_data* get_mouse_input(); -void map_element_right_click(int type, rct_map_element *mapElement, int x, int y); -int sub_6EDE88(int x, int y, rct_map_element **mapElement, int *outX, int *outY); -int get_next_key(); -static void game_handle_input_mouse(int x, int y, int state); +void map_element_right_click(sint32 type, rct_map_element *mapElement, sint32 x, sint32 y); +sint32 sub_6EDE88(sint32 x, sint32 y, rct_map_element **mapElement, sint32 *outX, sint32 *outY); +sint32 get_next_key(); +static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state); void game_handle_edge_scroll(); void game_handle_key_scroll(); -static void input_widget_left(int x, int y, rct_window *w, int widgetIndex); -void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_window* w, rct_widget* widget); +static void input_widget_left(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex); +void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, sint32 widgetIndex, rct_window* w, rct_widget* widget); void sub_6ED990(uint8 cursor_id); -static void input_window_position_continue(rct_window *w, int lastX, int lastY, int newX, int newY); -static void input_window_position_end(rct_window *w, int x, int y); -static void input_window_resize_begin(rct_window *w, int widgetIndex, int x, int y); -static void input_window_resize_continue(rct_window *w, int x, int y); +static void input_window_position_continue(rct_window *w, sint32 lastX, sint32 lastY, sint32 newX, sint32 newY); +static void input_window_position_end(rct_window *w, sint32 x, sint32 y); +static void input_window_resize_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); +static void input_window_resize_continue(rct_window *w, sint32 x, sint32 y); static void input_window_resize_end(); -static void input_viewport_drag_begin(rct_window *w, int x, int y); +static void input_viewport_drag_begin(rct_window *w, sint32 x, sint32 y); static void input_viewport_drag_continue(); static void input_viewport_drag_end(); -static void input_scroll_begin(rct_window *w, int widgetIndex, int x, int y); -static void input_scroll_continue(rct_window *w, int widgetIndex, int state, int x, int y); +static void input_scroll_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); +static void input_scroll_continue(rct_window *w, sint32 widgetIndex, sint32 state, sint32 x, sint32 y); static void input_scroll_end(); -static void input_scroll_part_update_hthumb(rct_window *w, int widgetIndex, int x, int scroll_id); -static void input_scroll_part_update_hleft(rct_window *w, int widgetIndex, int scroll_id); -static void input_scroll_part_update_hright(rct_window *w, int widgetIndex, int scroll_id); -static void input_scroll_part_update_vthumb(rct_window *w, int widgetIndex, int y, int scroll_id); -static void input_scroll_part_update_vtop(rct_window *w, int widgetIndex, int scroll_id); -static void input_scroll_part_update_vbottom(rct_window *w, int widgetIndex, int scroll_id); -static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y); +static void input_scroll_part_update_hthumb(rct_window *w, sint32 widgetIndex, sint32 x, sint32 scroll_id); +static void input_scroll_part_update_hleft(rct_window *w, sint32 widgetIndex, sint32 scroll_id); +static void input_scroll_part_update_hright(rct_window *w, sint32 widgetIndex, sint32 scroll_id); +static void input_scroll_part_update_vthumb(rct_window *w, sint32 widgetIndex, sint32 y, sint32 scroll_id); +static void input_scroll_part_update_vtop(rct_window *w, sint32 widgetIndex, sint32 scroll_id); +static void input_scroll_part_update_vbottom(rct_window *w, sint32 widgetIndex, sint32 scroll_id); +static void input_update_tooltip(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); #pragma region Mouse input @@ -129,7 +129,7 @@ void game_handle_input() sub_6EA73F(); - int x, y, state; + sint32 x, y, state; while ((state = game_get_next_input(&x, &y)) != MOUSE_STATE_RELEASED) { game_handle_input_mouse(x, y, state & 0xFF); } @@ -154,7 +154,7 @@ void game_handle_input() * * rct2: 0x006E83C7 */ -static int game_get_next_input(int *x, int *y) +static sint32 game_get_next_input(sint32 *x, sint32 *y) { rct_mouse_data *input = get_mouse_input(); if (input == NULL) { @@ -188,7 +188,7 @@ static rct_mouse_data *get_mouse_input() * * rct2: 0x006E957F */ -static void input_scroll_drag_begin(int x, int y, rct_window* w, rct_widget* widget, int widgetIndex) +static void input_scroll_drag_begin(sint32 x, sint32 y, rct_window* w, rct_widget* widget, sint32 widgetIndex) { gInputState = INPUT_STATE_SCROLL_RIGHT; gInputDragLastX = x; @@ -206,7 +206,7 @@ static void input_scroll_drag_begin(int x, int y, rct_window* w, rct_widget* wid * Based on (heavily changed) * rct2: 0x006E9E0E, 0x006E9ED0 */ -static void input_scroll_drag_continue(int x, int y, rct_window* w) +static void input_scroll_drag_continue(sint32 x, sint32 y, rct_window* w) { rct_widgetindex widgetIndex = _dragWidget.widget_index; uint8 scrollIndex = _dragScrollIndex; @@ -214,7 +214,7 @@ static void input_scroll_drag_continue(int x, int y, rct_window* w) rct_widget* widget = &w->widgets[widgetIndex]; rct_scroll* scroll = &w->scrolls[scrollIndex]; - int dx, dy; + sint32 dx, dy; dx = x - gInputDragLastX; dy = y - gInputDragLastY; @@ -237,8 +237,8 @@ static void input_scroll_drag_continue(int x, int y, rct_window* w) widget_scroll_update_thumbs(w, widgetIndex); window_invalidate_by_number(w->classification, w->number); - int fixedCursorPositionX = (int) ceilf(gInputDragLastX * gConfigGeneral.window_scale); - int fixedCursorPositionY = (int) ceilf(gInputDragLastY * gConfigGeneral.window_scale); + sint32 fixedCursorPositionX = (sint32) ceilf(gInputDragLastX * gConfigGeneral.window_scale); + sint32 fixedCursorPositionY = (sint32) ceilf(gInputDragLastY * gConfigGeneral.window_scale); platform_set_cursor_position(fixedCursorPositionX, fixedCursorPositionY); } @@ -247,7 +247,7 @@ static void input_scroll_drag_continue(int x, int y, rct_window* w) * * rct2: 0x006E8ACB */ -static void input_scroll_right(int x, int y, int state) +static void input_scroll_right(sint32 x, sint32 y, sint32 state) { rct_window* w = window_find_by_number(_dragWidget.window_classification, _dragWidget.window_number); if (w == NULL) { @@ -275,11 +275,11 @@ static void input_scroll_right(int x, int y, int state) * * rct2: 0x006E8655 */ -static void game_handle_input_mouse(int x, int y, int state) +static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state) { rct_window *w; rct_widget *widget; - int widgetIndex; + sint32 widgetIndex; // Get window and widget under cursor position w = window_find_from_point(x, y); @@ -428,7 +428,7 @@ static void game_handle_input_mouse(int x, int y, int state) #pragma region Window positioning / resizing -void input_window_position_begin(rct_window *w, int widgetIndex, int x, int y) +void input_window_position_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { gInputState = INPUT_STATE_POSITIONING_WINDOW; gInputDragLastX = x - w->x; @@ -438,15 +438,15 @@ void input_window_position_begin(rct_window *w, int widgetIndex, int x, int y) _dragWidget.widget_index = widgetIndex; } -static void input_window_position_continue(rct_window *w, int wdx, int wdy, int x, int y) +static void input_window_position_continue(rct_window *w, sint32 wdx, sint32 wdy, sint32 x, sint32 y) { - int snapProximity; + sint32 snapProximity; snapProximity = w->flags & WF_NO_SNAPPING ? 0 : gConfigGeneral.window_snap_proximity; window_move_and_snap(w, x - wdx, y - wdy, snapProximity); } -static void input_window_position_end(rct_window *w, int x, int y) +static void input_window_position_end(rct_window *w, sint32 x, sint32 y) { gInputState = INPUT_STATE_NORMAL; gTooltipTimeout = 0; @@ -454,7 +454,7 @@ static void input_window_position_end(rct_window *w, int x, int y) window_event_moved_call(w, x, y); } -static void input_window_resize_begin(rct_window *w, int widgetIndex, int x, int y) +static void input_window_resize_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { gInputState = INPUT_STATE_RESIZING; gInputDragLastX = x; @@ -466,11 +466,11 @@ static void input_window_resize_begin(rct_window *w, int widgetIndex, int x, int _originalWindowHeight = w->height; } -static void input_window_resize_continue(rct_window *w, int x, int y) +static void input_window_resize_continue(rct_window *w, sint32 x, sint32 y) { - int dx, dy, targetWidth, targetHeight; + sint32 dx, dy, targetWidth, targetHeight; - if (y < (int)gScreenHeight - 2) { + if (y < (sint32)gScreenHeight - 2) { dx = x - gInputDragLastX; dy = y - gInputDragLastY; targetWidth = _originalWindowWidth + dx; @@ -495,7 +495,7 @@ static void input_window_resize_end() #pragma region Viewport dragging -static void input_viewport_drag_begin(rct_window *w, int x, int y) +static void input_viewport_drag_begin(rct_window *w, sint32 x, sint32 y) { w->flags &= ~WF_SCROLLING_TO_LOCATION; gInputState = INPUT_STATE_VIEWPORT_RIGHT; @@ -510,7 +510,7 @@ static void input_viewport_drag_begin(rct_window *w, int x, int y) static void input_viewport_drag_continue() { - int dx, dy, newDragX, newDragY; + sint32 dx, dy, newDragX, newDragY; rct_window *w; rct_viewport *viewport; @@ -565,7 +565,7 @@ static void input_viewport_drag_end() #pragma region Scroll bars -static void input_scroll_begin(rct_window *w, int widgetIndex, int x, int y) +static void input_scroll_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { rct_widget *widget; @@ -578,7 +578,7 @@ static void input_scroll_begin(rct_window *w, int widgetIndex, int x, int y) gTooltipCursorX = x; gTooltipCursorY = y; - int eax, ebx, scroll_area, scroll_id; + sint32 eax, ebx, scroll_area, scroll_id; scroll_id = 0; // safety widget_scroll_get_part(w, widget, x, y, &eax, &ebx, &scroll_area, &scroll_id); @@ -593,15 +593,15 @@ static void input_scroll_begin(rct_window *w, int widgetIndex, int x, int y) rct_widget* widg = &w->widgets[widgetIndex]; rct_scroll* scroll = &w->scrolls[scroll_id]; - int widget_width = widg->right - widg->left - 1; + sint32 widget_width = widg->right - widg->left - 1; if (scroll->flags & VSCROLLBAR_VISIBLE) widget_width -= 11; - int widget_content_width = max(scroll->h_right - widget_width, 0); + sint32 widget_content_width = max(scroll->h_right - widget_width, 0); - int widget_height = widg->bottom - widg->top - 1; + sint32 widget_height = widg->bottom - widg->top - 1; if (scroll->flags & HSCROLLBAR_VISIBLE) widget_height -= 11; - int widget_content_height = max(scroll->v_bottom - widget_height, 0); + sint32 widget_content_height = max(scroll->v_bottom - widget_height, 0); switch (scroll_area) { case SCROLL_PART_HSCROLLBAR_LEFT: @@ -635,11 +635,11 @@ static void input_scroll_begin(rct_window *w, int widgetIndex, int x, int y) window_invalidate_by_number(widgetIndex, w->classification); } -static void input_scroll_continue(rct_window *w, int widgetIndex, int state, int x, int y) +static void input_scroll_continue(rct_window *w, sint32 widgetIndex, sint32 state, sint32 x, sint32 y) { rct_widget *widget; - int scroll_part, scroll_id; - int x2, y2; + sint32 scroll_part, scroll_id; + sint32 x2, y2; assert(w != NULL); @@ -655,14 +655,14 @@ static void input_scroll_continue(rct_window *w, int widgetIndex, int state, int widget_scroll_get_part(w, widget, x, y, &x2, &y2, &scroll_part, &scroll_id); if (_currentScrollArea == SCROLL_PART_HSCROLLBAR_THUMB){ - int originalTooltipCursorX = gTooltipCursorX; + sint32 originalTooltipCursorX = gTooltipCursorX; gTooltipCursorX = x; input_scroll_part_update_hthumb(w, widgetIndex, x - originalTooltipCursorX, scroll_id); return; } if (_currentScrollArea == SCROLL_PART_VSCROLLBAR_THUMB){ - int originalTooltipCursorY = gTooltipCursorY; + sint32 originalTooltipCursorY = gTooltipCursorY; gTooltipCursorY = y; input_scroll_part_update_vthumb(w, widgetIndex, y - originalTooltipCursorY, scroll_id); return; @@ -706,10 +706,10 @@ static void input_scroll_end() * * rct2: 0x006E98F2 */ -static void input_scroll_part_update_hthumb(rct_window *w, int widgetIndex, int x, int scroll_id) +static void input_scroll_part_update_hthumb(rct_window *w, sint32 widgetIndex, sint32 x, sint32 scroll_id) { rct_widget *widget = &w->widgets[widgetIndex]; - int newLeft; + sint32 newLeft; if (window_find_by_number(w->classification, w->number)) { newLeft = w->scrolls[scroll_id].h_right; @@ -743,11 +743,11 @@ static void input_scroll_part_update_hthumb(rct_window *w, int widgetIndex, int * * rct2: 0x006E99A9 */ -static void input_scroll_part_update_vthumb(rct_window *w, int widgetIndex, int y, int scroll_id) +static void input_scroll_part_update_vthumb(rct_window *w, sint32 widgetIndex, sint32 y, sint32 scroll_id) { assert(w != NULL); rct_widget *widget = &w->widgets[widgetIndex]; - int newTop; + sint32 newTop; if (window_find_by_number(w->classification, w->number)) { newTop = w->scrolls[scroll_id].v_bottom; @@ -781,7 +781,7 @@ static void input_scroll_part_update_vthumb(rct_window *w, int widgetIndex, int * * rct2: 0x006E9A60 */ -static void input_scroll_part_update_hleft(rct_window *w, int widgetIndex, int scroll_id) +static void input_scroll_part_update_hleft(rct_window *w, sint32 widgetIndex, sint32 scroll_id) { assert(w != NULL); if (window_find_by_number(w->classification, w->number)) { @@ -797,14 +797,14 @@ static void input_scroll_part_update_hleft(rct_window *w, int widgetIndex, int s * * rct2: 0x006E9ABF */ -static void input_scroll_part_update_hright(rct_window *w, int widgetIndex, int scroll_id) +static void input_scroll_part_update_hright(rct_window *w, sint32 widgetIndex, sint32 scroll_id) { assert(w != NULL); rct_widget *widget = &w->widgets[widgetIndex]; if (window_find_by_number(w->classification, w->number)) { w->scrolls[scroll_id].flags |= HSCROLLBAR_RIGHT_PRESSED; w->scrolls[scroll_id].h_left += 3; - int newLeft = widget->right - widget->left - 1; + sint32 newLeft = widget->right - widget->left - 1; if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE) newLeft -= 11; newLeft *= -1; @@ -822,7 +822,7 @@ static void input_scroll_part_update_hright(rct_window *w, int widgetIndex, int * * rct2: 0x006E9C37 */ -static void input_scroll_part_update_vtop(rct_window *w, int widgetIndex, int scroll_id) +static void input_scroll_part_update_vtop(rct_window *w, sint32 widgetIndex, sint32 scroll_id) { assert(w != NULL); if (window_find_by_number(w->classification, w->number)) { @@ -838,14 +838,14 @@ static void input_scroll_part_update_vtop(rct_window *w, int widgetIndex, int sc * * rct2: 0x006E9C96 */ -static void input_scroll_part_update_vbottom(rct_window *w, int widgetIndex, int scroll_id) +static void input_scroll_part_update_vbottom(rct_window *w, sint32 widgetIndex, sint32 scroll_id) { assert(w != NULL); rct_widget *widget = &w->widgets[widgetIndex]; if (window_find_by_number(w->classification, w->number)) { w->scrolls[scroll_id].flags |= VSCROLLBAR_DOWN_PRESSED; w->scrolls[scroll_id].v_top += 3; - int newTop = widget->bottom - widget->top - 1; + sint32 newTop = widget->bottom - widget->top - 1; if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE) newTop -= 11; newTop *= -1; @@ -867,7 +867,7 @@ static void input_scroll_part_update_vbottom(rct_window *w, int widgetIndex, int * * rct2: 0x006E9253 */ -static void input_widget_over(int x, int y, rct_window *w, int widgetIndex) +static void input_widget_over(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex) { rct_windowclass windowClass = 255; rct_windownumber windowNumber = 0; @@ -882,7 +882,7 @@ static void input_widget_over(int x, int y, rct_window *w, int widgetIndex) input_widget_over_change_check(windowClass, windowNumber, widgetIndex); if (w != NULL && widgetIndex != -1 && widget->type == WWT_SCROLL) { - int eax, ebx, scroll_part, edx; + sint32 eax, ebx, scroll_part, edx; widget_scroll_get_part(w, widget, x, y, &eax, &ebx, &scroll_part, &edx); if (scroll_part != SCROLL_PART_VIEW) @@ -905,7 +905,7 @@ static void input_widget_over(int x, int y, rct_window *w, int widgetIndex) * * rct2: 0x006E9269 */ -static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, int widgetIndex) +static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, sint32 widgetIndex) { // Prevents invalid widgets being clicked source of bug is elsewhere if (widgetIndex == -1) @@ -953,7 +953,7 @@ static void input_widget_over_flatbutton_invalidate() * * rct2: 0x006E95F9 */ -static void input_widget_left(int x, int y, rct_window *w, int widgetIndex) +static void input_widget_left(sint32 x, sint32 y, rct_window *w, sint32 widgetIndex) { rct_windowclass windowClass = 255; rct_windownumber windowNumber = 0; @@ -1038,14 +1038,14 @@ static void input_widget_left(int x, int y, rct_window *w, int widgetIndex) * * rct2: 0x006ED833 */ -void process_mouse_over(int x, int y) +void process_mouse_over(sint32 x, sint32 y) { rct_window* window; rct_window* subWindow; - int widgetId; - int cursorId; - int ebx, edi; + sint32 widgetId; + sint32 cursorId; + sint32 ebx, edi; cursorId = CURSOR_ARROW; set_map_tooltip_format_arg(0, rct_string_id, STR_NONE); @@ -1103,8 +1103,8 @@ void process_mouse_over(int x, int y) case WWT_SCROLL: { - int output_scroll_area, scroll_id; - int scroll_x, scroll_y; + sint32 output_scroll_area, scroll_id; + sint32 scroll_x, scroll_y; widget_scroll_get_part(window, &window->widgets[widgetId], x, y, &scroll_x, &scroll_y, &output_scroll_area, &scroll_id); cursorId = scroll_id; if (output_scroll_area != SCROLL_PART_VIEW) @@ -1135,7 +1135,7 @@ void process_mouse_over(int x, int y) * * rct2: 0x006ED801 */ -void process_mouse_tool(int x, int y) +void process_mouse_tool(sint32 x, sint32 y) { if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) { @@ -1156,13 +1156,13 @@ void process_mouse_tool(int x, int y) * * rct2: 0x006E8DA7 */ -void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_window *w, rct_widget *widget) +void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_windowclass cursor_w_class; rct_windownumber cursor_w_number; cursor_w_class = gPressedWidget.window_classification; cursor_w_number = gPressedWidget.window_number; - int cursor_widgetIndex = gPressedWidget.widget_index; + sint32 cursor_widgetIndex = gPressedWidget.widget_index; rct_window *cursor_w = window_find_by_number(cursor_w_class, cursor_w_number); if (cursor_w == NULL) { @@ -1204,7 +1204,7 @@ void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_wi case MOUSE_STATE_RIGHT_PRESS: if (gInputState == INPUT_STATE_DROPDOWN_ACTIVE) { if (w) { - int dropdown_index = 0; + sint32 dropdown_index = 0; if (w->classification == WC_DROPDOWN) { dropdown_index = dropdown_index_from_point(x, y, w); @@ -1269,7 +1269,7 @@ void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_wi if (!widget) break; - int mid_point_x = (widget->left + widget->right) / 2 + w->x; + sint32 mid_point_x = (widget->left + widget->right) / 2 + w->x; audio_play_sound_panned(5, mid_point_x, 0, 0, 0); if (cursor_w_class != w->classification || cursor_w_number != w->number || widgetIndex != cursor_widgetIndex) break; @@ -1300,7 +1300,7 @@ void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_wi } if (w->classification == WC_DROPDOWN){ - int dropdown_index = dropdown_index_from_point(x, y, w); + sint32 dropdown_index = dropdown_index_from_point(x, y, w); if (dropdown_index == -1) { return; } @@ -1363,7 +1363,7 @@ void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_wi } } -static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y) +static void input_update_tooltip(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (gTooltipWidget.window_classification == 255) { if (gTooltipCursorX == x && gTooltipCursorY == y) { @@ -1404,7 +1404,7 @@ static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y) void title_handle_keyboard_input() { rct_window *w; - int key; + sint32 key; if (gOpenRCT2Headless) { return; @@ -1466,7 +1466,7 @@ void title_handle_keyboard_input() void game_handle_keyboard_input() { rct_window *w; - int key; + sint32 key; if (!gConsoleOpen) { // Handle mouse scrolling @@ -1536,9 +1536,9 @@ void game_handle_keyboard_input() * * rct2: 0x00406CD2 */ -int get_next_key() +sint32 get_next_key() { - int i; + sint32 i; for (i = 0; i < 221; i++) { if (gKeysPressed[i]) { gKeysPressed[i] = 0; @@ -1582,7 +1582,7 @@ void invalidate_scroll() /** * rct2: 0x00406C96 */ -void store_mouse_input(int state, int x, int y) +void store_mouse_input(sint32 state, sint32 x, sint32 y) { uint32 writeIndex = _mouseInputQueueWriteIndex; uint32 nextWriteIndex = (writeIndex + 1) % countof(_mouseInputQueue); @@ -1601,7 +1601,7 @@ void store_mouse_input(int state, int x, int y) void game_handle_edge_scroll() { rct_window *mainWindow; - int scrollX, scrollY; + sint32 scrollX, scrollY; mainWindow = window_get_main(); if (mainWindow == NULL) @@ -1644,7 +1644,7 @@ void game_handle_edge_scroll() void game_handle_key_scroll() { rct_window *mainWindow; - int scrollX, scrollY; + sint32 scrollX, scrollY; mainWindow = window_get_main(); if (mainWindow == NULL) @@ -1663,7 +1663,7 @@ void game_handle_key_scroll() scrollX = 0; scrollY = 0; - for (int shortcutId = SHORTCUT_SCROLL_MAP_UP; shortcutId <= SHORTCUT_SCROLL_MAP_RIGHT; shortcutId++) { + for (sint32 shortcutId = SHORTCUT_SCROLL_MAP_UP; shortcutId <= SHORTCUT_SCROLL_MAP_RIGHT; shortcutId++) { uint16 shortcutKey = gShortcutKeys[shortcutId]; uint8 scancode = shortcutKey & 0xFF; diff --git a/src/openrct2/input.h b/src/openrct2/input.h index 6c5a900942..d9e87508f1 100644 --- a/src/openrct2/input.h +++ b/src/openrct2/input.h @@ -99,8 +99,8 @@ void title_handle_keyboard_input(); void game_handle_input(); void game_handle_keyboard_input(); -void store_mouse_input(int state, int x, int y); +void store_mouse_input(sint32 state, sint32 x, sint32 y); -void input_window_position_begin(rct_window *w, int widgetIndex, int x, int y); +void input_window_position_begin(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); #endif diff --git a/src/openrct2/interface/Cursors.cpp b/src/openrct2/interface/Cursors.cpp index 60c069032b..d2e915cd6e 100644 --- a/src/openrct2/interface/Cursors.cpp +++ b/src/openrct2/interface/Cursors.cpp @@ -104,12 +104,12 @@ extern "C" Cursors::Dispose(); } - int cursors_getcurrentcursor() + sint32 cursors_getcurrentcursor() { return Cursors::GetCurrentCursor(); } - void cursors_setcurrentcursor(int cursorId) + void cursors_setcurrentcursor(sint32 cursorId) { Cursors::SetCurrentCursor((CURSOR_ID)cursorId); } diff --git a/src/openrct2/interface/Cursors.h b/src/openrct2/interface/Cursors.h index bf1cdad5fb..87ae8b1a4a 100644 --- a/src/openrct2/interface/Cursors.h +++ b/src/openrct2/interface/Cursors.h @@ -83,8 +83,8 @@ extern "C" void cursors_initialise(); void cursors_dispose(); - int cursors_getcurrentcursor(); - void cursors_setcurrentcursor(int cursorId); + sint32 cursors_getcurrentcursor(); + void cursors_setcurrentcursor(sint32 cursorId); #ifdef __cplusplus } diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index ce6400c32e..f244850360 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -537,7 +537,7 @@ namespace ThemeManager GetThemePath(themesPattern, sizeof(themesPattern)); Path::Append(themesPattern, sizeof(themesPattern), "*.json"); - int handle = platform_enumerate_files_begin(themesPattern); + sint32 handle = platform_enumerate_files_begin(themesPattern); if (handle != INVALID_HANDLE) { file_info fileInfo; @@ -872,7 +872,7 @@ extern "C" windowTheme = &desc->DefaultTheme; } - for (int i = 0; i < 6; i++) { + for (sint32 i = 0; i < 6; i++) { window->colours[i] = windowTheme->Colours[i]; } // Some windows need to be transparent even if the colours aren't. diff --git a/src/openrct2/interface/chat.c b/src/openrct2/interface/chat.c index 45cb86e547..9cf2c2f7a6 100644 --- a/src/openrct2/interface/chat.c +++ b/src/openrct2/interface/chat.c @@ -28,17 +28,17 @@ bool gChatOpen = false; char _chatCurrentLine[CHAT_MAX_MESSAGE_LENGTH]; char _chatHistory[CHAT_HISTORY_SIZE][CHAT_INPUT_SIZE]; uint32 _chatHistoryTime[CHAT_HISTORY_SIZE]; -unsigned int _chatHistoryIndex = 0; +uint32 _chatHistoryIndex = 0; uint32 _chatCaretTicks = 0; -int _chatLeft; -int _chatTop; -int _chatRight; -int _chatBottom; -int _chatWidth; -int _chatHeight; +sint32 _chatLeft; +sint32 _chatTop; +sint32 _chatRight; +sint32 _chatBottom; +sint32 _chatWidth; +sint32 _chatHeight; -static const char* chat_history_get(unsigned int index); -static uint32 chat_history_get_time(unsigned int index); +static const char* chat_history_get(uint32 index); +static uint32 chat_history_get_time(uint32 index); static void chat_clear_input(); void chat_open() @@ -90,7 +90,7 @@ void chat_draw(rct_drawpixelinfo * dpi) char lineBuffer[CHAT_INPUT_SIZE + 10]; char* lineCh = lineBuffer; char* inputLine = _chatCurrentLine; - int inputLineHeight = 10; + sint32 inputLineHeight = 10; uint8 chatBackgroundColor = theme_get_colour(WC_CHAT, 0); // Draw chat window @@ -98,14 +98,14 @@ void chat_draw(rct_drawpixelinfo * dpi) inputLineHeight = chat_string_wrapped_get_height((void*)&inputLine, _chatWidth - 10); _chatTop -= inputLineHeight; - for (int i = 0; i < CHAT_HISTORY_SIZE; i++) { + for (sint32 i = 0; i < CHAT_HISTORY_SIZE; i++) { if (strlen(chat_history_get(i)) == 0) { continue; } safe_strcpy(lineBuffer, chat_history_get(i), sizeof(lineBuffer)); - int lineHeight = chat_string_wrapped_get_height((void*)&lineCh, _chatWidth - 10); + sint32 lineHeight = chat_string_wrapped_get_height((void*)&lineCh, _chatWidth - 10); _chatTop -= (lineHeight + 5); } @@ -125,12 +125,12 @@ void chat_draw(rct_drawpixelinfo * dpi) gfx_fill_rect_inset(dpi, _chatLeft + 1, _chatBottom - inputLineHeight - 5, _chatRight - 1, _chatBottom + 4, chatBackgroundColor, INSET_RECT_FLAG_BORDER_INSET); //Textbox } - int x = _chatLeft + 5; - int y = _chatBottom - inputLineHeight - 20; - int stringHeight = 0; + sint32 x = _chatLeft + 5; + sint32 y = _chatBottom - inputLineHeight - 20; + sint32 stringHeight = 0; // Draw chat history - for (int i = 0; i < CHAT_HISTORY_SIZE; i++, y -= stringHeight) { + for (sint32 i = 0; i < CHAT_HISTORY_SIZE; i++, y -= stringHeight) { if (!gChatOpen && SDL_TICKS_PASSED(SDL_GetTicks(), chat_history_get_time(i) + 10000)) { break; } @@ -161,8 +161,8 @@ void chat_draw(rct_drawpixelinfo * dpi) if (_chatCaretTicks < 15 && gfx_get_string_width(lineBuffer) < (_chatWidth - 10)) { memcpy(lineBuffer, _chatCurrentLine, gTextInput.selection_offset); lineBuffer[gTextInput.selection_offset] = 0; - int caretX = x + gfx_get_string_width(lineBuffer); - int caretY = y + 14; + sint32 caretX = x + gfx_get_string_width(lineBuffer); + sint32 caretY = y + 14; gfx_fill_rect(dpi, caretX, caretY, caretX + 6, caretY + 1, 0x38); } @@ -171,7 +171,7 @@ void chat_draw(rct_drawpixelinfo * dpi) void chat_history_add(const char *src) { - int index = _chatHistoryIndex % CHAT_HISTORY_SIZE; + sint32 index = _chatHistoryIndex % CHAT_HISTORY_SIZE; memset(_chatHistory[index], 0, CHAT_INPUT_SIZE); memcpy(_chatHistory[index], src, min(strlen(src), CHAT_INPUT_SIZE - 1)); _chatHistoryTime[index] = SDL_GetTicks(); @@ -180,7 +180,7 @@ void chat_history_add(const char *src) network_append_chat_log(src); } -void chat_input(int c) +void chat_input(sint32 c) { switch (c) { case SDL_SCANCODE_RETURN: @@ -196,12 +196,12 @@ void chat_input(int c) } } -static const char* chat_history_get(unsigned int index) +static const char* chat_history_get(uint32 index) { return _chatHistory[(_chatHistoryIndex + CHAT_HISTORY_SIZE - index - 1) % CHAT_HISTORY_SIZE]; } -static uint32 chat_history_get_time(unsigned int index) +static uint32 chat_history_get_time(uint32 index) { return _chatHistoryTime[(_chatHistoryIndex + CHAT_HISTORY_SIZE - index - 1) % CHAT_HISTORY_SIZE]; } @@ -213,9 +213,9 @@ static void chat_clear_input() // This method is the same as gfx_draw_string_left_wrapped. // But this adjusts the initial Y coordinate depending of the number of lines. -int chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, int x, int y, int width) +sint32 chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, sint32 x, sint32 y, sint32 width) { - int fontSpriteBase, lineHeight, lineY, numLines; + sint32 fontSpriteBase, lineHeight, lineY, numLines; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -229,13 +229,13 @@ int chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, int x, int y, i gCurrentFontFlags = 0; - int expectedY = y - (numLines * lineHeight); + sint32 expectedY = y - (numLines * lineHeight); if (expectedY < 50) { return (numLines * lineHeight); //Skip drawing, return total height. } lineY = y; - for (int line = 0; line <= numLines; ++line) { + for (sint32 line = 0; line <= numLines; ++line) { gfx_draw_string(dpi, buffer, TEXT_COLOUR_254, x, lineY - (numLines * lineHeight)); buffer = get_string_end(buffer) + 1; lineY += lineHeight; @@ -245,9 +245,9 @@ int chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, int x, int y, i // Wrap string without drawing, useful to get the height of a wrapped string. // Almost the same as gfx_draw_string_left_wrapped -int chat_string_wrapped_get_height(void *args, int width) +sint32 chat_string_wrapped_get_height(void *args, sint32 width) { - int fontSpriteBase, lineHeight, lineY, numLines; + sint32 fontSpriteBase, lineHeight, lineY, numLines; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -261,7 +261,7 @@ int chat_string_wrapped_get_height(void *args, int width) gCurrentFontFlags = 0; lineY = 0; - for (int line = 0; line <= numLines; ++line) { + for (sint32 line = 0; line <= numLines; ++line) { buffer = get_string_end(buffer) + 1; lineY += lineHeight; } diff --git a/src/openrct2/interface/chat.h b/src/openrct2/interface/chat.h index f18cf03182..183bb47e53 100644 --- a/src/openrct2/interface/chat.h +++ b/src/openrct2/interface/chat.h @@ -36,9 +36,9 @@ void chat_update(); void chat_draw(rct_drawpixelinfo * dpi); void chat_history_add(const char *src); -void chat_input(int c); +void chat_input(sint32 c); -int chat_string_wrapped_get_height(void *args, int width); -int chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, int x, int y, int width); +sint32 chat_string_wrapped_get_height(void *args, sint32 width); +sint32 chat_history_draw_string(rct_drawpixelinfo *dpi, void *args, sint32 x, sint32 y, sint32 width); #endif diff --git a/src/openrct2/interface/colour.c b/src/openrct2/interface/colour.c index 7903b77c42..ab2346e0c3 100644 --- a/src/openrct2/interface/colour.c +++ b/src/openrct2/interface/colour.c @@ -39,7 +39,7 @@ enum void colours_init_maps() { // Get colour maps from g1 - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { rct_g1_element *g1Element = &g1Elements[SPR_PALETTE_2_START + i]; ColourMapA[i].colour_0 = g1Element->offset[INDEX_COLOUR_0]; diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index 025035b3d5..9950d03a7e 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -51,20 +51,20 @@ bool gConsoleOpen = false; static bool _consoleInitialised = false; -static int _consoleLeft, _consoleTop, _consoleRight, _consoleBottom; -static int _lastMainViewportX, _lastMainViewportY; +static sint32 _consoleLeft, _consoleTop, _consoleRight, _consoleBottom; +static sint32 _lastMainViewportX, _lastMainViewportY; static utf8 _consoleBuffer[CONSOLE_BUFFER_SIZE] = { 0 }; static utf8 *_consoleBufferPointer = _consoleBuffer; static utf8 *_consoleViewBufferStart = _consoleBuffer; static utf8 _consoleCurrentLine[CONSOLE_INPUT_SIZE]; -static int _consoleCaretTicks; +static sint32 _consoleCaretTicks; static utf8 _consolePrintfBuffer[CONSOLE_BUFFER_2_SIZE]; static utf8 _consoleErrorBuffer[CONSOLE_BUFFER_2_SIZE]; -static int _consoleScrollPos = 0; +static sint32 _consoleScrollPos = 0; static utf8 _consoleHistory[CONSOLE_HISTORY_SIZE][CONSOLE_INPUT_SIZE]; -static int _consoleHistoryIndex = 0; -static int _consoleHistoryCount = 0; +static sint32 _consoleHistoryIndex = 0; +static sint32 _consoleHistoryCount = 0; static void console_invalidate(); static void console_write_prompt(); @@ -72,12 +72,12 @@ static void console_update_scroll(); static void console_clear_input(); static void console_history_add(const utf8 *src); static void console_write_all_commands(); -static int console_parse_int(const utf8 *src, bool *valid); +static sint32 console_parse_int(const utf8 *src, bool *valid); static double console_parse_double(const utf8 *src, bool *valid); -static int cc_variables(const utf8 **argv, int argc); -static int cc_windows(const utf8 **argv, int argc); -static int cc_help(const utf8 **argv, int argc); +static sint32 cc_variables(const utf8 **argv, sint32 argc); +static sint32 cc_windows(const utf8 **argv, sint32 argc); +static sint32 cc_help(const utf8 **argv, sint32 argc); static bool invalidArguments(bool *invalid, bool arguments); @@ -157,10 +157,10 @@ void console_draw(rct_drawpixelinfo *dpi) // Set font gCurrentFontSpriteBase = (gConfigInterface.console_small_font ? FONT_SPRITE_BASE_SMALL : FONT_SPRITE_BASE_MEDIUM); gCurrentFontFlags = 0; - int lineHeight = font_get_line_height(gCurrentFontSpriteBase); + sint32 lineHeight = font_get_line_height(gCurrentFontSpriteBase); - int lines = 0; - int maxLines = ((_consoleBottom - 22 - _consoleTop) / lineHeight) - 1; + sint32 lines = 0; + sint32 maxLines = ((_consoleBottom - 22 - _consoleTop) / lineHeight) - 1; utf8 *ch = strchr(_consoleBuffer, 0); while (ch > _consoleBuffer) { ch--; @@ -172,14 +172,14 @@ void console_draw(rct_drawpixelinfo *dpi) console_invalidate(); gfx_filter_rect(dpi, _consoleLeft, _consoleTop, _consoleRight, _consoleBottom, PALETTE_TRANSLUCENT_LIGHT_BLUE_HIGHLIGHT); - int x = _consoleLeft + 4; - int y = _consoleTop + 4; + sint32 x = _consoleLeft + 4; + sint32 y = _consoleTop + 4; // Draw previous lines utf8 lineBuffer[2 + 256], *lineCh; ch = _consoleViewBufferStart; - int currentLine = 0; - int drawLines = 0; + sint32 currentLine = 0; + sint32 drawLines = 0; while (*ch != 0) { // Find line break or null terminator utf8 *nextLine = ch; @@ -235,8 +235,8 @@ void console_draw(rct_drawpixelinfo *dpi) if (_consoleCaretTicks < 15) { memcpy(lineBuffer, _consoleCurrentLine, gTextInput.selection_offset); lineBuffer[gTextInput.selection_offset] = 0; - int caretX = x + gfx_get_string_width(lineBuffer); - int caretY = y + lineHeight; + sint32 caretX = x + gfx_get_string_width(lineBuffer); + sint32 caretY = y + lineHeight; gfx_fill_rect(dpi, caretX, caretY, caretX + 6, caretY + 1, FORMAT_WHITE); } @@ -247,7 +247,7 @@ void console_draw(rct_drawpixelinfo *dpi) gfx_fill_rect(dpi, _consoleLeft, _consoleBottom - 0, _consoleRight, _consoleBottom - 0, 12); } -void console_input(int c) +void console_input(sint32 c) { switch (c) { case SDL_SCANCODE_ESCAPE: @@ -339,9 +339,9 @@ void console_printf(const utf8 *format, ...) console_writeline(_consolePrintfBuffer); } -int console_parse_int(const utf8 *src, bool *valid) { +sint32 console_parse_int(const utf8 *src, bool *valid) { utf8 *end; - int value; + sint32 value; value = strtol(src, &end, 10); *valid = (*end == '\0'); return value; } @@ -355,8 +355,8 @@ double console_parse_double(const utf8 *src, bool *valid) { static void console_update_scroll() { - /*int lines = 0; - int maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1; + /*sint32 lines = 0; + sint32 maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1; char *ch = strchr(_consoleBuffer, 0); while (ch > _consoleBuffer && lines < maxLines) { ch--; @@ -369,11 +369,11 @@ static void console_update_scroll() _consoleViewBufferStart = ch;*/ } -void console_scroll(int delta) +void console_scroll(sint32 delta) { - int speed = 3; - int lines = 0; - int maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1; + sint32 speed = 3; + sint32 lines = 0; + sint32 maxLines = ((_consoleBottom - 22 - _consoleTop) / 10) - 1; utf8 *ch = strchr(_consoleBuffer, 0); while (ch > _consoleBuffer) { ch--; @@ -417,7 +417,7 @@ static void console_clear_input() static void console_history_add(const utf8 *src) { if (_consoleHistoryCount >= CONSOLE_HISTORY_SIZE) { - for (int i = 0; i < _consoleHistoryCount - 1; i++) + for (sint32 i = 0; i < _consoleHistoryCount - 1; i++) memcpy(_consoleHistory[i], _consoleHistory[i + 1], CONSOLE_INPUT_SIZE); _consoleHistoryCount--; } @@ -425,31 +425,31 @@ static void console_history_add(const utf8 *src) _consoleHistoryIndex = _consoleHistoryCount; } -static int cc_clear(const utf8 **argv, int argc) +static sint32 cc_clear(const utf8 **argv, sint32 argc) { console_clear(); return 0; } -static int cc_hide(const utf8 **argv, int argc) +static sint32 cc_hide(const utf8 **argv, sint32 argc) { console_close(); return 0; } -static int cc_echo(const utf8 **argv, int argc) +static sint32 cc_echo(const utf8 **argv, sint32 argc) { if (argc > 0) console_writeline(argv[0]); return 0; } -static int cc_rides(const utf8 **argv, int argc) +static sint32 cc_rides(const utf8 **argv, sint32 argc) { if (argc > 0) { if (strcmp(argv[0], "list") == 0) { rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { char name[128]; format_string(name, 128, ride->name, &ride->name_arguments); @@ -463,23 +463,23 @@ static int cc_rides(const utf8 **argv, int argc) } if (strcmp(argv[1], "type") == 0) { bool int_valid[3] = { 0 }; - int ride_index = console_parse_int(argv[2], &int_valid[0]); - int type = console_parse_int(argv[3], &int_valid[1]); + sint32 ride_index = console_parse_int(argv[2], &int_valid[0]); + sint32 type = console_parse_int(argv[3], &int_valid[1]); if (!int_valid[0] || !int_valid[1]) { console_printf("This command expects integer arguments"); } else if (ride_index < 0) { console_printf("Ride index must not be negative"); } else { gGameCommandErrorTitle = STR_CANT_CHANGE_OPERATING_MODE; - int res = game_do_command(0, (type << 8) | 1, 0, (RIDE_SETTING_RIDE_TYPE << 8) | ride_index, GAME_COMMAND_SET_RIDE_SETTING, 0, 0); + sint32 res = game_do_command(0, (type << 8) | 1, 0, (RIDE_SETTING_RIDE_TYPE << 8) | ride_index, GAME_COMMAND_SET_RIDE_SETTING, 0, 0); if (res == MONEY32_UNDEFINED) { console_printf("That didn't work"); } } } else if (strcmp(argv[1], "friction") == 0) { bool int_valid[2] = { 0 }; - int ride_index = console_parse_int(argv[2], &int_valid[0]); - int friction = console_parse_int(argv[3], &int_valid[1]); + sint32 ride_index = console_parse_int(argv[2], &int_valid[0]); + sint32 friction = console_parse_int(argv[3], &int_valid[1]); if (ride_index < 0) { console_printf("Ride index must not be negative"); @@ -492,7 +492,7 @@ static int cc_rides(const utf8 **argv, int argc) } else if (ride->type == RIDE_TYPE_NULL) { console_printf("No ride found with index %d",ride_index); } else { - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { uint16 vehicle_index = ride->vehicles[i]; while (vehicle_index != SPRITE_INDEX_NULL) { rct_vehicle *vehicle=GET_VEHICLE(vehicle_index); @@ -510,12 +510,12 @@ static int cc_rides(const utf8 **argv, int argc) return 0; } -static int cc_staff(const utf8 **argv, int argc) +static sint32 cc_staff(const utf8 **argv, sint32 argc) { if (argc > 0) { if (strcmp(argv[0], "list") == 0) { rct_peep *peep; - int i; + sint32 i; FOR_ALL_STAFF(i, peep) { char name[128]; format_string(name, 128, peep->name_string_idx, &peep->id); @@ -525,7 +525,7 @@ static int cc_staff(const utf8 **argv, int argc) if (argc < 4) { console_printf("staff set energy "); console_printf("staff set costume "); - for (int i = 0; i < ENTERTAINER_COSTUME_COUNT; i++) { + for (sint32 i = 0; i < ENTERTAINER_COSTUME_COUNT; i++) { char costume_name[128] = { 0 }; rct_string_id costume = STR_STAFF_OPTION_COSTUME_PANDA + i; format_string(costume_name, 128, STR_DROPDOWN_MENU_LABEL, &costume); @@ -536,7 +536,7 @@ static int cc_staff(const utf8 **argv, int argc) return 0; } if (strcmp(argv[1], "energy") == 0) { - int int_val[3]; + sint32 int_val[3]; bool int_valid[3] = { 0 }; int_val[0] = console_parse_int(argv[2], &int_valid[0]); int_val[1] = console_parse_int(argv[3], &int_valid[1]); @@ -548,7 +548,7 @@ static int cc_staff(const utf8 **argv, int argc) peep->energy_growth_rate = int_val[1]; } } else if (strcmp(argv[1], "costume") == 0) { - int int_val[2]; + sint32 int_val[2]; bool int_valid[2] = { 0 }; int_val[0] = console_parse_int(argv[2], &int_valid[0]); int_val[1] = console_parse_int(argv[3], &int_valid[1]); @@ -568,7 +568,7 @@ static int cc_staff(const utf8 **argv, int argc) return 1; } - int costume = int_val[1] | 0x80; + sint32 costume = int_val[1] | 0x80; game_do_command(peep->x, (costume << 8) | 1, peep->y, int_val[0], GAME_COMMAND_SET_STAFF_ORDER, 0, 0); } } @@ -578,7 +578,7 @@ static int cc_staff(const utf8 **argv, int argc) return 0; } -static int cc_get(const utf8 **argv, int argc) +static sint32 cc_get(const utf8 **argv, sint32 argc) { if (argc > 0) { if (strcmp(argv[0], "park_rating") == 0) { @@ -601,7 +601,7 @@ static int cc_get(const utf8 **argv, int argc) } else if (strcmp(argv[0], "guest_initial_happiness") == 0) { uint32 current_happiness = gGuestInitialHappiness; - for (int i = 15; i <= 99; i++) { + for (sint32 i = 15; i <= 99; i++) { if (i == 99) { console_printf("guest_initial_happiness %d%% (%d)", 15, gGuestInitialHappiness); } @@ -675,7 +675,7 @@ static int cc_get(const utf8 **argv, int argc) else if (strcmp(argv[0], "location") == 0) { rct_window *w = window_get_main(); if (w != NULL) { - int interactionType; + sint32 interactionType; rct_map_element *mapElement; rct_xy16 mapCoord = { 0 }; get_map_coordinates_from_pos(w->viewport->view_width / 2, w->viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, &interactionType, &mapElement, NULL); @@ -715,11 +715,11 @@ static int cc_get(const utf8 **argv, int argc) } return 0; } -static int cc_set(const utf8 **argv, int argc) +static sint32 cc_set(const utf8 **argv, sint32 argc) { - int i; + sint32 i; if (argc > 1) { - int int_val[4]; + sint32 int_val[4]; bool int_valid[4]; double double_val[4]; bool double_valid[4]; @@ -737,7 +737,7 @@ static int cc_set(const utf8 **argv, int argc) } if (strcmp(argv[0], "money") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - money32 money = MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100); + money32 money = MONEY((sint32)double_val[0], ((sint32)(double_val[0] * 100)) % 100); bool run_get_money = true; if (gCashEncrypted != ENCRYPT_MONEY(money)) { if (game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETMONEY, money, GAME_COMMAND_CHEAT, 0, 0) != MONEY32_UNDEFINED) { @@ -769,7 +769,7 @@ static int cc_set(const utf8 **argv, int argc) console_execute_silent("get max_loan"); } else if (strcmp(argv[0], "guest_initial_cash") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - gGuestInitialCash = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(1000, 0)); + gGuestInitialCash = clamp(MONEY((sint32)double_val[0], ((sint32)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(1000, 0)); console_execute_silent("get guest_initial_cash"); } else if (strcmp(argv[0], "guest_initial_happiness") == 0 && invalidArguments(&invalidArgs, int_valid[0])) { @@ -829,11 +829,11 @@ static int cc_set(const utf8 **argv, int argc) console_execute_silent("get park_open"); } else if (strcmp(argv[0], "land_rights_cost") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - gLandPrice = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(200, 0)); + gLandPrice = clamp(MONEY((sint32)double_val[0], ((sint32)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(200, 0)); console_execute_silent("get land_rights_cost"); } else if (strcmp(argv[0], "construction_rights_cost") == 0 && invalidArguments(&invalidArgs, double_valid[0])) { - gConstructionRightsPrice = clamp(MONEY((int)double_val[0], ((int)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(200, 0)); + gConstructionRightsPrice = clamp(MONEY((sint32)double_val[0], ((sint32)(double_val[0] * 100)) % 100), MONEY(0, 0), MONEY(200, 0)); console_execute_silent("get construction_rights_cost"); } else if (strcmp(argv[0], "climate") == 0) { @@ -876,9 +876,9 @@ static int cc_set(const utf8 **argv, int argc) else if (strcmp(argv[0], "location") == 0 && invalidArguments(&invalidArgs, int_valid[0] && int_valid[1])) { rct_window *w = window_get_main(); if (w != NULL) { - int x = (sint16)(int_val[0] * 32 + 16); - int y = (sint16)(int_val[1] * 32 + 16); - int z = map_element_height(x, y); + sint32 x = (sint16)(int_val[0] * 32 + 16); + sint32 y = (sint16)(int_val[1] * 32 + 16); + sint32 z = map_element_height(x, y); window_scroll_to_location(w, x, y, z); w->flags &= ~WF_SCROLLING_TO_LOCATION; viewport_update_position(w); @@ -960,7 +960,7 @@ static int cc_set(const utf8 **argv, int argc) } return 0; } -static int cc_twitch(const utf8 **argv, int argc) +static sint32 cc_twitch(const utf8 **argv, sint32 argc) { #ifdef DISABLE_TWITCH console_writeline_error("OpenRCT2 build not compiled with Twitch integeration."); @@ -970,11 +970,11 @@ static int cc_twitch(const utf8 **argv, int argc) return 0; } -static int cc_load_object(const utf8 **argv, int argc) { +static sint32 cc_load_object(const utf8 **argv, sint32 argc) { if (argc > 0) { char name[9] = { 0 }; memset(name, ' ', 8); - int i = 0; + sint32 i = 0; for (const char * ch = argv[0]; *ch != '\0' && i < 8; ch++) { name[i++] = *ch; } @@ -997,17 +997,17 @@ static int cc_load_object(const utf8 **argv, int argc) { console_writeline_error("Unable to load object."); return 1; } - int groupIndex = object_manager_get_loaded_object_entry_index(loadedObject); + sint32 groupIndex = object_manager_get_loaded_object_entry_index(loadedObject); uint8 objectType = entry->flags & 0x0F; if (objectType == OBJECT_TYPE_RIDE) { // Automatically research the ride so it's supported by the game. rct_ride_entry *rideEntry; - int rideType; + sint32 rideType; rideEntry = get_ride_entry(groupIndex); - for (int j = 0; j < 3; j++) { + for (sint32 j = 0; j < 3; j++) { rideType = rideEntry->ride_type[j]; if (rideType != 255) research_insert(true, 0x10000 | (rideType << 8) | groupIndex, rideEntry->category[0]); @@ -1035,11 +1035,11 @@ static int cc_load_object(const utf8 **argv, int argc) { return 0; } -static int cc_object_count(const utf8 **argv, int argc) { +static sint32 cc_object_count(const utf8 **argv, sint32 argc) { const utf8* object_type_names[] = { "Rides", "Small scenery", "Large scenery", "Walls", "Banners", "Paths", "Path Additions", "Scenery groups", "Park entrances", "Water" }; - for (int i = 0; i < 10; i++) { + for (sint32 i = 0; i < 10; i++) { - int entryGroupIndex = 0; + sint32 entryGroupIndex = 0; for (; entryGroupIndex < object_entry_group_counts[i]; entryGroupIndex++){ if (object_entry_groups[i].chunks[entryGroupIndex] == (uint8*)-1){ break; @@ -1051,19 +1051,19 @@ static int cc_object_count(const utf8 **argv, int argc) { return 0; } -static int cc_reset_user_strings(const utf8 **argv, int argc) +static sint32 cc_reset_user_strings(const utf8 **argv, sint32 argc) { reset_user_strings(); return 0; } -static int cc_fix_banner_count(const utf8 **argv, int argc) +static sint32 cc_fix_banner_count(const utf8 **argv, sint32 argc) { fix_banner_count(); return 0; } -static int cc_open(const utf8 **argv, int argc) { +static sint32 cc_open(const utf8 **argv, sint32 argc) { if (argc > 0) { bool title = (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) != 0; bool invalidTitle = false; @@ -1091,7 +1091,7 @@ static int cc_open(const utf8 **argv, int argc) { } -typedef int (*console_command_func)(const utf8 **argv, int argc); +typedef sint32 (*console_command_func)(const utf8 **argv, sint32 argc); typedef struct console_command { utf8 *command; console_command_func func; @@ -1167,22 +1167,22 @@ console_command console_command_table[] = { { "staff", cc_staff, "Staff management.", "staff "}, }; -static int cc_windows(const utf8 **argv, int argc) { - for (int i = 0; i < countof(console_window_table); i++) +static sint32 cc_windows(const utf8 **argv, sint32 argc) { + for (sint32 i = 0; i < countof(console_window_table); i++) console_writeline(console_window_table[i]); return 0; } -static int cc_variables(const utf8 **argv, int argc) +static sint32 cc_variables(const utf8 **argv, sint32 argc) { - for (int i = 0; i < countof(console_variable_table); i++) + for (sint32 i = 0; i < countof(console_variable_table); i++) console_writeline(console_variable_table[i]); return 0; } -static int cc_help(const utf8 **argv, int argc) +static sint32 cc_help(const utf8 **argv, sint32 argc) { if (argc > 0) { - for (int i = 0; i < countof(console_command_table); i++) { + for (sint32 i = 0; i < countof(console_command_table); i++) { if (strcmp(console_command_table[i].command, argv[0]) == 0) { console_writeline(console_command_table[i].help); console_printf("\nUsage: %s", console_command_table[i].usage); @@ -1197,7 +1197,7 @@ static int cc_help(const utf8 **argv, int argc) static void console_write_all_commands() { - for (int i = 0; i < countof(console_command_table); i++) + for (sint32 i = 0; i < countof(console_command_table); i++) console_writeline(console_command_table[i].command); } @@ -1210,8 +1210,8 @@ void console_execute(const utf8 *src) void console_execute_silent(const utf8 *src) { - int argc = 0; - int argvCapacity = 8; + sint32 argc = 0; + sint32 argvCapacity = 8; utf8 **argv = malloc(argvCapacity * sizeof(utf8*)); const utf8 *start = src; const utf8 *end; @@ -1264,7 +1264,7 @@ void console_execute_silent(const utf8 *src) } bool validCommand = false; - for (int i = 0; i < countof(console_command_table); i++) { + for (sint32 i = 0; i < countof(console_command_table); i++) { if (strcmp(argv[0], console_command_table[i].command) == 0) { console_command_table[i].func((const utf8 **)(argv + 1), argc - 1); validCommand = true; @@ -1272,7 +1272,7 @@ void console_execute_silent(const utf8 *src) } } - for (int i = 0; i < argc; i++) + for (sint32 i = 0; i < argc; i++) free(argv[i]); free(argv); diff --git a/src/openrct2/interface/console.h b/src/openrct2/interface/console.h index 69cea1faa0..3269aaaa12 100644 --- a/src/openrct2/interface/console.h +++ b/src/openrct2/interface/console.h @@ -29,7 +29,7 @@ void console_toggle(); void console_update(); void console_draw(rct_drawpixelinfo *dpi); -void console_input(int c); +void console_input(sint32 c); void console_write(const utf8 *src); void console_writeline(const utf8 *src); void console_writeline_error(const utf8 *src); @@ -40,6 +40,6 @@ void console_execute_silent(const utf8 *src); void console_clear(); void console_clear_line(); void console_refresh_caret(); -void console_scroll(int delta); +void console_scroll(sint32 delta); #endif diff --git a/src/openrct2/interface/graph.c b/src/openrct2/interface/graph.c index 2cb66e20c5..d15540ae74 100644 --- a/src/openrct2/interface/graph.c +++ b/src/openrct2/interface/graph.c @@ -18,9 +18,9 @@ #include "../localisation/localisation.h" #include "graph.h" -static void graph_draw_months_uint8(rct_drawpixelinfo *dpi, uint8 *history, int count, int baseX, int baseY) +static void graph_draw_months_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY) { - int i, x, y, yearOver32, currentMonth, currentDay; + sint32 i, x, y, yearOver32, currentMonth, currentDay; currentMonth = date_get_month(gDateMonthsElapsed); currentDay = gDateMonthTicks; @@ -42,9 +42,9 @@ static void graph_draw_months_uint8(rct_drawpixelinfo *dpi, uint8 *history, int } } -static void graph_draw_line_a_uint8(rct_drawpixelinfo *dpi, uint8 *history, int count, int baseX, int baseY) +static void graph_draw_line_a_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY) { - int i, x, y, lastX, lastY; + sint32 i, x, y, lastX, lastY; lastX = -1; lastY = -1; x = baseX; @@ -66,9 +66,9 @@ static void graph_draw_line_a_uint8(rct_drawpixelinfo *dpi, uint8 *history, int } } -static void graph_draw_line_b_uint8(rct_drawpixelinfo *dpi, uint8 *history, int count, int baseX, int baseY) +static void graph_draw_line_b_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY) { - int i, x, y, lastX, lastY; + sint32 i, x, y, lastX, lastY; lastX = -1; lastY = -1; @@ -89,16 +89,16 @@ static void graph_draw_line_b_uint8(rct_drawpixelinfo *dpi, uint8 *history, int } } -void graph_draw_uint8(rct_drawpixelinfo *dpi, uint8 *history, int count, int baseX, int baseY) +void graph_draw_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY) { graph_draw_months_uint8(dpi, history, count, baseX, baseY); graph_draw_line_a_uint8(dpi, history, count, baseX, baseY); graph_draw_line_b_uint8(dpi, history, count, baseX, baseY); } -static void graph_draw_months_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int baseX, int baseY) +static void graph_draw_months_money32(rct_drawpixelinfo *dpi, money32 *history, sint32 count, sint32 baseX, sint32 baseY) { - int i, x, y, yearOver32, currentMonth, currentDay; + sint32 i, x, y, yearOver32, currentMonth, currentDay; currentMonth = date_get_month(gDateMonthsElapsed); currentDay = gDateMonthTicks; @@ -120,9 +120,9 @@ static void graph_draw_months_money32(rct_drawpixelinfo *dpi, money32 *history, } } -static void graph_draw_line_a_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int baseX, int baseY, int modifier, int offset) +static void graph_draw_line_a_money32(rct_drawpixelinfo *dpi, money32 *history, sint32 count, sint32 baseX, sint32 baseY, sint32 modifier, sint32 offset) { - int i, x, y, lastX, lastY; + sint32 i, x, y, lastX, lastY; lastX = -1; lastY = -1; x = baseX; @@ -144,9 +144,9 @@ static void graph_draw_line_a_money32(rct_drawpixelinfo *dpi, money32 *history, } } -static void graph_draw_line_b_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int baseX, int baseY, int modifier, int offset) +static void graph_draw_line_b_money32(rct_drawpixelinfo *dpi, money32 *history, sint32 count, sint32 baseX, sint32 baseY, sint32 modifier, sint32 offset) { - int i, x, y, lastX, lastY; + sint32 i, x, y, lastX, lastY; lastX = -1; lastY = -1; @@ -167,7 +167,7 @@ static void graph_draw_line_b_money32(rct_drawpixelinfo *dpi, money32 *history, } } -void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int baseX, int baseY, int modifier, int offset) +void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, sint32 count, sint32 baseX, sint32 baseY, sint32 modifier, sint32 offset) { graph_draw_months_money32(dpi, history, count, baseX, baseY); graph_draw_line_a_money32(dpi, history, count, baseX, baseY, modifier, offset); diff --git a/src/openrct2/interface/graph.h b/src/openrct2/interface/graph.h index d950ea59dd..2a347ac6b8 100644 --- a/src/openrct2/interface/graph.h +++ b/src/openrct2/interface/graph.h @@ -20,7 +20,7 @@ #include "../common.h" #include "../drawing/drawing.h" -void graph_draw_uint8(rct_drawpixelinfo *dpi, uint8 *history, int count, int baseX, int baseY); -void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int baseX, int baseY, int modifier, int offset); +void graph_draw_uint8(rct_drawpixelinfo *dpi, uint8 *history, sint32 count, sint32 baseX, sint32 baseY); +void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, sint32 count, sint32 baseX, sint32 baseY, sint32 modifier, sint32 offset); #endif diff --git a/src/openrct2/interface/keyboard_shortcut.c b/src/openrct2/interface/keyboard_shortcut.c index cc2e882aa3..23d21021b1 100644 --- a/src/openrct2/interface/keyboard_shortcut.c +++ b/src/openrct2/interface/keyboard_shortcut.c @@ -42,9 +42,9 @@ static const shortcut_action shortcut_table[SHORTCUT_COUNT]; * * rct2: 0x006E3E91 */ -void keyboard_shortcut_set(int key) +void keyboard_shortcut_set(sint32 key) { - int i; + sint32 i; // Unmap shortcut that already uses this key for (i = 0; i < SHORTCUT_COUNT; i++) { @@ -61,9 +61,9 @@ void keyboard_shortcut_set(int key) config_shortcut_keys_save(); } -static int keyboard_shortcut_get_from_key(int key) +static sint32 keyboard_shortcut_get_from_key(sint32 key) { - for (int i = 0; i < SHORTCUT_COUNT; i++) { + for (sint32 i = 0; i < SHORTCUT_COUNT; i++) { if (key == gShortcutKeys[i]) { return i; } @@ -75,15 +75,15 @@ static int keyboard_shortcut_get_from_key(int key) * * rct2: 0x006E3E68 */ -void keyboard_shortcut_handle(int key) +void keyboard_shortcut_handle(sint32 key) { - int shortcut = keyboard_shortcut_get_from_key(key); + sint32 shortcut = keyboard_shortcut_get_from_key(key); if (shortcut != -1) { keyboard_shortcut_handle_command(shortcut); } } -void keyboard_shortcut_handle_command(int shortcutIndex) +void keyboard_shortcut_handle_command(sint32 shortcutIndex) { if (shortcutIndex >= 0 && shortcutIndex < countof(shortcut_table)) { shortcut_action action = shortcut_table[shortcutIndex]; @@ -125,7 +125,7 @@ void keyboard_shortcut_format_string(char *buffer, size_t size, uint16 shortcutK #pragma region Shortcut Commands -static void toggle_view_flag(int viewportFlag) +static void toggle_view_flag(sint32 viewportFlag) { rct_window *window; diff --git a/src/openrct2/interface/keyboard_shortcut.h b/src/openrct2/interface/keyboard_shortcut.h index c0da2707d3..9e2c8fefc5 100644 --- a/src/openrct2/interface/keyboard_shortcut.h +++ b/src/openrct2/interface/keyboard_shortcut.h @@ -24,9 +24,9 @@ /** The current shortcut being changed. */ extern uint8 gKeyboardShortcutChangeId; -void keyboard_shortcut_set(int key); -void keyboard_shortcut_handle(int key); -void keyboard_shortcut_handle_command(int shortcutIndex); +void keyboard_shortcut_set(sint32 key); +void keyboard_shortcut_handle(sint32 key); +void keyboard_shortcut_handle_command(sint32 shortcutIndex); void keyboard_shortcut_format_string(char *buffer, size_t size, uint16 shortcutKey); #endif diff --git a/src/openrct2/interface/screenshot.c b/src/openrct2/interface/screenshot.c index ef2fdd8ddd..86a3f6af82 100644 --- a/src/openrct2/interface/screenshot.c +++ b/src/openrct2/interface/screenshot.c @@ -37,7 +37,7 @@ uint8 gScreenshotCountdown = 0; */ void screenshot_check() { - int screenshotIndex; + sint32 screenshotIndex; if (gScreenshotCountdown != 0) { gScreenshotCountdown--; @@ -57,7 +57,7 @@ void screenshot_check() } static void screenshot_get_rendered_palette(rct_palette* palette) { - for (int i = 0; i < 256; i++) { + for (sint32 i = 0; i < 256; i++) { const SDL_Color *renderedEntry = &gPalette[i]; rct_palette_entry *entry = &palette->entries[i]; @@ -68,7 +68,7 @@ static void screenshot_get_rendered_palette(rct_palette* palette) { } } -static int screenshot_get_next_path(char *path, size_t size) +static sint32 screenshot_get_next_path(char *path, size_t size) { char screenshotPath[MAX_PATH]; @@ -98,9 +98,9 @@ static int screenshot_get_next_path(char *path, size_t size) // might be possible when switching timezones // in the unlikely case that this does happen, // append (%d) to the filename and increment - // this int until it doesn't overwrite any + // this sint32 until it doesn't overwrite any // other file in the directory. - int i; + sint32 i; for (i = 1; i < 1000; i++) { // Glue together path and filename snprintf(path, size, "%s%s %d-%02d-%02d %02d-%02d-%02d (%d).png", screenshotPath, park_name, currentDate.year, currentDate.month, currentDate.day, currentTime.hour, currentTime.minute, currentTime.second, i); @@ -114,10 +114,10 @@ static int screenshot_get_next_path(char *path, size_t size) return -1; } -int screenshot_dump_png(rct_drawpixelinfo *dpi) +sint32 screenshot_dump_png(rct_drawpixelinfo *dpi) { // Get a free screenshot path - int index; + sint32 index; char path[MAX_PATH] = ""; if ((index = screenshot_get_next_path(path, MAX_PATH)) == -1) { return -1; @@ -133,10 +133,10 @@ int screenshot_dump_png(rct_drawpixelinfo *dpi) } } -int screenshot_dump_png_32bpp(sint32 width, sint32 height, const void *pixels) +sint32 screenshot_dump_png_32bpp(sint32 width, sint32 height, const void *pixels) { // Get a free screenshot path - int index; + sint32 index; char path[MAX_PATH] = ""; if ((index = screenshot_get_next_path(path, MAX_PATH)) == -1) { return -1; @@ -151,18 +151,18 @@ int screenshot_dump_png_32bpp(sint32 width, sint32 height, const void *pixels) void screenshot_giant() { - int originalRotation = get_current_rotation(); - int originalZoom = 0; + sint32 originalRotation = get_current_rotation(); + sint32 originalZoom = 0; rct_window *mainWindow = window_get_main(); if (mainWindow != NULL && mainWindow->viewport != NULL) originalZoom = mainWindow->viewport->zoom; - int rotation = originalRotation; - int zoom = originalZoom; - int mapSize = gMapSize; - int resolutionWidth = (mapSize * 32 * 2) >> zoom; - int resolutionHeight = (mapSize * 32 * 1) >> zoom; + sint32 rotation = originalRotation; + sint32 zoom = originalZoom; + sint32 mapSize = gMapSize; + sint32 resolutionWidth = (mapSize * 32 * 2) >> zoom; + sint32 resolutionHeight = (mapSize * 32 * 1) >> zoom; resolutionWidth += 8; resolutionHeight += 128; @@ -177,11 +177,11 @@ void screenshot_giant() viewport.var_11 = 0; viewport.flags = 0; - int centreX = (mapSize / 2) * 32 + 16; - int centreY = (mapSize / 2) * 32 + 16; + sint32 centreX = (mapSize / 2) * 32 + 16; + sint32 centreY = (mapSize / 2) * 32 + 16; - int x = 0, y = 0; - int z = map_element_height(centreX, centreY) & 0xFFFF; + sint32 x = 0, y = 0; + sint32 z = map_element_height(centreX, centreY) & 0xFFFF; switch (rotation) { case 0: x = centreY - centreX; @@ -222,7 +222,7 @@ void screenshot_giant() // Get a free screenshot path char path[MAX_PATH]; - int index; + sint32 index; if ((index = screenshot_get_next_path(path, MAX_PATH)) == -1) { log_error("Giant screenshot failed, unable to find a suitable destination path."); window_error_open(STR_SCREENSHOT_FAILED, STR_NONE); @@ -242,7 +242,7 @@ void screenshot_giant() window_error_open(STR_SCREENSHOT_SAVED_AS, STR_NONE); } -int cmdline_for_screenshot(const char **argv, int argc) +sint32 cmdline_for_screenshot(const char **argv, sint32 argc) { bool giantScreenshot = argc == 5 && _stricmp(argv[2], "giant") == 0; if (argc != 4 && argc != 8 && !giantScreenshot) { @@ -254,7 +254,7 @@ int cmdline_for_screenshot(const char **argv, int argc) bool customLocation = false; bool centreMapX = false; bool centreMapY = false; - int resolutionWidth, resolutionHeight, customX = 0, customY = 0, customZoom, customRotation = 0; + sint32 resolutionWidth, resolutionHeight, customX = 0, customY = 0, customZoom, customRotation = 0; const char *inputPath = argv[0]; const char *outputPath = argv[1]; @@ -295,7 +295,7 @@ int cmdline_for_screenshot(const char **argv, int argc) gIntroState = INTRO_STATE_NONE; gScreenFlags = SCREEN_FLAGS_PLAYING; - int mapSize = gMapSize; + sint32 mapSize = gMapSize; if (resolutionWidth == 0 || resolutionHeight == 0) { resolutionWidth = (mapSize * 32 * 2) >> customZoom; resolutionHeight = (mapSize * 32 * 1) >> customZoom; @@ -320,8 +320,8 @@ int cmdline_for_screenshot(const char **argv, int argc) if (centreMapY) customY = (mapSize / 2) * 32 + 16; - int x = 0, y = 0; - int z = map_element_height(customX, customY) & 0xFFFF; + sint32 x = 0, y = 0; + sint32 z = map_element_height(customX, customY) & 0xFFFF; switch (customRotation) { case 0: x = customY - customX; diff --git a/src/openrct2/interface/screenshot.h b/src/openrct2/interface/screenshot.h index ce37374840..4cb3f80ed7 100644 --- a/src/openrct2/interface/screenshot.h +++ b/src/openrct2/interface/screenshot.h @@ -22,11 +22,11 @@ extern uint8 gScreenshotCountdown; void screenshot_check(); -int screenshot_dump(); -int screenshot_dump_png(rct_drawpixelinfo *dpi); -int screenshot_dump_png_32bpp(sint32 width, sint32 height, const void *pixels); +sint32 screenshot_dump(); +sint32 screenshot_dump_png(rct_drawpixelinfo *dpi); +sint32 screenshot_dump_png_32bpp(sint32 width, sint32 height, const void *pixels); void screenshot_giant(); -int cmdline_for_screenshot(const char **argv, int argc); +sint32 cmdline_for_screenshot(const char **argv, sint32 argc); #endif diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index 13e93f2f4f..60cd632756 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -86,7 +86,7 @@ void viewport_init_all() gWindowNextSlot = g_window_list; // Setting up viewports - for (int i = 0; i < MAX_VIEWPORT_COUNT; i++) { + for (sint32 i = 0; i < MAX_VIEWPORT_COUNT; i++) { g_viewport_list[i].width = 0; } @@ -111,8 +111,8 @@ void viewport_init_all() * out_x : ax * out_y : bx */ -void center_2d_coordinates(int x, int y, int z, int* out_x, int* out_y, rct_viewport* viewport){ - int start_x = x; +void center_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32* out_x, sint32* out_y, rct_viewport* viewport){ + sint32 start_x = x; rct_xyz16 coord_3d = { .x = x, @@ -152,10 +152,10 @@ void center_2d_coordinates(int x, int y, int z, int* out_x, int* out_y, rct_view * flags: edx top most 2 bits 0b_X1 for zoom clear see below for 2nd bit. * w: esi */ -void viewport_create(rct_window *w, int x, int y, int width, int height, int zoom, int center_x, int center_y, int center_z, char flags, sint16 sprite) +void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 height, sint32 zoom, sint32 center_x, sint32 center_y, sint32 center_z, char flags, sint16 sprite) { rct_viewport* viewport = NULL; - for (int i = 0; i < MAX_VIEWPORT_COUNT; i++) { + for (sint32 i = 0; i < MAX_VIEWPORT_COUNT; i++) { if (g_viewport_list[i].width == 0) { viewport = &g_viewport_list[i]; break; @@ -195,7 +195,7 @@ void viewport_create(rct_window *w, int x, int y, int width, int height, int zoo w->viewport_target_sprite = SPR_NONE; } - int view_x, view_y; + sint32 view_x, view_y; center_2d_coordinates(center_x, center_y, center_z, &view_x, &view_y, viewport); w->saved_view_x = view_x; @@ -229,7 +229,7 @@ void sub_689174(sint16* x, sint16* y, sint16 *z) uint32 rotation = get_current_rotation(); rct_xy16 pos; - for (int i = 0; i < 6; i++) { + for (sint32 i = 0; i < 6; i++) { pos = viewport_coord_to_map_coord(start_x, start_y, height); height = map_element_height((0xFFFF) & pos.x, (0xFFFF) & pos.y); @@ -237,8 +237,8 @@ void sub_689174(sint16* x, sint16* y, sint16 *z) // of the map. This can happen when the height is larger than the map size. sint16 max = gMapSizeMinus2; if (pos.x > max && pos.y > max) { - int x_corr[] = { -1, 1, 1, -1 }; - int y_corr[] = { -1, -1, 1, 1 }; + sint32 x_corr[] = { -1, 1, 1, -1 }; + sint32 y_corr[] = { -1, -1, 1, 1 }; pos.x += x_corr[rotation] * height; pos.y += y_corr[rotation] * height; } @@ -249,7 +249,7 @@ void sub_689174(sint16* x, sint16* y, sint16 *z) *z = height; } -static void sub_6E7FF3(rct_drawpixelinfo *dpi, rct_window *window, rct_viewport *viewport, int x, int y) +static void sub_6E7FF3(rct_drawpixelinfo *dpi, rct_window *window, rct_viewport *viewport, sint32 x, sint32 y) { // sub-divide by intersecting windows if (window < gWindowNextSlot) @@ -372,7 +372,7 @@ static void sub_6E7FF3(rct_drawpixelinfo *dpi, rct_window *window, rct_viewport static void viewport_shift_pixels(rct_drawpixelinfo *dpi, rct_window* w, rct_viewport* viewport, sint16 x_diff, sint16 y_diff) { rct_window* orignal_w = w; - int left = 0, right = 0, top = 0, bottom = 0; + sint32 left = 0, right = 0, top = 0, bottom = 0; for (; w < gWindowNextSlot; w++){ if (!(w->flags & WF_TRANSPARENT)) continue; @@ -422,10 +422,10 @@ static void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewp if ((!x_diff) && (!y_diff))return; if (w->flags & WF_7){ - int left = max(viewport->x, 0); - int top = max(viewport->y, 0); - int right = min(viewport->x + viewport->width, gScreenWidth); - int bottom = min(viewport->y + viewport->height, gScreenHeight); + sint32 left = max(viewport->x, 0); + sint32 top = max(viewport->y, 0); + sint32 right = min(viewport->x + viewport->width, gScreenWidth); + sint32 bottom = min(viewport->y + viewport->height, gScreenHeight); if (left >= right) return; if (top >= bottom) return; @@ -447,7 +447,7 @@ static void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewp viewport->x = 0; } - int eax = viewport->x + viewport->width - gScreenWidth; + sint32 eax = viewport->x + viewport->width - gScreenWidth; if (eax > 0){ viewport->width -= eax; viewport->view_width -= eax * zoom; @@ -485,19 +485,19 @@ static void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewp } //rct2: 0x006E7A15 -static void viewport_set_underground_flag(int underground, rct_window* window, rct_viewport* viewport) +static void viewport_set_underground_flag(sint32 underground, rct_window* window, rct_viewport* viewport) { if (window->classification != WC_MAIN_WINDOW) { if (!underground) { - int bit = viewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE; + sint32 bit = viewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE; viewport->flags &= ~VIEWPORT_FLAG_UNDERGROUND_INSIDE; if (!bit) return; } else { - int bit = viewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE; + sint32 bit = viewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE; viewport->flags |= VIEWPORT_FLAG_UNDERGROUND_INSIDE; if (bit) return; } @@ -530,12 +530,12 @@ void viewport_update_position(rct_window *window) viewport_set_underground_flag(0, window, viewport); //Clamp to the map minimum value - int at_map_edge_x = 0; + sint32 at_map_edge_x = 0; if (x < MAP_MINIMUM_X_Y){ x = MAP_MINIMUM_X_Y; at_map_edge_x = 1; } - int at_map_edge_y = 0; + sint32 at_map_edge_y = 0; if (y < MAP_MINIMUM_X_Y){ y = MAP_MINIMUM_X_Y; at_map_edge_y = 1; @@ -554,8 +554,8 @@ void viewport_update_position(rct_window *window) if (at_map_edge_x || at_map_edge_y) { // The &0xFFFF is to prevent the sign extension messing the // function up. - int zz = map_element_height(x & 0xFFFF, y & 0xFFFF); - int _2d_x, _2d_y; + sint32 zz = map_element_height(x & 0xFFFF, y & 0xFFFF); + sint32 _2d_x, _2d_y; center_2d_coordinates(x, y, zz, &_2d_x, &_2d_y, viewport); if (at_map_edge_x) @@ -604,12 +604,12 @@ void viewport_update_sprite_follow(rct_window *window) if (window->viewport_target_sprite != -1 && window->viewport){ rct_sprite* sprite = get_sprite(window->viewport_target_sprite); - int height = (map_element_height(0xFFFF & sprite->unknown.x, 0xFFFF & sprite->unknown.y) & 0xFFFF) - 16; - int underground = sprite->unknown.z < height; + sint32 height = (map_element_height(0xFFFF & sprite->unknown.x, 0xFFFF & sprite->unknown.y) & 0xFFFF) - 16; + sint32 underground = sprite->unknown.z < height; viewport_set_underground_flag(underground, window, window->viewport); - int center_x, center_y; + sint32 center_x, center_y; center_2d_coordinates(sprite->unknown.x, sprite->unknown.y, sprite->unknown.z, ¢er_x, ¢er_y, window->viewport); viewport_move(center_x, center_y, window, window->viewport); @@ -626,7 +626,7 @@ void viewport_update_sprite_follow(rct_window *window) * edi: dpi * ebp: bottom */ -void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, int top, int right, int bottom) +void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, sint32 left, sint32 top, sint32 right, sint32 bottom) { if (right <= viewport->x) return; if (bottom <= viewport->y) return; @@ -634,7 +634,7 @@ void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, i if (top >= viewport->y + viewport->height)return; #ifdef DEBUG_SHOW_DIRTY_BOX - int l = left, t = top, r = right, b = bottom; + sint32 l = left, t = top, r = right, b = bottom; #endif left = max(left - viewport->x, 0); @@ -773,15 +773,15 @@ static void viewport_paint_weather_gloom(rct_drawpixelinfo * dpi) * * rct2: 0x0068958D */ -void screen_pos_to_map_pos(sint16 *x, sint16 *y, int *direction) +void screen_pos_to_map_pos(sint16 *x, sint16 *y, sint32 *direction) { screen_get_map_xy(*x, *y, x, y, NULL); if (*x == MAP_LOCATION_NULL) return; - int my_direction; - int dist_from_center_x = abs(*x % 32); - int dist_from_center_y = abs(*y % 32); + sint32 my_direction; + sint32 dist_from_center_x = abs(*x % 32); + sint32 dist_from_center_y = abs(*y % 32); if (dist_from_center_x > 8 && dist_from_center_x < 24 && dist_from_center_y > 8 && dist_from_center_y < 24) { my_direction = 4; @@ -816,7 +816,7 @@ rct_xy16 screen_coord_to_viewport_coord(rct_viewport *viewport, uint16 x, uint16 return ret; } -rct_xy16 viewport_coord_to_map_coord(int x, int y, int z) +rct_xy16 viewport_coord_to_map_coord(sint32 x, sint32 y, sint32 z) { rct_xy16 ret = { 0 }; switch (get_current_rotation()) { @@ -1050,12 +1050,12 @@ static bool sub_679236_679662_679B0D_679FF1(uint32 ebx, rct_g1_element *image, u /** * rct2: 0x0067933B, 0x00679788, 0x00679C4A, 0x0067A117 */ -static bool sub_67933B_679788_679C4A_67A117(uint8 *esi, sint16 x_start_point, sint16 y_start_point, int round) { +static bool sub_67933B_679788_679C4A_67A117(uint8 *esi, sint16 x_start_point, sint16 y_start_point, sint32 round) { const uint8 *ebx = esi + ((uint16 *) esi)[y_start_point]; uint8 last_data_line = 0; while (!last_data_line) { - int no_pixels = *ebx++; + sint32 no_pixels = *ebx++; uint8 gap_size = *ebx++; last_data_line = no_pixels & 0x80; @@ -1084,7 +1084,7 @@ static bool sub_67933B_679788_679C4A_67A117(uint8 *esi, sint16 x_start_point, si } } - int x_start = gap_size - x_start_point; + sint32 x_start = gap_size - x_start_point; if (x_start <= 0) { no_pixels += x_start; if (no_pixels <= 0) { @@ -1125,7 +1125,7 @@ static bool sub_67933B_679788_679C4A_67A117(uint8 *esi, sint16 x_start_point, si * @param y (dx) * @return value originally stored in 0x00141F569 */ -static bool sub_679074(rct_drawpixelinfo *dpi, int imageId, sint16 x, sint16 y) +static bool sub_679074(rct_drawpixelinfo *dpi, sint32 imageId, sint16 x, sint16 y) { rct_g1_element *image = gfx_get_g1_element(imageId & 0x7FFFF); @@ -1150,7 +1150,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, int imageId, sint16 x, sint16 y) } } - int round = 1 << dpi->zoom_level; + sint32 round = 1 << dpi->zoom_level; if (image->flags & G1_FLAG_RLE_COMPRESSION) { y -= (round - 1); @@ -1247,12 +1247,12 @@ static bool sub_679074(rct_drawpixelinfo *dpi, int imageId, sint16 x, sint16 y) } // The code below is untested. - int total_no_pixels = image->width * image->height; + sint32 total_no_pixels = image->width * image->height; uint8 *source_pointer = image->offset; uint8 *new_source_pointer_start = malloc(total_no_pixels); uint8 *new_source_pointer = (*&new_source_pointer_start);// 0x9E3D28; intptr_t ebx1; - int ecx; + sint32 ecx; while (total_no_pixels > 0) { sint8 no_pixels = *source_pointer; if (no_pixels >= 0) { @@ -1266,7 +1266,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, int imageId, sint16 x, sint16 y) ecx = no_pixels; no_pixels &= 0x7; ecx >>= 3;//SAR - uintptr_t eax = ((int) no_pixels) << 8; + uintptr_t eax = ((sint32) no_pixels) << 8; ecx = -ecx;//Odd eax = (eax & 0xFF00) + *(source_pointer + 1); total_no_pixels -= ecx; @@ -1291,16 +1291,16 @@ static bool sub_679074(rct_drawpixelinfo *dpi, int imageId, sint16 x, sint16 y) * * rct2: 0x00679023 */ -static bool sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y) +static bool sub_679023(rct_drawpixelinfo *dpi, sint32 imageId, sint32 x, sint32 y) { imageId &= 0xBFFFFFFF; if (imageId & 0x20000000) { gUnkEDF81C = 0x20000000; - int index = (imageId >> 19) & 0x7F; + sint32 index = (imageId >> 19) & 0x7F; if (imageId & 0x80000000) { index &= 0x1F; } - int g1Index = palette_to_g1_offset[index]; + sint32 g1Index = palette_to_g1_offset[index]; unk_9ABDA4 = g1Elements[g1Index].offset; } else { gUnkEDF81C = 0; @@ -1352,7 +1352,7 @@ static void sub_68862C(rct_drawpixelinfo * dpi, paint_struct * ps) * mapElement: edx * viewport: edi */ -void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x, sint16 *y, int *interactionType, rct_map_element **mapElement, rct_viewport **viewport) +void get_map_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 flags, sint16 *x, sint16 *y, sint32 *interactionType, rct_map_element **mapElement, rct_viewport **viewport) { _unk9AC154 = flags & 0xFFFF; _unk9AC148 = 0; @@ -1360,14 +1360,14 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x if (window != NULL && window->viewport != NULL) { rct_viewport* myviewport = window->viewport; - screenX -= (int)myviewport->x; - screenY -= (int)myviewport->y; - if (screenX >= 0 && screenX < (int)myviewport->width && screenY >= 0 && screenY < (int)myviewport->height) + screenX -= (sint32)myviewport->x; + screenY -= (sint32)myviewport->y; + if (screenX >= 0 && screenX < (sint32)myviewport->width && screenY >= 0 && screenY < (sint32)myviewport->height) { screenX <<= myviewport->zoom; screenY <<= myviewport->zoom; - screenX += (int)myviewport->view_x; - screenY += (int)myviewport->view_y; + screenX += (sint32)myviewport->view_x; + screenY += (sint32)myviewport->view_y; _viewportDpi1.zoom_level = myviewport->zoom; screenX &= (0xFFFF << myviewport->zoom) & 0xFFFF; screenY &= (0xFFFF << myviewport->zoom) & 0xFFFF; @@ -1395,7 +1395,7 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x /** * Left, top, right and bottom represent 2D map coordinates at zoom 0. */ -void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, int bottom) +void viewport_invalidate(rct_viewport *viewport, sint32 left, sint32 top, sint32 right, sint32 bottom) { // if unknown viewport visibility, use the containing window to discover the status if (viewport->visibility == VC_UNKNOWN) @@ -1414,10 +1414,10 @@ void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, i if (viewport->visibility == VC_COVERED) return; - int viewportLeft = viewport->view_x; - int viewportTop = viewport->view_y; - int viewportRight = viewport->view_x + viewport->view_width; - int viewportBottom = viewport->view_y + viewport->view_height; + sint32 viewportLeft = viewport->view_x; + sint32 viewportTop = viewport->view_y; + sint32 viewportRight = viewport->view_x + viewport->view_width; + sint32 viewportBottom = viewport->view_y + viewport->view_height; if (right > viewportLeft && bottom > viewportTop) { left = max(left, viewportLeft); top = max(top, viewportTop); @@ -1441,7 +1441,7 @@ void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, i } } -static rct_viewport *viewport_find_from_point(int screenX, int screenY) +static rct_viewport *viewport_find_from_point(sint32 screenX, sint32 screenY) { rct_window *w = window_find_from_point(screenX, screenY); if (w == NULL) @@ -1471,9 +1471,9 @@ static rct_viewport *viewport_find_from_point(int screenX, int screenY) * map_element: edx ? * viewport: edi */ -void screen_get_map_xy(int screenX, int screenY, sint16 *x, sint16 *y, rct_viewport **viewport) { +void screen_get_map_xy(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, rct_viewport **viewport) { sint16 my_x, my_y; - int interactionType; + sint32 interactionType; rct_viewport *myViewport; get_map_coordinates_from_pos(screenX, screenY, VIEWPORT_INTERACTION_MASK_TERRAIN, &my_x, &my_y, &interactionType, NULL, &myViewport); if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE) { @@ -1484,8 +1484,8 @@ void screen_get_map_xy(int screenX, int screenY, sint16 *x, sint16 *y, rct_viewp rct_xy16 start_vp_pos = screen_coord_to_viewport_coord(myViewport, screenX, screenY); rct_xy16 map_pos = { my_x + 16, my_y + 16 }; - for (int i = 0; i < 5; i++) { - int z = map_element_height(map_pos.x, map_pos.y); + for (sint32 i = 0; i < 5; i++) { + sint32 z = map_element_height(map_pos.x, map_pos.y); map_pos = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z); map_pos.x = clamp(my_x, map_pos.x, my_x + 31); map_pos.y = clamp(my_y, map_pos.y, my_y + 31); diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/viewport.h index fdf6596185..a4dd45702f 100644 --- a/src/openrct2/interface/viewport.h +++ b/src/openrct2/interface/viewport.h @@ -75,9 +75,9 @@ enum { }; typedef struct viewport_interaction_info { - int type; - int x; - int y; + sint32 type; + sint32 x; + sint32 y; union { rct_map_element *mapElement; rct_sprite *sprite; @@ -115,19 +115,19 @@ extern uint32 gCurrentViewportFlags; #endif void viewport_init_all(); -void center_2d_coordinates(int x, int y, int z, int* out_x, int* out_y, rct_viewport* viewport); -void viewport_create(rct_window *w, int x, int y, int width, int height, int zoom, int center_x, int center_y, int center_z, char flags, sint16 sprite); +void center_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32* out_x, sint32* out_y, rct_viewport* viewport); +void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 height, sint32 zoom, sint32 center_x, sint32 center_y, sint32 center_z, char flags, sint16 sprite); void viewport_update_pointers(); void viewport_update_position(rct_window *window); void viewport_update_sprite_follow(rct_window *window); -void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, int top, int right, int bottom); +void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, sint32 left, sint32 top, sint32 right, sint32 bottom); void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, sint16 left, sint16 top, sint16 right, sint16 bottom); void sub_689174(sint16* x, sint16* y, sint16 *z); rct_xy16 screen_coord_to_viewport_coord(rct_viewport *viewport, uint16 x, uint16 y); -rct_xy16 viewport_coord_to_map_coord(int x, int y, int z); -void screen_pos_to_map_pos(sint16 *x, sint16 *y, int *direction); +rct_xy16 viewport_coord_to_map_coord(sint32 x, sint32 y, sint32 z); +void screen_pos_to_map_pos(sint16 *x, sint16 *y, sint32 *direction); void show_gridlines(); void hide_gridlines(); @@ -137,23 +137,23 @@ void show_construction_rights(); void hide_construction_rights(); void viewport_set_visibility(uint8 mode); -void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x, sint16 *y, int *interactionType, rct_map_element **mapElement, rct_viewport **viewport); +void get_map_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 flags, sint16 *x, sint16 *y, sint32 *interactionType, rct_map_element **mapElement, rct_viewport **viewport); -int viewport_interaction_get_item_left(int x, int y, viewport_interaction_info *info); -int viewport_interaction_left_over(int x, int y); -int viewport_interaction_left_click(int x, int y); -int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info *info); -int viewport_interaction_right_over(int x, int y); -int viewport_interaction_right_click(int x, int y); -void sub_68A15E(int screenX, int screenY, short *x, short *y, int *direction, rct_map_element **mapElement); +sint32 viewport_interaction_get_item_left(sint32 x, sint32 y, viewport_interaction_info *info); +sint32 viewport_interaction_left_over(sint32 x, sint32 y); +sint32 viewport_interaction_left_click(sint32 x, sint32 y); +sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interaction_info *info); +sint32 viewport_interaction_right_over(sint32 x, sint32 y); +sint32 viewport_interaction_right_click(sint32 x, sint32 y); +void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *direction, rct_map_element **mapElement); -void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int x, int y); +void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, sint32 x, sint32 y); -void sub_68B2B7(int x, int y); +void sub_68B2B7(sint32 x, sint32 y); -void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, int bottom); +void viewport_invalidate(rct_viewport *viewport, sint32 left, sint32 top, sint32 right, sint32 bottom); -void screen_get_map_xy(int screenX, int screenY, sint16 *x, sint16 *y, rct_viewport **viewport); +void screen_get_map_xy(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, rct_viewport **viewport); void screen_get_map_xy_with_z(sint16 screenX, sint16 screenY, sint16 z, sint16 *mapX, sint16 *mapY); void screen_get_map_xy_quadrant(sint16 screenX, sint16 screenY, sint16 *mapX, sint16 *mapY, uint8 *quadrant); void screen_get_map_xy_quadrant_with_z(sint16 screenX, sint16 screenY, sint16 z, sint16 *mapX, sint16 *mapY, uint8 *quadrant); diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 52bbe23649..a271c06684 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -30,18 +30,18 @@ #include "../world/sprite.h" #include "viewport.h" -static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int x, int y); -static void viewport_interaction_remove_footpath(rct_map_element *mapElement, int x, int y); -static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, int x, int y); -static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, int x, int y); -static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, int x, int y); -static rct_peep *viewport_interaction_get_closest_peep(int x, int y, int maxDistance); +static void viewport_interaction_remove_scenery(rct_map_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_footpath(rct_map_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, sint32 x, sint32 y); +static rct_peep *viewport_interaction_get_closest_peep(sint32 x, sint32 y, sint32 maxDistance); /** * * rct2: 0x006ED9D0 */ -int viewport_interaction_get_item_left(int x, int y, viewport_interaction_info *info) +sint32 viewport_interaction_get_item_left(sint32 x, sint32 y, viewport_interaction_info *info) { rct_map_element *mapElement; rct_sprite *sprite; @@ -104,7 +104,7 @@ int viewport_interaction_get_item_left(int x, int y, viewport_interaction_info * return info->type; } -int viewport_interaction_left_over(int x, int y) +sint32 viewport_interaction_left_over(sint32 x, sint32 y) { viewport_interaction_info info; @@ -118,7 +118,7 @@ int viewport_interaction_left_over(int x, int y) } } -int viewport_interaction_left_click(int x, int y) +sint32 viewport_interaction_left_click(sint32 x, sint32 y) { viewport_interaction_info info; @@ -160,13 +160,13 @@ int viewport_interaction_left_click(int x, int y) * * rct2: 0x006EDE88 */ -int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info *info) +sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interaction_info *info) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; rct_banner *banner; rct_ride *ride; - int i, stationIndex; + sint32 i, stationIndex; // No click input for title screen or track manager if (gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_MANAGER)) @@ -339,7 +339,7 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info return info->type = VIEWPORT_INTERACTION_ITEM_NONE; } -int viewport_interaction_right_over(int x, int y) +sint32 viewport_interaction_right_over(sint32 x, sint32 y) { viewport_interaction_info info; @@ -350,7 +350,7 @@ int viewport_interaction_right_over(int x, int y) * * rct2: 0x006E8A62 */ -int viewport_interaction_right_click(int x, int y) +sint32 viewport_interaction_right_click(sint32 x, sint32 y) { rct_xy_element mapElement; viewport_interaction_info info; @@ -399,7 +399,7 @@ int viewport_interaction_right_click(int x, int y) * * rct2: 0x006E08D2 */ -static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int x, int y) +static void viewport_interaction_remove_scenery(rct_map_element *mapElement, sint32 x, sint32 y) { gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( @@ -417,9 +417,9 @@ static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int * * rct2: 0x006A614A */ -static void viewport_interaction_remove_footpath(rct_map_element *mapElement, int x, int y) +static void viewport_interaction_remove_footpath(rct_map_element *mapElement, sint32 x, sint32 y) { - int z; + sint32 z; rct_window *w; rct_map_element *mapElement2; @@ -443,9 +443,9 @@ static void viewport_interaction_remove_footpath(rct_map_element *mapElement, in * * rct2: 0x006A61AB */ -static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, int x, int y) +static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, sint32 x, sint32 y) { - int type; + sint32 type; type = mapElement->properties.path.type >> 4; if (mapElement->type & 1) @@ -467,9 +467,9 @@ static void viewport_interaction_remove_footpath_item(rct_map_element *mapElemen * * rct2: 0x00666C0E */ -void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int x, int y) +void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, sint32 x, sint32 y) { - int rotation = (mapElement->type + 1) & 3; + sint32 rotation = (mapElement->type + 1) & 3; switch (mapElement->properties.entrance.index & 0x0F) { case 1: x += TileDirectionDelta[rotation].x; @@ -488,7 +488,7 @@ void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int * * rct2: 0x006E57A9 */ -static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, int x, int y) +static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, sint32 x, sint32 y) { rct_scenery_entry *sceneryEntry = get_wall_entry(mapElement->properties.fence.type); if (sceneryEntry->wall.var_0D != 0xFF){ @@ -511,12 +511,12 @@ static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, i * * rct2: 0x006B88DC */ -static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, int x, int y) +static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, sint32 x, sint32 y) { rct_scenery_entry *sceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); if (sceneryEntry->large_scenery.var_11 != 0xFF){ - int id = (mapElement->type & 0xC0) | + sint32 id = (mapElement->type & 0xC0) | ((mapElement->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | ((mapElement->properties.scenerymultiple.colour[1] & 0xE0) >> 5); window_sign_open(id); @@ -534,9 +534,9 @@ static void viewport_interaction_remove_large_scenery(rct_map_element *mapElemen } } -static rct_peep *viewport_interaction_get_closest_peep(int x, int y, int maxDistance) +static rct_peep *viewport_interaction_get_closest_peep(sint32 x, sint32 y, sint32 maxDistance) { - int distance, closestDistance; + sint32 distance, closestDistance; uint16 spriteIndex; rct_window *w; rct_viewport *viewport; @@ -578,10 +578,10 @@ static rct_peep *viewport_interaction_get_closest_peep(int x, int y, int maxDist * * rct2: 0x0068A15E */ -void sub_68A15E(int screenX, int screenY, short *x, short *y, int *direction, rct_map_element **mapElement) +void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *direction, rct_map_element **mapElement) { sint16 my_x, my_y; - int interactionType; + sint32 interactionType; rct_map_element *myMapElement; rct_viewport *viewport; get_map_coordinates_from_pos(screenX, screenY, VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER, &my_x, &my_y, &interactionType, &myMapElement, &viewport); @@ -599,7 +599,7 @@ void sub_68A15E(int screenX, int screenY, short *x, short *y, int *direction, rc rct_xy16 start_vp_pos = screen_coord_to_viewport_coord(viewport, screenX, screenY); rct_xy16 map_pos = { my_x + 16, my_y + 16 }; - for (int i = 0; i < 5; i++) { + for (sint32 i = 0; i < 5; i++) { sint16 z = originalZ; if (interactionType != VIEWPORT_INTERACTION_ITEM_WATER) { z = map_element_height(map_pos.x, map_pos.y); @@ -610,9 +610,9 @@ void sub_68A15E(int screenX, int screenY, short *x, short *y, int *direction, rc } // Determine to which edge the cursor is closest - int myDirection; - int mod_x = map_pos.x & 0x1F; - int mod_y = map_pos.y & 0x1F; + sint32 myDirection; + sint32 mod_x = map_pos.x & 0x1F; + sint32 mod_y = map_pos.y & 0x1F; if (mod_x < mod_y) { if (mod_x + mod_y < 32) { myDirection = 0; diff --git a/src/openrct2/interface/widget.c b/src/openrct2/interface/widget.c index 0f4dddac4e..df9db94ac0 100644 --- a/src/openrct2/interface/widget.c +++ b/src/openrct2/interface/widget.c @@ -25,40 +25,40 @@ #include -static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); -static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, int l, int t, int r, int b, int colour); -static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, int l, int t, int r, int b, int colour); -static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); +static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); +static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, sint32 l, sint32 t, sint32 r, sint32 b, sint32 colour); +static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, sint32 l, sint32 t, sint32 r, sint32 b, sint32 colour); +static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); /** * * rct2: 0x006EAF26 */ -void widget_scroll_update_thumbs(rct_window *w, int widget_index) +void widget_scroll_update_thumbs(rct_window *w, sint32 widget_index) { rct_widget *widget = &w->widgets[widget_index]; rct_scroll* scroll = &w->scrolls[window_get_scroll_data_index(w, widget_index)]; if (scroll->flags & HSCROLLBAR_VISIBLE) { - int view_size = widget->right - widget->left - 21; + sint32 view_size = widget->right - widget->left - 21; if (scroll->flags & VSCROLLBAR_VISIBLE) view_size -= 11; - int x = scroll->h_left * view_size; + sint32 x = scroll->h_left * view_size; if (scroll->h_right != 0) x /= scroll->h_right; scroll->h_thumb_left = x + 11; @@ -82,10 +82,10 @@ void widget_scroll_update_thumbs(rct_window *w, int widget_index) } if (scroll->flags & VSCROLLBAR_VISIBLE) { - int view_size = widget->bottom - widget->top - 21; + sint32 view_size = widget->bottom - widget->top - 21; if (scroll->flags & HSCROLLBAR_VISIBLE) view_size -= 11; - int y = scroll->v_top * view_size; + sint32 y = scroll->v_top * view_size; if (scroll->v_bottom != 0) y /= scroll->v_bottom; scroll->v_thumb_top = y + 11; @@ -114,7 +114,7 @@ void widget_scroll_update_thumbs(rct_window *w, int widget_index) * * rct2: 0x006EB2A8 */ -void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { switch (w->widgets[widgetIndex].type) { case WWT_FRAME: @@ -182,16 +182,16 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) * * rct2: 0x006EB6CE */ -static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // uint8 press = ((w->flags & WF_10) ? INSET_RECT_FLAG_FILL_MID_LIGHT : 0); @@ -218,16 +218,16 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetI * * rct2: 0x006EB765 */ -static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -251,16 +251,16 @@ static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget * * rct2: 0x006EB8E5 */ -static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Check if the button is pressed down uint8 press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; @@ -284,7 +284,7 @@ static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget * * rct2: 0x006EB806 */ -static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; @@ -308,8 +308,8 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd } // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; // Get the colour and disabled image uint8 colour = w->colours[widget->colour] & 0x7F; @@ -323,7 +323,7 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd * * rct2: 0x006EB861 */ -static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { if (!widget_is_disabled(w, widgetIndex) && widget_is_highlighted(w, widgetIndex)) { widget_button_draw(dpi, w, widgetIndex); @@ -334,10 +334,10 @@ static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int w rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -362,16 +362,16 @@ static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int w * * rct2: 0x006EBBEB */ -static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -388,7 +388,7 @@ static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widget * * rct2: 0x006EBC41 */ -static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; @@ -399,8 +399,8 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge // colour = 2; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; rct_string_id stringId = widget->text; if (stringId == STR_NONE) @@ -442,7 +442,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge * * rct2: 0x006EBD52 */ -static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; @@ -451,9 +451,9 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) uint8 colour = w->colours[widget->colour]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; // TODO: -2 seems odd if (widget->text == (rct_string_id)-2 || widget->text == STR_NONE) @@ -468,16 +468,16 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) * * rct2: 0x006EBD1F */ -static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -490,21 +490,21 @@ static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetI * * rct2: 0x006EC1A6 */ -static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left + 5; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left + 5; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; - int press = 0; + sint32 press = 0; if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) press |= INSET_RECT_FLAG_BORDER_INSET; @@ -519,17 +519,17 @@ static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIn * * rct2: 0x006EB535 */ -static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left + 5; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; - int textRight = l; + sint32 l = w->x + widget->left + 5; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; + sint32 textRight = l; // Text if (widget->text != STR_NONE) { @@ -575,16 +575,16 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg * * rct2: 0x006EB2F9 */ -static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -607,7 +607,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge l = widget->left + w->x + 2; t = widget->top + w->y + 1; - int width = widget->right - widget->left - 4; + sint32 width = widget->right - widget->left - 4; if ((widget + 1)->type == WWT_CLOSEBOX) { width -= 10; if ((widget + 2)->type == WWT_CLOSEBOX) @@ -621,16 +621,16 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge * * rct2: 0x006EBB85 */ -static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Check if the button is pressed down uint8 press = 0; @@ -661,16 +661,16 @@ static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg * * rct2: 0x006EBAD9 */ -static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltb - int l = w->x + widget->left; - int t = w->y + widget->top; - int b = w->y + widget->bottom; - int yMid = (b + t) / 2; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 b = w->y + widget->bottom; + sint32 yMid = (b + t) / 2; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -701,18 +701,18 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg * * rct2: 0x006EBD96 */ -static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget - int scrollIndex = window_get_scroll_data_index(w, widgetIndex); + sint32 scrollIndex = window_get_scroll_data_index(w, widgetIndex); rct_widget *widget = &w->widgets[widgetIndex]; rct_scroll* scroll = &w->scrolls[scrollIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -749,10 +749,10 @@ static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget rct_drawpixelinfo scroll_dpi = *dpi; // Clip the scroll dpi against the outer dpi - int cl = max(dpi->x, l); - int ct = max(dpi->y, t); - int cr = min(dpi->x + dpi->width, r); - int cb = min(dpi->y + dpi->height, b); + sint32 cl = max(dpi->x, l); + sint32 ct = max(dpi->y, t); + sint32 cr = min(dpi->x + dpi->width, r); + sint32 cb = min(dpi->y + dpi->height, b); // Set the respective dpi attributes scroll_dpi.x = cl - l + scroll->h_left; @@ -768,7 +768,7 @@ static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget window_event_scroll_paint_call(w, &scroll_dpi, scrollIndex); } -static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, int l, int t, int r, int b, int colour) +static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, sint32 l, sint32 t, sint32 r, sint32 b, sint32 colour) { colour &= 0x7F; // Trough @@ -794,7 +794,7 @@ static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i gfx_draw_string(dpi, (char*)BlackRightArrowString, COLOUR_BLACK, r - 6, t); } -static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, int l, int t, int r, int b, int colour) +static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, sint32 l, sint32 t, sint32 r, sint32 b, sint32 colour) { colour &= 0x7F; // Trough @@ -824,19 +824,19 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i * * rct2: 0x006EB951 */ -static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Get the image - int image = widget->image; + sint32 image = widget->image; if (image == SPR_NONE) return; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; // Get the colour uint8 colour = NOT_TRANSLUCENT(w->colours[widget->colour]); @@ -869,17 +869,17 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetI } } -int widget_is_enabled(rct_window *w, int widgetIndex) +sint32 widget_is_enabled(rct_window *w, sint32 widgetIndex) { return (w->enabled_widgets & (1LL << widgetIndex)) ? 1 : 0; } -int widget_is_disabled(rct_window *w, int widgetIndex) +sint32 widget_is_disabled(rct_window *w, sint32 widgetIndex) { return (w->disabled_widgets & (1LL << widgetIndex)) ? 1 : 0; } -int widget_is_pressed(rct_window *w, int widgetIndex) +sint32 widget_is_pressed(rct_window *w, sint32 widgetIndex) { if (w->pressed_widgets & (1LL << widgetIndex)) { return 1; @@ -894,7 +894,7 @@ int widget_is_pressed(rct_window *w, int widgetIndex) return 0; } -int widget_is_highlighted(rct_window *w, int widgetIndex) +sint32 widget_is_highlighted(rct_window *w, sint32 widgetIndex) { if (gHoverWidget.window_classification != w->classification) return 0; if (gHoverWidget.window_number != w->number) return 0; @@ -902,7 +902,7 @@ int widget_is_highlighted(rct_window *w, int widgetIndex) return 1; } -int widget_is_active_tool(rct_window *w, int widgetIndex) +sint32 widget_is_active_tool(rct_window *w, sint32 widgetIndex) { if (!(gInputFlags & INPUT_FLAG_TOOL_ACTIVE)) return 0; @@ -926,7 +926,7 @@ int widget_is_active_tool(rct_window *w, int widgetIndex) * esi: w * edi: widget */ -void widget_scroll_get_part(rct_window *w, rct_widget *widget, int x, int y, int *output_x, int *output_y, int *output_scroll_area, int *scroll_id) +void widget_scroll_get_part(rct_window *w, rct_widget *widget, sint32 x, sint32 y, sint32 *output_x, sint32 *output_y, sint32 *output_scroll_area, sint32 *scroll_id) { rct_widget* iterator = w->widgets; *scroll_id = 0; @@ -942,9 +942,9 @@ void widget_scroll_get_part(rct_window *w, rct_widget *widget, int x, int y, int if ((w->scrolls[*scroll_id].flags & HSCROLLBAR_VISIBLE) && y >= (w->y + widget->bottom - 11)) { //horizon scrollbar - int rightOffset = 0; - int iteratorLeft = widget->left + w->x + 10; - int iteratorRight = widget->right + w->x - 10; + sint32 rightOffset = 0; + sint32 iteratorLeft = widget->left + w->x + 10; + sint32 iteratorRight = widget->right + w->x - 10; if (w->scrolls[*scroll_id].flags & VSCROLLBAR_VISIBLE) { rightOffset = 11; @@ -977,9 +977,9 @@ void widget_scroll_get_part(rct_window *w, rct_widget *widget, int x, int y, int else if ((w->scrolls[*scroll_id].flags & VSCROLLBAR_VISIBLE) && (x >= w->x + widget->right - 11)) { //vertical scrollbar - int bottomOffset = 0; - int iteratorTop = widget->top + w->y + 10; - int iteratorBottom = widget->bottom + w->y; + sint32 bottomOffset = 0; + sint32 iteratorTop = widget->top + w->y + 10; + sint32 iteratorBottom = widget->bottom + w->y; if (w->scrolls[*scroll_id].flags & HSCROLLBAR_VISIBLE) { bottomOffset = 11; @@ -1041,7 +1041,7 @@ void widget_set_enabled(rct_window *w, uint64 widgetIndex, bool enabled) } } -void widget_set_checkbox_value(rct_window *w, int widgetIndex, int value) +void widget_set_checkbox_value(rct_window *w, sint32 widgetIndex, sint32 value) { if (value) w->pressed_widgets |= (1ULL << widgetIndex); @@ -1049,20 +1049,20 @@ void widget_set_checkbox_value(rct_window *w, int widgetIndex, int value) w->pressed_widgets &= ~(1ULL << widgetIndex); } -static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) +static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex) { - int no_lines = 0; - int font_height = 0; + sint32 no_lines = 0; + sint32 font_height = 0; char wrapped_string[512]; // Get the widget rct_widget *widget = &w->widgets[widgetIndex]; // Resolve the absolute ltrb - int l = w->x + widget->left; - int t = w->y + widget->top; - int r = w->x + widget->right; - int b = w->y + widget->bottom; + sint32 l = w->x + widget->left; + sint32 t = w->y + widget->top; + sint32 r = w->x + widget->right; + sint32 b = w->y + widget->bottom; // Get the colour uint8 colour = w->colours[widget->colour]; @@ -1103,9 +1103,9 @@ static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg // Make a copy of the string for measuring the width. char temp_string[512] = { 0 }; memcpy(temp_string, wrapped_string, min(string_length, gTextInput.selection_offset)); - int cur_x = l + gfx_get_string_width(temp_string) + 3; + sint32 cur_x = l + gfx_get_string_width(temp_string) + 3; - int width = 6; + sint32 width = 6; if ((uint32)gTextInput.selection_offset < strlen(gTextBoxInput)){ // Make a new 1 character wide string for measuring the width // of the character that the cursor is under. diff --git a/src/openrct2/interface/widget.h b/src/openrct2/interface/widget.h index b46afb7ad9..e3557cc96b 100644 --- a/src/openrct2/interface/widget.h +++ b/src/openrct2/interface/widget.h @@ -57,17 +57,17 @@ enum { SCROLL_BOTH = SCROLL_HORIZONTAL | SCROLL_VERTICAL }; -void widget_scroll_update_thumbs(rct_window *w, int widget_index); -void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex); +void widget_scroll_update_thumbs(rct_window *w, sint32 widget_index); +void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 widgetIndex); -int widget_is_enabled(rct_window *w, int widgetIndex); -int widget_is_disabled(rct_window *w, int widgetIndex); -int widget_is_pressed(rct_window *w, int widgetIndex); -int widget_is_highlighted(rct_window *w, int widgetIndex); -int widget_is_active_tool(rct_window *w, int widgetIndex); -void widget_scroll_get_part(rct_window *w, rct_widget* widget, int x, int y, int *output_x, int *output_y, int *output_scroll_area, int *scroll_id); +sint32 widget_is_enabled(rct_window *w, sint32 widgetIndex); +sint32 widget_is_disabled(rct_window *w, sint32 widgetIndex); +sint32 widget_is_pressed(rct_window *w, sint32 widgetIndex); +sint32 widget_is_highlighted(rct_window *w, sint32 widgetIndex); +sint32 widget_is_active_tool(rct_window *w, sint32 widgetIndex); +void widget_scroll_get_part(rct_window *w, rct_widget* widget, sint32 x, sint32 y, sint32 *output_x, sint32 *output_y, sint32 *output_scroll_area, sint32 *scroll_id); void widget_set_enabled(rct_window *w, uint64 widgetIndex, bool enabled); -void widget_set_checkbox_value(rct_window *w, int widgetIndex, int value); +void widget_set_checkbox_value(rct_window *w, sint32 widgetIndex, sint32 value); #endif diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index 5d447ae231..56fb0b2a86 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -42,8 +42,8 @@ rct_window * gWindowAudioExclusive; uint16 TextInputDescriptionArgs[4]; widget_identifier gCurrentTextBox = { { 255, 0 }, 0 }; char gTextBoxInput[512] = { 0 }; -int gMaxTextBoxInputLength = 0; -int gTextBoxFrameNo = 0; +sint32 gMaxTextBoxInputLength = 0; +sint32 gTextBoxFrameNo = 0; bool gUsingWidgetTextBox = 0; uint16 gWindowUpdateTicks; @@ -74,27 +74,27 @@ float window_scroll_locations[][2] = { {0.125f, 0.125f}, }; -static bool sub_6EA95D(int x, int y, int width, int height); +static bool sub_6EA95D(sint32 x, sint32 y, sint32 width, sint32 height); static void window_all_wheel_input(); -static int window_draw_split(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int right, int bottom); -static void window_draw_single(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int right, int bottom); +static sint32 window_draw_split(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom); +static void window_draw_single(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom); -static int window_get_widget_index(rct_window *w, rct_widget *widget) +static sint32 window_get_widget_index(rct_window *w, rct_widget *widget) { - int i = 0; + sint32 i = 0; for (rct_widget *widget2 = w->widgets; widget2->type != WWT_LAST; widget2++, i++) if (widget == widget2) return i; return -1; } -static int window_get_scroll_index(rct_window *w, int targetWidgetIndex) +static sint32 window_get_scroll_index(rct_window *w, sint32 targetWidgetIndex) { if (w->widgets[targetWidgetIndex].type != WWT_SCROLL) return -1; - int scrollIndex = 0; - int widgetIndex = 0; + sint32 scrollIndex = 0; + sint32 widgetIndex = 0; for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) { if (widgetIndex == targetWidgetIndex) break; @@ -105,12 +105,12 @@ static int window_get_scroll_index(rct_window *w, int targetWidgetIndex) return scrollIndex; } -static int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget) +static sint32 window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget) { if (widget->type != WWT_SCROLL) return -1; - int scrollIndex = 0; + sint32 scrollIndex = 0; for (rct_widget *widget2 = w->widgets; widget2->type != WWT_LAST; widget2++) { if (widget2 == widget) break; @@ -121,7 +121,7 @@ static int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget return scrollIndex; } -static rct_widget *window_get_scroll_widget(rct_window *w, int scrollIndex) +static rct_widget *window_get_scroll_widget(rct_window *w, sint32 scrollIndex) { for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++) { if (widget->type != WWT_SCROLL) @@ -187,20 +187,20 @@ void window_update_all() * * rct2: 0x006E78E3 */ -static void window_scroll_wheel_input(rct_window *w, int scrollIndex, int wheel) +static void window_scroll_wheel_input(rct_window *w, sint32 scrollIndex, sint32 wheel) { rct_scroll *scroll = &w->scrolls[scrollIndex]; rct_widget *widget = window_get_scroll_widget(w, scrollIndex); - int widgetIndex = window_get_widget_index(w, widget); + sint32 widgetIndex = window_get_widget_index(w, widget); if (scroll->flags & VSCROLLBAR_VISIBLE) { - int size = widget->bottom - widget->top - 1; + sint32 size = widget->bottom - widget->top - 1; if (scroll->flags & HSCROLLBAR_VISIBLE) size -= 11; size = max(0, scroll->v_bottom - size); scroll->v_top = min(max(0, scroll->v_top + wheel), size); } else { - int size = widget->right - widget->left - 1; + sint32 size = widget->right - widget->left - 1; if (scroll->flags & VSCROLLBAR_VISIBLE) size -= 11; size = max(0, scroll->h_right - size); @@ -215,9 +215,9 @@ static void window_scroll_wheel_input(rct_window *w, int scrollIndex, int wheel) * * rct2: 0x006E793B */ -static int window_wheel_input(rct_window *w, int wheel) +static sint32 window_wheel_input(rct_window *w, sint32 wheel) { - int i = 0; + sint32 i = 0; for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++) { if (widget->type != WWT_SCROLL) continue; @@ -238,7 +238,7 @@ static int window_wheel_input(rct_window *w, int wheel) * * rct2: 0x006E79FB */ -static void window_viewport_wheel_input(rct_window *w, int wheel) +static void window_viewport_wheel_input(rct_window *w, sint32 wheel) { if (gScreenFlags & 9) return; @@ -249,13 +249,13 @@ static void window_viewport_wheel_input(rct_window *w, int wheel) window_zoom_out(w, true); } -static bool window_other_wheel_input(rct_window *w, int widgetIndex, int wheel) +static bool window_other_wheel_input(rct_window *w, sint32 widgetIndex, sint32 wheel) { // HACK: Until we have a new window system that allows us to add new events like mouse wheel easily, // this selective approach will have to do. // Allow mouse wheel scrolling to increment or decrement the land tool size for various windows - int previewWidgetIndex; + sint32 previewWidgetIndex; switch (w->classification) { case WC_WATER: case WC_CLEAR_SCENERY: @@ -274,7 +274,7 @@ static bool window_other_wheel_input(rct_window *w, int widgetIndex, int wheel) // Preview / Increment / Decrement if (widgetIndex >= previewWidgetIndex && widgetIndex < previewWidgetIndex + 3) { - int buttonWidgetIndex = wheel < 0 ? previewWidgetIndex + 2 : previewWidgetIndex + 1; + sint32 buttonWidgetIndex = wheel < 0 ? previewWidgetIndex + 2 : previewWidgetIndex + 1; window_event_mouse_up_call(w, buttonWidgetIndex); return true; } @@ -289,8 +289,8 @@ static bool window_other_wheel_input(rct_window *w, int widgetIndex, int wheel) static void window_all_wheel_input() { // Get wheel value - int raw = gCursorState.wheel; - int wheel = 0; + sint32 raw = gCursorState.wheel; + sint32 wheel = 0; while (1) { raw -= 120; if (raw < 0) @@ -321,11 +321,11 @@ static void window_all_wheel_input() } // Check scroll view, cursor is over - int widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y); + sint32 widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y); if (widgetIndex != -1) { rct_widget *widget = &w->widgets[widgetIndex]; if (widget->type == WWT_SCROLL) { - int scrollIndex = window_get_scroll_index(w, widgetIndex); + sint32 scrollIndex = window_get_scroll_index(w, widgetIndex); rct_scroll *scroll = &w->scrolls[scrollIndex]; if (scroll->flags & (HSCROLLBAR_VISIBLE | VSCROLLBAR_VISIBLE)) { window_scroll_wheel_input(w, window_get_scroll_index(w, widgetIndex), wheel); @@ -345,9 +345,9 @@ static void window_all_wheel_input() } } -static void window_close_surplus(int cap, sint8 avoid_classification) +static void window_close_surplus(sint32 cap, sint8 avoid_classification) { - int count, i, diff; + sint32 count, i, diff; //find the amount of windows that are currently open count = WINDOW_LIMIT_MAX; for (i = 0; i < WINDOW_LIMIT_MAX; i++) { @@ -376,10 +376,10 @@ static void window_close_surplus(int cap, sint8 avoid_classification) /* * Changes the maximum amount of windows allowed */ -void window_set_window_limit(int value) +void window_set_window_limit(sint32 value) { - int prev = gConfigGeneral.window_limit; - int val = clamp(value, WINDOW_LIMIT_MIN, WINDOW_LIMIT_MAX); + sint32 prev = gConfigGeneral.window_limit; + sint32 val = clamp(value, WINDOW_LIMIT_MIN, WINDOW_LIMIT_MAX); gConfigGeneral.window_limit = val; config_save_default(); // Checks if value decreases and then closes surplus @@ -401,7 +401,7 @@ void window_set_window_limit(int value) * @param flags (ch) * @param class (cl) */ -rct_window *window_create(int x, int y, int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags) +rct_window *window_create(sint32 x, sint32 y, sint32 width, sint32 height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags) { // Check if there are any window slots left // include WINDOW_LIMIT_RESERVED for items such as the main viewport and toolbars to not appear to be counted. @@ -486,11 +486,11 @@ rct_window *window_create(int x, int y, int width, int height, rct_window_event_ * @param width (bx) * @param height (cx) */ -static bool sub_6EA8EC(int x, int y, int width, int height) +static bool sub_6EA8EC(sint32 x, sint32 y, sint32 width, sint32 height) { uint16 screenWidth = gScreenWidth; uint16 screenHeight = gScreenHeight; - int unk; + sint32 unk; unk = -(width / 4); if (x < unk) return false; @@ -511,7 +511,7 @@ static bool sub_6EA8EC(int x, int y, int width, int height) * @param width (bx) * @param height (cx) */ -static bool sub_6EA934(int x, int y, int width, int height) +static bool sub_6EA934(sint32 x, sint32 y, sint32 width, sint32 height) { if (x < 0) return false; if (y < 28) return false; @@ -529,7 +529,7 @@ static bool sub_6EA934(int x, int y, int width, int height) * @param width (bx) * @param height (cx) */ -static bool sub_6EA95D(int x, int y, int width, int height) +static bool sub_6EA95D(sint32 x, sint32 y, sint32 width, sint32 height) { for (rct_window *w = g_window_list; w < RCT2_LAST_WINDOW; w++) { if (w->flags & WF_STICK_TO_BACK) @@ -555,7 +555,7 @@ static bool sub_6EA95D(int x, int y, int width, int height) * @param flags (ch) * @param class (cl) */ -rct_window *window_create_auto_pos(int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags) +rct_window *window_create_auto_pos(sint32 width, sint32 height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags) { uint16 screenWidth = gScreenWidth; uint16 screenHeight = gScreenHeight; @@ -569,10 +569,10 @@ rct_window *window_create_auto_pos(int width, int height, rct_window_event_list // if (w != NULL) { // if (w->x > -60 && w->x < gScreenWidth - 20) { // if (w->y < gScreenHeight - 20) { - // int x = w->x; + // sint32 x = w->x; // if (w->x + width > gScreenWidth) // x = gScreenWidth - 20 - width; - // int y = w->y; + // sint32 y = w->y; // return window_create(x + 10, y + 10, width, height, event_handlers, cls, flags); // } // } @@ -580,8 +580,8 @@ rct_window *window_create_auto_pos(int width, int height, rct_window_event_list // } // Place window in an empty corner of the screen - int x = 0; - int y = 30; + sint32 x = 0; + sint32 y = 30; if (sub_6EA934(x, y, width, height)) goto foundSpace; x = screenWidth - width; @@ -677,9 +677,9 @@ foundSpace: return window_create(x, y, width, height, event_handlers, cls, flags); } -rct_window *window_create_centred(int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags) +rct_window *window_create_centred(sint32 width, sint32 height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags) { - int x, y; + sint32 x, y; x = (gScreenWidth - width) / 2; y = max(28, (gScreenHeight - height) / 2); @@ -694,7 +694,7 @@ rct_window *window_create_centred(int width, int height, rct_window_event_list * */ void window_close(rct_window* window) { - int num_windows; + sint32 num_windows; if (window == NULL) return; @@ -721,7 +721,7 @@ void window_close(rct_window* window) // Remove window from list and reshift all windows RCT2_NEW_WINDOW--; - num_windows = (int)(RCT2_NEW_WINDOW - window); + num_windows = (sint32)(RCT2_NEW_WINDOW - window); if (num_windows > 0) memmove(window, window + 1, num_windows * sizeof(rct_window)); @@ -856,10 +856,10 @@ void window_close_all_except_class(rct_windowclass cls) * * rct2: 0x006EA845 */ -rct_window *window_find_from_point(int x, int y) +rct_window *window_find_from_point(sint32 x, sint32 y) { rct_window *w; - int widget_index; + sint32 widget_index; for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--) { if (x < w->x || x >= w->x + w->width || y < w->y || y >= w->y + w->height) @@ -885,14 +885,14 @@ rct_window *window_find_from_point(int x, int y) * returns widget_index (edx) * EDI NEEDS TO BE SET TO w->widgets[widget_index] AFTER */ -int window_find_widget_from_point(rct_window *w, int x, int y) +sint32 window_find_widget_from_point(rct_window *w, sint32 x, sint32 y) { // Invalidate the window window_event_invalidate_call(w); // Find the widget at point x, y - int widget_index = -1; - for (int i = 0;; i++) { + sint32 widget_index = -1; + for (sint32 i = 0;; i++) { rct_widget *widget = &w->widgets[i]; if (widget->type == WWT_LAST) { break; @@ -971,13 +971,13 @@ void window_invalidate_all() * Invalidates the specified widget of a window. * rct2: 0x006EC402 */ -void widget_invalidate(rct_window *w, int widgetIndex) +void widget_invalidate(rct_window *w, sint32 widgetIndex) { rct_widget* widget; assert(w != NULL); #if DEBUG - for (int i = 0; i <= widgetIndex; i++) { + for (sint32 i = 0; i <= widgetIndex; i++) { assert(w->widgets[i].type != WWT_LAST); } #endif @@ -992,7 +992,7 @@ void widget_invalidate(rct_window *w, int widgetIndex) /** * Invalidates the specified widget of all windows that match the specified window class. */ -void widget_invalidate_by_class(rct_windowclass cls, int widgetIndex) +void widget_invalidate_by_class(rct_windowclass cls, sint32 widgetIndex) { rct_window* w; @@ -1008,7 +1008,7 @@ void widget_invalidate_by_class(rct_windowclass cls, int widgetIndex) * @param cls (al) with bit 15 set * @param number (bx) */ -void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, int widgetIndex) +void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, sint32 widgetIndex) { rct_window* w; @@ -1027,8 +1027,8 @@ void window_init_scroll_widgets(rct_window *w) { rct_widget* widget; rct_scroll* scroll; - int widget_index, scroll_index; - int width, height; + sint32 widget_index, scroll_index; + sint32 width, height; widget_index = 0; scroll_index = 0; @@ -1068,7 +1068,7 @@ void window_init_scroll_widgets(rct_window *w) */ void window_update_scroll_widgets(rct_window *w) { - int widgetIndex, scrollIndex, width, height, scrollPositionChanged; + sint32 widgetIndex, scrollIndex, width, height, scrollPositionChanged; rct_scroll *scroll; rct_widget *widget; @@ -1111,9 +1111,9 @@ void window_update_scroll_widgets(rct_window *w) } } -int window_get_scroll_data_index(rct_window *w, int widget_index) +sint32 window_get_scroll_data_index(rct_window *w, sint32 widget_index) { - int i, result; + sint32 i, result; result = 0; assert(w != NULL); @@ -1150,7 +1150,7 @@ rct_window *window_bring_to_front(rct_window *w) } if (w->x + w->width < 20) { - int i = 20 - w->x; + sint32 i = 20 - w->x; w->x += i; if (w->viewport != NULL) w->viewport->x += i; @@ -1231,7 +1231,7 @@ void window_push_others_right(rct_window* window) */ void window_push_others_below(rct_window *w1) { - int push_amount; + sint32 push_amount; rct_window* w2; // Enumerate through all other windows @@ -1289,7 +1289,7 @@ rct_window *window_get_main() */ void window_scroll_to_viewport(rct_window *w) { - int x, y, z; + sint32 x, y, z; rct_window *mainWindow; assert(w != NULL); // In original checked to make sure x and y were not -1 as well. @@ -1320,7 +1320,7 @@ void window_scroll_to_viewport(rct_window *w) * @param y (ecx) * @param z (edx) */ -void window_scroll_to_location(rct_window *w, int x, int y, int z) +void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z) { rct_xyz16 location_3d = { .x = x, @@ -1345,9 +1345,9 @@ void window_scroll_to_location(rct_window *w, int x, int y, int z) rct_xy16 map_coordinate = coordinate_3d_to_2d(&location_3d, get_current_rotation()); - int i = 0; + sint32 i = 0; if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) { - int found = 0; + sint32 found = 0; while (!found) { sint16 x2 = w->viewport->x + (sint16)(w->viewport->width * window_scroll_locations[i][0]); sint16 y2 = w->viewport->y + (sint16)(w->viewport->height * window_scroll_locations[i][1]); @@ -1405,7 +1405,7 @@ static void sub_688956() * 1: clockwise * -1: anti-clockwise */ -void window_rotate_camera(rct_window *w, int direction) +void window_rotate_camera(rct_window *w, sint32 direction) { rct_viewport *viewport = w->viewport; if (viewport == NULL) @@ -1433,7 +1433,7 @@ void window_rotate_camera(rct_window *w, int direction) gCurrentRotation = (get_current_rotation() + direction) & 3; - int new_x, new_y; + sint32 new_x, new_y; center_2d_coordinates(x, y, z, &new_x, &new_y, viewport); w->saved_view_x = new_x; @@ -1450,19 +1450,19 @@ void window_rotate_camera(rct_window *w, int direction) void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint16 *map_y, sint16 *offset_x, sint16 *offset_y) { // Get mouse position to offset against. - int mouse_x, mouse_y; + sint32 mouse_x, mouse_y; platform_get_cursor_position_scaled(&mouse_x, &mouse_y); // Compute map coordinate by mouse position. get_map_coordinates_from_pos(mouse_x, mouse_y, VIEWPORT_INTERACTION_MASK_NONE, map_x, map_y, NULL, NULL, NULL); // Get viewport coordinates centring around the tile. - int base_height = map_element_height(*map_x, *map_y); - int dest_x, dest_y; + sint32 base_height = map_element_height(*map_x, *map_y); + sint32 dest_x, dest_y; center_2d_coordinates(*map_x, *map_y, base_height, &dest_x, &dest_y, w->viewport); // Rebase mouse position onto centre of window, and compensate for zoom level. - int rebased_x = ((w->width >> 1) - mouse_x) * (1 << w->viewport->zoom), + sint32 rebased_x = ((w->width >> 1) - mouse_x) * (1 << w->viewport->zoom), rebased_y = ((w->height >> 1) - mouse_y) * (1 << w->viewport->zoom); // Compute cursor offset relative to tile. @@ -1473,16 +1473,16 @@ void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint16 map_y, sint16 offset_x, sint16 offset_y) { // Get viewport coordinates centring around the tile. - int dest_x, dest_y; - int base_height = map_element_height(map_x, map_y); + sint32 dest_x, dest_y; + sint32 base_height = map_element_height(map_x, map_y); center_2d_coordinates(map_x, map_y, base_height, &dest_x, &dest_y, w->viewport); // Get mouse position to offset against. - int mouse_x, mouse_y; + sint32 mouse_x, mouse_y; platform_get_cursor_position_scaled(&mouse_x, &mouse_y); // Rebase mouse position onto centre of window, and compensate for zoom level. - int rebased_x = ((w->width >> 1) - mouse_x) * (1 << w->viewport->zoom), + sint32 rebased_x = ((w->width >> 1) - mouse_x) * (1 << w->viewport->zoom), rebased_y = ((w->height >> 1) - mouse_y) * (1 << w->viewport->zoom); // Apply offset to the viewport. @@ -1490,7 +1490,7 @@ void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint w->saved_view_y = dest_y + rebased_y + (offset_y / (1 << w->viewport->zoom)); } -void window_zoom_set(rct_window *w, int zoomLevel, bool atCursor) +void window_zoom_set(rct_window *w, sint32 zoomLevel, bool atCursor) { rct_viewport* v = w->viewport; @@ -1574,7 +1574,7 @@ void main_window_zoom(bool zoomIn, bool atCursor) { * right (dx) * bottom (bp) */ -void window_draw(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int right, int bottom) +void window_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom) { if (!window_is_visible(w)) return; @@ -1603,7 +1603,7 @@ void window_draw(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int r * Splits a drawing of a window into regions that can be seen and are not hidden * by other opaque overlapping windows. */ -static int window_draw_split(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int right, int bottom) +static sint32 window_draw_split(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom) { rct_window* topwindow; @@ -1644,14 +1644,14 @@ static int window_draw_split(rct_drawpixelinfo *dpi, rct_window *w, int left, in return 0; } -static void window_draw_single(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int right, int bottom) +static void window_draw_single(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom) { // Copy dpi so we can crop it rct_drawpixelinfo copy = *dpi; dpi = © // Clamp left to 0 - int overflow = left - dpi->x; + sint32 overflow = left - dpi->x; if (overflow > 0) { dpi->x += overflow; dpi->width -= overflow; @@ -1711,7 +1711,7 @@ static void window_draw_single(rct_drawpixelinfo *dpi, rct_window *w, int left, void window_draw_widgets(rct_window *w, rct_drawpixelinfo *dpi) { rct_widget *widget; - int widgetIndex; + sint32 widgetIndex; if ((w->flags & WF_TRANSPARENT) && !(w->flags & WF_NO_BACKGROUND)) gfx_filter_rect(dpi, w->x, w->y, w->x + w->width - 1, w->y + w->height - 1, PALETTE_51); @@ -1747,12 +1747,12 @@ void window_draw_viewport(rct_drawpixelinfo *dpi, rct_window *w) viewport_render(dpi, w->viewport, dpi->x, dpi->y, dpi->x + dpi->width, dpi->y + dpi->height); } -void window_set_position(rct_window *w, int x, int y) +void window_set_position(rct_window *w, sint32 x, sint32 y) { window_move_position(w, x - w->x, y - w->y); } -void window_move_position(rct_window *w, int dx, int dy) +void window_move_position(rct_window *w, sint32 dx, sint32 dy) { if (dx == 0 && dy == 0) return; @@ -1772,9 +1772,9 @@ void window_move_position(rct_window *w, int dx, int dy) window_invalidate(w); } -void window_resize(rct_window *w, int dw, int dh) +void window_resize(rct_window *w, sint32 dw, sint32 dh) { - int i; + sint32 i; if (dw == 0 && dh == 0) return; @@ -1799,7 +1799,7 @@ void window_resize(rct_window *w, int dw, int dh) window_invalidate(w); } -void window_set_resize(rct_window *w, int minWidth, int minHeight, int maxWidth, int maxHeight) +void window_set_resize(rct_window *w, sint32 minWidth, sint32 minHeight, sint32 maxWidth, sint32 maxHeight) { w->min_width = minWidth; w->min_height = minHeight; @@ -1807,8 +1807,8 @@ void window_set_resize(rct_window *w, int minWidth, int minHeight, int maxWidth, w->max_height = maxHeight; // Clamp width and height to minimum and maximum - int width = clamp(minWidth, w->width, maxWidth); - int height = clamp(minHeight, w->height, maxHeight); + sint32 width = clamp(minWidth, w->width, maxWidth); + sint32 height = clamp(minHeight, w->height, maxHeight); // Resize window if size has changed if (w->width != width || w->height != height) { @@ -1827,7 +1827,7 @@ void window_set_resize(rct_window *w, int minWidth, int minHeight, int maxWidth, * @param widgetIndex (dx) * @param w (esi) */ -int tool_set(rct_window *w, int widgetIndex, int tool) +sint32 tool_set(rct_window *w, sint32 widgetIndex, sint32 tool) { if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) { if ( @@ -1891,7 +1891,7 @@ void window_event_close_call(rct_window *w) w->event_handlers->close(w); } -void window_event_mouse_up_call(rct_window *w, int widgetIndex) +void window_event_mouse_up_call(rct_window *w, sint32 widgetIndex) { if (w->event_handlers->mouse_up != NULL) w->event_handlers->mouse_up(w, widgetIndex); @@ -1903,13 +1903,13 @@ void window_event_resize_call(rct_window *w) w->event_handlers->resize(w); } -void window_event_mouse_down_call(rct_window *w, int widgetIndex) +void window_event_mouse_down_call(rct_window *w, sint32 widgetIndex) { if (w->event_handlers->mouse_down != NULL) w->event_handlers->mouse_down(widgetIndex, w, &w->widgets[widgetIndex]); } -void window_event_dropdown_call(rct_window *w, int widgetIndex, int dropdownIndex) +void window_event_dropdown_call(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (w->event_handlers->dropdown != NULL) w->event_handlers->dropdown(w, widgetIndex, dropdownIndex); @@ -1939,31 +1939,31 @@ void window_event_unknown_08_call(rct_window *w) w->event_handlers->unknown_08(w); } -void window_event_tool_update_call(rct_window *w, int widgetIndex, int x, int y) +void window_event_tool_update_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (w->event_handlers->tool_update != NULL) w->event_handlers->tool_update(w, widgetIndex, x, y); } -void window_event_tool_down_call(rct_window *w, int widgetIndex, int x, int y) +void window_event_tool_down_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (w->event_handlers->tool_down != NULL) w->event_handlers->tool_down(w, widgetIndex, x, y); } -void window_event_tool_drag_call(rct_window *w, int widgetIndex, int x, int y) +void window_event_tool_drag_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (w->event_handlers->tool_drag != NULL) w->event_handlers->tool_drag(w, widgetIndex, x, y); } -void window_event_tool_up_call(rct_window *w, int widgetIndex, int x, int y) +void window_event_tool_up_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (w->event_handlers->tool_up != NULL) w->event_handlers->tool_up(w, widgetIndex, x, y); } -void window_event_tool_abort_call(rct_window *w, int widgetIndex) +void window_event_tool_abort_call(rct_window *w, sint32 widgetIndex) { if (w->event_handlers->tool_abort != NULL) w->event_handlers->tool_abort(w, widgetIndex); @@ -1975,32 +1975,32 @@ void window_event_unknown_0E_call(rct_window *w) w->event_handlers->unknown_0E(w); } -void window_get_scroll_size(rct_window *w, int scrollIndex, int *width, int *height) +void window_get_scroll_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { if (w->event_handlers->get_scroll_size != NULL) { w->event_handlers->get_scroll_size(w, scrollIndex, width, height); } } -void window_event_scroll_mousedown_call(rct_window *w, int scrollIndex, int x, int y) +void window_event_scroll_mousedown_call(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { if (w->event_handlers->scroll_mousedown != NULL) w->event_handlers->scroll_mousedown(w, scrollIndex, x, y); } -void window_event_scroll_mousedrag_call(rct_window *w, int scrollIndex, int x, int y) +void window_event_scroll_mousedrag_call(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { if (w->event_handlers->scroll_mousedrag != NULL) w->event_handlers->scroll_mousedrag(w, scrollIndex, x, y); } -void window_event_scroll_mouseover_call(rct_window *w, int scrollIndex, int x, int y) +void window_event_scroll_mouseover_call(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { if (w->event_handlers->scroll_mouseover != NULL) w->event_handlers->scroll_mouseover(w, scrollIndex, x, y); } -void window_event_textinput_call(rct_window *w, int widgetIndex, char *text) +void window_event_textinput_call(rct_window *w, sint32 widgetIndex, char *text) { if (w->event_handlers->text_input != NULL) w->event_handlers->text_input(w, widgetIndex, text); @@ -2012,13 +2012,13 @@ void window_event_unknown_14_call(rct_window *w) w->event_handlers->unknown_14(w); } -void window_event_unknown_15_call(rct_window *w, int scrollIndex, int scrollAreaType) +void window_event_unknown_15_call(rct_window *w, sint32 scrollIndex, sint32 scrollAreaType) { if (w->event_handlers->unknown_15 != NULL) w->event_handlers->unknown_15(w, scrollIndex, scrollAreaType); } -rct_string_id window_event_tooltip_call(rct_window *w, int widgetIndex) +rct_string_id window_event_tooltip_call(rct_window *w, sint32 widgetIndex) { rct_string_id result = 0; if (w->event_handlers->tooltip != NULL) @@ -2026,15 +2026,15 @@ rct_string_id window_event_tooltip_call(rct_window *w, int widgetIndex) return result; } -int window_event_cursor_call(rct_window *w, int widgetIndex, int x, int y) +sint32 window_event_cursor_call(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { - int cursorId = CURSOR_ARROW; + sint32 cursorId = CURSOR_ARROW; if (w->event_handlers->cursor != NULL) w->event_handlers->cursor(w, widgetIndex, x, y, &cursorId); return cursorId; } -void window_event_moved_call(rct_window *w, int x, int y) +void window_event_moved_call(rct_window *w, sint32 x, sint32 y) { if (w->event_handlers->moved != NULL) w->event_handlers->moved(w, x, y); @@ -2052,7 +2052,7 @@ void window_event_paint_call(rct_window *w, rct_drawpixelinfo *dpi) w->event_handlers->paint(w, dpi); } -void window_event_scroll_paint_call(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +void window_event_scroll_paint_call(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { if (w->event_handlers->scroll_paint != NULL) w->event_handlers->scroll_paint(w, dpi, scrollIndex); @@ -2063,7 +2063,7 @@ void window_event_scroll_paint_call(rct_window *w, rct_drawpixelinfo *dpi, int s * the two locations. * rct2: New function not from rct2 */ -void window_bubble_list_item(rct_window* w, int item_position){ +void window_bubble_list_item(rct_window* w, sint32 item_position){ char swap = w->list_item_positions[item_position]; w->list_item_positions[item_position] = w->list_item_positions[item_position + 1]; w->list_item_positions[item_position + 1] = swap; @@ -2075,8 +2075,8 @@ void window_bubble_list_item(rct_window* w, int item_position){ * Called after a window resize to move windows if they * are going to be out of sight. */ -void window_relocate_windows(int width, int height){ - int new_location = 8; +void window_relocate_windows(sint32 width, sint32 height){ + sint32 new_location = 8; for (rct_window* w = g_window_list; w < RCT2_NEW_WINDOW; w++){ // Work out if the window requires moving @@ -2088,8 +2088,8 @@ void window_relocate_windows(int width, int height){ } // Calculate the new locations - int x = w->x; - int y = w->y; + sint32 x = w->x; + sint32 y = w->y; w->x = new_location; w->y = new_location + 28; @@ -2107,7 +2107,7 @@ void window_relocate_windows(int width, int height){ /** * rct2: 0x0066B905 */ -void window_resize_gui(int width, int height) +void window_resize_gui(sint32 width, sint32 height) { if (gScreenFlags & 0xE){ window_resize_gui_scenario_editor(width, height); @@ -2162,7 +2162,7 @@ void window_resize_gui(int width, int height) /** * rct2: 0x0066F0DD */ -void window_resize_gui_scenario_editor(int width, int height) +void window_resize_gui_scenario_editor(sint32 width, sint32 height) { rct_window* mainWind = window_get_main(); if (mainWind) { @@ -2195,8 +2195,8 @@ void window_resize_gui_scenario_editor(int width, int height) /* Based on rct2: 0x6987ED and another version from window_park */ void window_align_tabs(rct_window *w, uint8 start_tab_id, uint8 end_tab_id) { - int i, x = w->widgets[start_tab_id].left; - int tab_width = w->widgets[start_tab_id].right - w->widgets[start_tab_id].left; + sint32 i, x = w->widgets[start_tab_id].left; + sint32 tab_width = w->widgets[start_tab_id].right - w->widgets[start_tab_id].left; for (i = start_tab_id; i <= end_tab_id; i++) { if (!(w->disabled_widgets & (1LL << i))) { @@ -2225,7 +2225,7 @@ void window_close_construction_windows() */ static void window_invalidate_pressed_image_buttons(rct_window *w) { - int widgetIndex; + sint32 widgetIndex; rct_widget *widget; widgetIndex = 0; @@ -2286,9 +2286,9 @@ void window_update_viewport_ride_music() } } -static void window_snap_left(rct_window *w, int proximity) +static void window_snap_left(rct_window *w, sint32 proximity) { - int right, rightMost, wLeftProximity, wRightProximity, wBottom; + sint32 right, rightMost, wLeftProximity, wRightProximity, wBottom; rct_window *mainWindow, *w2; mainWindow = window_get_main(); @@ -2319,9 +2319,9 @@ static void window_snap_left(rct_window *w, int proximity) w->x = rightMost; } -static void window_snap_top(rct_window *w, int proximity) +static void window_snap_top(rct_window *w, sint32 proximity) { - int bottom, bottomMost, wTopProximity, wBottomProximity, wRight; + sint32 bottom, bottomMost, wTopProximity, wBottomProximity, wRight; rct_window *mainWindow, *w2; mainWindow = window_get_main(); @@ -2352,9 +2352,9 @@ static void window_snap_top(rct_window *w, int proximity) w->y = bottomMost; } -static void window_snap_right(rct_window *w, int proximity) +static void window_snap_right(rct_window *w, sint32 proximity) { - int leftMost, wLeftProximity, wRightProximity, wRight, wBottom, screenWidth; + sint32 leftMost, wLeftProximity, wRightProximity, wRight, wBottom, screenWidth; rct_window *mainWindow, *w2; mainWindow = window_get_main(); @@ -2385,9 +2385,9 @@ static void window_snap_right(rct_window *w, int proximity) w->x = leftMost - w->width; } -static void window_snap_bottom(rct_window *w, int proximity) +static void window_snap_bottom(rct_window *w, sint32 proximity) { - int topMost, wTopProximity, wBottomProximity, wRight, wBottom, screenHeight; + sint32 topMost, wTopProximity, wBottomProximity, wRight, wBottom, screenHeight; rct_window *mainWindow, *w2; mainWindow = window_get_main(); @@ -2418,10 +2418,10 @@ static void window_snap_bottom(rct_window *w, int proximity) w->y = topMost - w->height; } -void window_move_and_snap(rct_window *w, int newWindowX, int newWindowY, int snapProximity) +void window_move_and_snap(rct_window *w, sint32 newWindowX, sint32 newWindowY, sint32 snapProximity) { - int originalX = w->x; - int originalY = w->y; + sint32 originalX = w->x; + sint32 originalY = w->y; newWindowY = clamp(29, newWindowY, gScreenHeight - 34); @@ -2446,7 +2446,7 @@ void window_move_and_snap(rct_window *w, int newWindowX, int newWindowY, int sna window_set_position(w, newWindowX, newWindowY); } -int window_can_resize(rct_window *w) +sint32 window_can_resize(rct_window *w) { return (w->flags & WF_RESIZABLE) && (w->min_width != w->max_width || w->min_height != w->max_height); } @@ -2460,7 +2460,7 @@ void textinput_cancel() window_close_by_class(WC_TEXTINPUT); } -void window_start_textbox(rct_window *call_w, int call_widget, rct_string_id existing_text, char * existing_args, int maxLength) +void window_start_textbox(rct_window *call_w, sint32 call_widget, rct_string_id existing_text, char * existing_args, sint32 maxLength) { if (gUsingWidgetTextBox) window_cancel_textbox(); diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 7d4e4dfcd2..e3931fef1e 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -36,8 +36,8 @@ struct TitleSequence; extern uint16 TextInputDescriptionArgs[4]; extern char gTextBoxInput[512]; -extern int gMaxTextBoxInputLength; -extern int gTextBoxFrameNo; +extern sint32 gMaxTextBoxInputLength; +extern sint32 gTextBoxFrameNo; extern bool gUsingWidgetTextBox; typedef void wndproc(struct rct_window*, union rct_window_event*); @@ -53,7 +53,7 @@ typedef struct window_identifier { typedef struct widget_identifier { window_identifier window; - int widget_index; + sint32 widget_index; } widget_identifier; extern widget_identifier gCurrentTextBox; @@ -148,33 +148,33 @@ enum{ typedef struct rct_window_event_list { void (*close)(struct rct_window*); - void (*mouse_up)(struct rct_window*, int); + void (*mouse_up)(struct rct_window*, sint32); void (*resize)(struct rct_window*); - void (*mouse_down)(int, struct rct_window*, rct_widget*); - void (*dropdown)(struct rct_window*, int, int); + void (*mouse_down)(sint32, struct rct_window*, rct_widget*); + void (*dropdown)(struct rct_window*, sint32, sint32); void (*unknown_05)(struct rct_window*); void (*update)(struct rct_window*); void (*unknown_07)(struct rct_window*); void (*unknown_08)(struct rct_window*); - void (*tool_update)(struct rct_window*, int, int, int); - void (*tool_down)(struct rct_window*, int, int, int); - void (*tool_drag)(struct rct_window*, int, int, int); - void (*tool_up)(struct rct_window*, int, int, int); - void (*tool_abort)(struct rct_window*, int); + void (*tool_update)(struct rct_window*, sint32, sint32, sint32); + void (*tool_down)(struct rct_window*, sint32, sint32, sint32); + void (*tool_drag)(struct rct_window*, sint32, sint32, sint32); + void (*tool_up)(struct rct_window*, sint32, sint32, sint32); + void (*tool_abort)(struct rct_window*, sint32); void (*unknown_0E)(struct rct_window*); - void (*get_scroll_size)(struct rct_window*, int, int*, int*); - void (*scroll_mousedown)(struct rct_window*, int, int, int); - void (*scroll_mousedrag)(struct rct_window*, int, int, int); - void (*scroll_mouseover)(struct rct_window*, int, int, int); - void (*text_input)(struct rct_window*, int, char*); + void (*get_scroll_size)(struct rct_window*, sint32, sint32*, sint32*); + void (*scroll_mousedown)(struct rct_window*, sint32, sint32, sint32); + void (*scroll_mousedrag)(struct rct_window*, sint32, sint32, sint32); + void (*scroll_mouseover)(struct rct_window*, sint32, sint32, sint32); + void (*text_input)(struct rct_window*, sint32, char*); void (*unknown_14)(struct rct_window*); - void (*unknown_15)(struct rct_window*, int, int); - void (*tooltip)(struct rct_window*, int, rct_string_id*); - void (*cursor)(struct rct_window*, int, int, int, int*); - void (*moved)(struct rct_window*, int, int); + void (*unknown_15)(struct rct_window*, sint32, sint32); + void (*tooltip)(struct rct_window*, sint32, rct_string_id*); + void (*cursor)(struct rct_window*, sint32, sint32, sint32, sint32*); + void (*moved)(struct rct_window*, sint32, sint32); void (*invalidate)(struct rct_window*); void (*paint)(struct rct_window*, rct_drawpixelinfo*); - void (*scroll_paint)(struct rct_window*, rct_drawpixelinfo*, int); + void (*scroll_paint)(struct rct_window*, rct_drawpixelinfo*, sint32); } rct_window_event_list; typedef struct campaign_variables { @@ -526,8 +526,8 @@ enum GUEST_LIST_FILTER_TYPE GLFT_GUESTS_THINKING_X, }; -typedef void (*modal_callback)(int result); -typedef void (*loadsave_callback)(int result, const utf8 * path); +typedef void (*modal_callback)(sint32 result); +typedef void (*loadsave_callback)(sint32 result, const utf8 * path); typedef void (*scenarioselect_callback)(const utf8 *path); extern loadsave_callback gLoadSaveCallback; @@ -560,11 +560,11 @@ void window_dispatch_update_all(); void window_update_all_viewports(); void window_update_all(); -void window_set_window_limit(int value); +void window_set_window_limit(sint32 value); -rct_window *window_create(int x, int y, int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags); -rct_window *window_create_auto_pos(int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags); -rct_window *window_create_centred(int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags); +rct_window *window_create(sint32 x, sint32 y, sint32 width, sint32 height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags); +rct_window *window_create_auto_pos(sint32 width, sint32 height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags); +rct_window *window_create_centred(sint32 width, sint32 height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags); void window_close(rct_window *window); void window_close_by_class(rct_windowclass cls); void window_close_by_number(rct_windowclass cls, rct_windownumber number); @@ -573,18 +573,18 @@ void window_close_all(); void window_close_all_except_class(rct_windowclass cls); rct_window *window_find_by_class(rct_windowclass cls); rct_window *window_find_by_number(rct_windowclass cls, rct_windownumber number); -rct_window *window_find_from_point(int x, int y); -int window_find_widget_from_point(rct_window *w, int x, int y); +rct_window *window_find_from_point(sint32 x, sint32 y); +sint32 window_find_widget_from_point(rct_window *w, sint32 x, sint32 y); void window_invalidate(rct_window *window); void window_invalidate_by_class(rct_windowclass cls); void window_invalidate_by_number(rct_windowclass cls, rct_windownumber number); void window_invalidate_all(); -void widget_invalidate(rct_window *w, int widgetIndex); -void widget_invalidate_by_class(rct_windowclass cls, int widgetIndex); -void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, int widgetIndex); +void widget_invalidate(rct_window *w, sint32 widgetIndex); +void widget_invalidate_by_class(rct_windowclass cls, sint32 widgetIndex); +void widget_invalidate_by_number(rct_windowclass cls, rct_windownumber number, sint32 widgetIndex); void window_init_scroll_widgets(rct_window *w); void window_update_scroll_widgets(rct_window *w); -int window_get_scroll_data_index(rct_window *w, int widget_index); +sint32 window_get_scroll_data_index(rct_window *w, sint32 widget_index); rct_window *window_bring_to_front(rct_window *w); rct_window *window_bring_to_front_by_class(rct_windowclass cls); @@ -596,29 +596,29 @@ void window_push_others_below(rct_window *w1); rct_window *window_get_main(); void window_scroll_to_viewport(rct_window *w); -void window_scroll_to_location(rct_window *w, int x, int y, int z); -void window_rotate_camera(rct_window *w, int direction); +void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z); +void window_rotate_camera(rct_window *w, sint32 direction); void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint16 *map_y, sint16 *offset_x, sint16 *offset_y); void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint16 map_y, sint16 offset_x, sint16 offset_y); -void window_zoom_set(rct_window *w, int zoomLevel, bool atCursor); +void window_zoom_set(rct_window *w, sint32 zoomLevel, bool atCursor); void window_zoom_in(rct_window *w, bool atCursor); void window_zoom_out(rct_window *w, bool atCursor); void main_window_zoom(bool zoomIn, bool atCursor); -void window_show_textinput(rct_window *w, int widgetIndex, uint16 title, uint16 text, int value); -void window_text_input_key(rct_window* w, int key); +void window_show_textinput(rct_window *w, sint32 widgetIndex, uint16 title, uint16 text, sint32 value); +void window_text_input_key(rct_window* w, sint32 key); -void window_draw_all(rct_drawpixelinfo *dpi, short left, short top, short right, short bottom); -void window_draw(rct_drawpixelinfo *dpi, rct_window *w, int left, int top, int right, int bottom); +void window_draw_all(rct_drawpixelinfo *dpi, sint16 left, sint16 top, sint16 right, sint16 bottom); +void window_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, sint32 right, sint32 bottom); void window_draw_widgets(rct_window *w, rct_drawpixelinfo *dpi); void window_draw_viewport(rct_drawpixelinfo *dpi, rct_window *w); -void window_set_position(rct_window *w, int x, int y); -void window_move_position(rct_window *w, int dx, int dy); -void window_resize(rct_window *w, int dw, int dh); -void window_set_resize(rct_window *w, int minWidth, int minHeight, int maxWidth, int maxHeight); +void window_set_position(rct_window *w, sint32 x, sint32 y); +void window_move_position(rct_window *w, sint32 dx, sint32 dy); +void window_resize(rct_window *w, sint32 dw, sint32 dh); +void window_set_resize(rct_window *w, sint32 minWidth, sint32 minHeight, sint32 maxWidth, sint32 maxHeight); -int tool_set(rct_window *w, int widgetIndex, int tool); +sint32 tool_set(rct_window *w, sint32 widgetIndex, sint32 tool); void tool_cancel(); void window_close_construction_windows(); @@ -627,9 +627,9 @@ void window_update_viewport_ride_music(); // Open window functions void window_main_open(); -void window_relocate_windows(int width, int height); -void window_resize_gui(int width, int height); -void window_resize_gui_scenario_editor(int width, int height); +void window_relocate_windows(sint32 width, sint32 height); +void window_resize_gui(sint32 width, sint32 height); +void window_resize_gui_scenario_editor(sint32 width, sint32 height); void window_top_toolbar_open(); void window_game_bottom_toolbar_open(); void window_game_bottom_toolbar_invalidate_news_item(); @@ -649,11 +649,11 @@ void window_water_open(); void window_land_rights_open(); void window_staff_list_open(); void window_guest_list_open(); -void window_guest_list_open_with_filter(int type, int index); +void window_guest_list_open_with_filter(sint32 type, sint32 index); void window_map_open(); void window_options_open(); void window_shortcut_keys_open(); -void window_shortcut_change_open(int selected_key); +void window_shortcut_change_open(sint32 selected_key); void window_guest_open(rct_peep* peep); rct_window *window_staff_open(rct_peep* peep); void window_staff_fire_prompt_open(rct_peep* peep); @@ -665,18 +665,18 @@ void window_park_rating_open(); void window_finances_open(); void window_finances_research_open(); void window_new_campaign_open(sint16 campaignType); -rct_window *window_ride_main_open(int rideIndex); -rct_window *window_ride_open_station(int rideIndex, int stationIndex); +rct_window *window_ride_main_open(sint32 rideIndex); +rct_window *window_ride_open_station(sint32 rideIndex, sint32 stationIndex); rct_window *window_ride_open_track(rct_map_element *mapElement); rct_window *window_ride_open_vehicle(rct_vehicle *vehicle); -void window_ride_demolish_prompt_open(int rideIndex); +void window_ride_demolish_prompt_open(sint32 rideIndex); void window_ride_construct(rct_window *w); void window_ride_list_open(); rct_window *window_ride_construction_open(); rct_window *window_maze_construction_open(); -void ride_construction_toolupdate_entrance_exit(int screenX, int screenY); -void ride_construction_toolupdate_construct(int screenX, int screenY); -void ride_construction_tooldown_construct(int screenX, int screenY); +void ride_construction_toolupdate_entrance_exit(sint32 screenX, sint32 screenY); +void ride_construction_toolupdate_construct(sint32 screenX, sint32 screenY); +void ride_construction_tooldown_construct(sint32 screenX, sint32 screenY); void custom_currency_window_open(); @@ -699,8 +699,8 @@ void window_server_list_open(); void window_server_start_open(); void window_research_open(); -void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, int baseWidgetIndex); -void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, int baseWidgetIndex); +void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex); +void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex); void window_scenery_open(); void window_music_credits_open(); @@ -708,14 +708,14 @@ void window_publisher_credits_open(); void window_track_manage_open(struct track_design_file_ref *tdFileRef); void window_viewport_open(); void window_themes_open(); -void window_title_editor_open(int tab); -void window_title_command_editor_open(struct TitleSequence * sequence, int command, bool insert); +void window_title_editor_open(sint32 tab); +void window_title_command_editor_open(struct TitleSequence * sequence, sint32 command, bool insert); void window_tile_inspector_open(); void window_tile_inspector_clear_clipboard(); -void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, int maxLength); -void window_text_input_raw_open(rct_window* call_w, int call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, int maxLength); +void window_text_input_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength); +void window_text_input_raw_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength); rct_window *window_mapgen_open(); -rct_window *window_loadsave_open(int type, char *defaultName); +rct_window *window_loadsave_open(sint32 type, char *defaultName); rct_window *window_changelog_open(); void window_debug_paint_open(); @@ -728,7 +728,7 @@ void window_editor_objective_options_open(); void window_guest_list_init_vars_a(); void window_guest_list_init_vars_b(); -void window_bubble_list_item(rct_window* w, int item_position); +void window_bubble_list_item(rct_window* w, sint32 item_position); void window_align_tabs( rct_window *w, uint8 start_tab_id, uint8 end_tab_id ); @@ -739,45 +739,45 @@ void window_map_tooltip_update_visibility(); void window_staff_list_init_vars(); -void game_command_callback_pickup_guest(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -void game_command_callback_pickup_staff(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); +void game_command_callback_pickup_guest(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +void game_command_callback_pickup_staff(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); void window_event_close_call(rct_window* w); -void window_event_mouse_up_call(rct_window* w, int widgetIndex); +void window_event_mouse_up_call(rct_window* w, sint32 widgetIndex); void window_event_resize_call(rct_window* w); -void window_event_mouse_down_call(rct_window *w, int widgetIndex); -void window_event_dropdown_call(rct_window* w, int widgetIndex, int dropdownIndex); +void window_event_mouse_down_call(rct_window *w, sint32 widgetIndex); +void window_event_dropdown_call(rct_window* w, sint32 widgetIndex, sint32 dropdownIndex); void window_event_unknown_05_call(rct_window* w); void window_event_update_call(rct_window *w); void window_event_unknown_07_call(rct_window* w); void window_event_unknown_08_call(rct_window* w); -void window_event_tool_update_call(rct_window* w, int widgetIndex, int x, int y); -void window_event_tool_down_call(rct_window* w, int widgetIndex, int x, int y); -void window_event_tool_drag_call(rct_window* w, int widgetIndex, int x, int y); -void window_event_tool_up_call(rct_window* w, int widgetIndex, int x, int y); -void window_event_tool_abort_call(rct_window* w, int widgetIndex); +void window_event_tool_update_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_event_tool_down_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_event_tool_drag_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_event_tool_up_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_event_tool_abort_call(rct_window* w, sint32 widgetIndex); void window_event_unknown_0E_call(rct_window* w); -void window_get_scroll_size(rct_window *w, int scrollIndex, int *width, int *height); -void window_event_scroll_mousedown_call(rct_window* w, int scrollIndex, int x, int y); -void window_event_scroll_mousedrag_call(rct_window* w, int scrollIndex, int x, int y); -void window_event_scroll_mouseover_call(rct_window* w, int scrollIndex, int x, int y); -void window_event_textinput_call(rct_window *w, int widgetIndex, char *text); +void window_get_scroll_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +void window_event_scroll_mousedown_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y); +void window_event_scroll_mousedrag_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y); +void window_event_scroll_mouseover_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y); +void window_event_textinput_call(rct_window *w, sint32 widgetIndex, char *text); void window_event_unknown_14_call(rct_window* w); -void window_event_unknown_15_call(rct_window* w, int scrollIndex, int scrollAreaType); -rct_string_id window_event_tooltip_call(rct_window* w, int widgetIndex); -int window_event_cursor_call(rct_window* w, int widgetIndex, int x, int y); -void window_event_moved_call(rct_window* w, int x, int y); +void window_event_unknown_15_call(rct_window* w, sint32 scrollIndex, sint32 scrollAreaType); +rct_string_id window_event_tooltip_call(rct_window* w, sint32 widgetIndex); +sint32 window_event_cursor_call(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_event_moved_call(rct_window* w, sint32 x, sint32 y); void window_event_invalidate_call(rct_window* w); void window_event_paint_call(rct_window* w, rct_drawpixelinfo *dpi); -void window_event_scroll_paint_call(rct_window* w, rct_drawpixelinfo *dpi, int scrollIndex); +void window_event_scroll_paint_call(rct_window* w, rct_drawpixelinfo *dpi, sint32 scrollIndex); void sub_6EA73F(); void textinput_cancel(); -void window_move_and_snap(rct_window *w, int newWindowX, int newWindowY, int snapProximity); -int window_can_resize(rct_window *w); +void window_move_and_snap(rct_window *w, sint32 newWindowX, sint32 newWindowY, sint32 snapProximity); +sint32 window_can_resize(rct_window *w); -void window_start_textbox(rct_window *call_w, int call_widget, rct_string_id existing_text, char *existing_args, int maxLength); +void window_start_textbox(rct_window *call_w, sint32 call_widget, rct_string_id existing_text, char *existing_args, sint32 maxLength); void window_cancel_textbox(); void window_update_textbox_caret(); void window_update_textbox(); diff --git a/src/openrct2/intro.c b/src/openrct2/intro.c index ba4710d60b..7f8ff7a158 100644 --- a/src/openrct2/intro.c +++ b/src/openrct2/intro.c @@ -31,7 +31,7 @@ uint8 gIntroState; // Used mainly for timing but also for Y coordinate and fading. -static int _introStateCounter; +static sint32 _introStateCounter; static void *_soundChannel = NULL; static bool _chainLiftFinished; @@ -161,7 +161,7 @@ void intro_update() void intro_draw(rct_drawpixelinfo *dpi) { - int screenWidth = gScreenWidth; + sint32 screenWidth = gScreenWidth; switch (gIntroState) { case INTRO_STATE_DISCLAIMER_1: diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index 64b1a08356..5f90c1c417 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -37,10 +37,10 @@ constexpr uint64 MAX_OBJECT_OVERRIDES = 4096; constexpr uint64 MAX_SCENARIO_OVERRIDES = 4096; constexpr rct_string_id ObjectOverrideBase = 0x6000; -constexpr int ObjectOverrideMaxStringCount = 4; +constexpr sint32 ObjectOverrideMaxStringCount = 4; constexpr rct_string_id ScenarioOverrideBase = 0x7000; -constexpr int ScenarioOverrideMaxStringCount = 3; +constexpr sint32 ScenarioOverrideMaxStringCount = 3; struct ObjectOverride { @@ -147,7 +147,7 @@ public: } for (size_t i = 0; i < _objectOverrides.size(); i++) { - for (int j = 0; j < ObjectOverrideMaxStringCount; j++) + for (sint32 j = 0; j < ObjectOverrideMaxStringCount; j++) { const utf8 * * strPtr = &(_objectOverrides[i].strings[j]); if (*strPtr != nullptr) @@ -158,7 +158,7 @@ public: } for (size_t i = 0; i < _scenarioOverrides.size(); i++) { - for (int j = 0; j < ScenarioOverrideMaxStringCount; j++) + for (sint32 j = 0; j < ScenarioOverrideMaxStringCount; j++) { const utf8 **strPtr = &(_scenarioOverrides[i].strings[j]); if (*strPtr != nullptr) @@ -205,9 +205,9 @@ public: { if (stringId >= ScenarioOverrideBase) { - int offset = stringId - ScenarioOverrideBase; - int ooIndex = offset / ScenarioOverrideMaxStringCount; - int ooStringIndex = offset % ScenarioOverrideMaxStringCount; + sint32 offset = stringId - ScenarioOverrideBase; + sint32 ooIndex = offset / ScenarioOverrideMaxStringCount; + sint32 ooStringIndex = offset % ScenarioOverrideMaxStringCount; if (_scenarioOverrides.size() > (size_t)ooIndex) { @@ -220,9 +220,9 @@ public: } else if (stringId >= ObjectOverrideBase) { - int offset = stringId - ObjectOverrideBase; - int ooIndex = offset / ObjectOverrideMaxStringCount; - int ooStringIndex = offset % ObjectOverrideMaxStringCount; + sint32 offset = stringId - ObjectOverrideBase; + sint32 ooIndex = offset / ObjectOverrideMaxStringCount; + sint32 ooStringIndex = offset % ObjectOverrideMaxStringCount; if (_objectOverrides.size() > (size_t)ooIndex) { @@ -251,7 +251,7 @@ public: Guard::ArgumentNotNull(objectIdentifier); Guard::Assert(index < ObjectOverrideMaxStringCount); - int ooIndex = 0; + sint32 ooIndex = 0; for (const ObjectOverride &objectOverride : _objectOverrides) { if (strncmp(objectOverride.name, objectIdentifier, 8) == 0) @@ -273,7 +273,7 @@ public: Guard::ArgumentNotNull(scenarioFilename); Guard::Assert(index < ScenarioOverrideMaxStringCount); - int ooIndex = 0; + sint32 ooIndex = 0; for (const ScenarioOverride &scenarioOverride : _scenarioOverrides) { if (String::Equals(scenarioOverride.filename.c_str(), scenarioFilename, true)) @@ -558,7 +558,7 @@ public: // Validate identifier const utf8 * identifier = sb.GetBuffer(); - int stringId; + sint32 stringId; if (_currentGroup == nullptr) { if (sscanf(identifier, "STR_%4d", &stringId) != 1) @@ -598,7 +598,7 @@ public: } else { - sb.Append((int)token); + sb.Append((sint32)token); } } else @@ -672,7 +672,7 @@ public: // Handle explicit byte values if (*token == 0) { - int number; + sint32 number; if (sscanf(tokenName, "%d", &number) == 1) { *token = Math::Clamp(0, number, 255); diff --git a/src/openrct2/localisation/convert.c b/src/openrct2/localisation/convert.c index 456821b511..85c64e81bd 100644 --- a/src/openrct2/localisation/convert.c +++ b/src/openrct2/localisation/convert.c @@ -25,9 +25,9 @@ static const encoding_convert_entry GB2312ToUnicodeTable[7445]; static const encoding_convert_entry Big5ToUnicodeTable[13710]; static const encoding_convert_entry RCT2ToUnicodeTable[256]; -int rct2_to_utf8(utf8 *dst, const char *src) +sint32 rct2_to_utf8(utf8 *dst, const char *src) { - int codepoint; + sint32 codepoint; utf8 *start = dst; const char *ch = src; @@ -47,14 +47,14 @@ int rct2_to_utf8(utf8 *dst, const char *src) dst = utf8_write_codepoint(dst, codepoint); } dst = utf8_write_codepoint(dst, 0); - return (int)(dst - start); + return (sint32)(dst - start); } -int utf8_to_rct2(char *dst, const utf8 *src) +sint32 utf8_to_rct2(char *dst, const utf8 *src) { char *start = dst; const utf8 *ch = src; - int codepoint; + sint32 codepoint; while ((codepoint = utf8_get_next(ch, &ch)) != 0) { codepoint = encoding_convert_unicode_to_rct2(codepoint); if (codepoint < 256) { @@ -66,10 +66,10 @@ int utf8_to_rct2(char *dst, const utf8 *src) } } *dst++ = 0; - return (int)(dst - start); + return (sint32)(dst - start); } -static int encoding_search_compare(const void *pKey, const void *pEntry) +static sint32 encoding_search_compare(const void *pKey, const void *pEntry) { uint16 key = *((uint16*)pKey); encoding_convert_entry *entry = (encoding_convert_entry*)pEntry; @@ -78,7 +78,7 @@ static int encoding_search_compare(const void *pKey, const void *pEntry) return 0; } -static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_convert_entry *table, int count) +static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_convert_entry *table, sint32 count) { encoding_convert_entry *entry = bsearch(&code, table, count, sizeof(encoding_convert_entry), encoding_search_compare); if (entry == NULL) return code; @@ -88,7 +88,7 @@ static wchar_t encoding_convert_x_to_unicode(wchar_t code, const encoding_conver wchar_t encoding_convert_unicode_to_rct2(wchar_t unicode) { // Can't do a binary search as its sorted by RCT2 code, not unicode - for (int i = 0; i < countof(RCT2ToUnicodeTable); i++) { + for (sint32 i = 0; i < countof(RCT2ToUnicodeTable); i++) { if (RCT2ToUnicodeTable[i].unicode == unicode) return RCT2ToUnicodeTable[i].code; } return unicode; diff --git a/src/openrct2/localisation/currency.h b/src/openrct2/localisation/currency.h index 1c24826983..4e2930bea2 100644 --- a/src/openrct2/localisation/currency.h +++ b/src/openrct2/localisation/currency.h @@ -55,7 +55,7 @@ typedef enum { typedef struct currency_descriptor { char isoCode[4]; // Rate is relative to 0.10 GBP - int rate; + sint32 rate; uint8 affix_unicode; utf8 symbol_unicode[CURRENCY_SYMBOL_MAX_SIZE]; uint8 affix_ascii; diff --git a/src/openrct2/localisation/date.c b/src/openrct2/localisation/date.c index 5b075a046c..432ba60bab 100644 --- a/src/openrct2/localisation/date.c +++ b/src/openrct2/localisation/date.c @@ -41,17 +41,17 @@ const rct_string_id DateFormatStringFormatIds[] = { openrct_timeofday gRealTimeOfDay; -int date_get_month(int months) +sint32 date_get_month(sint32 months) { return months % MONTH_COUNT; } -int date_get_year(int months) +sint32 date_get_year(sint32 months) { return months / MONTH_COUNT; } -int date_get_total_months(int month, int year) +sint32 date_get_total_months(sint32 month, sint32 year) { return (year - 1) * MONTH_COUNT + month; } diff --git a/src/openrct2/localisation/date.h b/src/openrct2/localisation/date.h index 3c49b3a2af..0b96e030ce 100644 --- a/src/openrct2/localisation/date.h +++ b/src/openrct2/localisation/date.h @@ -54,9 +54,9 @@ extern uint16 gDateMonthsElapsed; extern openrct_timeofday gRealTimeOfDay; -int date_get_month(int months); -int date_get_year(int months); -int date_get_total_months(int month, int year); +sint32 date_get_month(sint32 months); +sint32 date_get_year(sint32 months); +sint32 date_get_total_months(sint32 month, sint32 year); void date_reset(); void date_update_real_time_of_day(); diff --git a/src/openrct2/localisation/format_codes.c b/src/openrct2/localisation/format_codes.c index 640bdf6890..04d1688da7 100644 --- a/src/openrct2/localisation/format_codes.c +++ b/src/openrct2/localisation/format_codes.c @@ -102,7 +102,7 @@ format_code_token format_code_tokens[] = { uint32 format_get_code(const char *token) { - int i; + sint32 i; for (i = 0; i < countof(format_code_tokens); i++) if (_strcmpi(token, format_code_tokens[i].token) == 0) return format_code_tokens[i].code; @@ -111,14 +111,14 @@ uint32 format_get_code(const char *token) const char *format_get_token(uint32 code) { - int i; + sint32 i; for (i = 0; i < countof(format_code_tokens); i++) if (code == format_code_tokens[i].code) return format_code_tokens[i].token; return 0; } -bool utf8_should_use_sprite_for_codepoint(int codepoint) +bool utf8_should_use_sprite_for_codepoint(sint32 codepoint) { switch (codepoint) { case FORMAT_UP: diff --git a/src/openrct2/localisation/language.cpp b/src/openrct2/localisation/language.cpp index 54f0dbeace..9a09cfcd06 100644 --- a/src/openrct2/localisation/language.cpp +++ b/src/openrct2/localisation/language.cpp @@ -28,7 +28,7 @@ extern "C" { #include "localisation.h" -int gCurrentLanguage = LANGUAGE_UNDEFINED; +sint32 gCurrentLanguage = LANGUAGE_UNDEFINED; bool gUseTrueTypeFont = false; static ILanguagePack * _languageFallback = nullptr; @@ -44,7 +44,7 @@ void utf8_remove_format_codes(utf8 * text, bool allowcolours) { const utf8 * ch = text; utf8 * dstCh = text; - int codepoint; + sint32 codepoint; while ((codepoint = String::GetNextCodepoint(ch, &ch)) != 0) { if (!utf8_is_format_code(codepoint) || (allowcolours && utf8_is_colour_code(codepoint))) @@ -87,7 +87,7 @@ static utf8 * GetLanguagePath(utf8 * buffer, size_t bufferSize, uint32 languageI return buffer; } -bool language_open(int id) +bool language_open(sint32 id) { char filename[MAX_PATH]; @@ -128,7 +128,7 @@ void language_close_all() constexpr rct_string_id NONSTEX_BASE_STRING_ID = 3463; constexpr uint16 MAX_OBJECT_CACHED_STRINGS = 2048; -static wchar_t convert_specific_language_character_to_unicode(int languageId, wchar_t codepoint) +static wchar_t convert_specific_language_character_to_unicode(sint32 languageId, wchar_t codepoint) { switch (languageId) { case RCT2_LANGUAGE_ID_KOREAN: @@ -142,7 +142,7 @@ static wchar_t convert_specific_language_character_to_unicode(int languageId, wc } } -static utf8 * convert_multibyte_charset(const char * src, size_t srcMaxSize, int languageId) +static utf8 * convert_multibyte_charset(const char * src, size_t srcMaxSize, sint32 languageId) { constexpr char CODEPOINT_DOUBLEBYTE = (char)(uint8)0xFF; @@ -174,7 +174,7 @@ static utf8 * convert_multibyte_charset(const char * src, size_t srcMaxSize, int return sb.StealString(); } -static bool rct2_language_is_multibyte_charset(int languageId) +static bool rct2_language_is_multibyte_charset(sint32 languageId) { switch (languageId) { case RCT2_LANGUAGE_ID_KOREAN: @@ -187,7 +187,7 @@ static bool rct2_language_is_multibyte_charset(int languageId) } } -utf8 *rct2_language_string_to_utf8(const char *src, size_t srcSize, int languageId) +utf8 *rct2_language_string_to_utf8(const char *src, size_t srcSize, sint32 languageId) { if (rct2_language_is_multibyte_charset(languageId)) { diff --git a/src/openrct2/localisation/language.h b/src/openrct2/localisation/language.h index d31f9a3f30..89fae144b1 100644 --- a/src/openrct2/localisation/language.h +++ b/src/openrct2/localisation/language.h @@ -60,7 +60,7 @@ typedef struct language_descriptor { extern const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT]; -extern int gCurrentLanguage; +extern sint32 gCurrentLanguage; extern bool gUseTrueTypeFont; extern const utf8 BlackUpArrowString[]; @@ -70,20 +70,20 @@ extern const utf8 BlackRightArrowString[]; extern const utf8 CheckBoxMarkString[]; const char *language_get_string(rct_string_id id); -bool language_open(int id); +bool language_open(sint32 id); void language_close_all(); uint32 utf8_get_next(const utf8 *char_ptr, const utf8 **nextchar_ptr); utf8 *utf8_write_codepoint(utf8 *dst, uint32 codepoint); -int utf8_insert_codepoint(utf8 *dst, uint32 codepoint); +sint32 utf8_insert_codepoint(utf8 *dst, uint32 codepoint); bool utf8_is_codepoint_start(const utf8 *text); void utf8_remove_format_codes(utf8 *text, bool allowcolours); -int utf8_get_codepoint_length(int codepoint); -int utf8_length(const utf8 *text); +sint32 utf8_get_codepoint_length(sint32 codepoint); +sint32 utf8_length(const utf8 *text); wchar_t *utf8_to_widechar(const utf8 *src); utf8 *widechar_to_utf8(const wchar_t *src); -utf8 *rct2_language_string_to_utf8(const char *src, size_t srcSize, int languageId); +utf8 *rct2_language_string_to_utf8(const char *src, size_t srcSize, sint32 languageId); bool language_get_localised_scenario_strings(const utf8 *scenarioFilename, rct_string_id *outStringIds); rct_string_id language_allocate_object_string(const utf8 * target); void language_free_object_string(rct_string_id stringId); diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/localisation.c index 50f12742ff..6abd04d044 100644 --- a/src/openrct2/localisation/localisation.c +++ b/src/openrct2/localisation/localisation.c @@ -363,9 +363,9 @@ static void format_append_string_n(char **dest, size_t *size, const utf8 *string } } -static void format_integer(char **dest, size_t *size, long long value) +static void format_integer(char **dest, size_t *size, sint64 value) { - int digit; + sint32 digit; char *nbegin, *nend, *ncur; char tmp; @@ -419,9 +419,9 @@ static void format_integer(char **dest, size_t *size, long long value) } } -static void format_comma_separated_integer(char **dest, size_t *size, long long value) +static void format_comma_separated_integer(char **dest, size_t *size, sint64 value) { - int digit, groupIndex; + sint32 digit, groupIndex; char *nbegin, *nend, *ncur; char tmp; const char *commaMark = language_get_string(STR_LOCALE_THOUSANDS_SEPARATOR); @@ -502,15 +502,15 @@ static void format_comma_separated_integer(char **dest, size_t *size, long long } } -static void format_comma_separated_fixed_1dp(char **dest, size_t *size, long long value) +static void format_comma_separated_fixed_1dp(char **dest, size_t *size, sint64 value) { - int digit, groupIndex; + sint32 digit, groupIndex; char *nbegin, *nend, *ncur; char tmp; const char *commaMark = language_get_string(STR_LOCALE_THOUSANDS_SEPARATOR); const char *decimalMark = language_get_string(STR_LOCALE_DECIMAL_POINT); const char *ch = NULL; - int zeroNeeded = 1; + sint32 zeroNeeded = 1; if ((*size) == 0) return; @@ -595,15 +595,15 @@ static void format_comma_separated_fixed_1dp(char **dest, size_t *size, long lon } } -static void format_comma_separated_fixed_2dp(char **dest, size_t *size, long long value) +static void format_comma_separated_fixed_2dp(char **dest, size_t *size, sint64 value) { - int digit, groupIndex; + sint32 digit, groupIndex; char *nbegin, *nend, *ncur; char tmp; const char *commaMark = language_get_string(STR_LOCALE_THOUSANDS_SEPARATOR); const char *decimalMark = language_get_string(STR_LOCALE_DECIMAL_POINT); const char *ch = NULL; - int zeroNeeded = 1; + sint32 zeroNeeded = 1; if ((*size) == 0) return; @@ -694,7 +694,7 @@ static void format_comma_separated_fixed_2dp(char **dest, size_t *size, long lon } } -static void format_currency(char **dest, size_t *size, long long value) +static void format_currency(char **dest, size_t *size, sint64 value) { if ((*size) == 0) return; @@ -732,13 +732,13 @@ static void format_currency(char **dest, size_t *size, long long value) format_append_string(dest, size, symbol); } -static void format_currency_2dp(char **dest, size_t *size, long long value) +static void format_currency_2dp(char **dest, size_t *size, sint64 value) { if ((*size) == 0) return; const currency_descriptor *currencyDesc = &CurrencyDescriptors[gConfigGeneral.currency_format]; - int rate = currencyDesc->rate; + sint32 rate = currencyDesc->rate; value *= rate; // Negative sign @@ -828,7 +828,7 @@ static void format_duration(char **dest, size_t *size, uint16 value) uint16 args[] = { minutes, seconds }; uint16 *argsRef = &args[1]; - int minuteIndex = 0; + sint32 minuteIndex = 0; if (minutes > 0) { minuteIndex = 1; if (minutes != 1) { @@ -838,7 +838,7 @@ static void format_duration(char **dest, size_t *size, uint16 value) argsRef--; } - int secondsIndex = 0; + sint32 secondsIndex = 0; if (seconds != 1) { secondsIndex = 1; } @@ -861,7 +861,7 @@ static void format_realtime(char **dest, size_t *size, uint16 value) uint16 args[] = { hours, minutes }; uint16 *argsRef = &args[1]; - int hourIndex = 0; + sint32 hourIndex = 0; if (hours > 0) { hourIndex = 1; if (hours != 1) { @@ -871,7 +871,7 @@ static void format_realtime(char **dest, size_t *size, uint16 value) argsRef--; } - int minuteIndex = 0; + sint32 minuteIndex = 0; if (minutes != 1) { minuteIndex = 1; } @@ -881,7 +881,7 @@ static void format_realtime(char **dest, size_t *size, uint16 value) format_string_part(dest, size, stringId, (char**)&argsRef); } -static void format_string_code(unsigned int format_code, char **dest, size_t *size, char **args) +static void format_string_code(uint32 format_code, char **dest, size_t *size, char **args) { intptr_t value; @@ -978,7 +978,7 @@ static void format_string_code(unsigned int format_code, char **dest, size_t *si value = *((uint16*)*args); *args += 2; - format_append_string(dest, size, language_get_string(DateGameMonthNames[date_get_month((int)value)])); + format_append_string(dest, size, language_get_string(DateGameMonthNames[date_get_month((sint32)value)])); break; case FORMAT_VELOCITY: // Pop argument @@ -1038,7 +1038,7 @@ static void format_string_part_from_raw(utf8 **dest, size_t *size, const utf8 *s #endif while (*size > 1) { - unsigned int code = utf8_get_next(src, &src); + uint32 code = utf8_get_next(src, &src); if (code < ' ') { if (code == 0) { break; @@ -1320,11 +1320,11 @@ utf8 *win1252_to_utf8_alloc(const char *src, size_t srcMaxSize) size_t stringLength = strnlen(src, srcMaxSize); size_t reservedSpace = (stringLength * 4) + 1; utf8 *result = malloc(reservedSpace); - int actualSpace = win1252_to_utf8(result, src, stringLength, reservedSpace); + sint32 actualSpace = win1252_to_utf8(result, src, stringLength, reservedSpace); return (utf8*)realloc(result, actualSpace); } -int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t maxBufferLength) +sint32 win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t maxBufferLength) { #ifdef __WINDOWS__ utf16 stackBuffer[256]; @@ -1339,8 +1339,8 @@ int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t ma intermediateBuffer = heapBuffer; } } - MultiByteToWideChar(CP_ACP, 0, src, -1, intermediateBuffer, (int)bufferCount); - int result = WideCharToMultiByte(CP_UTF8, 0, intermediateBuffer, -1, dst, (int)maxBufferLength, NULL, NULL); + MultiByteToWideChar(CP_ACP, 0, src, -1, intermediateBuffer, (sint32)bufferCount); + sint32 result = WideCharToMultiByte(CP_UTF8, 0, intermediateBuffer, -1, dst, (sint32)maxBufferLength, NULL, NULL); free(heapBuffer); #else @@ -1352,7 +1352,7 @@ int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t ma iconv_t cd = iconv_open(to_charset, from_charset); if ((iconv_t)-1 == cd) { - int error = errno; + sint32 error = errno; switch (error) { case EINVAL: @@ -1368,7 +1368,7 @@ int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t ma size_t conversion_result = iconv(cd, &buffer_conv, &srcLength, &outBuf, &obl); if (conversion_result == (size_t)-1) { - int error = errno; + sint32 error = errno; switch (error) { case EILSEQ: @@ -1384,7 +1384,7 @@ int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t ma log_error("Unknown error encountered, errno = %d", error); } } - int close_result = iconv_close(cd); + sint32 close_result = iconv_close(cd); if (close_result == -1) { log_error("Failed to close iconv, errno = %d", errno); @@ -1392,7 +1392,7 @@ int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t ma size_t byte_diff = maxBufferLength - obl + 1; dst[byte_diff - 1] = '\0'; //log_warning("converted %s of size %d, %d", dst, byte_diff, strlen(dst)); - int result = byte_diff; + sint32 result = byte_diff; free(buffer_orig); #endif // __WINDOWS__ diff --git a/src/openrct2/localisation/localisation.h b/src/openrct2/localisation/localisation.h index 37d02f93ee..8a2b671c2c 100644 --- a/src/openrct2/localisation/localisation.h +++ b/src/openrct2/localisation/localisation.h @@ -24,10 +24,10 @@ #include "string_ids.h" #include "../management/marketing.h" -bool utf8_is_format_code(int codepoint); -bool utf8_is_colour_code(int codepoint); -bool utf8_should_use_sprite_for_codepoint(int codepoint); -int utf8_get_format_code_arg_length(int codepoint); +bool utf8_is_format_code(sint32 codepoint); +bool utf8_is_colour_code(sint32 codepoint); +bool utf8_should_use_sprite_for_codepoint(sint32 codepoint); +sint32 utf8_get_format_code_arg_length(sint32 codepoint); void utf8_remove_formatting(utf8* string, bool allowColours); void format_string(char *dest, size_t size, rct_string_id format, void *args); @@ -36,21 +36,21 @@ void format_string_to_upper(char *dest, size_t size, rct_string_id format, void void generate_string_file(); utf8 *get_string_end(const utf8 *text); size_t get_string_size(const utf8 *text); -int get_string_length(const utf8 *text); +sint32 get_string_length(const utf8 *text); money32 string_to_money(char * string_to_monetise); void money_to_string(money32 amount, char * buffer_to_put_value_to, size_t buffer_len); void user_string_clear_all(); -rct_string_id user_string_allocate(int base, const utf8 *text); +rct_string_id user_string_allocate(sint32 base, const utf8 *text); void user_string_free(rct_string_id id); bool is_user_string_id(rct_string_id stringId); utf8 *win1252_to_utf8_alloc(const char *src, size_t srcMaxSize); -int win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t maxBufferLength); +sint32 win1252_to_utf8(utf8string dst, const char *src, size_t srcLength, size_t maxBufferLength); -int rct2_to_utf8(utf8 *dst, const char *src); -int utf8_to_rct2(char *dst, const utf8 *src); +sint32 rct2_to_utf8(utf8 *dst, const char *src); +sint32 utf8_to_rct2(char *dst, const utf8 *src); wchar_t encoding_convert_rct2_to_unicode(wchar_t rct2str); wchar_t encoding_convert_unicode_to_rct2(wchar_t unicode); wchar_t encoding_convert_gb2312_to_unicode(wchar_t gb2312); diff --git a/src/openrct2/localisation/user.c b/src/openrct2/localisation/user.c index b33b425b70..d70a6cc94d 100644 --- a/src/openrct2/localisation/user.c +++ b/src/openrct2/localisation/user.c @@ -37,9 +37,9 @@ void user_string_clear_all() * * rct2: 0x006C421D */ -rct_string_id user_string_allocate(int base, const utf8 *text) +rct_string_id user_string_allocate(sint32 base, const utf8 *text) { - int highBits = (base & 0x7F) << 9; + sint32 highBits = (base & 0x7F) << 9; bool allowDuplicates = base & 0x80; if (!allowDuplicates && user_string_exists(text)) { @@ -48,7 +48,7 @@ rct_string_id user_string_allocate(int base, const utf8 *text) } char *userString = gUserStrings; - for (int i = 0; i < MAX_USER_STRINGS; i++, userString += USER_STRING_MAX_LENGTH) { + for (sint32 i = 0; i < MAX_USER_STRINGS; i++, userString += USER_STRING_MAX_LENGTH) { if (userString[0] != 0) continue; @@ -75,7 +75,7 @@ void user_string_free(rct_string_id id) static bool user_string_exists(const utf8 *text) { char *userString = gUserStrings; - for (int i = 0; i < MAX_USER_STRINGS; i++, userString += USER_STRING_MAX_LENGTH) { + for (sint32 i = 0; i < MAX_USER_STRINGS; i++, userString += USER_STRING_MAX_LENGTH) { if (userString[0] == 0) continue; @@ -94,7 +94,7 @@ void reset_user_strings() { char *userString = gUserStrings; - for (int i = 0; i < MAX_USER_STRINGS; i++, userString += USER_STRING_MAX_LENGTH) { + for (sint32 i = 0; i < MAX_USER_STRINGS; i++, userString += USER_STRING_MAX_LENGTH) { userString[0] = 0; } diff --git a/src/openrct2/localisation/utf8.c b/src/openrct2/localisation/utf8.c index 8ffb1fee40..d6730cebd2 100644 --- a/src/openrct2/localisation/utf8.c +++ b/src/openrct2/localisation/utf8.c @@ -19,8 +19,8 @@ uint32 utf8_get_next(const utf8 *char_ptr, const utf8 **nextchar_ptr) { - int result; - int numBytes; + sint32 result; + sint32 numBytes; if (!(char_ptr[0] & 0x80)) { result = char_ptr[0]; @@ -72,9 +72,9 @@ utf8 *utf8_write_codepoint(utf8 *dst, uint32 codepoint) * Inserts the given codepoint at the given address, shifting all characters after along. * @returns the size of the inserted codepoint. */ -int utf8_insert_codepoint(utf8 *dst, uint32 codepoint) +sint32 utf8_insert_codepoint(utf8 *dst, uint32 codepoint) { - int shift = utf8_get_codepoint_length(codepoint); + sint32 shift = utf8_get_codepoint_length(codepoint); utf8 *endPoint = get_string_end(dst); memmove(dst + shift, dst, endPoint - dst + 1); utf8_write_codepoint(dst, codepoint); @@ -88,7 +88,7 @@ bool utf8_is_codepoint_start(const utf8 *text) return false; } -int utf8_get_codepoint_length(int codepoint) +sint32 utf8_get_codepoint_length(sint32 codepoint) { if (codepoint <= 0x7F) { return 1; @@ -105,12 +105,12 @@ int utf8_get_codepoint_length(int codepoint) * Gets the number of characters / codepoints in a UTF-8 string (not necessarily 1:1 with bytes and not including null * terminator). */ -int utf8_length(const utf8 *text) +sint32 utf8_length(const utf8 *text) { - int codepoint; + sint32 codepoint; const utf8 *ch = text; - int count = 0; + sint32 count = 0; while ((codepoint = utf8_get_next(ch, &ch)) != 0) { count++; } @@ -123,7 +123,7 @@ wchar_t *utf8_to_widechar(const utf8 *src) wchar_t *dst = result; const utf8 *ch = src; - int codepoint; + sint32 codepoint; while ((codepoint = utf8_get_next(ch, &ch)) != 0) { if ((uint32)codepoint > 0xFFFF) { *dst++ = '?'; @@ -156,11 +156,11 @@ utf8 *widechar_to_utf8(const wchar_t *src) */ utf8 *get_string_end(const utf8 *text) { - int codepoint; + sint32 codepoint; const utf8 *ch = text; while ((codepoint = utf8_get_next(ch, &ch)) != 0) { - int argLength = utf8_get_format_code_arg_length(codepoint); + sint32 argLength = utf8_get_format_code_arg_length(codepoint); ch += argLength; } return (utf8*)(ch - 1); @@ -177,12 +177,12 @@ size_t get_string_size(const utf8 *text) /** * Return the number of visible characters (excludes format codes) in the given UTF-8 string. */ -int get_string_length(const utf8 *text) +sint32 get_string_length(const utf8 *text) { - int codepoint; + sint32 codepoint; const utf8 *ch = text; - int count = 0; + sint32 count = 0; while ((codepoint = utf8_get_next(ch, &ch)) != 0) { if (utf8_is_format_code(codepoint)) { ch += utf8_get_format_code_arg_length(codepoint); @@ -193,7 +193,7 @@ int get_string_length(const utf8 *text) return count; } -int utf8_get_format_code_arg_length(int codepoint) +sint32 utf8_get_format_code_arg_length(sint32 codepoint) { switch (codepoint) { case FORMAT_MOVE_X: @@ -226,7 +226,7 @@ void utf8_remove_formatting(utf8* string, bool allowColours) { } } -bool utf8_is_format_code(int codepoint) +bool utf8_is_format_code(sint32 codepoint) { if (codepoint < 32) return true; if (codepoint >= FORMAT_ARGUMENT_CODE_START && codepoint <= FORMAT_ARGUMENT_CODE_END) return true; @@ -235,7 +235,7 @@ bool utf8_is_format_code(int codepoint) return false; } -bool utf8_is_colour_code(int codepoint) +bool utf8_is_colour_code(sint32 codepoint) { if (codepoint >= FORMAT_COLOUR_CODE_START && codepoint <= FORMAT_COLOUR_CODE_END) return true; return false; diff --git a/src/openrct2/management/award.c b/src/openrct2/management/award.c index d889031d01..ec6b7b0d39 100644 --- a/src/openrct2/management/award.c +++ b/src/openrct2/management/award.c @@ -69,7 +69,7 @@ static const rct_string_id AwardNewsStrings[] = { rct_award gCurrentAwards[MAX_AWARDS]; -bool award_is_positive(int type) +bool award_is_positive(sint32 type) { return AwardPositiveMap[type]; } @@ -77,11 +77,11 @@ bool award_is_positive(int type) #pragma region Award checks /** More than 1/16 of the total guests must be thinking untidy thoughts. */ -static int award_is_deserved_most_untidy(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_most_untidy(sint32 awardType, sint32 activeAwardTypes) { uint16 spriteIndex; rct_peep *peep; - int negativeCount; + sint32 negativeCount; if (activeAwardTypes & (1 << PARK_AWARD_MOST_BEAUTIFUL)) return 0; @@ -110,12 +110,12 @@ static int award_is_deserved_most_untidy(int awardType, int activeAwardTypes) } /** More than 1/64 of the total guests must be thinking tidy thoughts and less than 6 guests thinking untidy thoughts. */ -static int award_is_deserved_most_tidy(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_most_tidy(sint32 awardType, sint32 activeAwardTypes) { uint16 spriteIndex; rct_peep *peep; - int positiveCount; - int negativeCount; + sint32 positiveCount; + sint32 negativeCount; if (activeAwardTypes & (1 << PARK_AWARD_MOST_UNTIDY)) return 0; @@ -146,9 +146,9 @@ static int award_is_deserved_most_tidy(int awardType, int activeAwardTypes) } /** At least 6 open roller coasters. */ -static int award_is_deserved_best_rollercoasters(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_rollercoasters(sint32 awardType, sint32 activeAwardTypes) { - int i, rollerCoasters; + sint32 i, rollerCoasters; rct_ride *ride; rct_ride_entry *rideType; @@ -171,7 +171,7 @@ static int award_is_deserved_best_rollercoasters(int awardType, int activeAwardT } /** Entrance fee is 0.10 less than half of the total ride value. */ -static int award_is_deserved_best_value(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_value(sint32 awardType, sint32 activeAwardTypes) { if (activeAwardTypes & (1 << PARK_AWARD_WORST_VALUE)) return 0; @@ -187,12 +187,12 @@ static int award_is_deserved_best_value(int awardType, int activeAwardTypes) } /** More than 1/128 of the total guests must be thinking scenic thoughts and less than 16 untidy thoughts. */ -static int award_is_deserved_most_beautiful(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_most_beautiful(sint32 awardType, sint32 activeAwardTypes) { uint16 spriteIndex; rct_peep *peep; - int positiveCount; - int negativeCount; + sint32 positiveCount; + sint32 negativeCount; if (activeAwardTypes & (1 << PARK_AWARD_MOST_UNTIDY)) return 0; @@ -223,7 +223,7 @@ static int award_is_deserved_most_beautiful(int awardType, int activeAwardTypes) } /** Entrance fee is more than total ride value. */ -static int award_is_deserved_worse_value(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_worse_value(sint32 awardType, sint32 activeAwardTypes) { if (activeAwardTypes & (1 << PARK_AWARD_BEST_VALUE)) return 0; @@ -239,9 +239,9 @@ static int award_is_deserved_worse_value(int awardType, int activeAwardTypes) } /** No more than 2 people who think the vandalism is bad and no crashes. */ -static int award_is_deserved_safest(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_safest(sint32 awardType, sint32 activeAwardTypes) { - int i, peepsWhoDislikeVandalism; + sint32 i, peepsWhoDislikeVandalism; uint16 spriteIndex; rct_peep *peep; rct_ride *ride; @@ -266,12 +266,12 @@ static int award_is_deserved_safest(int awardType, int activeAwardTypes) } /** All staff types, at least 20 staff, one staff per 32 peeps. */ -static int award_is_deserved_best_staff(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_staff(sint32 awardType, sint32 activeAwardTypes) { uint16 spriteIndex; rct_peep *peep; - int peepCount, staffCount; - int staffTypeFlags; + sint32 peepCount, staffCount; + sint32 staffTypeFlags; if (activeAwardTypes & (1 << PARK_AWARD_MOST_UNTIDY)) return 0; @@ -293,9 +293,9 @@ static int award_is_deserved_best_staff(int awardType, int activeAwardTypes) } /** At least 7 shops, 4 unique, one shop per 128 guests and no more than 12 hungry guests. */ -static int award_is_deserved_best_food(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_food(sint32 awardType, sint32 activeAwardTypes) { - int i, hungryPeeps, shops, uniqueShops; + sint32 i, hungryPeeps, shops, uniqueShops; uint64 shopTypes; rct_ride *ride; rct_ride_entry *rideType; @@ -342,9 +342,9 @@ static int award_is_deserved_best_food(int awardType, int activeAwardTypes) } /** No more than 2 unique shops, less than one shop per 256 guests and more than 15 hungry guests. */ -static int award_is_deserved_worst_food(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_worst_food(sint32 awardType, sint32 activeAwardTypes) { - int i, hungryPeeps, shops, uniqueShops; + sint32 i, hungryPeeps, shops, uniqueShops; uint64 shopTypes; rct_ride *ride; rct_ride_entry *rideType; @@ -391,9 +391,9 @@ static int award_is_deserved_worst_food(int awardType, int activeAwardTypes) } /** At least 4 restrooms, 1 restroom per 128 guests and no more than 16 guests who think they need the restroom. */ -static int award_is_deserved_best_restrooms(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_restrooms(sint32 awardType, sint32 activeAwardTypes) { - unsigned int i, numRestrooms, guestsWhoNeedRestroom; + uint32 i, numRestrooms, guestsWhoNeedRestroom; rct_ride *ride; uint16 spriteIndex; rct_peep *peep; @@ -426,9 +426,9 @@ static int award_is_deserved_best_restrooms(int awardType, int activeAwardTypes) } /** More than half of the rides have satisfaction <= 6 and park rating <= 650. */ -static int award_is_deserved_most_disappointing(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_most_disappointing(sint32 awardType, sint32 activeAwardTypes) { - unsigned int i, countedRides, disappointingRides; + uint32 i, countedRides, disappointingRides; rct_ride *ride; if (activeAwardTypes & (1 << PARK_AWARD_BEST_VALUE)) @@ -456,9 +456,9 @@ static int award_is_deserved_most_disappointing(int awardType, int activeAwardTy } /** At least 6 open water rides. */ -static int award_is_deserved_best_water_rides(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_water_rides(sint32 awardType, sint32 activeAwardTypes) { - int i, waterRides; + sint32 i, waterRides; rct_ride *ride; rct_ride_entry *rideType; @@ -481,9 +481,9 @@ static int award_is_deserved_best_water_rides(int awardType, int activeAwardType } /** At least 6 custom designed rides. */ -static int award_is_deserved_best_custom_designed_rides(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_custom_designed_rides(sint32 awardType, sint32 activeAwardTypes) { - int i, customDesignedRides; + sint32 i, customDesignedRides; rct_ride *ride; if (activeAwardTypes & (1 << PARK_AWARD_MOST_DISAPPOINTING)) @@ -508,9 +508,9 @@ static int award_is_deserved_best_custom_designed_rides(int awardType, int activ /** At least 5 colourful rides and more than half of the rides are colourful. */ const uint8 dazzling_ride_colours[] = { 5, 14, 20, 30 }; -static int award_is_deserved_most_dazzling_ride_colours(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_most_dazzling_ride_colours(sint32 awardType, sint32 activeAwardTypes) { - int i, j, countedRides, colourfulRides; + sint32 i, j, countedRides, colourfulRides; rct_ride *ride; uint8 mainTrackColour; @@ -538,9 +538,9 @@ static int award_is_deserved_most_dazzling_ride_colours(int awardType, int activ } /** At least 10 peeps and more than 1/64 of total guests are lost or can't find something. */ -static int award_is_deserved_most_confusing_layout(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_most_confusing_layout(sint32 awardType, sint32 activeAwardTypes) { - unsigned int peepsCounted, peepsLost; + uint32 peepsCounted, peepsLost; uint16 spriteIndex; rct_peep *peep; @@ -559,9 +559,9 @@ static int award_is_deserved_most_confusing_layout(int awardType, int activeAwar } /** At least 10 open gentle rides. */ -static int award_is_deserved_best_gentle_rides(int awardType, int activeAwardTypes) +static sint32 award_is_deserved_best_gentle_rides(sint32 awardType, sint32 activeAwardTypes) { - int i, gentleRides; + sint32 i, gentleRides; rct_ride *ride; rct_ride_entry *rideType; @@ -583,7 +583,7 @@ static int award_is_deserved_best_gentle_rides(int awardType, int activeAwardTyp return (gentleRides >= 10); } -typedef int (*award_deserved_check)(int, int); +typedef sint32 (*award_deserved_check)(sint32, sint32); award_deserved_check _awardChecks[] = { award_is_deserved_most_untidy, @@ -605,7 +605,7 @@ award_deserved_check _awardChecks[] = { award_is_deserved_best_gentle_rides }; -static int award_is_deserved(int awardType, int activeAwardTypes) +static sint32 award_is_deserved(sint32 awardType, sint32 activeAwardTypes) { return _awardChecks[awardType](awardType, activeAwardTypes); } @@ -614,7 +614,7 @@ static int award_is_deserved(int awardType, int activeAwardTypes) void award_reset() { - int i; + sint32 i; for (i = 0; i < MAX_AWARDS; i++) gCurrentAwards[i].time = 0; } @@ -628,9 +628,9 @@ void award_update_all() // Only add new awards if park is open if (gParkFlags & PARK_FLAGS_PARK_OPEN) { // Set active award types as flags - int activeAwardTypes = 0; - int freeAwardEntryIndex = -1; - for (int i = 0; i < MAX_AWARDS; i++) { + sint32 activeAwardTypes = 0; + sint32 freeAwardEntryIndex = -1; + for (sint32 i = 0; i < MAX_AWARDS; i++) { if (gCurrentAwards[i].time != 0) activeAwardTypes |= (1 << gCurrentAwards[i].type); else if (freeAwardEntryIndex == -1) @@ -640,7 +640,7 @@ void award_update_all() // Check if there was a free award entry if (freeAwardEntryIndex != -1) { // Get a random award type not already active - int awardType; + sint32 awardType; do { awardType = (((scenario_rand() & 0xFF) * 17) >> 8) & 0xFF; } while (activeAwardTypes & (1 << awardType)); @@ -659,7 +659,7 @@ void award_update_all() } // Decrease award times - for (int i = 0; i < MAX_AWARDS; i++) + for (sint32 i = 0; i < MAX_AWARDS; i++) if (gCurrentAwards[i].time != 0) if (--gCurrentAwards[i].time == 0) window_invalidate_by_class(WC_PARK_INFORMATION); diff --git a/src/openrct2/management/award.h b/src/openrct2/management/award.h index ba9a0a87fd..92477b252d 100644 --- a/src/openrct2/management/award.h +++ b/src/openrct2/management/award.h @@ -52,7 +52,7 @@ enum { extern rct_award gCurrentAwards[MAX_AWARDS]; -bool award_is_positive(int type); +bool award_is_positive(sint32 type); void award_reset(); void award_update_all(); diff --git a/src/openrct2/management/finance.c b/src/openrct2/management/finance.c index 6e7bcde7cd..60555c95ab 100644 --- a/src/openrct2/management/finance.c +++ b/src/openrct2/management/finance.c @@ -45,7 +45,7 @@ const money32 research_cost_table[4] = { MONEY(400,00) // Maximum funding }; -int dword_988E60[] = { 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0 }; +sint32 dword_988E60[] = { 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0 }; money32 gInitialCash; money32 gCashEncrypted; @@ -139,7 +139,7 @@ void finance_pay_interest() */ void finance_pay_ride_upkeep() { - int i; + sint32 i; rct_ride* ride; FOR_ALL_RIDES(i, ride) { @@ -165,7 +165,7 @@ void finance_pay_ride_upkeep() void finance_reset_history() { - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { gCashHistory[i] = MONEY32_UNDEFINED; gWeeklyProfitHistory[i] = MONEY32_UNDEFINED; gParkValueHistory[i] = MONEY32_UNDEFINED; @@ -237,7 +237,7 @@ void finance_update_daily_profit() // Ride costs rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride->status != RIDE_STATUS_CLOSED && ride->upkeep_cost != -1) { current_profit -= 2 * ride->upkeep_cost; @@ -286,7 +286,7 @@ money32 finance_get_current_cash() * * rct2: 0x0069DFB3 */ -void game_command_set_current_loan(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_current_loan(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { money32 money, loanDifference, currentLoan; money32 newLoan = *edx; diff --git a/src/openrct2/management/finance.h b/src/openrct2/management/finance.h index 07207d3d47..65c59e85db 100644 --- a/src/openrct2/management/finance.h +++ b/src/openrct2/management/finance.h @@ -19,7 +19,7 @@ #include "../common.h" -typedef int rct_expenditure_type; +typedef sint32 rct_expenditure_type; enum { RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION, @@ -84,7 +84,7 @@ money32 finance_get_initial_cash(); money32 finance_get_current_loan(); money32 finance_get_maximum_loan(); money32 finance_get_current_cash(); -void game_command_set_current_loan(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void game_command_set_current_loan(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); money32 finance_get_last_month_shop_profit(); diff --git a/src/openrct2/management/marketing.c b/src/openrct2/management/marketing.c index c05c180289..3c0de6ff2d 100644 --- a/src/openrct2/management/marketing.c +++ b/src/openrct2/management/marketing.c @@ -34,14 +34,14 @@ const money16 AdvertisingCampaignPricePerWeek[] = { MONEY(200,00) // RIDE }; -static const int AdvertisingCampaignGuestGenerationProbabilities[] = { 400, 300, 200, 200, 250, 200 }; +static const sint32 AdvertisingCampaignGuestGenerationProbabilities[] = { 400, 300, 200, 200, 250, 200 }; uint8 gMarketingCampaignDaysLeft[20]; uint8 gMarketingCampaignRideIndex[22]; -int marketing_get_campaign_guest_generation_probability(int campaign) +sint32 marketing_get_campaign_guest_generation_probability(sint32 campaign) { - int probability = AdvertisingCampaignGuestGenerationProbabilities[campaign]; + sint32 probability = AdvertisingCampaignGuestGenerationProbabilities[campaign]; rct_ride *ride; // Lower probability of guest generation if price was already low @@ -70,11 +70,11 @@ int marketing_get_campaign_guest_generation_probability(int campaign) */ void marketing_update() { - for (int campaign = 0; campaign < ADVERTISING_CAMPAIGN_COUNT; campaign++) { + for (sint32 campaign = 0; campaign < ADVERTISING_CAMPAIGN_COUNT; campaign++) { if (gCheatsNeverendingMarketing) continue; - int active = (gMarketingCampaignDaysLeft[campaign] & CAMPAIGN_ACTIVE_FLAG) != 0; + sint32 active = (gMarketingCampaignDaysLeft[campaign] & CAMPAIGN_ACTIVE_FLAG) != 0; if (gMarketingCampaignDaysLeft[campaign] == 0) continue; @@ -89,7 +89,7 @@ void marketing_update() if (--gMarketingCampaignDaysLeft[campaign] != 0) continue; - int campaignItem = gMarketingCampaignRideIndex[campaign]; + sint32 campaignItem = gMarketingCampaignRideIndex[campaign]; // This sets the string parameters for the marketing types that have an argument. if (campaign == ADVERTISING_CAMPAIGN_RIDE_FREE || campaign == ADVERTISING_CAMPAIGN_RIDE) { @@ -106,7 +106,7 @@ void marketing_update() } } -void marketing_set_guest_campaign(rct_peep *peep, int campaign) +void marketing_set_guest_campaign(rct_peep *peep, sint32 campaign) { switch (campaign) { case ADVERTISING_CAMPAIGN_PARK_ENTRY_FREE: @@ -138,7 +138,7 @@ void marketing_set_guest_campaign(rct_peep *peep, int campaign) } } -void marketing_start_campaign(int type, int rideOrItem, int numWeeks) +void marketing_start_campaign(sint32 type, sint32 rideOrItem, sint32 numWeeks) { gGameCommandErrorTitle = STR_CANT_START_MARKETING_CAMPAIGN; game_do_command(0, (numWeeks << 8) | GAME_COMMAND_FLAG_APPLY, 0, (rideOrItem << 8) | type, GAME_COMMAND_START_MARKETING_CAMPAIGN, 0, 0); @@ -148,11 +148,11 @@ void marketing_start_campaign(int type, int rideOrItem, int numWeeks) * * rct2: 0x0069E73C */ -void game_command_start_campaign(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_start_campaign(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int type = *edx & 0xFF; - int rideOrItem = (*edx >> 8) & 0xFF; - int numWeeks = (*ebx >> 8) & 0xFF; + sint32 type = *edx & 0xFF; + sint32 rideOrItem = (*edx >> 8) & 0xFF; + sint32 numWeeks = (*ebx >> 8) & 0xFF; if (type < 0 || type >= countof(AdvertisingCampaignPricePerWeek)) { @@ -178,9 +178,9 @@ void game_command_start_campaign(int* eax, int* ebx, int* ecx, int* edx, int* es *ebx = numWeeks * AdvertisingCampaignPricePerWeek[type]; } -bool marketing_is_campaign_type_applicable(int campaignType) +bool marketing_is_campaign_type_applicable(sint32 campaignType) { - int i; + sint32 i; rct_ride *ride; rct_ride_entry *rideEntry; diff --git a/src/openrct2/management/marketing.h b/src/openrct2/management/marketing.h index f0af48ddea..869816e76c 100644 --- a/src/openrct2/management/marketing.h +++ b/src/openrct2/management/marketing.h @@ -44,11 +44,11 @@ extern const money16 AdvertisingCampaignPricePerWeek[6]; extern uint8 gMarketingCampaignDaysLeft[20]; extern uint8 gMarketingCampaignRideIndex[22]; -int marketing_get_campaign_guest_generation_probability(int campaign); +sint32 marketing_get_campaign_guest_generation_probability(sint32 campaign); void marketing_update(); -void marketing_set_guest_campaign(rct_peep *peep, int campaign); -void marketing_start_campaign(int type, int rideOrItem, int numWeeks); -void game_command_start_campaign(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -bool marketing_is_campaign_type_applicable(int campaignType); +void marketing_set_guest_campaign(rct_peep *peep, sint32 campaign); +void marketing_start_campaign(sint32 type, sint32 rideOrItem, sint32 numWeeks); +void game_command_start_campaign(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +bool marketing_is_campaign_type_applicable(sint32 campaignType); #endif diff --git a/src/openrct2/management/news_item.c b/src/openrct2/management/news_item.c index f11778ee82..2cfff7867e 100644 --- a/src/openrct2/management/news_item.c +++ b/src/openrct2/management/news_item.c @@ -41,9 +41,9 @@ const uint8 news_type_properties[] = { NEWS_TYPE_HAS_SUBJECT, // NEWS_ITEM_GRAPH }; -static int news_item_get_new_history_slot(); +static sint32 news_item_get_new_history_slot(); -bool news_item_is_valid_idx(int index) +bool news_item_is_valid_idx(sint32 index) { if (index >= MAX_NEWS_ITEMS) { log_error("Tried to get news item past MAX_NEWS."); @@ -52,7 +52,7 @@ bool news_item_is_valid_idx(int index) return true; } -rct_news_item *news_item_get(int index) +rct_news_item *news_item_get(sint32 index) { if (news_item_is_valid_idx(index)) { return &gNewsItems[index]; @@ -61,7 +61,7 @@ rct_news_item *news_item_get(int index) } } -bool news_item_is_empty(int index) +bool news_item_is_empty(sint32 index) { return news_item_get(index)->type == NEWS_ITEM_NULL; } @@ -77,7 +77,7 @@ bool news_item_is_queue_empty() */ void news_item_init_queue() { - int i; + sint32 i; news_item_get(0)->type = NEWS_ITEM_NULL; news_item_get(11)->type = NEWS_ITEM_NULL; @@ -92,7 +92,7 @@ void news_item_init_queue() static void news_item_tick_current() { - int ticks; + sint32 ticks; ticks = ++news_item_get(0)->ticks; // Only play news item sound when in normal playing mode if (ticks == 1 && (gScreenFlags == SCREEN_FLAGS_PLAYING)) { @@ -103,7 +103,7 @@ static void news_item_tick_current() static bool news_item_is_current_old() { - int remove_time = 320; + sint32 remove_time = 320; if (!news_item_is_empty(5) && !news_item_is_empty(4) && !news_item_is_empty(3) && @@ -142,7 +142,7 @@ void news_item_update_current() */ void news_item_close_current() { - int i; + sint32 i; rct_news_item *newsItems = gNewsItems; // Check if there is a current message @@ -173,7 +173,7 @@ void news_item_close_current() static void news_item_shift_history_up() { - const int history_idx = 11; + const sint32 history_idx = 11; rct_news_item *history_start = news_item_get(history_idx); const size_t count = sizeof(rct_news_item) * (MAX_NEWS_ITEMS - 1 - history_idx); memmove(history_start, history_start + 1, count); @@ -184,9 +184,9 @@ static void news_item_shift_history_up() * Finds a spare history slot or replaces an existing one if there are no spare * slots available. */ -static int news_item_get_new_history_slot() +static sint32 news_item_get_new_history_slot() { - int i; + sint32 i; // Find an available history news item slot for (i = 11; i < MAX_NEWS_ITEMS; i++) @@ -204,9 +204,9 @@ static int news_item_get_new_history_slot() * * rct2: 0x0066BA74 */ -void news_item_get_subject_location(int type, int subject, int *x, int *y, int *z) +void news_item_get_subject_location(sint32 type, sint32 subject, sint32 *x, sint32 *y, sint32 *z) { - int i; + sint32 i; rct_ride *ride; rct_peep *peep; rct_vehicle *vehicle; @@ -320,7 +320,7 @@ void news_item_add_to_queue_raw(uint8 type, const utf8 *text, uint32 assoc) * rct2: 0x0066EBE6 * */ -void news_item_open_subject(int type, int subject) +void news_item_open_subject(sint32 type, sint32 subject) { rct_peep* peep; rct_window* window; @@ -387,7 +387,7 @@ void news_item_open_subject(int type, int subject) void news_item_disable_news(uint8 type, uint32 assoc) { // TODO: write test invalidating windows - for (int i = 0; i < 11; i++) { + for (sint32 i = 0; i < 11; i++) { if (!news_item_is_empty(i)) { rct_news_item * const newsItem = news_item_get(i); if (type == newsItem->type && assoc == newsItem->assoc) { @@ -401,7 +401,7 @@ void news_item_disable_news(uint8 type, uint32 assoc) } } - for (int i = 11; i < MAX_NEWS_ITEMS; i++) { + for (sint32 i = 11; i < MAX_NEWS_ITEMS; i++) { if (!news_item_is_empty(i)) { rct_news_item * const newsItem = news_item_get(i); if (type == newsItem->type && assoc == newsItem->assoc) { diff --git a/src/openrct2/management/news_item.h b/src/openrct2/management/news_item.h index 8c538fad60..afe204e7be 100644 --- a/src/openrct2/management/news_item.h +++ b/src/openrct2/management/news_item.h @@ -64,15 +64,15 @@ extern rct_news_item gNewsItems[MAX_NEWS_ITEMS]; void news_item_init_queue(); void news_item_update_current(); void news_item_close_current(); -void news_item_get_subject_location(int type, int subject, int *x, int *y, int *z); +void news_item_get_subject_location(sint32 type, sint32 subject, sint32 *x, sint32 *y, sint32 *z); void news_item_add_to_queue(uint8 type, rct_string_id string_id, uint32 assoc); void news_item_add_to_queue_raw(uint8 type, const utf8 *text, uint32 assoc); -void news_item_open_subject(int type, int subject); +void news_item_open_subject(sint32 type, sint32 subject); void news_item_disable_news(uint8 type, uint32 assoc); -rct_news_item *news_item_get(int index); -bool news_item_is_empty(int index); +rct_news_item *news_item_get(sint32 index); +bool news_item_is_empty(sint32 index); bool news_item_is_queue_empty(); -bool news_item_is_valid_idx(int index); +bool news_item_is_valid_idx(sint32 index); void news_item_add_to_queue_custom(rct_news_item *newNewsItem); diff --git a/src/openrct2/management/research.c b/src/openrct2/management/research.c index ca18285b83..6413d3ff08 100644 --- a/src/openrct2/management/research.c +++ b/src/openrct2/management/research.c @@ -30,7 +30,7 @@ #include "news_item.h" #include "research.h" -const int _researchRate[] = { 0, 160, 250, 400 }; +const sint32 _researchRate[] = { 0, 160, 250, 400 }; uint8 gResearchFundingLevel; uint8 gResearchPriorities; @@ -56,8 +56,8 @@ uint32 gResearchedSceneryItems[56]; bool gSilentResearch = false; -static void ride_type_set_invented(int rideType); -static void ride_entry_set_invented(int rideEntryIndex); +static void ride_type_set_invented(sint32 rideType); +static void ride_entry_set_invented(sint32 rideEntryIndex); /** * @@ -76,7 +76,7 @@ void research_reset_items() */ void research_update_uncompleted_types() { - int uncompletedResearchTypes = 0; + sint32 uncompletedResearchTypes = 0; rct_research_item *researchItem = gResearchItems; while (researchItem++->entryIndex != RESEARCHED_ITEMS_SEPARATOR); @@ -95,15 +95,15 @@ static void research_calculate_expected_date() if (gResearchProgressStage == RESEARCH_STAGE_INITIAL_RESEARCH || gResearchFundingLevel == RESEARCH_FUNDING_NONE) { gResearchExpectedDay = 255; } else { - int progressRemaining = gResearchProgressStage == RESEARCH_STAGE_COMPLETING_DESIGN ? 0x10000 : 0x20000; + sint32 progressRemaining = gResearchProgressStage == RESEARCH_STAGE_COMPLETING_DESIGN ? 0x10000 : 0x20000; progressRemaining -= gResearchProgress; - int daysRemaining = (progressRemaining / _researchRate[gResearchFundingLevel]) * 128; + sint32 daysRemaining = (progressRemaining / _researchRate[gResearchFundingLevel]) * 128; - int expectedDay = gDateMonthTicks + (daysRemaining & 0xFFFF); - int dayQuotient = expectedDay / 0x10000; - int dayRemainder = expectedDay % 0x10000; + sint32 expectedDay = gDateMonthTicks + (daysRemaining & 0xFFFF); + sint32 dayQuotient = expectedDay / 0x10000; + sint32 dayRemainder = expectedDay % 0x10000; - int expectedMonth = date_get_month(gDateMonthsElapsed + dayQuotient + (daysRemaining >> 16)); + sint32 expectedMonth = date_get_month(gDateMonthsElapsed + dayQuotient + (daysRemaining >> 16)); expectedDay = (dayRemainder * days_in_month[expectedMonth]) >> 16; gResearchExpectedDay = expectedDay; @@ -124,7 +124,7 @@ static void research_invalidate_related_windows() static void research_next_design() { rct_research_item *firstUnresearchedItem, *researchItem, tmp; - int ignoreActiveResearchTypes; + sint32 ignoreActiveResearchTypes; // Skip already researched items firstUnresearchedItem = gResearchItems; @@ -180,8 +180,8 @@ void research_finish_item(sint32 entryIndex) if (entryIndex >= 0x10000) { // Ride - int base_ride_type = (entryIndex >> 8) & 0xFF; - int rideEntryIndex = entryIndex & 0xFF; + sint32 base_ride_type = (entryIndex >> 8) & 0xFF; + sint32 rideEntryIndex = entryIndex & 0xFF; rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); if (rideEntry != NULL && rideEntry != (rct_ride_entry *)-1) { @@ -190,7 +190,7 @@ void research_finish_item(sint32 entryIndex) gResearchedTrackTypesB[base_ride_type] = (RideTypePossibleTrackConfigurations[base_ride_type] >> 32ULL) & 0xFFFFFFFFULL; if (RideData4[base_ride_type].flags & RIDE_TYPE_FLAG4_3) { - int ebx = RideData4[base_ride_type].alternate_type; + sint32 ebx = RideData4[base_ride_type].alternate_type; gResearchedTrackTypesA[ebx] = (RideTypePossibleTrackConfigurations[ebx]) & 0xFFFFFFFFULL; gResearchedTrackTypesB[ebx] = (RideTypePossibleTrackConfigurations[ebx] >> 32ULL) & 0xFFFFFFFFULL; } @@ -198,7 +198,7 @@ void research_finish_item(sint32 entryIndex) ride_entry_set_invented(rideEntryIndex); if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE)) { - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { rct_ride_entry *rideEntry2 = get_ride_entry(i); if (rideEntry2 == (rct_ride_entry*)-1) continue; @@ -230,8 +230,8 @@ void research_finish_item(sint32 entryIndex) rct_scenery_set_entry *scenerySetEntry = get_scenery_group_entry(entryIndex & 0xFFFF); if (scenerySetEntry != NULL && scenerySetEntry != (rct_scenery_set_entry *)-1) { - for (int i = 0; i < scenerySetEntry->entry_count; i++) { - int subSceneryEntryIndex = scenerySetEntry->scenery_entries[i]; + for (sint32 i = 0; i < scenerySetEntry->entry_count; i++) { + sint32 subSceneryEntryIndex = scenerySetEntry->scenery_entries[i]; gResearchedSceneryItems[subSceneryEntryIndex >> 5] |= 1UL << (subSceneryEntryIndex & 0x1F); } @@ -255,7 +255,7 @@ void research_finish_item(sint32 entryIndex) */ void research_update() { - int editorScreenFlags, researchLevel, currentResearchProgress; + sint32 editorScreenFlags, researchLevel, currentResearchProgress; editorScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER; if (gScreenFlags & editorScreenFlags) @@ -327,20 +327,20 @@ void sub_684AC3(){ ebp->category = cat; } - for (int i = 0; i < 8; ++i){ + for (sint32 i = 0; i < 8; ++i){ gResearchedRideTypes[i] = 0; gResearchedRideEntries[i] = 0; } - for (int i = 0; i < 56; i++) { + for (sint32 i = 0; i < 56; i++) { gResearchedSceneryItems[i] = 0xFFFFFFFF; } - for (int i = 0; i < 19; ++i){ + for (sint32 i = 0; i < 19; ++i){ rct_scenery_set_entry* scenery_set = get_scenery_group_entry(i); if ((intptr_t)scenery_set == -1)continue; - for (int j = 0; j < scenery_set->entry_count; ++j){ + for (sint32 j = 0; j < scenery_set->entry_count; ++j){ uint8 value = scenery_set->scenery_entries[j] & 0x1F; gResearchedSceneryItems[scenery_set->scenery_entries[j] >> 5] &= ~(1UL << value); } @@ -409,7 +409,7 @@ void research_remove_non_separate_vehicle_types() * * rct2: 0x006857FA */ -static void research_insert_unresearched(int entryIndex, int category) +static void research_insert_unresearched(sint32 entryIndex, sint32 category) { rct_research_item *researchItem, *researchItem2; @@ -435,7 +435,7 @@ static void research_insert_unresearched(int entryIndex, int category) * * rct2: 0x00685826 */ -static void research_insert_researched(int entryIndex, int category) +static void research_insert_researched(sint32 entryIndex, sint32 category) { rct_research_item *researchItem, *researchItem2; @@ -478,7 +478,7 @@ void research_remove(sint32 entryIndex){ } } -void research_insert(int researched, int entryIndex, int category) +void research_insert(sint32 researched, sint32 entryIndex, sint32 category) { if (researched) research_insert_researched(entryIndex, category); @@ -493,26 +493,26 @@ void research_insert(int researched, int entryIndex, int category) void research_populate_list_random() { // Rides - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { rct_ride_entry *rideEntry = get_ride_entry(i); if (rideEntry == (rct_ride_entry*)-1) continue; - int researched = (scenario_rand() & 0xFF) > 128; - for (int j = 0; j < 3; j++) { - int rideType = rideEntry->ride_type[j]; + sint32 researched = (scenario_rand() & 0xFF) > 128; + for (sint32 j = 0; j < 3; j++) { + sint32 rideType = rideEntry->ride_type[j]; if (rideType != 255) research_insert(researched, 0x10000 | (rideType << 8) | i, rideEntry->category[0]); } } // Scenery - for (int i = 0; i < 19; i++) { + for (sint32 i = 0; i < 19; i++) { rct_scenery_set_entry *scenerySetEntry = get_scenery_group_entry(i); if (scenerySetEntry == (rct_scenery_set_entry*)-1) continue; - int researched = (scenario_rand() & 0xFF) > 85; + sint32 researched = (scenario_rand() & 0xFF) > 85; research_insert(researched, i, RESEARCH_CATEGORY_SCENERYSET); } } @@ -520,20 +520,20 @@ void research_populate_list_random() void research_populate_list_researched() { // Rides - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { rct_ride_entry *rideEntry = get_ride_entry(i); if (rideEntry == (rct_ride_entry*)-1) continue; - for (int j = 0; j < 3; j++) { - int rideType = rideEntry->ride_type[j]; + for (sint32 j = 0; j < 3; j++) { + sint32 rideType = rideEntry->ride_type[j]; if (rideType != 255) research_insert(true, 0x10000 | (rideType << 8) | i, rideEntry->category[0]); } } // Scenery - for (int i = 0; i < 19; i++) { + for (sint32 i = 0; i < 19; i++) { rct_scenery_set_entry *scenerySetEntry = get_scenery_group_entry(i); if (scenerySetEntry == (rct_scenery_set_entry*)-1) continue; @@ -542,13 +542,13 @@ void research_populate_list_researched() } } -void research_set_funding(int amount) +void research_set_funding(sint32 amount) { game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, amount, GAME_COMMAND_SET_RESEARCH_FUNDING, 0, 0); } -void research_set_priority(int activeCategories) +void research_set_priority(sint32 activeCategories) { game_do_command(0, (1 << 8) | GAME_COMMAND_FLAG_APPLY, 0, activeCategories, GAME_COMMAND_SET_RESEARCH_FUNDING, 0, 0); } @@ -557,11 +557,11 @@ void research_set_priority(int activeCategories) * * rct2: 0x00684A7F */ -void game_command_set_research_funding(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_research_funding(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int setPriorities = (*ebx & (1 << 8)) != 0; - int fundingAmount = *edx; - int activeCategories = *edx; + sint32 setPriorities = (*ebx & (1 << 8)) != 0; + sint32 fundingAmount = *edx; + sint32 activeCategories = *edx; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RESEARCH; if (*ebx & GAME_COMMAND_FLAG_APPLY) { @@ -587,7 +587,7 @@ void research_insert_ride_entry(uint8 entryIndex, bool researched) { rct_ride_entry *rideEntry = get_ride_entry(entryIndex); uint8 category = rideEntry->category[0]; - for (int i = 0; i < 3; i++) { + for (sint32 i = 0; i < 3; i++) { uint8 rideType = rideEntry->ride_type[i]; if (rideType != 255) { research_insert(researched, 0x10000 | (rideType << 8) | entryIndex, category); @@ -600,23 +600,23 @@ void research_insert_scenery_group_entry(uint8 entryIndex, bool researched) research_insert(researched, entryIndex, RESEARCH_CATEGORY_SCENERYSET); } -bool ride_type_is_invented(int rideType) +bool ride_type_is_invented(sint32 rideType) { - int quadIndex = rideType >> 5; - int bitIndex = rideType & 0x1F; + sint32 quadIndex = rideType >> 5; + sint32 bitIndex = rideType & 0x1F; bool invented = (gResearchedRideTypes[quadIndex] & ((uint32)1 << bitIndex)); return invented; } -bool ride_entry_is_invented(int rideEntryIndex) +bool ride_entry_is_invented(sint32 rideEntryIndex) { - int quadIndex = rideEntryIndex >> 5; - int bitIndex = rideEntryIndex & 0x1F; + sint32 quadIndex = rideEntryIndex >> 5; + sint32 bitIndex = rideEntryIndex & 0x1F; bool invented = (gResearchedRideEntries[quadIndex] & ((uint32)1 << bitIndex)); return invented; } -bool track_type_is_invented(uint8 rideType, int trackType) +bool track_type_is_invented(uint8 rideType, sint32 trackType) { if (trackType < 32) { bool invented = (gResearchedTrackTypesA[rideType] & (1UL << trackType)); @@ -628,24 +628,24 @@ bool track_type_is_invented(uint8 rideType, int trackType) } } -static void ride_type_set_invented(int rideType) +static void ride_type_set_invented(sint32 rideType) { - int quadIndex = rideType >> 5; - int bitIndex = rideType & 0x1F; + sint32 quadIndex = rideType >> 5; + sint32 bitIndex = rideType & 0x1F; gResearchedRideTypes[quadIndex] |= 1 << bitIndex; } -static void ride_entry_set_invented(int rideEntryIndex) +static void ride_entry_set_invented(sint32 rideEntryIndex) { - int quadIndex = rideEntryIndex >> 5; - int bitIndex = rideEntryIndex & 0x1F; + sint32 quadIndex = rideEntryIndex >> 5; + sint32 bitIndex = rideEntryIndex & 0x1F; gResearchedRideEntries[quadIndex] |= 1 << bitIndex; } bool scenery_is_invented(uint16 sceneryItem) { - int quadIndex = sceneryItem >> 5; - int bitIndex = sceneryItem & 0x1F; + sint32 quadIndex = sceneryItem >> 5; + sint32 bitIndex = sceneryItem & 0x1F; bool invented = (gResearchedSceneryItems[quadIndex] & ((uint32)1 << bitIndex)); return invented; } diff --git a/src/openrct2/management/research.h b/src/openrct2/management/research.h index b15c97aa67..a40e5f690e 100644 --- a/src/openrct2/management/research.h +++ b/src/openrct2/management/research.h @@ -92,19 +92,19 @@ void research_remove_non_separate_vehicle_types(); void research_populate_list_random(); void research_populate_list_researched(); -void research_set_funding(int amount); -void research_set_priority(int activeCategories); -void game_command_set_research_funding(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void research_set_funding(sint32 amount); +void research_set_priority(sint32 activeCategories); +void game_command_set_research_funding(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); void research_finish_item(sint32 entryIndex); -void research_insert(int researched, int entryIndex, int category); +void research_insert(sint32 researched, sint32 entryIndex, sint32 category); void research_remove(sint32 entryIndex); void research_insert_ride_entry(uint8 entryIndex, bool researched); void research_insert_scenery_group_entry(uint8 entryIndex, bool researched); -bool ride_type_is_invented(int rideType); -bool ride_entry_is_invented(int rideEntryIndex); -bool track_type_is_invented(uint8 rideType, int trackType); +bool ride_type_is_invented(sint32 rideType); +bool ride_entry_is_invented(sint32 rideEntryIndex); +bool track_type_is_invented(uint8 rideType, sint32 trackType); bool scenery_is_invented(uint16 sceneryItem); #endif diff --git a/src/openrct2/network/NetworkAction.cpp b/src/openrct2/network/NetworkAction.cpp index e6a9a910c8..89d30ca86b 100644 --- a/src/openrct2/network/NetworkAction.cpp +++ b/src/openrct2/network/NetworkAction.cpp @@ -25,7 +25,7 @@ extern "C" #include "../localisation/string_ids.h" } -int NetworkActions::FindCommand(int command) +sint32 NetworkActions::FindCommand(sint32 command) { auto it = std::find_if(Actions.begin(), Actions.end(), [&command](NetworkAction const &action) { @@ -40,12 +40,12 @@ int NetworkActions::FindCommand(int command) }); if (it != Actions.end()) { - return (int)(it - Actions.begin()); + return (sint32)(it - Actions.begin()); } return -1; } -int NetworkActions::FindCommandByPermissionName(const std::string &permission_name) +sint32 NetworkActions::FindCommandByPermissionName(const std::string &permission_name) { auto it = std::find_if(Actions.begin(), Actions.end(), [&permission_name](NetworkAction const &action) { @@ -57,7 +57,7 @@ int NetworkActions::FindCommandByPermissionName(const std::string &permission_na }); if (it != Actions.end()) { - return (int)(it - Actions.begin()); + return (sint32)(it - Actions.begin()); } return -1; } diff --git a/src/openrct2/network/NetworkAction.h b/src/openrct2/network/NetworkAction.h index cd5f65541c..3e672bc57d 100644 --- a/src/openrct2/network/NetworkAction.h +++ b/src/openrct2/network/NetworkAction.h @@ -25,7 +25,7 @@ class NetworkAction final public: rct_string_id Name; std::string PermissionName; - std::vector Commands; + std::vector Commands; }; class NetworkActions final @@ -33,6 +33,6 @@ class NetworkActions final public: static const std::vector Actions; - static int FindCommand(int command); - static int FindCommandByPermissionName(const std::string &permission_name); + static sint32 FindCommand(sint32 command); + static sint32 FindCommandByPermissionName(const std::string &permission_name); }; diff --git a/src/openrct2/network/NetworkConnection.cpp b/src/openrct2/network/NetworkConnection.cpp index ed1daaccbe..75e8649ebf 100644 --- a/src/openrct2/network/NetworkConnection.cpp +++ b/src/openrct2/network/NetworkConnection.cpp @@ -42,7 +42,7 @@ NetworkConnection::~NetworkConnection() } } -int NetworkConnection::ReadPacket() +sint32 NetworkConnection::ReadPacket() { if (InboundPacket.BytesTransferred < sizeof(InboundPacket.Size)) { diff --git a/src/openrct2/network/NetworkConnection.h b/src/openrct2/network/NetworkConnection.h index f5e9487449..7fa5e2644f 100644 --- a/src/openrct2/network/NetworkConnection.h +++ b/src/openrct2/network/NetworkConnection.h @@ -45,7 +45,7 @@ public: NetworkConnection(); ~NetworkConnection(); - int ReadPacket(); + sint32 ReadPacket(); void QueuePacket(std::unique_ptr packet, bool front = false); void SendQueuedPackets(); void ResetLastPacketTime(); diff --git a/src/openrct2/network/NetworkGroup.cpp b/src/openrct2/network/NetworkGroup.cpp index a4e27ab6ae..d6e632a60e 100644 --- a/src/openrct2/network/NetworkGroup.cpp +++ b/src/openrct2/network/NetworkGroup.cpp @@ -51,7 +51,7 @@ NetworkGroup NetworkGroup::FromJson(const json_t * json) if (perm_name == nullptr) { continue; } - int action_id = NetworkActions::FindCommandByPermissionName(perm_name); + sint32 action_id = NetworkActions::FindCommandByPermissionName(perm_name); if (action_id != -1) { group.ToggleActionPermission(action_id); } @@ -129,9 +129,9 @@ bool NetworkGroup::CanPerformAction(size_t index) const return (ActionsAllowed[byte] & (1 << bit)) ? true : false; } -bool NetworkGroup::CanPerformCommand(int command) const +bool NetworkGroup::CanPerformCommand(sint32 command) const { - int action = NetworkActions::FindCommand(command); + sint32 action = NetworkActions::FindCommand(command); if (action != -1) { return CanPerformAction(action); diff --git a/src/openrct2/network/NetworkGroup.h b/src/openrct2/network/NetworkGroup.h index 58f2b1bf40..b26bf761a2 100644 --- a/src/openrct2/network/NetworkGroup.h +++ b/src/openrct2/network/NetworkGroup.h @@ -40,7 +40,7 @@ public: void Write(NetworkPacket &packet); void ToggleActionPermission(size_t index); bool CanPerformAction(size_t index) const; - bool CanPerformCommand(int command) const; + bool CanPerformCommand(sint32 command) const; json_t * ToJson() const; diff --git a/src/openrct2/network/NetworkKey.cpp b/src/openrct2/network/NetworkKey.cpp index f2a6ffaeb1..51dffa1e66 100644 --- a/src/openrct2/network/NetworkKey.cpp +++ b/src/openrct2/network/NetworkKey.cpp @@ -26,7 +26,7 @@ #define KEY_TYPE EVP_PKEY_RSA -constexpr int KEY_LENGTH_BITS = 2048; +constexpr sint32 KEY_LENGTH_BITS = 2048; NetworkKey::NetworkKey() { @@ -106,7 +106,7 @@ bool NetworkKey::LoadPrivate(SDL_RWops * file) } char * priv_key = new char[size]; file->read(file, priv_key, 1, size); - BIO * bio = BIO_new_mem_buf(priv_key, (int)size); + BIO * bio = BIO_new_mem_buf(priv_key, (sint32)size); if (bio == nullptr) { log_error("Failed to initialise OpenSSL's BIO!"); @@ -150,7 +150,7 @@ bool NetworkKey::LoadPublic(SDL_RWops * file) } char * pub_key = new char[size]; file->read(file, pub_key, 1, size); - BIO * bio = BIO_new_mem_buf(pub_key, (int)size); + BIO * bio = BIO_new_mem_buf(pub_key, (sint32)size); if (bio == nullptr) { log_error("Failed to initialise OpenSSL's BIO!"); @@ -196,7 +196,7 @@ bool NetworkKey::SavePrivate(SDL_RWops *file) log_error("Failed to initialise OpenSSL's BIO!"); return false; } - int result = PEM_write_bio_RSAPrivateKey(bio, rsa, nullptr, nullptr, 0, nullptr, nullptr); + sint32 result = PEM_write_bio_RSAPrivateKey(bio, rsa, nullptr, nullptr, 0, nullptr, nullptr); if (result != 1) { log_error("failed to write private key!"); @@ -205,7 +205,7 @@ bool NetworkKey::SavePrivate(SDL_RWops *file) } RSA_free(rsa); - int keylen = BIO_pending(bio); + sint32 keylen = BIO_pending(bio); char * pem_key = new char[keylen]; BIO_read(bio, pem_key, keylen); file->write(file, pem_key, keylen, 1); @@ -238,7 +238,7 @@ bool NetworkKey::SavePublic(SDL_RWops *file) log_error("Failed to initialise OpenSSL's BIO!"); return false; } - int result = PEM_write_bio_RSAPublicKey(bio, rsa); + sint32 result = PEM_write_bio_RSAPublicKey(bio, rsa); if (result != 1) { log_error("failed to write private key!"); @@ -247,7 +247,7 @@ bool NetworkKey::SavePublic(SDL_RWops *file) } RSA_free(rsa); - int keylen = BIO_pending(bio); + sint32 keylen = BIO_pending(bio); char * pem_key = new char[keylen]; BIO_read(bio, pem_key, keylen); file->write(file, pem_key, keylen, 1); @@ -276,7 +276,7 @@ std::string NetworkKey::PublicKeyString() log_error("Failed to initialise OpenSSL's BIO!"); return nullptr; } - int result = PEM_write_bio_RSAPublicKey(bio, rsa); + sint32 result = PEM_write_bio_RSAPublicKey(bio, rsa); if (result != 1) { log_error("failed to write private key!"); @@ -285,7 +285,7 @@ std::string NetworkKey::PublicKeyString() } RSA_free(rsa); - int keylen = BIO_pending(bio); + sint32 keylen = BIO_pending(bio); char * pem_key = new char[keylen + 1]; BIO_read(bio, pem_key, keylen); BIO_free_all(bio); @@ -328,13 +328,13 @@ std::string NetworkKey::PublicKeyHash() EVP_MD_CTX_destroy(ctx); return nullptr; } - unsigned int digest_size = EVP_MAX_MD_SIZE; - std::vector digest(EVP_MAX_MD_SIZE); + uint32 digest_size = EVP_MAX_MD_SIZE; + std::vector digest(EVP_MAX_MD_SIZE); // Cleans up `ctx` automatically. EVP_DigestFinal(ctx, digest.data(), &digest_size); std::string digest_out; digest_out.reserve(EVP_MAX_MD_SIZE * 2 + 1); - for (unsigned int i = 0; i < digest_size; i++) + for (uint32 i = 0; i < digest_size; i++) { char buf[3]; snprintf(buf, 3, "%02x", digest[i]); @@ -380,9 +380,9 @@ bool NetworkKey::Sign(const uint8 * md, const size_t len, char ** signature, siz return false; } - unsigned char * sig; + uint8 * sig; /* Allocate memory for the signature based on size in slen */ - if ((sig = (unsigned char*)OPENSSL_malloc((int)(sizeof(unsigned char) * (*out_size)))) == NULL) + if ((sig = (unsigned char*)OPENSSL_malloc((sint32)(sizeof(unsigned char) * (*out_size)))) == NULL) { log_error("Failed to crypto-allocate space fo signature"); EVP_MD_CTX_destroy(mdctx); @@ -429,7 +429,7 @@ bool NetworkKey::Verify(const uint8 * md, const size_t len, const char * sig, co return false; } - if (1 == EVP_DigestVerifyFinal(mdctx, (unsigned char *)sig, siglen)) + if (1 == EVP_DigestVerifyFinal(mdctx, (uint8 *)sig, siglen)) { EVP_MD_CTX_destroy(mdctx); log_verbose("Succesfully verified signature"); diff --git a/src/openrct2/network/NetworkPlayer.h b/src/openrct2/network/NetworkPlayer.h index fce5f1da94..b53bcc754b 100644 --- a/src/openrct2/network/NetworkPlayer.h +++ b/src/openrct2/network/NetworkPlayer.h @@ -38,11 +38,11 @@ public: uint8 Group = 0; money32 MoneySpent = MONEY(0, 0); uint32 CommandsRan = 0; - int LastAction = -999; + sint32 LastAction = -999; uint32 LastActionTime = 0; rct_xyz16 LastActionCoord = { 0 }; rct_peep* PickupPeep = 0; - int PickupPeepOldX = SPRITE_LOCATION_NULL; + sint32 PickupPeepOldX = SPRITE_LOCATION_NULL; std::string KeyHash; NetworkPlayer() = default; diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 64bcf6071e..09d59d1dc1 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -43,8 +43,8 @@ enum MASTER_SERVER_STATUS MASTER_SERVER_STATUS_INTERNAL_ERROR = 500 }; -constexpr int MASTER_SERVER_REGISTER_TIME = 120 * 1000; // 2 minutes -constexpr int MASTER_SERVER_HEARTBEAT_TIME = 60 * 1000; // 1 minute +constexpr sint32 MASTER_SERVER_REGISTER_TIME = 120 * 1000; // 2 minutes +constexpr sint32 MASTER_SERVER_HEARTBEAT_TIME = 60 * 1000; // 1 minute class NetworkServerAdvertiser : public INetworkServerAdvertiser { @@ -162,7 +162,7 @@ private: json_t *jsonStatus = json_object_get(jsonRoot, "status"); if (json_is_integer(jsonStatus)) { - int status = (int)json_integer_value(jsonStatus); + sint32 status = (sint32)json_integer_value(jsonStatus); if (status == MASTER_SERVER_STATUS_OK) { json_t * jsonToken = json_object_get(jsonRoot, "token"); @@ -190,7 +190,7 @@ private: json_t *jsonStatus = json_object_get(jsonRoot, "status"); if (json_is_integer(jsonStatus)) { - int status = (int)json_integer_value(jsonStatus); + sint32 status = (sint32)json_integer_value(jsonStatus); if (status == MASTER_SERVER_STATUS_OK) { // Master server has successfully updated our server status @@ -232,9 +232,9 @@ private: // Generate a string of 16 random hex characters (64-integer key as a hex formatted string) static const char hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; char key[17]; - for (int i = 0; i < 16; i++) + for (sint32 i = 0; i < 16; i++) { - int hexCharIndex = util_rand() % Util::CountOf(hexChars); + sint32 hexCharIndex = util_rand() % Util::CountOf(hexChars); key[i] = hexChars[hexCharIndex]; } key[Util::CountOf(key) - 1] = 0; diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp index 7b6e9ed00e..864986971e 100644 --- a/src/openrct2/network/TcpSocket.cpp +++ b/src/openrct2/network/TcpSocket.cpp @@ -47,7 +47,7 @@ #include #include #include - typedef int SOCKET; + typedef sint32 SOCKET; #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 #define LAST_SOCKET_ERROR() errno @@ -132,7 +132,7 @@ public: } sockaddr_storage ss; - int ss_len; + sint32 ss_len; if (!ResolveAddress(address, port, &ss, &ss_len)) { throw SocketException("Unable to resolve address."); @@ -146,7 +146,7 @@ public: } // Turn off IPV6_V6ONLY so we can accept both v4 and v6 connections - int value = 0; + sint32 value = 0; if (setsockopt(_socket, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&value, sizeof(value)) != 0) { log_error("IPV6_V6ONLY failed. %d", LAST_SOCKET_ERROR()); @@ -207,7 +207,7 @@ public: else { char hostName[NI_MAXHOST]; - int rc = getnameinfo( + sint32 rc = getnameinfo( (struct sockaddr *)&client_addr, client_len, hostName, @@ -239,7 +239,7 @@ public: _status = SOCKET_STATUS_RESOLVING; sockaddr_storage ss; - int ss_len; + sint32 ss_len; if (!ResolveAddress(address, port, &ss, &ss_len)) { throw SocketException("Unable to resolve address."); @@ -260,7 +260,7 @@ public: // Connect uint32 connectStartTick; - int connectResult = connect(_socket, (sockaddr *)&ss, ss_len); + sint32 connectResult = connect(_socket, (sockaddr *)&ss, ss_len); if (connectResult != SOCKET_ERROR || (LAST_SOCKET_ERROR() != EINPROGRESS && LAST_SOCKET_ERROR() != EWOULDBLOCK)) { @@ -269,7 +269,7 @@ public: connectStartTick = SDL_GetTicks(); - int error = 0; + sint32 error = 0; socklen_t len = sizeof(error); if (getsockopt(_socket, SOL_SOCKET, SO_ERROR, (char *)&error, &len) != 0) { @@ -291,7 +291,7 @@ public: timeval timeout; timeout.tv_sec = 0; timeout.tv_usec = 0; - if (select((int)(_socket + 1), nullptr, &writeFD, nullptr, &timeout) > 0) + if (select((sint32)(_socket + 1), nullptr, &writeFD, nullptr, &timeout) > 0) { error = 0; len = sizeof(error); @@ -331,7 +331,7 @@ public: req->Socket = this; req->Address = std::string(address); req->Port = port; - SDL_CreateThread([](void * pointer) -> int + SDL_CreateThread([](void * pointer) -> sint32 { auto req2 = static_cast(pointer); try @@ -370,7 +370,7 @@ public: { const char * bufferStart = (const char *)buffer + totalSent; size_t remainingSize = size - totalSent; - int sentBytes = send(_socket, (const char *)bufferStart, (int)remainingSize, FLAG_NO_PIPE); + sint32 sentBytes = send(_socket, (const char *)bufferStart, (sint32)remainingSize, FLAG_NO_PIPE); if (sentBytes == SOCKET_ERROR) { return totalSent; @@ -387,7 +387,7 @@ public: throw Exception("Socket not connected."); } - int readBytes = recv(_socket, (char *)buffer, (int)size, 0); + sint32 readBytes = recv(_socket, (char *)buffer, (sint32)size, 0); if (readBytes == 0) { *sizeReceived = 0; @@ -443,7 +443,7 @@ private: _status = SOCKET_STATUS_CLOSED; } - bool ResolveAddress(const char * address, uint16 port, sockaddr_storage * ss, int * ss_len) + bool ResolveAddress(const char * address, uint16 port, sockaddr_storage * ss, sint32 * ss_len) { std::string serviceName = std::to_string(port); @@ -463,7 +463,7 @@ private: else { memcpy(ss, result->ai_addr, result->ai_addrlen); - *ss_len = (int)result->ai_addrlen; + *ss_len = (sint32)result->ai_addrlen; freeaddrinfo(result); return true; } @@ -475,7 +475,7 @@ private: u_long nonBlocking = on; return ioctlsocket(socket, FIONBIO, &nonBlocking) == 0; #else - int flags = fcntl(socket, F_GETFL, 0); + sint32 flags = fcntl(socket, F_GETFL, 0); return fcntl(socket, F_SETFL, on ? (flags | O_NONBLOCK) : (flags & ~O_NONBLOCK)) == 0; #endif } diff --git a/src/openrct2/network/http.cpp b/src/openrct2/network/http.cpp index 40fd1a7a06..62b69ecc87 100644 --- a/src/openrct2/network/http.cpp +++ b/src/openrct2/network/http.cpp @@ -151,7 +151,7 @@ http_response_t *http_request(const http_request_t *request) return NULL; } - long httpStatusCode; + sint32 httpStatusCode; curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpStatusCode); char* contentType; @@ -173,7 +173,7 @@ http_response_t *http_request(const http_request_t *request) if (root != NULL) { response = (http_response_t*) malloc(sizeof(http_response_t)); response->tag = request->tag; - response->status_code = (int) httpStatusCode; + response->status_code = (sint32) httpStatusCode; response->root = root; response->type = HTTP_DATA_JSON; response->size = writeBuffer.length; @@ -182,7 +182,7 @@ http_response_t *http_request(const http_request_t *request) } else { response = (http_response_t*) malloc(sizeof(http_response_t)); response->tag = request->tag; - response->status_code = (int) httpStatusCode; + response->status_code = (sint32) httpStatusCode; response->body = writeBuffer.ptr; response->type = HTTP_DATA_RAW; response->size = writeBuffer.length; @@ -217,7 +217,7 @@ void http_request_async(const http_request_t *request, void (*callback)(http_res args->request.tag = request->tag; args->callback = callback; - SDL_Thread *thread = SDL_CreateThread([](void *ptr) -> int { + SDL_Thread *thread = SDL_CreateThread([](void *ptr) -> sint32 { TempThreadArgs *args2 = (TempThreadArgs*)ptr; http_response_t *response = http_request(&args2->request); diff --git a/src/openrct2/network/http.h b/src/openrct2/network/http.h index ac1f25b8aa..5806e9cd7d 100644 --- a/src/openrct2/network/http.h +++ b/src/openrct2/network/http.h @@ -41,7 +41,7 @@ typedef struct http_request_t { typedef struct http_response_t { void *tag; - int status_code; + sint32 status_code; http_data_type type; size_t size; union { diff --git a/src/openrct2/network/network.cpp b/src/openrct2/network/network.cpp index 59b3532f23..d34de1f5d4 100644 --- a/src/openrct2/network/network.cpp +++ b/src/openrct2/network/network.cpp @@ -37,7 +37,7 @@ extern "C" { } rct_peep* _pickup_peep = 0; -int _pickup_peep_old_x = SPRITE_LOCATION_NULL; +sint32 _pickup_peep_old_x = SPRITE_LOCATION_NULL; #ifndef DISABLE_NETWORK @@ -196,7 +196,7 @@ void Network::Close() gfx_invalidate_screen(); } -bool Network::BeginClient(const char* host, unsigned short port) +bool Network::BeginClient(const char* host, uint16 port) { if (GetMode() != NETWORK_MODE_NONE) { return false; @@ -269,7 +269,7 @@ bool Network::BeginClient(const char* host, unsigned short port) return true; } -bool Network::BeginServer(unsigned short port, const char* address) +bool Network::BeginServer(uint16 port, const char* address) { Close(); if (!Init()) @@ -323,17 +323,17 @@ bool Network::BeginServer(unsigned short port, const char* address) return true; } -int Network::GetMode() +sint32 Network::GetMode() { return mode; } -int Network::GetStatus() +sint32 Network::GetStatus() { return status; } -int Network::GetAuthStatus() +sint32 Network::GetAuthStatus() { if (GetMode() == NETWORK_MODE_CLIENT) { return server_connection.AuthStatus; @@ -577,7 +577,7 @@ bool Network::CheckSRAND(uint32 tick, uint32 srand0) return true; } -void Network::KickPlayer(int playerId) +void Network::KickPlayer(sint32 playerId) { for(auto it = client_connection_list.begin(); it != client_connection_list.end(); it++) { if ((*it)->Player->Id == playerId) { @@ -609,8 +609,8 @@ std::string Network::GenerateAdvertiseKey() // Generate a string of 16 random hex characters (64-integer key as a hex formatted string) static char hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; char key[17]; - for (int i = 0; i < 16; i++) { - int hexCharIndex = util_rand() % Util::CountOf(hexChars); + for (sint32 i = 0; i < 16; i++) { + sint32 hexCharIndex = util_rand() % Util::CountOf(hexChars); key[i] = hexChars[hexCharIndex]; } key[Util::CountOf(key) - 1] = 0; @@ -630,9 +630,9 @@ const char *Network::GetMasterServerUrl() NetworkGroup* Network::AddGroup() { NetworkGroup* addedgroup = nullptr; - int newid = -1; + sint32 newid = -1; // Find first unused group id - for (int id = 0; id < 255; id++) { + for (sint32 id = 0; id < 255; id++) { if (std::find_if(group_list.begin(), group_list.end(), [&id](std::unique_ptr const& group) { return group->Id == id; }) == group_list.end()) { @@ -919,7 +919,7 @@ void Network::Server_Send_MAP(NetworkConnection* connection) } SDL_RWops* rw = SDL_RWFromFP(temp, SDL_TRUE); size_t out_size; - unsigned char *header; + uint8 *header; std::vector objects; if (connection) { objects = connection->RequestedObjects; @@ -952,27 +952,27 @@ void Network::Server_Send_MAP(NetworkConnection* connection) free(header); } -unsigned char * Network::save_for_network(SDL_RWops *rw_buffer, size_t &out_size, const std::vector &objects) const +uint8 * Network::save_for_network(SDL_RWops *rw_buffer, size_t &out_size, const std::vector &objects) const { - unsigned char * header = nullptr; + uint8 * header = nullptr; out_size = 0; bool RLEState = gUseRLE; gUseRLE = false; scenario_save_network(rw_buffer, objects); gUseRLE = RLEState; - int size = (int)SDL_RWtell(rw_buffer); + sint32 size = (sint32)SDL_RWtell(rw_buffer); std::vector buffer(size); SDL_RWseek(rw_buffer, 0, RW_SEEK_SET); if (SDL_RWread(rw_buffer, &buffer[0], size, 1) == 0) { log_warning("Failed to read temporary map file into memory."); return nullptr; } - unsigned char *compressed = util_zlib_deflate(&buffer[0], size, &out_size); + uint8 *compressed = util_zlib_deflate(&buffer[0], size, &out_size); if (compressed != NULL) { - header = (unsigned char *)_strdup("open2_sv6_zlib"); + header = (uint8 *)_strdup("open2_sv6_zlib"); size_t header_len = strlen((char *)header) + 1; // account for null terminator - header = (unsigned char *)realloc(header, header_len + out_size); + header = (uint8 *)realloc(header, header_len + out_size); if (header == nullptr) { log_error("Failed to allocate %u bytes.", header_len + out_size); } else { @@ -983,7 +983,7 @@ unsigned char * Network::save_for_network(SDL_RWops *rw_buffer, size_t &out_size free(compressed); } else { log_warning("Failed to compress the data, falling back to non-compressed sv6."); - header = (unsigned char *)malloc(size); + header = (uint8 *)malloc(size); if (header == nullptr) { log_error("Failed to allocate %u bytes.", size); } else { @@ -1035,7 +1035,7 @@ void Network::Server_Send_TICK() // Simple counter which limits how often a sprite checksum gets sent. // This can get somewhat expensive, so we don't want to push it every tick in release, // but debug version can check more often. - static int checksum_counter = 0; + static sint32 checksum_counter = 0; checksum_counter++; if (checksum_counter >= 100) { checksum_counter = 0; @@ -1054,7 +1054,7 @@ void Network::Server_Send_PLAYERLIST() { std::unique_ptr packet(NetworkPacket::Allocate()); *packet << (uint32)NETWORK_COMMAND_PLAYERLIST << (uint8)player_list.size(); - for (unsigned int i = 0; i < player_list.size(); i++) { + for (uint32 i = 0; i < player_list.size(); i++) { player_list[i]->Write(*packet); } SendPacketToClients(*packet); @@ -1082,7 +1082,7 @@ void Network::Server_Send_PINGLIST() { std::unique_ptr packet(NetworkPacket::Allocate()); *packet << (uint32)NETWORK_COMMAND_PINGLIST << (uint8)player_list.size(); - for (unsigned int i = 0; i < player_list.size(); i++) { + for (size_t i = 0; i < player_list.size(); i++) { *packet << player_list[i]->Id << player_list[i]->Ping; } SendPacketToClients(*packet); @@ -1136,7 +1136,7 @@ void Network::Server_Send_GROUPLIST(NetworkConnection& connection) { std::unique_ptr packet(NetworkPacket::Allocate()); *packet << (uint32)NETWORK_COMMAND_GROUPLIST << (uint8)group_list.size() << default_group; - for (unsigned int i = 0; i < group_list.size(); i++) { + for (uint32 i = 0; i < group_list.size(); i++) { group_list[i]->Write(*packet); } connection.QueuePacket(std::move(packet)); @@ -1163,7 +1163,7 @@ void Network::Server_Send_EVENT_PLAYER_DISCONNECTED(const char *playerName, cons bool Network::ProcessConnection(NetworkConnection& connection) { - int packetStatus; + sint32 packetStatus; do { packetStatus = connection.ReadPacket(); switch(packetStatus) { @@ -1231,8 +1231,8 @@ void Network::ProcessGameCommandQueue() game_command_callback = game_command_callback_get_callback(gc.callback); } game_command_playerid = gc.playerid; - int command = gc.esi; - money32 cost = game_do_command_p(command, (int*)&gc.eax, (int*)&gc.ebx, (int*)&gc.ecx, (int*)&gc.edx, (int*)&gc.esi, (int*)&gc.edi, (int*)&gc.ebp); + sint32 command = gc.esi; + money32 cost = game_do_command_p(command, (sint32*)&gc.eax, (sint32*)&gc.ebx, (sint32*)&gc.ecx, (sint32*)&gc.edx, (sint32*)&gc.esi, (sint32*)&gc.edi, (sint32*)&gc.ebp); if (cost != MONEY32_UNDEFINED) { NetworkPlayer* player = GetPlayerByID(gc.playerid); if (player) { @@ -1285,10 +1285,10 @@ void Network::RemoveClient(std::unique_ptr& connection) NetworkPlayer* Network::AddPlayer(const utf8 *name, const std::string &keyhash) { NetworkPlayer* addedplayer = nullptr; - int newid = -1; + sint32 newid = -1; if (GetMode() == NETWORK_MODE_SERVER) { // Find first unused player id - for (int id = 0; id < 255; id++) { + for (sint32 id = 0; id < 255; id++) { if (std::find_if(player_list.begin(), player_list.end(), [&id](std::unique_ptr const& player) { return player->Id == id; }) == player_list.end()) { @@ -1338,7 +1338,7 @@ std::string Network::MakePlayerNameUnique(const std::string &name) // Note: Player names are case-insensitive std::string new_name = name.substr(0, 31); - int counter = 1; + sint32 counter = 1; bool unique; do { unique = true; @@ -1470,7 +1470,7 @@ void Network::Server_Handle_TOKEN(NetworkConnection& connection, NetworkPacket& { uint8 token_size = 10 + (rand() & 0x7f); connection.Challenge.resize(token_size); - for (int i = 0; i < token_size; i++) { + for (sint32 i = 0; i < token_size; i++) { connection.Challenge[i] = (uint8)(rand() & 0xff); } Server_Send_TOKEN(connection); @@ -1545,7 +1545,7 @@ void Network::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacket& p connection.AuthStatus = NETWORK_AUTH_VERIFICATIONFAILURE; } else { const char *signature = (const char *)packet.Read(sigsize); - SDL_RWops *pubkey_rw = SDL_RWFromConstMem(pubkey, (int)strlen(pubkey)); + SDL_RWops *pubkey_rw = SDL_RWFromConstMem(pubkey, (sint32)strlen(pubkey)); if (signature == nullptr || pubkey_rw == nullptr) { connection.AuthStatus = NETWORK_AUTH_VERIFICATIONFAILURE; log_verbose("Signature verification failed, invalid data!"); @@ -1607,7 +1607,7 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa { uint32 size, offset; packet >> size >> offset; - int chunksize = (int)(packet.Size - packet.BytesRead); + sint32 chunksize = (sint32)(packet.Size - packet.BytesRead); if (chunksize <= 0) { return; } @@ -1615,7 +1615,7 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa chunk_buffer.resize(size); } char str_downloading_map[256]; - unsigned int downloading_map_args[2] = {(offset + chunksize) / 1024, size / 1024}; + uint32 downloading_map_args[2] = {(offset + chunksize) / 1024, size / 1024}; format_string(str_downloading_map, 256, STR_MULTIPLAYER_DOWNLOADING_MAP, downloading_map_args); window_network_status_open(str_downloading_map, []() -> void { gNetwork.Close(); @@ -1624,7 +1624,7 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa if (offset + chunksize == size) { window_network_status_close(); bool has_to_free = false; - unsigned char *data = &chunk_buffer[0]; + uint8 *data = &chunk_buffer[0]; size_t data_size = size; // zlib-compressed if (strcmp("open2_sv6_zlib", (char *)&chunk_buffer[0]) == 0) @@ -1642,7 +1642,7 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa } else { log_verbose("Assuming received map is in plain sv6 format"); } - SDL_RWops* rw = SDL_RWFromMem(data, (int)data_size); + SDL_RWops* rw = SDL_RWFromMem(data, (sint32)data_size); if (game_load_network(rw)) { game_load_init(); game_command_queue.clear(); @@ -1719,9 +1719,9 @@ void Network::Server_Handle_GAMECMD(NetworkConnection& connection, NetworkPacket packet >> tick >> args[0] >> args[1] >> args[2] >> args[3] >> args[4] >> args[5] >> args[6] >> callback; - int commandCommand = args[4]; + sint32 commandCommand = args[4]; - int ticks = SDL_GetTicks(); //tick count is different by time last_action_time is set, keep same value. + sint32 ticks = SDL_GetTicks(); //tick count is different by time last_action_time is set, keep same value. // Check if player's group permission allows command to run NetworkGroup* group = GetGroupByID(connection.Player->Group); @@ -1789,7 +1789,7 @@ void Network::Client_Handle_PLAYERLIST(NetworkConnection& connection, NetworkPac uint8 size; packet >> size; std::vector ids; - for (unsigned int i = 0; i < size; i++) { + for (uint32 i = 0; i < size; i++) { NetworkPlayer tempplayer; tempplayer.Read(packet); ids.push_back(tempplayer.Id); @@ -1821,7 +1821,7 @@ void Network::Client_Handle_PING(NetworkConnection& connection, NetworkPacket& p void Network::Server_Handle_PING(NetworkConnection& connection, NetworkPacket& packet) { - int ping = SDL_GetTicks() - connection.PingTime; + sint32 ping = SDL_GetTicks() - connection.PingTime; if (ping < 0) { ping = 0; } @@ -1835,7 +1835,7 @@ void Network::Client_Handle_PINGLIST(NetworkConnection& connection, NetworkPacke { uint8 size; packet >> size; - for (unsigned int i = 0; i < size; i++) { + for (uint32 i = 0; i < size; i++) { uint8 id; uint16 ping; packet >> id >> ping; @@ -1874,7 +1874,7 @@ void Network::Client_Handle_GROUPLIST(NetworkConnection& connection, NetworkPack group_list.clear(); uint8 size; packet >> size >> default_group; - for (unsigned int i = 0; i < size; i++) { + for (uint32 i = 0; i < size; i++) { NetworkGroup group; group.Read(packet); std::unique_ptr newgroup(new NetworkGroup(group)); // change to make_unique in c++14 @@ -1960,7 +1960,7 @@ namespace Convert } } -int network_init() +sint32 network_init() { return gNetwork.Init(); } @@ -1975,12 +1975,12 @@ void network_shutdown_client() gNetwork.ShutdownClient(); } -int network_begin_client(const char *host, int port) +sint32 network_begin_client(const char *host, sint32 port) { return gNetwork.BeginClient(host, port); } -int network_begin_server(int port) +sint32 network_begin_server(sint32 port) { return gNetwork.BeginServer(port); } @@ -1990,17 +1990,17 @@ void network_update() gNetwork.Update(); } -int network_get_mode() +sint32 network_get_mode() { return gNetwork.GetMode(); } -int network_get_status() +sint32 network_get_status() { return gNetwork.GetStatus(); } -int network_get_authstatus() +sint32 network_get_authstatus() { return gNetwork.GetAuthStatus(); } @@ -2015,42 +2015,42 @@ uint8 network_get_current_player_id() return gNetwork.GetPlayerID(); } -int network_get_num_players() +sint32 network_get_num_players() { - return (int)gNetwork.player_list.size(); + return (sint32)gNetwork.player_list.size(); } -const char* network_get_player_name(unsigned int index) +const char* network_get_player_name(uint32 index) { return (const char*)gNetwork.player_list[index]->Name.c_str(); } -uint32 network_get_player_flags(unsigned int index) +uint32 network_get_player_flags(uint32 index) { return gNetwork.player_list[index]->Flags; } -int network_get_player_ping(unsigned int index) +sint32 network_get_player_ping(uint32 index) { return gNetwork.player_list[index]->Ping; } -int network_get_player_id(unsigned int index) +sint32 network_get_player_id(uint32 index) { return gNetwork.player_list[index]->Id; } -money32 network_get_player_money_spent(unsigned int index) +money32 network_get_player_money_spent(uint32 index) { return gNetwork.player_list[index]->MoneySpent; } -void network_add_player_money_spent(unsigned int index, money32 cost) +void network_add_player_money_spent(uint32 index, money32 cost) { gNetwork.player_list[index]->AddMoneySpent(cost); } -int network_get_player_last_action(unsigned int index, int time) +sint32 network_get_player_last_action(uint32 index, sint32 time) { if (time && SDL_TICKS_PASSED(SDL_GetTicks(), gNetwork.player_list[index]->LastActionTime + time)) { return -999; @@ -2058,68 +2058,68 @@ int network_get_player_last_action(unsigned int index, int time) return gNetwork.player_list[index]->LastAction; } -void network_set_player_last_action(unsigned int index, int command) +void network_set_player_last_action(uint32 index, sint32 command) { gNetwork.player_list[index]->LastAction = NetworkActions::FindCommand(command); gNetwork.player_list[index]->LastActionTime = SDL_GetTicks(); } -rct_xyz16 network_get_player_last_action_coord(unsigned int index) +rct_xyz16 network_get_player_last_action_coord(uint32 index) { return gNetwork.player_list[index]->LastActionCoord; } -void network_set_player_last_action_coord(unsigned int index, rct_xyz16 coord) +void network_set_player_last_action_coord(uint32 index, rct_xyz16 coord) { if (index < gNetwork.player_list.size()) { gNetwork.player_list[index]->LastActionCoord = coord; } } -unsigned int network_get_player_commands_ran(unsigned int index) +uint32 network_get_player_commands_ran(uint32 index) { return gNetwork.player_list[index]->CommandsRan; } -int network_get_player_index(uint8 id) +sint32 network_get_player_index(uint8 id) { auto it = gNetwork.GetPlayerIteratorByID(id); if(it == gNetwork.player_list.end()){ return -1; } - return (int)(gNetwork.GetPlayerIteratorByID(id) - gNetwork.player_list.begin()); + return (sint32)(gNetwork.GetPlayerIteratorByID(id) - gNetwork.player_list.begin()); } -uint8 network_get_player_group(unsigned int index) +uint8 network_get_player_group(uint32 index) { return gNetwork.player_list[index]->Group; } -void network_set_player_group(unsigned int index, unsigned int groupindex) +void network_set_player_group(uint32 index, uint32 groupindex) { gNetwork.player_list[index]->Group = gNetwork.group_list[groupindex]->Id; } -int network_get_group_index(uint8 id) +sint32 network_get_group_index(uint8 id) { auto it = gNetwork.GetGroupIteratorByID(id); if(it == gNetwork.group_list.end()){ return -1; } - return (int)(gNetwork.GetGroupIteratorByID(id) - gNetwork.group_list.begin()); + return (sint32)(gNetwork.GetGroupIteratorByID(id) - gNetwork.group_list.begin()); } -uint8 network_get_group_id(unsigned int index) +uint8 network_get_group_id(uint32 index) { return gNetwork.group_list[index]->Id; } -int network_get_num_groups() +sint32 network_get_num_groups() { - return (int)gNetwork.group_list.size(); + return (sint32)gNetwork.group_list.size(); } -const char* network_get_group_name(unsigned int index) +const char* network_get_group_name(uint32 index) { return gNetwork.group_list[index]->GetName().c_str(); } @@ -2154,7 +2154,7 @@ void network_chat_show_server_greeting() } } -void game_command_set_player_group(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_player_group(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { uint8 playerid = (uint8)*ecx; uint8 groupid = (uint8)*edx; @@ -2201,7 +2201,7 @@ void game_command_set_player_group(int* eax, int* ebx, int* ecx, int* edx, int* *ebx = 0; } -void game_command_modify_groups(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_modify_groups(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint8 action = (uint8)*eax; uint8 groupid = (uint8)(*eax >> 8); @@ -2243,7 +2243,7 @@ void game_command_modify_groups(int *eax, int *ebx, int *ecx, int *edx, int *esi } }break; case 2:{ // set permissions - int index = *ecx; + sint32 index = *ecx; bool all = *edx & 1; bool allvalue = (*edx >> 1) & 1; if (groupid == 0) { // cant change admin group permissions @@ -2332,7 +2332,7 @@ void game_command_modify_groups(int *eax, int *ebx, int *ecx, int *edx, int *esi *ebx = 0; } -void game_command_kick_player(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_kick_player(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint8 playerid = (uint8)*eax; NetworkPlayer* player = gNetwork.GetPlayerByID(playerid); @@ -2360,12 +2360,12 @@ uint8 network_get_default_group() return gNetwork.GetDefaultGroup(); } -int network_get_num_actions() +sint32 network_get_num_actions() { - return (int)NetworkActions::Actions.size(); + return (sint32)NetworkActions::Actions.size(); } -rct_string_id network_get_action_name_string_id(unsigned int index) +rct_string_id network_get_action_name_string_id(uint32 index) { if (index < NetworkActions::Actions.size()) { @@ -2375,12 +2375,12 @@ rct_string_id network_get_action_name_string_id(unsigned int index) } } -int network_can_perform_action(unsigned int groupindex, unsigned int index) +sint32 network_can_perform_action(uint32 groupindex, uint32 index) { return gNetwork.group_list[groupindex]->CanPerformAction(index); } -int network_can_perform_command(unsigned int groupindex, unsigned int index) +sint32 network_can_perform_command(uint32 groupindex, uint32 index) { return gNetwork.group_list[groupindex]->CanPerformCommand(index); } @@ -2395,17 +2395,17 @@ rct_peep* network_get_pickup_peep(uint8 playerid) return gNetwork.GetMode() == NETWORK_MODE_NONE ? _pickup_peep : gNetwork.GetPlayerByID(playerid)->PickupPeep; } -void network_set_pickup_peep_old_x(uint8 playerid, int x) +void network_set_pickup_peep_old_x(uint8 playerid, sint32 x) { gNetwork.GetMode() == NETWORK_MODE_NONE ? _pickup_peep_old_x = x : gNetwork.GetPlayerByID(playerid)->PickupPeepOldX = x; } -int network_get_pickup_peep_old_x(uint8 playerid) +sint32 network_get_pickup_peep_old_x(uint8 playerid) { return gNetwork.GetMode() == NETWORK_MODE_NONE ? _pickup_peep_old_x : gNetwork.GetPlayerByID(playerid)->PickupPeepOldX; } -int network_get_current_player_group_index() +sint32 network_get_current_player_group_index() { return network_get_group_index(gNetwork.GetPlayerByID(gNetwork.GetPlayerID())->Group); } @@ -2500,53 +2500,53 @@ const utf8 * network_get_server_provider_email() { return gNetwork.ServerProvide const utf8 * network_get_server_provider_website() { return gNetwork.ServerProviderWebsite.c_str(); } #else -int network_get_mode() { return NETWORK_MODE_NONE; } -int network_get_status() { return NETWORK_STATUS_NONE; } -int network_get_authstatus() { return NETWORK_AUTH_NONE; } +sint32 network_get_mode() { return NETWORK_MODE_NONE; } +sint32 network_get_status() { return NETWORK_STATUS_NONE; } +sint32 network_get_authstatus() { return NETWORK_AUTH_NONE; } uint32 network_get_server_tick() { return gCurrentTicks; } void network_send_gamecmd(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32 esi, uint32 edi, uint32 ebp, uint8 callback) {} void network_send_map() {} void network_update() {} -int network_begin_client(const char *host, int port) { return 1; } -int network_begin_server(int port) { return 1; } -int network_get_num_players() { return 1; } -const char* network_get_player_name(unsigned int index) { return "local (OpenRCT2 compiled without MP)"; } -uint32 network_get_player_flags(unsigned int index) { return 0; } -int network_get_player_ping(unsigned int index) { return 0; } -int network_get_player_id(unsigned int index) { return 0; } -money32 network_get_player_money_spent(unsigned int index) { return MONEY(0, 0); } -void network_add_player_money_spent(unsigned int index, money32 cost) { } -int network_get_player_last_action(unsigned int index, int time) { return -999; } -void network_set_player_last_action(unsigned int index, int command) { } -rct_xyz16 network_get_player_last_action_coord(unsigned int index) { return {0, 0, 0}; } -void network_set_player_last_action_coord(unsigned int index, rct_xyz16 coord) { } -unsigned int network_get_player_commands_ran(unsigned int index) { return 0; } -int network_get_player_index(uint8 id) { return -1; } -uint8 network_get_player_group(unsigned int index) { return 0; } -void network_set_player_group(unsigned int index, unsigned int groupindex) { } -int network_get_group_index(uint8 id) { return -1; } -uint8 network_get_group_id(unsigned int index) { return 0; } -int network_get_num_groups() { return 0; } -const char* network_get_group_name(unsigned int index) { return ""; }; -void game_command_set_player_group(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { } -void game_command_modify_groups(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { } -void game_command_kick_player(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { } +sint32 network_begin_client(const char *host, sint32 port) { return 1; } +sint32 network_begin_server(sint32 port) { return 1; } +sint32 network_get_num_players() { return 1; } +const char* network_get_player_name(uint32 index) { return "local (OpenRCT2 compiled without MP)"; } +uint32 network_get_player_flags(uint32 index) { return 0; } +sint32 network_get_player_ping(uint32 index) { return 0; } +sint32 network_get_player_id(uint32 index) { return 0; } +money32 network_get_player_money_spent(uint32 index) { return MONEY(0, 0); } +void network_add_player_money_spent(uint32 index, money32 cost) { } +sint32 network_get_player_last_action(uint32 index, sint32 time) { return -999; } +void network_set_player_last_action(uint32 index, sint32 command) { } +rct_xyz16 network_get_player_last_action_coord(uint32 index) { return {0, 0, 0}; } +void network_set_player_last_action_coord(uint32 index, rct_xyz16 coord) { } +uint32 network_get_player_commands_ran(uint32 index) { return 0; } +sint32 network_get_player_index(uint8 id) { return -1; } +uint8 network_get_player_group(uint32 index) { return 0; } +void network_set_player_group(uint32 index, uint32 groupindex) { } +sint32 network_get_group_index(uint8 id) { return -1; } +uint8 network_get_group_id(uint32 index) { return 0; } +sint32 network_get_num_groups() { return 0; } +const char* network_get_group_name(uint32 index) { return ""; }; +void game_command_set_player_group(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { } +void game_command_modify_groups(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { } +void game_command_kick_player(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { } uint8 network_get_default_group() { return 0; } -int network_get_num_actions() { return 0; } -rct_string_id network_get_action_name_string_id(unsigned int index) { return -1; } -int network_can_perform_action(unsigned int groupindex, unsigned int index) { return 0; } -int network_can_perform_command(unsigned int groupindex, unsigned int index) { return 0; } +sint32 network_get_num_actions() { return 0; } +rct_string_id network_get_action_name_string_id(uint32 index) { return -1; } +sint32 network_can_perform_action(uint32 groupindex, uint32 index) { return 0; } +sint32 network_can_perform_command(uint32 groupindex, uint32 index) { return 0; } void network_set_pickup_peep(uint8 playerid, rct_peep* peep) { _pickup_peep = peep; } rct_peep* network_get_pickup_peep(uint8 playerid) { return _pickup_peep; } -void network_set_pickup_peep_old_x(uint8 playerid, int x) { _pickup_peep_old_x = x; } -int network_get_pickup_peep_old_x(uint8 playerid) { return _pickup_peep_old_x; } +void network_set_pickup_peep_old_x(uint8 playerid, sint32 x) { _pickup_peep_old_x = x; } +sint32 network_get_pickup_peep_old_x(uint8 playerid) { return _pickup_peep_old_x; } void network_send_chat(const char* text) {} void network_send_password(const char* password) {} void network_close() {} void network_shutdown_client() {} void network_set_password(const char* password) {} uint8 network_get_current_player_id() { return 0; } -int network_get_current_player_group_index() { return 0; } +sint32 network_get_current_player_group_index() { return 0; } void network_append_chat_log(const utf8 *text) { } const utf8 * network_get_server_name() { return nullptr; } const utf8 * network_get_server_description() { return nullptr; } diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index cfa778b072..3cf2da128b 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -93,11 +93,11 @@ public: ~Network(); bool Init(); void Close(); - bool BeginClient(const char* host, unsigned short port); - bool BeginServer(unsigned short port, const char* address = NULL); - int GetMode(); - int GetStatus(); - int GetAuthStatus(); + bool BeginClient(const char* host, uint16 port); + bool BeginServer(uint16 port, const char* address = NULL); + sint32 GetMode(); + sint32 GetStatus(); + sint32 GetAuthStatus(); uint32 GetServerTick(); uint8 GetPlayerID(); void Update(); @@ -108,7 +108,7 @@ public: static const char* FormatChat(NetworkPlayer* fromplayer, const char* text); void SendPacketToClients(NetworkPacket& packet, bool front = false); bool CheckSRAND(uint32 tick, uint32 srand0); - void KickPlayer(int playerId); + void KickPlayer(sint32 playerId); void SetPassword(const char* password); void ShutdownClient(); NetworkGroup* AddGroup(); @@ -189,11 +189,11 @@ private: } }; - int mode = NETWORK_MODE_NONE; - int status = NETWORK_STATUS_NONE; + sint32 mode = NETWORK_MODE_NONE; + sint32 status = NETWORK_STATUS_NONE; bool wsa_initialized = false; ITcpSocket * listening_socket = nullptr; - unsigned short listening_port = 0; + uint16 listening_port = 0; NetworkConnection server_connection; SOCKET_STATUS _lastConnectStatus; uint32 last_tick_sent_time = 0; @@ -244,7 +244,7 @@ private: void Client_Handle_OBJECTS(NetworkConnection& connection, NetworkPacket& packet); void Server_Handle_OBJECTS(NetworkConnection& connection, NetworkPacket& packet); - unsigned char * save_for_network(SDL_RWops *buffer, size_t &out_size, const std::vector &objects) const; + uint8 * save_for_network(SDL_RWops *buffer, size_t &out_size, const std::vector &objects) const; }; namespace Convert @@ -261,50 +261,50 @@ namespace Convert #ifdef __cplusplus extern "C" { #endif // __cplusplus -int network_init(); +sint32 network_init(); void network_close(); void network_shutdown_client(); -int network_begin_client(const char *host, int port); -int network_begin_server(int port); +sint32 network_begin_client(const char *host, sint32 port); +sint32 network_begin_server(sint32 port); -int network_get_mode(); -int network_get_status(); +sint32 network_get_mode(); +sint32 network_get_status(); void network_update(); -int network_get_authstatus(); +sint32 network_get_authstatus(); uint32 network_get_server_tick(); uint8 network_get_current_player_id(); -int network_get_num_players(); -const char* network_get_player_name(unsigned int index); -uint32 network_get_player_flags(unsigned int index); -int network_get_player_ping(unsigned int index); -int network_get_player_id(unsigned int index); -money32 network_get_player_money_spent(unsigned int index); -void network_add_player_money_spent(unsigned int index, money32 cost); -int network_get_player_last_action(unsigned int index, int time); -void network_set_player_last_action(unsigned int index, int command); -rct_xyz16 network_get_player_last_action_coord(unsigned int index); -void network_set_player_last_action_coord(unsigned int index, rct_xyz16 coord); -unsigned int network_get_player_commands_ran(unsigned int index); -int network_get_player_index(uint8 id); -uint8 network_get_player_group(unsigned int index); -void network_set_player_group(unsigned int index, unsigned int groupindex); -int network_get_group_index(uint8 id); -int network_get_current_player_group_index(); -uint8 network_get_group_id(unsigned int index); -int network_get_num_groups(); -const char* network_get_group_name(unsigned int index); -void game_command_set_player_group(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_modify_groups(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_kick_player(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +sint32 network_get_num_players(); +const char* network_get_player_name(uint32 index); +uint32 network_get_player_flags(uint32 index); +sint32 network_get_player_ping(uint32 index); +sint32 network_get_player_id(uint32 index); +money32 network_get_player_money_spent(uint32 index); +void network_add_player_money_spent(uint32 index, money32 cost); +sint32 network_get_player_last_action(uint32 index, sint32 time); +void network_set_player_last_action(uint32 index, sint32 command); +rct_xyz16 network_get_player_last_action_coord(uint32 index); +void network_set_player_last_action_coord(uint32 index, rct_xyz16 coord); +uint32 network_get_player_commands_ran(uint32 index); +sint32 network_get_player_index(uint8 id); +uint8 network_get_player_group(uint32 index); +void network_set_player_group(uint32 index, uint32 groupindex); +sint32 network_get_group_index(uint8 id); +sint32 network_get_current_player_group_index(); +uint8 network_get_group_id(uint32 index); +sint32 network_get_num_groups(); +const char* network_get_group_name(uint32 index); +void game_command_set_player_group(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_modify_groups(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_kick_player(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); uint8 network_get_default_group(); -int network_get_num_actions(); -rct_string_id network_get_action_name_string_id(unsigned int index); -int network_can_perform_action(unsigned int groupindex, unsigned int index); -int network_can_perform_command(unsigned int groupindex, unsigned int index); +sint32 network_get_num_actions(); +rct_string_id network_get_action_name_string_id(uint32 index); +sint32 network_can_perform_action(uint32 groupindex, uint32 index); +sint32 network_can_perform_command(uint32 groupindex, uint32 index); void network_set_pickup_peep(uint8 playerid, rct_peep* peep); rct_peep* network_get_pickup_peep(uint8 playerid); -void network_set_pickup_peep_old_x(uint8 playerid, int x); -int network_get_pickup_peep_old_x(uint8 playerid); +void network_set_pickup_peep_old_x(uint8 playerid, sint32 x); +sint32 network_get_pickup_peep_old_x(uint8 playerid); void network_send_map(); void network_send_chat(const char* text); diff --git a/src/openrct2/network/twitch.cpp b/src/openrct2/network/twitch.cpp index 3e3cc657fc..869b8968df 100644 --- a/src/openrct2/network/twitch.cpp +++ b/src/openrct2/network/twitch.cpp @@ -106,10 +106,10 @@ namespace Twitch constexpr uint32 PulseTime = 10 * 1000; constexpr const char * TwitchExtendedBaseUrl = "http://openrct.ursalabs.co/api/1/"; - static int _twitchState = TWITCH_STATE_LEFT; + static sint32 _twitchState = TWITCH_STATE_LEFT; static bool _twitchIdle = true; static uint32 _twitchLastPulseTick = 0; - static int _twitchLastPulseOperation = 1; + static sint32 _twitchLastPulseOperation = 1; static http_response_t * _twitchJsonResponse; static void Join(); @@ -554,7 +554,7 @@ namespace Twitch char * ch = buffer + 1; while (ch[0] != '\0') { - if ((unsigned char)ch[0] < 32 || (unsigned char)ch[0] > 122) + if ((uint8)ch[0] < 32 || (uint8)ch[0] > 122) { ch[0] = ' '; } diff --git a/src/openrct2/object.h b/src/openrct2/object.h index 28a886162a..b03361d828 100644 --- a/src/openrct2/object.h +++ b/src/openrct2/object.h @@ -79,8 +79,8 @@ typedef struct rct_object_entry_extended { } rct_object_entry_extended; assert_struct_size(rct_object_entry_extended, 0x14); -extern int object_entry_group_counts[]; -extern int object_entry_group_encoding[]; +extern sint32 object_entry_group_counts[]; +extern sint32 object_entry_group_encoding[]; typedef struct rct_object_entry_group { void **chunks; @@ -109,13 +109,13 @@ extern const rct_object_entry_group object_entry_groups[]; void object_list_load(); bool object_read_and_load_entries(SDL_RWops* rw); bool object_load_entries(rct_object_entry* entries); -int object_load_packed(SDL_RWops* rw); +sint32 object_load_packed(SDL_RWops* rw); bool object_saved_packed(SDL_RWops* rw, const rct_object_entry * entry); bool object_entry_is_empty(const rct_object_entry *entry); bool object_entry_compare(const rct_object_entry *a, const rct_object_entry *b); -int object_calculate_checksum(const rct_object_entry * entry, const void * data, size_t dataLength); -int find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index); +sint32 object_calculate_checksum(const rct_object_entry * entry, const void * data, size_t dataLength); +sint32 find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index); void object_create_identifier_name(char* string_buffer, size_t size, const rct_object_entry* object); rct_object_entry *object_list_find_by_name(const char *name); diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index c5f5706efc..c63e159fb6 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -186,7 +186,7 @@ public: { if (_loadedObjects != nullptr) { - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { UnloadObject(_loadedObjects[i]); } @@ -304,7 +304,7 @@ private: // Build a hash set for quick checking auto exceptSet = std::unordered_set(); - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { Object * object = newLoadedObjects[i]; if (object != nullptr) @@ -316,7 +316,7 @@ private: // Unload objects that are not in the hash set size_t totalObjectsLoaded = 0; size_t numObjectsUnloaded = 0; - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { Object * object = _loadedObjects[i]; if (object != nullptr) @@ -335,7 +335,7 @@ private: void UpdateLegacyLoadedObjectList() { - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { Object * loadedObject = nullptr; if (_loadedObjects != nullptr) @@ -427,7 +427,7 @@ private: { bool missingObjects = false; size_t numRequiredObjects = 0; - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { const rct_object_entry * entry = &entries[i]; const ObjectRepositoryItem * ori = nullptr; @@ -455,7 +455,7 @@ private: { size_t newObjectsLoaded = 0; Object * * loadedObjects = Memory::AllocateArray(OBJECT_ENTRY_COUNT); - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { Object * loadedObject = nullptr; const ObjectRepositoryItem * ori = requiredObjects[i]; @@ -518,7 +518,7 @@ private: static sint32 GetIndexFromTypeEntry(uint8 objectType, uint8 entryIndex) { - int result = 0; + sint32 result = 0; for (uint8 i = 0; i < objectType; i++) { result += object_entry_group_counts[i]; diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index bdc8a90a9e..90d3d20201 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -72,7 +72,7 @@ struct ObjectEntryHash size_t operator()(const rct_object_entry &entry) const { uint32 hash = 5381; - for (int i = 0; i < 8; i++) + for (sint32 i = 0; i < 8; i++) { hash = ((hash << 5) + hash) + entry.name[i]; } @@ -99,7 +99,7 @@ class ObjectRepository final : public IObjectRepository QueryDirectoryResult _queryDirectoryResult = { 0 }; ObjectEntryMap _itemMap; uint16 _languageId = 0; - int _numConflicts; + sint32 _numConflicts; public: ObjectRepository(IPlatformEnvironment * env) @@ -422,11 +422,11 @@ private: switch (item.ObjectEntry.flags & 0x0F) { case OBJECT_TYPE_RIDE: item.RideFlags = stream->ReadValue(); - for (int i = 0; i < 2; i++) + for (sint32 i = 0; i < 2; i++) { item.RideCategory[i] = stream->ReadValue(); } - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) { item.RideType[i] = stream->ReadValue(); } @@ -452,11 +452,11 @@ private: switch (item.ObjectEntry.flags & 0x0F) { case OBJECT_TYPE_RIDE: stream->WriteValue(item.RideFlags); - for (int i = 0; i < 2; i++) + for (sint32 i = 0; i < 2; i++) { stream->WriteValue(item.RideCategory[i]); } - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) { stream->WriteValue(item.RideType[i]); } @@ -565,7 +565,7 @@ private: } } - static void * CalculateExtraBytesToFixChecksum(int currentChecksum, int targetChecksum, size_t * outSize) + static void * CalculateExtraBytesToFixChecksum(sint32 currentChecksum, sint32 targetChecksum, size_t * outSize) { // Allocate 11 extra bytes to manipulate the checksum uint8 * salt = Memory::Allocate(11); @@ -573,7 +573,7 @@ private: // Next work out which bits need to be flipped to make the current checksum match the one in the file // The bitwise rotation compensates for the rotation performed during the checksum calculation*/ - int bitsToFlip = targetChecksum ^ ((currentChecksum << 25) | (currentChecksum >> 7)); + sint32 bitsToFlip = targetChecksum ^ ((currentChecksum << 25) | (currentChecksum >> 7)); // Each set bit encountered during encoding flips one bit of the resulting checksum (so each bit of the checksum is an // XOR of bits from the file). Here, we take each bit that should be flipped in the checksum and set one of the bits in @@ -597,7 +597,7 @@ private: void GetPathForNewObject(utf8 * buffer, size_t bufferSize, const char * name) { char normalisedName[9] = { 0 }; - for (int i = 0; i < 8; i++) + for (sint32 i = 0; i < 8; i++) { if (name[i] != ' ') { @@ -736,7 +736,7 @@ extern "C" } } - int object_load_packed(SDL_RWops * rw) + sint32 object_load_packed(SDL_RWops * rw) { IObjectRepository * objRepo = GetObjectRepository(); @@ -894,7 +894,7 @@ extern "C" { return 0; } - int match = memcmp(a->name, b->name, 8); + sint32 match = memcmp(a->name, b->name, 8); if (match) { return 0; @@ -906,7 +906,7 @@ extern "C" { return 0; } - int match = memcmp(a->name, b->name, 8); + sint32 match = memcmp(a->name, b->name, 8); if (match) { return 0; @@ -919,14 +919,14 @@ extern "C" return 1; } - int object_calculate_checksum(const rct_object_entry * entry, const void * data, size_t dataLength) + sint32 object_calculate_checksum(const rct_object_entry * entry, const void * data, size_t dataLength) { const uint8 * entryBytePtr = (uint8 *)entry; uint32 checksum = 0xF369A75B; checksum ^= entryBytePtr[0]; checksum = rol32(checksum, 11); - for (int i = 4; i < 12; i++) + for (sint32 i = 4; i < 12; i++) { checksum ^= entryBytePtr[i]; checksum = rol32(checksum, 11); @@ -948,6 +948,6 @@ extern "C" checksum = rol32(checksum, 11); } - return (int)checksum; + return (sint32)checksum; } } diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 94f0383481..b1034c008c 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -32,7 +32,7 @@ extern "C" RideObject::~RideObject() { - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) { Memory::Free(_peepLoadingPositions[i]); } @@ -42,7 +42,7 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(8, STREAM_SEEK_CURRENT); _legacyType.flags = stream->ReadValue(); - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) { _legacyType.ride_type[i] = stream->ReadValue(); } @@ -57,7 +57,7 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) _legacyType.rear_vehicle = stream->ReadValue(); _legacyType.third_vehicle = stream->ReadValue(); _legacyType.pad_019 = stream->ReadValue(); - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) { rct_ride_entry_vehicle * entry = &_legacyType.vehicles[i]; ReadLegacyVehicle(context, stream, entry); @@ -84,7 +84,7 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) else { // When not in select by track type mode, add boosters if the track type is eligible - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) { if (_legacyType.ride_type[i] == RIDE_TYPE_LOOPING_ROLLER_COASTER || _legacyType.ride_type[i] == RIDE_TYPE_CORKSCREW_ROLLER_COASTER || @@ -104,7 +104,7 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) // Read preset colours, by default there are 32 _presetColours.count = stream->ReadValue(); - int coloursCount = _presetColours.count; + sint32 coloursCount = _presetColours.count; // To indicate a ride has different colours each train the count // is set to 255. There are only actually 32 colours though. if (coloursCount == 255) @@ -118,7 +118,7 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) } // Read peep loading positions - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) { uint16 numPeepLoadingPositions = stream->ReadValue(); if (numPeepLoadingPositions == 255) @@ -155,13 +155,13 @@ void RideObject::Load() _legacyType.images_offset = gfx_object_allocate_images(GetImageTable()->GetImages(), GetImageTable()->GetCount()); _legacyType.vehicle_preset_list = &_presetColours; - int cur_vehicle_images_offset = _legacyType.images_offset + 3; - for (int i = 0; i < 4; i++) + sint32 cur_vehicle_images_offset = _legacyType.images_offset + 3; + for (sint32 i = 0; i < 4; i++) { rct_ride_entry_vehicle * vehicleEntry = &_legacyType.vehicles[i]; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT) { - int al = 1; + sint32 al = 1; if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_SWINGING) { al = 13; @@ -208,11 +208,11 @@ void RideObject::Load() vehicleEntry->var_16 = vehicleEntry->var_02 * vehicleEntry->var_03; vehicleEntry->base_image_id = cur_vehicle_images_offset; - int image_index = vehicleEntry->base_image_id; + sint32 image_index = vehicleEntry->base_image_id; if (vehicleEntry->car_visual != VEHICLE_VISUAL_RIVER_RAPIDS) { - int b = vehicleEntry->var_16 * 32; + sint32 b = vehicleEntry->var_16 * 32; if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_11) b /= 2; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15) b /= 8; @@ -345,7 +345,7 @@ void RideObject::Load() if (!(vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_10)) { - int num_images = cur_vehicle_images_offset - vehicleEntry->base_image_id; + sint32 num_images = cur_vehicle_images_offset - vehicleEntry->base_image_id; if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_13) { num_images *= 2; @@ -395,11 +395,11 @@ const utf8 * RideObject::GetCapacity() const void RideObject::SetRepositoryItem(ObjectRepositoryItem * item) const { - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) { item->RideType[i] = _legacyType.ride_type[i]; } - for (int i = 0; i < 2; i++) + for (sint32 i = 0; i < 2; i++) { item->RideCategory[i] = _legacyType.category[i]; } diff --git a/src/openrct2/object_list.c b/src/openrct2/object_list.c index b465464cd3..7b08f65b26 100644 --- a/src/openrct2/object_list.c +++ b/src/openrct2/object_list.c @@ -22,7 +22,7 @@ #include "util/util.h" // 98DA00 -int object_entry_group_counts[] = { +sint32 object_entry_group_counts[] = { 128, // rides 252, // small scenery 128, // large scenery @@ -37,7 +37,7 @@ int object_entry_group_counts[] = { }; // 98DA2C -int object_entry_group_encoding[] = { +sint32 object_entry_group_encoding[] = { CHUNK_ENCODING_RLE, CHUNK_ENCODING_RLE, CHUNK_ENCODING_RLE, @@ -147,7 +147,7 @@ bool object_read_and_load_entries(SDL_RWops* rw) * bl = entry_index * ecx = entry_type */ -int find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index){ +sint32 find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index){ *entry_type = entry->flags & 0xF; rct_object_entry_group entry_group = object_entry_groups[*entry_type]; diff --git a/src/openrct2/paint/map_element/banner.c b/src/openrct2/paint/map_element/banner.c index a721f1d131..73dcc271aa 100644 --- a/src/openrct2/paint/map_element/banner.c +++ b/src/openrct2/paint/map_element/banner.c @@ -35,7 +35,7 @@ const rct_xy16 BannerBoundBoxes[][2] = { * * rct2: 0x006B9CC4 */ -void banner_paint(uint8 direction, int height, rct_map_element* map_element) +void banner_paint(uint8 direction, sint32 height, rct_map_element* map_element) { uint16 boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ; rct_drawpixelinfo* dpi = unk_140E9A8; diff --git a/src/openrct2/paint/map_element/entrance.c b/src/openrct2/paint/map_element/entrance.c index 03db337fda..a8d30ee312 100644 --- a/src/openrct2/paint/map_element/entrance.c +++ b/src/openrct2/paint/map_element/entrance.c @@ -32,7 +32,7 @@ static uint32 _unk9E32BC; * * rct2: 0x0066508C, 0x00665540 */ -static void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_element) +static void ride_entrance_exit_paint(uint8 direction, sint32 height, rct_map_element* map_element) { uint8 is_exit = map_element->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT; @@ -185,7 +185,7 @@ static void ride_entrance_exit_paint(uint8 direction, int height, rct_map_elemen * * rct2: 0x006658ED */ -static void park_entrance_paint(uint8 direction, int height, rct_map_element* map_element){ +static void park_entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element){ if (gTrackDesignSaveMode) return; @@ -275,7 +275,7 @@ static void park_entrance_paint(uint8 direction, int height, rct_map_element* ma * * rct2: 0x00664FD4 */ -void entrance_paint(uint8 direction, int height, rct_map_element* map_element){ +void entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element){ gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_LABEL; rct_drawpixelinfo* dpi = unk_140E9A8; @@ -285,7 +285,7 @@ void entrance_paint(uint8 direction, int height, rct_map_element* map_element){ if (entrance_get_directions(map_element) & 0xF){ - int z = map_element->base_height * 8 + 3; + sint32 z = map_element->base_height * 8 + 3; uint32 image_id = 0x20101689 + get_height_marker_offset() + (z / 16); image_id -= gMapBaseZ; diff --git a/src/openrct2/paint/map_element/fence.c b/src/openrct2/paint/map_element/fence.c index 17ae19551d..cb414d3bcd 100644 --- a/src/openrct2/paint/map_element/fence.c +++ b/src/openrct2/paint/map_element/fence.c @@ -130,7 +130,7 @@ static void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryE * @param height (dx) * @param map_element (esi) */ -void fence_paint(uint8 direction, int height, rct_map_element * map_element) +void fence_paint(uint8 direction, sint32 height, rct_map_element * map_element) { gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_WALL; @@ -142,7 +142,7 @@ void fence_paint(uint8 direction, int height, rct_map_element * map_element) } - int primaryColour = map_element->properties.fence.item[1] & 0x1F; + sint32 primaryColour = map_element->properties.fence.item[1] & 0x1F; uint32 imageColourFlags = primaryColour << 19 | 0x20000000; uint32 dword_141F718 = imageColourFlags + 0x23800006; diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/map_element/map_element.c index e8c198ba06..12c9d5639d 100644 --- a/src/openrct2/paint/map_element/map_element.c +++ b/src/openrct2/paint/map_element/map_element.c @@ -45,16 +45,16 @@ uint8 gRightTunnelCount; uint8 gVerticalTunnelHeight; #endif -static void blank_tiles_paint(int x, int y); -static void sub_68B3FB(int x, int y); +static void blank_tiles_paint(sint32 x, sint32 y); +static void sub_68B3FB(sint32 x, sint32 y); -const int SEGMENTS_ALL = SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4; +const sint32 SEGMENTS_ALL = SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4; /** * * rct2: 0x0068B35F */ -void map_element_paint_setup(int x, int y) +void map_element_paint_setup(sint32 x, sint32 y) { if ( x < gMapSizeUnits && @@ -77,7 +77,7 @@ void map_element_paint_setup(int x, int y) * * rct2: 0x0068B2B7 */ -void sub_68B2B7(int x, int y) +void sub_68B2B7(sint32 x, sint32 y) { if ( x < gMapSizeUnits && @@ -100,11 +100,11 @@ void sub_68B2B7(int x, int y) * * rct2: 0x0068B60E */ -static void blank_tiles_paint(int x, int y) +static void blank_tiles_paint(sint32 x, sint32 y) { rct_drawpixelinfo *dpi = unk_140E9A8; - int dx = 0; + sint32 dx = 0; switch (get_current_rotation()) { case 0: dx = x + y; @@ -125,7 +125,7 @@ static void blank_tiles_paint(int x, int y) } dx /= 2; dx -= 16; - int bx = dx + 32; + sint32 bx = dx + 32; if (bx <= dpi->y) return; dx -= 20; dx -= dpi->height; @@ -142,7 +142,7 @@ bool gShowSupportSegmentHeights = false; * * rct2: 0x0068B3FB */ -static void sub_68B3FB(int x, int y) +static void sub_68B3FB(sint32 x, sint32 y) { rct_drawpixelinfo *dpi = unk_140E9A8; @@ -163,7 +163,7 @@ static void sub_68B3FB(int x, int y) rct_map_element* map_element = map_get_first_element_at(x >> 5, y >> 5); uint8 rotation = get_current_rotation(); - int dx = 0; + sint32 dx = 0; switch (rotation) { case 0: dx = x + y; @@ -196,7 +196,7 @@ static void sub_68B3FB(int x, int y) arrowRotation + (gMapSelectArrowDirection & 0xFC) + 0x20900C27; - int arrowZ = gMapSelectArrowPosition.z; + sint32 arrowZ = gMapSelectArrowPosition.z; gUnk9DE568 = x; gUnk9DE56C = y; @@ -204,7 +204,7 @@ static void sub_68B3FB(int x, int y) sub_98197C(imageId, 0, 0, 32, 32, 0xFF, arrowZ, 0, 0, arrowZ + 18, rotation); } - int bx = dx + 52; + sint32 bx = dx + 52; if (bx <= dpi->y) return; @@ -236,8 +236,8 @@ static void sub_68B3FB(int x, int y) gUnk9DE56C = y; gDidPassSurface = false; do { - int direction = (map_element->type + rotation) & MAP_ELEMENT_DIRECTION_MASK; - int height = map_element->base_height * 8; + sint32 direction = (map_element->type + rotation) & MAP_ELEMENT_DIRECTION_MASK; + sint32 height = map_element->base_height * 8; rct_xy16 dword_9DE574 = gPaintMapPosition; g_currently_drawn_item = map_element; @@ -289,24 +289,24 @@ static void sub_68B3FB(int x, int y) return; } - static const int segmentPositions[][3] = { + static const sint32 segmentPositions[][3] = { {0, 6, 2}, {5, 4, 8}, {1, 7, 3}, }; - for (int sy = 0; sy < 3; sy++) { - for (int sx = 0; sx < 3; sx++) { + for (sint32 sy = 0; sy < 3; sy++) { + for (sint32 sx = 0; sx < 3; sx++) { uint16 segmentHeight = gSupportSegments[segmentPositions[sy][sx]].height; - int imageColourFlats = 0b101111 << 19 | 0x40000000; + sint32 imageColourFlats = 0b101111 << 19 | 0x40000000; if (segmentHeight == 0xFFFF) { segmentHeight = gSupport.height; // white: 0b101101 imageColourFlats = 0b111011 << 19 | 0x40000000; } - int xOffset = sy * 10; - int yOffset = -22 + sx * 10; + sint32 xOffset = sy * 10; + sint32 yOffset = -22 + sx * 10; paint_struct * ps = sub_98197C(5504 | imageColourFlats, xOffset, yOffset, 10, 10, 1, segmentHeight, xOffset + 1, yOffset + 16, segmentHeight, get_current_rotation()); if (ps != NULL) { ps->flags &= PAINT_STRUCT_FLAG_IS_MASKED; @@ -363,9 +363,9 @@ const uint16 segment_offsets[9] = { SEGMENT_D4 }; -void paint_util_set_segment_support_height(int segments, uint16 height, uint8 slope) +void paint_util_set_segment_support_height(sint32 segments, uint16 height, uint8 slope) { - for (int s = 0; s < 9; s++) { + for (sint32 s = 0; s < 9; s++) { if (segments & segment_offsets[s]) { gSupportSegments[s].height = height; if (height != 0xFFFF) { diff --git a/src/openrct2/paint/map_element/map_element.h b/src/openrct2/paint/map_element/map_element.h index d1420ca8eb..fec0194d39 100644 --- a/src/openrct2/paint/map_element/map_element.h +++ b/src/openrct2/paint/map_element/map_element.h @@ -46,7 +46,7 @@ enum SEGMENT_C4 = (1 << 8), // 4 }; -extern const int SEGMENTS_ALL; +extern const sint32 SEGMENTS_ALL; extern const uint16 segment_offsets[9]; enum @@ -116,18 +116,18 @@ void paint_util_set_vertical_tunnel(uint16 height); void paint_util_set_general_support_height(sint16 height, uint8 slope); void paint_util_force_set_general_support_height(sint16 height, uint8 slope); -void paint_util_set_segment_support_height(int segments, uint16 height, uint8 slope); +void paint_util_set_segment_support_height(sint32 segments, uint16 height, uint8 slope); uint16 paint_util_rotate_segments(uint16 segments, uint8 rotation); -void map_element_paint_setup(int x, int y); +void map_element_paint_setup(sint32 x, sint32 y); -void entrance_paint(uint8 direction, int height, rct_map_element* map_element); -void banner_paint(uint8 direction, int height, rct_map_element* map_element); +void entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element); +void banner_paint(uint8 direction, sint32 height, rct_map_element* map_element); void surface_paint(uint8 direction, uint16 height, rct_map_element *mapElement); void path_paint(uint8 direction, uint16 height, rct_map_element *mapElement); -void scenery_paint(uint8 direction, int height, rct_map_element* mapElement); -void fence_paint(uint8 direction, int height, rct_map_element* mapElement); +void scenery_paint(uint8 direction, sint32 height, rct_map_element* mapElement); +void fence_paint(uint8 direction, sint32 height, rct_map_element* mapElement); void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *mapElement); -void track_paint(uint8 direction, int height, rct_map_element *mapElement); +void track_paint(uint8 direction, sint32 height, rct_map_element *mapElement); #endif diff --git a/src/openrct2/paint/map_element/path.c b/src/openrct2/paint/map_element/path.c index 9185405eeb..444a377e29 100644 --- a/src/openrct2/paint/map_element/path.c +++ b/src/openrct2/paint/map_element/path.c @@ -82,12 +82,12 @@ const uint8 byte_98D8A4[] = { 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0 }; -void loc_6A37C9(rct_map_element * mapElement, int height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); +void loc_6A37C9(rct_map_element * mapElement, sint32 height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); void loc_6A3B57(rct_map_element* mapElement, sint16 height, rct_footpath_entry* footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); /* rct2: 0x006A5AE5 */ -static void path_bit_lights_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, int height, uint8 edges, uint32 pathBitImageFlags) { +static void path_bit_lights_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { if (footpath_element_is_sloped(mapElement)) height += 8; @@ -138,7 +138,7 @@ static void path_bit_lights_paint(rct_scenery_entry* pathBitEntry, rct_map_eleme } /* rct2: 0x006A5C94 */ -static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, int height, uint8 edges, uint32 pathBitImageFlags) { +static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { if (footpath_element_is_sloped(mapElement)) height += 8; @@ -217,7 +217,7 @@ static void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element } /* rct2: 0x006A5E81 */ -static void path_bit_benches_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, int height, uint8 edges, uint32 pathBitImageFlags) { +static void path_bit_benches_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { uint32 imageId; if (!(edges & (1 << 0))) { @@ -265,7 +265,7 @@ static void path_bit_benches_paint(rct_scenery_entry* pathBitEntry, rct_map_elem } /* rct2: 0x006A6008 */ -static void path_bit_jumping_fountains_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, int height, uint8 edges, uint32 pathBitImageFlags, rct_drawpixelinfo* dpi) { +static void path_bit_jumping_fountains_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags, rct_drawpixelinfo* dpi) { if (dpi->zoom_level != 0) return; @@ -742,7 +742,7 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element) if (staff_is_patrol_area_set(200 + staffType, x, y)) { uint32 imageId = 2618; - int height2 = map_element->base_height * 8; + sint32 height2 = map_element->base_height * 8; if (footpath_element_is_sloped(map_element)) { imageId = 2619 + ((map_element->properties.path.type + get_current_rotation()) & 3); height2 += 16; @@ -794,7 +794,7 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element) #endif } -void loc_6A37C9(rct_map_element * mapElement, int height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags) +void loc_6A37C9(rct_map_element * mapElement, sint32 height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags) { // Rol edges around rotation uint8 edges = ((mapElement->properties.path.edges << get_current_rotation()) & 0xF) | diff --git a/src/openrct2/paint/map_element/scenery.c b/src/openrct2/paint/map_element/scenery.c index 2dbb61be8d..a6ba6c7304 100644 --- a/src/openrct2/paint/map_element/scenery.c +++ b/src/openrct2/paint/map_element/scenery.c @@ -42,16 +42,16 @@ static const rct_xy16 lengths[] = { * * rct2: 0x006DFF47 */ -void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { - //RCT2_CALLPROC_X(0x6DFF47, 0, 0, direction, height, (int)mapElement, 0, 0); return; +void scenery_paint(uint8 direction, sint32 height, rct_map_element* mapElement) { + //RCT2_CALLPROC_X(0x6DFF47, 0, 0, direction, height, (sint32)mapElement, 0, 0); return; gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_SCENERY; rct_xyz16 boxlength; rct_xyz16 boxoffset; boxoffset.x = 0; boxoffset.y = 0; boxoffset.z = height; - int baseImageid = 0; - const int rotation = get_current_rotation(); + sint32 baseImageid = 0; + const sint32 rotation = get_current_rotation(); if (gTrackDesignSaveMode) { if (!track_design_save_contains_map_element(mapElement)) { baseImageid = 0x21700000; @@ -134,7 +134,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { if (dword_F64EB0 == 0) { // Draw translucent overlay: // TODO: Name palette entries - int image_id = (baseImageid & 0x7FFFF) + (GlassPaletteIds[(mapElement->properties.scenery.colour_1 & 0x1F)] << 19) + 0x40000004; + sint32 image_id = (baseImageid & 0x7FFFF) + (GlassPaletteIds[(mapElement->properties.scenery.colour_1 & 0x1F)] << 19) + 0x40000004; sub_98199C(image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x, boxoffset.y, boxoffset.z, rotation); } } @@ -145,7 +145,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { // 6E01A9: if (entry->small_scenery.flags & SMALL_SCENERY_FLAG12) { // 6E0512: - int image_id = ((gCurrentTicks / 2) & 0xF) + entry->image + 4; + sint32 image_id = ((gCurrentTicks / 2) & 0xF) + entry->image + 4; if (dword_F64EB0 != 0) { image_id = (image_id & 0x7FFFF) | dword_F64EB0; } @@ -153,7 +153,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { } else if (entry->small_scenery.flags & SMALL_SCENERY_FLAG13) { // 6E043B: - int image_id = ((gCurrentTicks / 2) & 0xF) + entry->image + 8; + sint32 image_id = ((gCurrentTicks / 2) & 0xF) + entry->image + 8; if (dword_F64EB0 != 0) { image_id = (image_id & 0x7FFFF) | dword_F64EB0; } @@ -173,8 +173,8 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { } else if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_IS_CLOCK) { // 6E035C: - int minuteImageOffset = ((gRealTimeOfDay.minute + 6) * 17) / 256; - int timeImageBase = gRealTimeOfDay.hour; + sint32 minuteImageOffset = ((gRealTimeOfDay.minute + 6) * 17) / 256; + sint32 timeImageBase = gRealTimeOfDay.hour; while (timeImageBase >= 12) { timeImageBase -= 12; } @@ -182,7 +182,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { if (timeImageBase >= 48) { timeImageBase -= 48; } - int image_id = timeImageBase + (direction * 12); + sint32 image_id = timeImageBase + (direction * 12); if (image_id >= 48) { image_id -= 48; } @@ -205,7 +205,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { } else if (entry->small_scenery.flags & SMALL_SCENERY_FLAG15) { // 6E02F6: - int image_id = gCurrentTicks; + sint32 image_id = gCurrentTicks; image_id += gUnk9DE568 / 4; image_id += gUnk9DE56C / 4; image_id = (image_id / 4) & 15; @@ -218,7 +218,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { if (entry->small_scenery.flags & SMALL_SCENERY_FLAG16) { // nothing } - int esi = gCurrentTicks; + sint32 esi = gCurrentTicks; if (!(entry->small_scenery.flags & SMALL_SCENERY_FLAG22)) { // 6E01F8: esi += ((gUnk9DE568 / 4) + (gUnk9DE56C / 4)); @@ -229,7 +229,7 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { uint8 cl = cx & 0xFF; esi >>= cl; esi &= entry->small_scenery.var_16; - int image_id = 0; + sint32 image_id = 0; if (esi < entry->small_scenery.var_18) { image_id = entry->small_scenery.var_10[esi]; } @@ -257,8 +257,8 @@ void scenery_paint(uint8 direction, int height, rct_map_element* mapElement) { // 6E0556: Draw supports: if (mapElement->properties.scenery.colour_1 & 0x20) { if (!(entry->small_scenery.flags & SMALL_SCENERY_FLAG20)) { - int ax = 0; - int supportHeight = height; + sint32 ax = 0; + sint32 supportHeight = height; if (supportHeight & 0xF) { supportHeight &= 0xFFFFFFF0; ax = 49; diff --git a/src/openrct2/paint/map_element/scenery_multiple.c b/src/openrct2/paint/map_element/scenery_multiple.c index 440c2507dd..5fc8fd6b50 100644 --- a/src/openrct2/paint/map_element/scenery_multiple.c +++ b/src/openrct2/paint/map_element/scenery_multiple.c @@ -32,15 +32,15 @@ static void scenery_multiple_paint_supports(uint8 direction, uint16 height, rct_ return; } - int ax = 0; - int supportHeight = height; + sint32 ax = 0; + sint32 supportHeight = height; if (supportHeight & 0xF) { supportHeight &= 0xFFFFFFF0; ax = 49; } - int supportImageColourFlags = 0x20000000; + sint32 supportImageColourFlags = 0x20000000; if (dword_F4387C) { supportImageColourFlags = dword_F4387C; @@ -48,7 +48,7 @@ static void scenery_multiple_paint_supports(uint8 direction, uint16 height, rct_ wooden_b_supports_paint_setup((direction & 1), ax, supportHeight, supportImageColourFlags, NULL); - int clearanceHeight = ceil2(mapElement->clearance_height * 8 + 15, 16); + sint32 clearanceHeight = ceil2(mapElement->clearance_height * 8 + 15, 16); if (tile->var_7 & 0x40) { paint_util_set_segment_support_height(SEGMENTS_ALL, clearanceHeight, 0x20); @@ -67,9 +67,9 @@ static rct_large_scenery_text_glyph *scenery_multiple_sign_get_glyph(rct_large_s return &text->glyphs[codepoint]; } -static int scenery_multiple_sign_text_width(const utf8 *str, rct_large_scenery_text *text) +static sint32 scenery_multiple_sign_text_width(const utf8 *str, rct_large_scenery_text *text) { - int width = 0; + sint32 width = 0; uint32 codepoint; while ((codepoint = utf8_get_next(str, &str)) != 0) { width += scenery_multiple_sign_get_glyph(text, codepoint)->width; @@ -77,9 +77,9 @@ static int scenery_multiple_sign_text_width(const utf8 *str, rct_large_scenery_t return width; } -static int scenery_multiple_sign_text_height(const utf8 *str, rct_large_scenery_text *text) +static sint32 scenery_multiple_sign_text_height(const utf8 *str, rct_large_scenery_text *text) { - int height = 0; + sint32 height = 0; uint32 codepoint; while ((codepoint = utf8_get_next(str, &str)) != 0) { height += scenery_multiple_sign_get_glyph(text, codepoint)->height; @@ -92,7 +92,7 @@ static const utf8 *scenery_multiple_sign_fit_text(const utf8 *str, rct_large_sce static utf8 fitStr[32]; utf8 *fitStrEnd = fitStr; safe_strcpy(fitStr, str, sizeof(fitStr)); - int w = 0; + sint32 w = 0; uint32 codepoint; while (w <= text->max_width && (codepoint = utf8_get_next(fitStrEnd, (const utf8**)&fitStrEnd)) != 0) { if (height) { @@ -105,16 +105,16 @@ static const utf8 *scenery_multiple_sign_fit_text(const utf8 *str, rct_large_sce return fitStr; } -static int div_to_minus_infinity(int a, int b) { +static sint32 div_to_minus_infinity(sint32 a, sint32 b) { return (a / b) - (a % b < 0); } -static void scenery_multiple_sign_paint_line(const utf8 *str, rct_large_scenery_text *text, int textImage, int textColour, uint8 direction, int y_offset) +static void scenery_multiple_sign_paint_line(const utf8 *str, rct_large_scenery_text *text, sint32 textImage, sint32 textColour, uint8 direction, sint32 y_offset) { const utf8 *fitStr = scenery_multiple_sign_fit_text(str, text, false); - int width = scenery_multiple_sign_text_width(fitStr, text); - int x_offset = text->offset[(direction & 1)].x; - int acc = y_offset * ((direction & 1) ? -1 : 1); + sint32 width = scenery_multiple_sign_text_width(fitStr, text); + sint32 x_offset = text->offset[(direction & 1)].x; + sint32 acc = y_offset * ((direction & 1) ? -1 : 1); if (!(text->var_C & 0x1)) { // sign is horizontal, center text: x_offset -= (width / 2); @@ -122,7 +122,7 @@ static void scenery_multiple_sign_paint_line(const utf8 *str, rct_large_scenery_ } uint32 codepoint; while ((codepoint = utf8_get_next(fitStr, &fitStr)) != 0) { - int glyph_offset = scenery_multiple_sign_get_glyph(text, codepoint)->image_offset; + sint32 glyph_offset = scenery_multiple_sign_get_glyph(text, codepoint)->image_offset; uint8 glyph_type = direction & 1; if (text->var_C & 0x1) { // vertical sign glyph_offset *= 2; @@ -139,7 +139,7 @@ static void scenery_multiple_sign_paint_line(const utf8 *str, rct_large_scenery_ } } } - int image_id = (textImage + glyph_offset + glyph_type) | textColour; + sint32 image_id = (textImage + glyph_offset + glyph_type) | textColour; if (direction == 3) { paint_attach_to_previous_ps(image_id, x_offset, -div_to_minus_infinity(acc, 2)); } else { @@ -184,7 +184,7 @@ static const boundbox s98E3C4[] = { * rct2: 0x006B7F0C */ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *mapElement) { - //RCT2_CALLPROC_X(0x6B7F0C, 0, 0, direction, height, (int)mapElement, 0, 0); return; + //RCT2_CALLPROC_X(0x6B7F0C, 0, 0, direction, height, (sint32)mapElement, 0, 0); return; gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY; uint32 ebp = mapElement->properties.scenerymultiple.type >> 10; rct_scenery_entry *entry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & 0x3FF); @@ -209,13 +209,13 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map dword_F4387C = ebp; image_id |= dword_F4387C; } - int ah = tile->z_clearance; + sint32 ah = tile->z_clearance; if (ah > 0x80) { ah = 0x80; } ah -= 3; uint16 edi = tile->var_7; - int esi = 16; + sint32 esi = 16; if (edi & 0xF00) { edi &= 0xF000; edi = rol16(edi, direction); @@ -234,7 +234,7 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map } if (entry->large_scenery.flags & 0x4) { if (entry->large_scenery.tiles[1].x_offset != (sint16)(uint16)0xFFFF) { - int al = ((mapElement->properties.surface.terrain >> 2) - 1) & 3; + sint32 al = ((mapElement->properties.surface.terrain >> 2) - 1) & 3; if (al != direction) { scenery_multiple_paint_supports(direction, height, mapElement, dword_F4387C, tile); return; @@ -249,7 +249,7 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map // Draw sign text: set_format_arg(0, uint32, 0); set_format_arg(4, uint32, 0); - int textColour = mapElement->properties.scenerymultiple.colour[1] & 0x1F; + sint32 textColour = mapElement->properties.scenerymultiple.colour[1] & 0x1F; if (dword_F4387C) { textColour = COLOUR_GREY; } @@ -265,14 +265,14 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map utf8 signString[MAX_PATH]; format_string(signString, MAX_PATH, stringId, gCommonFormatArgs); rct_large_scenery_text *text = entry->large_scenery.text; - int y_offset = (text->offset[(direction & 1)].y * 2); + sint32 y_offset = (text->offset[(direction & 1)].y * 2); if (text->var_C & 0x1) { // Draw vertical sign: y_offset += 1; utf8 fitStr[32]; const utf8 *fitStrPtr = fitStr; safe_strcpy(fitStr, scenery_multiple_sign_fit_text(signString, text, true), sizeof(fitStr)); - int height2 = scenery_multiple_sign_text_height(fitStr, text); + sint32 height = scenery_multiple_sign_text_height(fitStr, text); uint32 codepoint; while ((codepoint = utf8_get_next(fitStrPtr, &fitStrPtr)) != 0) { utf8 str[5] = {0}; @@ -284,17 +284,17 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map y_offset -= (direction & 1); if (text->var_C & 0x2) { // Draw two-line sign: - int width = scenery_multiple_sign_text_width(signString, text); + sint32 width = scenery_multiple_sign_text_width(signString, text); if (width > text->max_width) { y_offset -= scenery_multiple_sign_get_glyph(text, 'A')->height + 1; utf8 *src = signString; - for (int i = 0; i < 2; i++) { + for (sint32 i = 0; i < 2; i++) { utf8 str1[64] = {0}; utf8 *dst = str1; utf8 *srcold = src; utf8 *spacesrc = 0; utf8 *spacedst = 0; - int w = 0; + sint32 w = 0; uint32 codepoint = utf8_get_next(src, (const utf8**)&src); do { w += scenery_multiple_sign_get_glyph(text, codepoint)->width; diff --git a/src/openrct2/paint/map_element/surface.c b/src/openrct2/paint/map_element/surface.c index b4fe674f85..efd72b9d23 100644 --- a/src/openrct2/paint/map_element/surface.c +++ b/src/openrct2/paint/map_element/surface.c @@ -313,7 +313,7 @@ struct tile_descriptor corner_height corner_heights; }; -static uint8 viewport_surface_paint_setup_get_relative_slope(rct_map_element * mapElement, int rotation) +static uint8 viewport_surface_paint_setup_get_relative_slope(rct_map_element * mapElement, sint32 rotation) { uint8 slope = mapElement->properties.surface.slope; @@ -994,7 +994,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) tile_descriptor tileDescriptors[5]; tileDescriptors[0] = selfDescriptor; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { rct_xy16 offset = viewport_surface_paint_data[i][rotation]; rct_xy16 position = {.x = base.x + offset.x, .y = base.y + offset.y}; @@ -1025,10 +1025,10 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) if ((gCurrentViewportFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0)) { sint16 x = gPaintMapPosition.x, y = gPaintMapPosition.y; - int dx = map_element_height(x + 16, y + 16) & 0xFFFF; + sint32 dx = map_element_height(x + 16, y + 16) & 0xFFFF; dx += 3; - int image_id = (SPR_HEIGHT_MARKER_BASE + dx / 16) | 0x20780000; + sint32 image_id = (SPR_HEIGHT_MARKER_BASE + dx / 16) | 0x20780000; image_id += get_height_marker_offset(); image_id -= gMapBaseZ; @@ -1046,7 +1046,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) } else { bool showGridlines = (gCurrentViewportFlags & VIEWPORT_FLAG_GRIDLINES); - int branch = -1; + sint32 branch = -1; if ((mapElement->properties.surface.terrain & 0xE0) == 0) { if ((mapElement->type & 0x3) == 0) { if (zoomLevel == 0) { @@ -1059,7 +1059,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) assert(surfaceShape < countof(byte_97B444)); uint8 image_offset = byte_97B444[surfaceShape]; - int image_id; + sint32 image_id; uint32 ebp = terrain_type; switch (branch) { case 0: @@ -1098,7 +1098,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) { sint16 x = gPaintMapPosition.x & 0x20; sint16 y = gPaintMapPosition.y & 0x20; - int index = (y | (x << 1)) >> 5; + sint32 index = (y | (x << 1)) >> 5; if (branch == 6) { image_id = dword_97B878[index][showGridlines ? 1 : 0] + image_offset; @@ -1147,14 +1147,14 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) gCurrentViewportFlags & VIEWPORT_FLAG_LAND_OWNERSHIP ) { rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; - for (int i = 0; i < 2; ++i) { + for (sint32 i = 0; i < 2; ++i) { rct2_peep_spawn * spawn = &gPeepSpawns[i]; if ((spawn->x & 0xFFE0) == pos.x && (spawn->y & 0xFFE0) == pos.y) { // TODO: SPR_TERRAIN_SELECTION_SQUARE_SIMPLE ??? (no variations) sub_98196C(2624, 0, 0, 32, 32, 16, spawn->z * 16, rotation); - int offset = ((spawn->direction ^ 2) + rotation) & 3; + sint32 offset = ((spawn->direction ^ 2) + rotation) & 3; uint32 image_id = (3111 + offset) | 0x20380000; sub_98196C(image_id, 0, 0, 32, 32, 19, spawn->z * 16, rotation); } @@ -1170,7 +1170,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) } else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) { rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; paint_struct * backup = g_ps_F1AD28; - int height2 = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3; + sint32 height2 = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3; sub_98196C(22955, 16, 16, 1, 1, 0, height2, rotation); g_ps_F1AD28 = backup; } @@ -1185,7 +1185,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) } else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) { paint_struct * backup = g_ps_F1AD28; rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; - int height2 = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF; + sint32 height2 = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF; sub_98196C(22956, 16, 16, 1, 1, 0, height2 + 3, rotation); g_ps_F1AD28 = backup; } @@ -1227,11 +1227,11 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) uint32 image_id = (SPR_TERRAIN_SELECTION_CORNER + byte_97B444[surfaceShape]) | eax | 0x20000000; paint_attach_to_previous_ps(image_id, 0, 0); } else { - int local_surfaceShape = surfaceShape; - int local_height = height; + sint32 local_surfaceShape = surfaceShape; + sint32 local_height = height; // Water tool if (mapElement->properties.surface.terrain & 0x1F) { - int waterHeight = (mapElement->properties.surface.terrain & 0x1F) * 16; + sint32 waterHeight = (mapElement->properties.surface.terrain & 0x1F) * 16; if (waterHeight > height) { local_height += 16; @@ -1249,7 +1249,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) } } - int image_id = (SPR_TERRAIN_SELECTION_CORNER + byte_97B444[local_surfaceShape]) | 0x21300000; + sint32 image_id = (SPR_TERRAIN_SELECTION_CORNER + byte_97B444[local_surfaceShape]) | 0x21300000; paint_struct * backup = g_ps_F1AD28; sub_98196C(image_id, 0, 0, 32, 32, 1, local_height, rotation); @@ -1318,7 +1318,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) #ifdef __MINGW32__ // The other code crashes mingw 4.8.2, as available on Travis - for (int i = 0; i < TUNNEL_MAX_COUNT; i++) { + for (sint32 i = 0; i < TUNNEL_MAX_COUNT; i++) { backupLeftTunnels[i] = gLeftTunnels[i]; backupRightTunnels[i] = gRightTunnels[i]; } @@ -1335,7 +1335,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) #ifdef __MINGW32__ // The other code crashes mingw 4.8.2, as available on Travis - for (int i = 0; i < TUNNEL_MAX_COUNT; i++) { + for (sint32 i = 0; i < TUNNEL_MAX_COUNT; i++) { gLeftTunnels[i] = backupLeftTunnels[i]; gRightTunnels[i] = backupRightTunnels[i]; } @@ -1355,12 +1355,12 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) if (!gTrackDesignSaveMode) { gUnk141E9DC = waterHeight; - int image_offset = 0; + sint32 image_offset = 0; if (waterHeight <= localHeight) { image_offset = byte_97B740[surfaceShape & 0xF]; } - int image_id = (SPR_WATER_MASK + image_offset) | 0x60000000 | PALETTE_WATER << 19; + sint32 image_id = (SPR_WATER_MASK + image_offset) | 0x60000000 | PALETTE_WATER << 19; sub_98196C(image_id, 0, 0, 32, 32, -1, waterHeight, rotation); paint_attach_to_previous_ps(SPR_WATER_OVERLAY + image_offset, 0, 0); @@ -1393,8 +1393,8 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) uint8 al = regs.al | regs.ah; - for (int i = 0; i < 4; i++) { - int bit = al & 1; + for (sint32 i = 0; i < 4; i++) { + sint32 bit = al & 1; al >>= 1; if (bit == 0) { @@ -1402,7 +1402,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) } - int bit_1, bit_8, bit_4, bit_2; + sint32 bit_1, bit_8, bit_4, bit_2; rct_xy8 offset; rct_xy16 box_offset, box_size; uint32 image_1, image_2, image_3; @@ -1475,9 +1475,9 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement) image_5 = image_3; } - int local_ebx = surfaceShape; - int local_height = height; - int image_id = 0; + sint32 local_ebx = surfaceShape; + sint32 local_height = height; + sint32 image_id = 0; if (!(local_ebx & bit_1)) { // first if (local_ebx & bit_8) { // second image_id = image_3; diff --git a/src/openrct2/paint/paint.c b/src/openrct2/paint/paint.c index f45b6d41c8..b058051cdd 100644 --- a/src/openrct2/paint/paint.c +++ b/src/openrct2/paint/paint.c @@ -90,7 +90,7 @@ void paint_init(rct_drawpixelinfo * dpi) gNextFreePaintStruct = gPaintStructs; g_ps_F1AD28 = NULL; g_aps_F1AD2C = NULL; - for (int i = 0; i < 512; i++) { + for (sint32 i = 0; i < 512; i++) { _paintQuadrants[i] = NULL; } _paintQuadrantBackIndex = -1; @@ -147,11 +147,11 @@ static paint_struct * sub_9819_c(uint32 image_id, rct_xyz16 offset, rct_xyz16 bo ps->x = map.x; ps->y = map.y; - int left = map.x + g1Element->x_offset; - int bottom = map.y + g1Element->y_offset; + sint32 left = map.x + g1Element->x_offset; + sint32 bottom = map.y + g1Element->y_offset; - int right = left + g1Element->width; - int top = bottom + g1Element->height; + sint32 right = left + g1Element->width; + sint32 top = bottom + g1Element->height; rct_drawpixelinfo * dpi = unk_140E9A8; @@ -795,7 +795,7 @@ static void paint_arrange_structs_helper(paint_struct * ps_next, uint16 ax, uint if (ps_next->var_1B & (1 << 7)) break; if (!(ps_next->var_1B & (1 << 1))) continue; - int yes = 0; + sint32 yes = 0; switch (rotation) { case 0: if (initialBBox.z_end >= ps_next->bound_box_z && initialBBox.y_end >= ps_next->bound_box_y && initialBBox.x_end >= ps_next->bound_box_x @@ -1028,7 +1028,7 @@ static uint32 paint_ps_colourify_image(uint32 imageId, uint8 spriteType, uint32 static void draw_pixel_info_crop_by_zoom(rct_drawpixelinfo *dpi) { - int zoom = dpi->zoom_level; + sint32 zoom = dpi->zoom_level; dpi->zoom_level = 0; dpi->x >>= zoom; dpi->y >>= zoom; diff --git a/src/openrct2/paint/sprite/litter.c b/src/openrct2/paint/sprite/litter.c index 4898a5b7b0..1a09a7fa59 100644 --- a/src/openrct2/paint/sprite/litter.c +++ b/src/openrct2/paint/sprite/litter.c @@ -70,7 +70,7 @@ static const litter_sprite litter_sprites[] = { * Litter Paint Setup * rct2: 0x006736FC */ -void litter_paint(rct_litter *litter, int imageDirection) +void litter_paint(rct_litter *litter, sint32 imageDirection) { rct_drawpixelinfo *dpi; diff --git a/src/openrct2/paint/sprite/misc.c b/src/openrct2/paint/sprite/misc.c index 1114290ebc..55c49237a6 100644 --- a/src/openrct2/paint/sprite/misc.c +++ b/src/openrct2/paint/sprite/misc.c @@ -37,7 +37,7 @@ extern const uint8 * duck_animations[]; /** * rct2: 0x00672AC9 */ -void misc_paint(rct_sprite *misc, int imageDirection) +void misc_paint(rct_sprite *misc, sint32 imageDirection) { rct_drawpixelinfo * dpi = unk_140E9A8; @@ -113,7 +113,7 @@ void misc_paint(rct_sprite *misc, int imageDirection) rct_jumping_fountain jumpingFountain = misc->jumping_fountain; uint16 height = jumpingFountain.z + 6; - int ebx = imageDirection / 8; + sint32 ebx = imageDirection / 8; uint8 al = (jumpingFountain.fountain_flags / 128) & 1; uint8 ah = (jumpingFountain.sprite_direction / 16) & 1; diff --git a/src/openrct2/paint/sprite/peep.c b/src/openrct2/paint/sprite/peep.c index 1b1a926dc6..f1e32c19c7 100644 --- a/src/openrct2/paint/sprite/peep.c +++ b/src/openrct2/paint/sprite/peep.c @@ -25,7 +25,7 @@ * * rct2: 0x0068F0FB */ -void peep_paint(rct_peep * peep, int imageDirection) +void peep_paint(rct_peep * peep, sint32 imageDirection) { #ifdef __ENABLE_LIGHTFX__ diff --git a/src/openrct2/paint/sprite/sprite.c b/src/openrct2/paint/sprite/sprite.c index 1d3e14960d..4269b18eb5 100644 --- a/src/openrct2/paint/sprite/sprite.c +++ b/src/openrct2/paint/sprite/sprite.c @@ -52,7 +52,7 @@ void sprite_paint_setup(const uint16 eax, const uint16 ecx) { if (dpi->x + dpi->width <= spr->unknown.sprite_left)continue; if (spr->unknown.sprite_right <= dpi->x)continue; - int image_direction = get_current_rotation(); + sint32 image_direction = get_current_rotation(); image_direction <<= 3; image_direction += spr->unknown.sprite_direction; image_direction &= 0x1F; diff --git a/src/openrct2/paint/sprite/sprite.h b/src/openrct2/paint/sprite/sprite.h index 3d34ed04b1..13ce77a472 100644 --- a/src/openrct2/paint/sprite/sprite.h +++ b/src/openrct2/paint/sprite/sprite.h @@ -22,8 +22,8 @@ void sprite_paint_setup(const uint16 eax, const uint16 ecx); -void misc_paint(rct_sprite *misc, int imageDirection); -void litter_paint(rct_litter *litter, int imageDirection); -void peep_paint(rct_peep *peep, int imageDirection); +void misc_paint(rct_sprite *misc, sint32 imageDirection); +void litter_paint(rct_litter *litter, sint32 imageDirection); +void peep_paint(rct_peep *peep, sint32 imageDirection); #endif diff --git a/src/openrct2/paint/supports.c b/src/openrct2/paint/supports.c index 312e9fc7c6..ffdd6b61ba 100644 --- a/src/openrct2/paint/supports.c +++ b/src/openrct2/paint/supports.c @@ -345,7 +345,7 @@ paint_struct * gWoodenSupportsPrependTo; * @param[out] underground (Carry flag) true if underground. * @returns (al) true if any supports have been drawn, otherwise false. */ -bool wooden_a_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, bool* underground) +bool wooden_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground) { if (underground != NULL){ *underground = false; @@ -359,7 +359,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin return false; } - int z = floor2(gSupport.height + 15, 16); + sint32 z = floor2(gSupport.height + 15, 16); height -= z; if (height < 0) { if (underground != NULL) { @@ -371,10 +371,10 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin bool hasSupports = false; bool drawFlatPiece = false; - int rotation = get_current_rotation(); + sint32 rotation = get_current_rotation(); // Draw base support (usually shaped to the slope) - int slope = gSupport.slope; + sint32 slope = gSupport.slope; if (slope & (1 << 5)) { // Above scenery (just put a base piece above it) drawFlatPiece = true; @@ -388,7 +388,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin return false; } - int imageId = WoodenSupportImageIds[supportType].slope; + sint32 imageId = WoodenSupportImageIds[supportType].slope; if (imageId == 0) { drawFlatPiece = true; } else { @@ -411,7 +411,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin return false; } - int imageId = WoodenSupportImageIds[supportType].slope; + sint32 imageId = WoodenSupportImageIds[supportType].slope; if (imageId == 0) { drawFlatPiece = true; } else { @@ -426,7 +426,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin // Draw flat base support if (drawFlatPiece) { - int imageId = WoodenSupportImageIds[supportType].flat | imageColourFlags; + sint32 imageId = WoodenSupportImageIds[supportType].flat | imageColourFlags; sub_98196C(imageId, 0, 0, 32, 32, 0, z - 2, rotation); hasSupports = true; } @@ -435,7 +435,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin while (height != 0) { if ((z & 16) == 0 && height >= 2 && z + 16 != gUnk141E9DC) { // Full support - int imageId = WoodenSupportImageIds[supportType].full | imageColourFlags; + sint32 imageId = WoodenSupportImageIds[supportType].full | imageColourFlags; uint8 ah = height == 2 ? 23 : 28; sub_98196C(imageId, 0, 0, 32, 32, ah, z, rotation); hasSupports = true; @@ -443,7 +443,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin height -= 2; } else { // Half support - int imageId = WoodenSupportImageIds[supportType].half | imageColourFlags; + sint32 imageId = WoodenSupportImageIds[supportType].half | imageColourFlags; uint8 ah = height == 1 ? 7 : 12; sub_98196C(imageId, 0, 0, 32, 32, ah, z, rotation); hasSupports = true; @@ -456,7 +456,7 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin if (special != 0) { special = (special - 1) & 0xFFFF; - int imageId = WoodenCurveSupportImageIds[supportType]; + sint32 imageId = WoodenCurveSupportImageIds[supportType]; if (imageId != 0 && byte_97B23C[special].var_7 != 0) { imageId += special; imageId |= imageColourFlags; @@ -492,11 +492,11 @@ bool wooden_a_supports_paint_setup(int supportType, int special, int height, uin * * @return (al) whether supports have been drawn */ -bool wooden_b_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, bool * underground) +bool wooden_b_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool * underground) { #ifndef NO_RCT2 if (gUseOriginalRidePaint) { - int eax = special, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; + sint32 eax = special, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; RCT2_CALLFUNC_X(0x00662D5C, &eax, &ebx, &ecx, &edx, &esi, &_edi, &ebp); return eax & 0xFF; } @@ -687,7 +687,7 @@ bool wooden_b_supports_paint_setup(int supportType, int special, int height, uin * @param imageColourFlags (ebp) * rct2: 0x00663105 */ -bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, int special, int height, uint32 imageColourFlags) +bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, sint32 special, sint32 height, uint32 imageColourFlags) { if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) { return false; @@ -698,7 +698,7 @@ bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, int special, } sint16 originalHeight = height; - int originalSegment = segment; + sint32 originalSegment = segment; const uint8 rotation = get_current_rotation(); sint16 unk9E3294 = -1; @@ -859,7 +859,7 @@ bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, int special, return true; - //int eax = special, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; + //sint32 eax = special, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; //RCT2_CALLFUNC_X(0x00663105, &eax, &ebx, &ecx, &edx, &esi, &_edi, &ebp); //return eax & 0xFF; } @@ -876,11 +876,11 @@ bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, int special, * * @return (Carry Flag) */ -bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, int special, int height, uint32 imageColourFlags) +bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, sint32 special, sint32 height, uint32 imageColourFlags) { #ifndef NO_RCT2 if (gUseOriginalRidePaint) { - int eax = special, ebx = segment, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; + sint32 eax = special, ebx = segment, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; RCT2_CALLFUNC_X(0x00663584, &eax, &ebx, &ecx, &edx, &esi, &_edi, &ebp); return eax & 0xFF; } @@ -945,7 +945,7 @@ bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, int special, ); } - int si = baseHeight; + sint32 si = baseHeight; if ((gSupportSegments[segment].slope & 0x20) || (baseHeight - gSupportSegments[segment].height < 6) @@ -988,7 +988,7 @@ bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, int special, sint16 endHeight; - int i = 1; + sint32 i = 1; while (true) { endHeight = baseHeight + 16; if (endHeight > si) { @@ -1067,13 +1067,13 @@ bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, int special, * * @return Whether supports were drawn */ -bool path_a_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, +bool path_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, rct_footpath_entry * pathEntry, bool * underground) { #ifndef NO_RCT2 if (gUseOriginalRidePaint) { RCT2_GLOBAL(0xF3EF6C, rct_footpath_entry *) = pathEntry; - int eax = special, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; + sint32 eax = special, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = supportType, ebp = imageColourFlags; RCT2_CALLFUNC_X(0x006A2ECC, &eax, &ebx, &ecx, &edx, &esi, &_edi, &ebp); return eax & 0xFF; } @@ -1247,13 +1247,13 @@ bool path_a_supports_paint_setup(int supportType, int special, int height, uint3 * * @return Whether supports were drawn */ -bool path_b_supports_paint_setup(int segment, int special, int height, uint32 imageColourFlags, +bool path_b_supports_paint_setup(sint32 segment, sint32 special, sint32 height, uint32 imageColourFlags, rct_footpath_entry * pathEntry) { #ifndef NO_RCT2 if (gUseOriginalRidePaint) { RCT2_GLOBAL(0xF3EF6C, rct_footpath_entry *) = pathEntry; - int eax = special, ebx = segment, ecx = 0, edx = height, esi = 0, _edi = 0, ebp = imageColourFlags; + sint32 eax = special, ebx = segment, ecx = 0, edx = height, esi = 0, _edi = 0, ebp = imageColourFlags; RCT2_CALLFUNC_X(0x006A326B, &eax, &ebx, &ecx, &edx, &esi, &_edi, &ebp); return eax & 0xFF; } @@ -1317,7 +1317,7 @@ bool path_b_supports_paint_setup(int segment, int special, int height, uint32 im while (keepGoing) { sint16 z; - for (int i = 0; i < 4; ++i) { + for (sint32 i = 0; i < 4; ++i) { z = baseHeight + 16; if (z > height) { z = height; diff --git a/src/openrct2/paint/supports.h b/src/openrct2/paint/supports.h index 9cb958acc2..19fc95148f 100644 --- a/src/openrct2/paint/supports.h +++ b/src/openrct2/paint/supports.h @@ -26,12 +26,12 @@ extern paint_struct * gWoodenSupportsPrependTo; #define gWoodenSupportsPrependTo RCT2_GLOBAL(0x009DEA58, paint_struct *) #endif -bool wooden_a_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, bool* underground); -bool wooden_b_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, bool* underground); -bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, int special, int height, uint32 imageColourFlags); -bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, int special, int height, uint32 imageColourFlags); -bool path_a_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, rct_footpath_entry * pathEntry, bool * underground); -bool path_b_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags, rct_footpath_entry * pathEntry); +bool wooden_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground); +bool wooden_b_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground); +bool metal_a_supports_paint_setup(uint8 supportType, uint8 segment, sint32 special, sint32 height, uint32 imageColourFlags); +bool metal_b_supports_paint_setup(uint8 supportType, uint8 segment, sint32 special, sint32 height, uint32 imageColourFlags); +bool path_a_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, rct_footpath_entry * pathEntry, bool * underground); +bool path_b_supports_paint_setup(sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, rct_footpath_entry * pathEntry); // There are 13 types of metal supports. A graphic showing all of them is available here: https://cloud.githubusercontent.com/assets/737603/19420485/7eaba28e-93ec-11e6-83cb-03190accc094.png enum { diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index 41c74c119b..cdbe1a59ce 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -117,42 +117,42 @@ enum { F1EE18_RIDE_ENTRANCE = 1 << 3, }; -static void sub_68F41A(rct_peep *peep, int index); +static void sub_68F41A(rct_peep *peep, sint32 index); static void peep_update(rct_peep *peep); -static int peep_has_empty_container(rct_peep* peep); -static int peep_has_drink(rct_peep* peep); -static int peep_has_food_standard_flag(rct_peep* peep); -static int peep_has_food_extra_flag(rct_peep* peep); -static int peep_empty_container_standard_flag(rct_peep* peep); -static int peep_empty_container_extra_flag(rct_peep* peep); -static int peep_should_find_bench(rct_peep* peep); +static sint32 peep_has_empty_container(rct_peep* peep); +static sint32 peep_has_drink(rct_peep* peep); +static sint32 peep_has_food_standard_flag(rct_peep* peep); +static sint32 peep_has_food_extra_flag(rct_peep* peep); +static sint32 peep_empty_container_standard_flag(rct_peep* peep); +static sint32 peep_empty_container_extra_flag(rct_peep* peep); +static sint32 peep_should_find_bench(rct_peep* peep); static void peep_stop_purchase_thought(rct_peep* peep, uint8 ride_type); static void sub_693BAB(rct_peep* peep); -static int sub_693C9E(rct_peep *peep); +static sint32 sub_693C9E(rct_peep *peep); static void peep_spend_money(rct_peep *peep, money16 *peep_expend_type, money32 amount); -static void peep_set_has_ridden(rct_peep *peep, int rideIndex); -static bool peep_has_ridden(rct_peep *peep, int rideIndex); -static void peep_set_has_ridden_ride_type(rct_peep *peep, int rideType); -static bool peep_has_ridden_ride_type(rct_peep *peep, int rideType); -static void peep_on_enter_or_exit_ride(rct_peep *peep, int rideIndex, int flags); +static void peep_set_has_ridden(rct_peep *peep, sint32 rideIndex); +static bool peep_has_ridden(rct_peep *peep, sint32 rideIndex); +static void peep_set_has_ridden_ride_type(rct_peep *peep, sint32 rideType); +static bool peep_has_ridden_ride_type(rct_peep *peep, sint32 rideType); +static void peep_on_enter_or_exit_ride(rct_peep *peep, sint32 rideIndex, sint32 flags); static void peep_update_favourite_ride(rct_peep *peep, rct_ride *ride); static sint16 peep_calculate_ride_satisfaction(rct_peep *peep, rct_ride *ride); static void peep_update_ride_nausea_growth(rct_peep *peep, rct_ride *ride); -static bool sub_69AF1E(rct_peep *peep, int rideIndex, int shopItem, money32 price); -static bool peep_should_use_cash_machine(rct_peep *peep, int rideIndex); -static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNum, int flags); -static void peep_ride_is_too_intense(rct_peep *peep, int rideIndex, bool peepAtRide); -static void peep_chose_not_to_go_on_ride(rct_peep *peep, int rideIndex, bool peepAtRide, bool updateLastRide); -static void peep_tried_to_enter_full_queue(rct_peep *peep, int rideIndex); -static bool peep_should_go_to_shop(rct_peep *peep, int rideIndex, bool peepAtShop); +static bool sub_69AF1E(rct_peep *peep, sint32 rideIndex, sint32 shopItem, money32 price); +static bool peep_should_use_cash_machine(rct_peep *peep, sint32 rideIndex); +static bool peep_should_go_on_ride(rct_peep *peep, sint32 rideIndex, sint32 entranceNum, sint32 flags); +static void peep_ride_is_too_intense(rct_peep *peep, sint32 rideIndex, bool peepAtRide); +static void peep_chose_not_to_go_on_ride(rct_peep *peep, sint32 rideIndex, bool peepAtRide, bool updateLastRide); +static void peep_tried_to_enter_full_queue(rct_peep *peep, sint32 rideIndex); +static bool peep_should_go_to_shop(rct_peep *peep, sint32 rideIndex, bool peepAtShop); static bool peep_find_ride_to_look_at(rct_peep *peep, uint8 edge, uint8 *rideToView, uint8 *rideSeatToView); static void peep_easter_egg_peep_interactions(rct_peep *peep); -static int peep_get_height_on_slope(rct_peep *peep, int x, int y); +static sint32 peep_get_height_on_slope(rct_peep *peep, sint32 x, sint32 y); static void peep_pick_ride_to_go_on(rct_peep *peep); -static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType); -static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFlags); +static void peep_head_for_nearest_ride_type(rct_peep *peep, sint32 rideType); +static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, sint32 rideTypeFlags); static void peep_give_real_name(rct_peep *peep); -static int guest_surface_path_finding(rct_peep* peep); +static sint32 guest_surface_path_finding(rct_peep* peep); static void peep_read_map(rct_peep *peep); static bool peep_heading_for_ride_or_park_exit(rct_peep *peep); static bool peep_update_fixing_sub_state_0(rct_ride *ride); @@ -165,9 +165,9 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep *peep, rct_ri static bool peep_update_fixing_sub_state_10(bool firstRun, rct_peep *peep, rct_ride *ride); static bool peep_update_fixing_sub_state_11(bool firstRun, rct_peep *peep, rct_ride *ride); static bool peep_update_fixing_sub_state_12(bool firstRun, rct_peep *peep, rct_ride *ride); -static bool peep_update_fixing_sub_state_13(bool firstRun, int steps, rct_peep *peep, rct_ride *ride); +static bool peep_update_fixing_sub_state_13(bool firstRun, sint32 steps, rct_peep *peep, rct_ride *ride); static bool peep_update_fixing_sub_state_14(bool firstRun, rct_peep *peep, rct_ride *ride); -static void sub_6B7588(int rideIndex); +static void sub_6B7588(sint32 rideIndex); bool loc_690FD0(rct_peep *peep, uint8 *rideToView, uint8 *rideSeatToView, rct_map_element *esi); @@ -566,11 +566,11 @@ static const rct_xy16 * _97e1bc[RIDE_TYPE_COUNT] = { NULL, }; -int peep_get_staff_count() +sint32 peep_get_staff_count() { uint16 spriteIndex; rct_peep *peep; - int count = 0; + sint32 count = 0; FOR_ALL_STAFF(spriteIndex, peep) count++; @@ -584,7 +584,7 @@ int peep_get_staff_count() */ void peep_update_all() { - int i; + sint32 i; uint16 spriteIndex; rct_peep* peep; @@ -940,7 +940,7 @@ static const uint8 peep_extra_item_containers[] = { * * rct2: 0x0068F41A */ -static void sub_68F41A(rct_peep *peep, int index) +static void sub_68F41A(rct_peep *peep, sint32 index) { if (peep->type == PEEP_TYPE_STAFF){ if (peep->staff_type != STAFF_TYPE_SECURITY) @@ -1305,7 +1305,7 @@ static void sub_68F41A(rct_peep *peep, int index) } if (peep->var_42 == 0){ - int chosen_food = bitscanforward(peep_has_food_standard_flag(peep)); + sint32 chosen_food = bitscanforward(peep_has_food_standard_flag(peep)); if (chosen_food != -1){ peep->item_standard_flags &= ~(1 << chosen_food); @@ -1402,7 +1402,7 @@ static void sub_68F41A(rct_peep *peep, int index) * rct2: 0x68F3AE * Set peep state to falling if path below has gone missing, return 1 if current path is valid, 0 if peep starts falling */ -static int checkForPath(rct_peep *peep){ +static sint32 checkForPath(rct_peep *peep){ peep->var_C4++; if ((peep->var_C4 & 0xF) != (peep->sprite_index & 0xF)){ // This condition makes the check happen less often so the peeps hover for a short, @@ -1417,7 +1417,7 @@ static int checkForPath(rct_peep *peep){ map_type = MAP_ELEMENT_TYPE_SURFACE; } - int z = peep->next_z; + sint32 z = peep->next_z; do { if (map_element_get_type(map_element) == map_type){ @@ -1584,7 +1584,7 @@ const rct_xy16 word_981D7C[4] = { * @param distance (bp) * @param peep (esi) */ -static int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_peep* peep){ +static sint32 peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_peep* peep){ _unk_F1AEF0 = peep->action_sprite_image_offset; if (peep->action == 0xFE){ peep->action = 0xFF; @@ -1593,8 +1593,8 @@ static int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_pee *x = peep->x - peep->destination_x; *y = peep->y - peep->destination_y; - int x_delta = abs(*x); - int y_delta = abs(*y); + sint32 x_delta = abs(*x); + sint32 y_delta = abs(*y); *xy_distance = x_delta + y_delta; @@ -1602,7 +1602,7 @@ static int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_pee if (*xy_distance <= peep->destination_tolerence){ return 0; } - int direction = 0; + sint32 direction = 0; if (x_delta < y_delta){ direction = 8; if (*y >= 0){ @@ -1631,7 +1631,7 @@ static int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_pee const rct_sprite_image * edi = g_sprite_entries[peep->sprite_type].sprite_image; const uint8* _edi = (edi[peep->action_sprite_type]).unkn_04; peep->action_frame++; - int ebx = _edi[peep->action_frame + 1]; + sint32 ebx = _edi[peep->action_frame + 1]; // If last frame of action if (ebx == 0xFF){ @@ -1667,7 +1667,7 @@ static int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_pee // Create sick at location litter_create(peep->x, peep->y, peep->z, peep->sprite_direction, (peep->sprite_index & 1) ? LITTER_TYPE_SICK_ALT: LITTER_TYPE_SICK); - int sound_id = SOUND_COUGH_1 + (scenario_rand() & 3); + sint32 sound_id = SOUND_COUGH_1 + (scenario_rand() & 3); audio_play_sound_at_location(sound_id, peep->x, peep->y, peep->z); invalidate_sprite_2((rct_sprite*)peep); @@ -1798,8 +1798,8 @@ void peep_update_sprite_type(rct_peep* peep) (peep->item_standard_flags & PEEP_ITEM_UMBRELLA) && peep->x != SPRITE_LOCATION_NULL ) { - int x = peep->x & 0xFFE0; - int y = peep->y & 0xFFE0; + sint32 x = peep->x & 0xFFE0; + sint32 y = peep->y & 0xFFE0; if (x < 0x1FFF && y < 0x1FFF) { rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); @@ -1900,7 +1900,7 @@ void peep_pickup(rct_peep* peep) peep_window_state_update(peep); } -void peep_pickup_abort(rct_peep* peep, int old_x) +void peep_pickup_abort(rct_peep* peep, sint32 old_x) { if (!peep) return; @@ -1925,7 +1925,7 @@ void peep_pickup_abort(rct_peep* peep, int old_x) gPickupPeepImage = UINT32_MAX; } -bool peep_pickup_place(rct_peep* peep, int x, int y, int z, bool apply) +bool peep_pickup_place(rct_peep* peep, sint32 x, sint32 y, sint32 z, bool apply) { if (!peep) return false; @@ -1939,18 +1939,18 @@ bool peep_pickup_place(rct_peep* peep, int x, int y, int z, bool apply) if (!mapElement) return false; - int dest_x = x & 0xFFE0; - int dest_y = y & 0xFFE0; + sint32 dest_x = x & 0xFFE0; + sint32 dest_y = y & 0xFFE0; // Set the coordinate of destination to be exactly // in the middle of a tile. dest_x += 16; dest_y += 16; // Set the tile coordinate to top left of tile - int tile_y = dest_y & 0xFFE0; - int tile_x = dest_x & 0xFFE0; + sint32 tile_y = dest_y & 0xFFE0; + sint32 tile_x = dest_x & 0xFFE0; - int dest_z = mapElement->base_height * 8 + 16; + sint32 dest_z = mapElement->base_height * 8 + 16; if (!map_is_location_owned(tile_x, tile_y, dest_z)){ gGameCommandErrorTitle = STR_ERR_CANT_PLACE_PERSON_HERE; @@ -1991,7 +1991,7 @@ bool peep_pickup_place(rct_peep* peep, int x, int y, int z, bool apply) return true; } -bool peep_pickup_command(unsigned int peepnum, int x, int y, int z, int action, bool apply) +bool peep_pickup_command(uint32 peepnum, sint32 x, sint32 y, sint32 z, sint32 action, bool apply) { if (peepnum >= MAX_SPRITES) { log_error("Failed to pick up peep for sprite %d", peepnum); @@ -2042,13 +2042,13 @@ bool peep_pickup_command(unsigned int peepnum, int x, int y, int z, int action, return true; } -void game_command_pickup_guest(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_pickup_guest(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int peepnum = *eax; - int x = *edi; - int y = *ebp; - int z = *edx; - int action = *ecx; + sint32 peepnum = *eax; + sint32 x = *edi; + sint32 y = *ebp; + sint32 z = *edx; + sint32 action = *ecx; if (peep_pickup_command(peepnum, x, y, z, action, *ebx & GAME_COMMAND_FLAG_APPLY)) { *ebx = 0; } @@ -2130,13 +2130,13 @@ static void peep_update_falling(rct_peep* peep){ // If not drowning then falling. Note: peeps 'fall' after leaving a ride/enter the park. rct_map_element *map_element = map_get_first_element_at(peep->x / 32, peep->y / 32); rct_map_element *saved_map = NULL; - int saved_height = 0; + sint32 saved_height = 0; if (map_element != NULL) { do { // If a path check if we are on it if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) { - int height = map_height_from_slope(peep->x, peep->y, map_element->properties.surface.slope) + sint32 height = map_height_from_slope(peep->x, peep->y, map_element->properties.surface.slope) + map_element->base_height * 8; if (height < peep->z - 1 || height > peep->z + 4) continue; @@ -2148,7 +2148,7 @@ static void peep_update_falling(rct_peep* peep){ else if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SURFACE) { // If the surface is water check to see if we could be drowning if (map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) { - int height = (map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 16; + sint32 height = (map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 16; if (height - 4 >= peep->z && height < peep->z + 20) { // Looks like we are drowning! @@ -2177,7 +2177,7 @@ static void peep_update_falling(rct_peep* peep){ return; } } - int map_height = map_element_height(0xFFFF & peep->x, 0xFFFF & peep->y) & 0xFFFF; + sint32 map_height = map_element_height(0xFFFF & peep->x, 0xFFFF & peep->y) & 0xFFFF; if (map_height < peep->z || map_height - 4 > peep->z) continue; saved_height = map_height; saved_map = map_element; @@ -2207,7 +2207,7 @@ static void peep_update_falling(rct_peep* peep){ peep->next_y = peep->y & 0xFFE0; peep->next_z = saved_map->base_height; - int edx = saved_map->properties.surface.slope & 0x7; + sint32 edx = saved_map->properties.surface.slope & 0x7; if (map_element_get_type(saved_map) != MAP_ELEMENT_TYPE_PATH){ edx = 8; } @@ -2263,10 +2263,10 @@ static void peep_update_sitting(rct_peep* peep){ sub_693C9E(peep); if (!(_unk_F1EE18 & F1EE18_DESTINATION_REACHED)) return; - int ebx = peep->var_37 & 0x7; - int x = (peep->x & 0xFFE0) + _981F2C[ebx].x; - int y = (peep->y & 0xFFE0) + _981F2C[ebx].y; - int z = peep->z; + sint32 ebx = peep->var_37 & 0x7; + sint32 x = (peep->x & 0xFFE0) + _981F2C[ebx].x; + sint32 y = (peep->y & 0xFFE0) + _981F2C[ebx].y; + sint32 z = peep->z; invalidate_sprite_2((rct_sprite*)peep); sprite_move(x, y, z, (rct_sprite*)peep); @@ -2324,7 +2324,7 @@ static void peep_update_sitting(rct_peep* peep){ return; } - int rand = scenario_rand(); + sint32 rand = scenario_rand(); if ((rand & 0xFFFF) > 131){ peep_try_get_up_from_sitting(peep); return; @@ -2395,7 +2395,7 @@ static rct_vehicle* peep_choose_car_from_ride(rct_peep* peep, rct_ride* ride, ui rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); - for (int i = peep->current_car; i > 0; --i){ + for (sint32 i = peep->current_car; i > 0; --i){ vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); } @@ -2429,9 +2429,9 @@ static void peep_choose_seat_from_car(rct_peep* peep, rct_ride* ride, rct_vehicl * rct2: 0x00691D27 */ static void peep_go_to_ride_entrance(rct_peep* peep, rct_ride* ride){ - int x = ride->entrances[peep->current_ride_station] & 0xFF; - int y = ride->entrances[peep->current_ride_station] >> 8; - int z = ride->station_heights[peep->current_ride_station]; + sint32 x = ride->entrances[peep->current_ride_station] & 0xFF; + sint32 y = ride->entrances[peep->current_ride_station] >> 8; + sint32 z = ride->station_heights[peep->current_ride_station]; rct_map_element* map_element = ride_get_station_exit_element(ride, x, y, z); @@ -2515,7 +2515,7 @@ static void peep_update_ride_sub_state_0(rct_peep* peep){ if (ride->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) return; - for (int i = 0; i < ride->num_vehicles; ++i){ + for (sint32 i = 0; i < ride->num_vehicles; ++i){ rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[i]); if (vehicle->next_free_seat >= vehicle->num_seats) @@ -2537,7 +2537,7 @@ static void peep_update_ride_sub_state_0(rct_peep* peep){ peep->current_train = chosen_train; uint8* car_array_pointer = car_array; - int i = 0; + sint32 i = 0; uint16 vehicle_id = ride->vehicles[chosen_train]; rct_vehicle* vehicle = GET_VEHICLE(vehicle_id); @@ -2758,7 +2758,7 @@ static void peep_update_ride_sub_state_1(rct_peep* peep){ } rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); - for (int i = peep->current_car; i != 0; --i){ + for (sint32 i = peep->current_car; i != 0; --i){ vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); } @@ -3024,7 +3024,7 @@ static void peep_update_ride_sub_state_2(rct_peep* peep){ } rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); - for (int i = peep->current_car; i != 0; --i){ + for (sint32 i = peep->current_car; i != 0; --i){ vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); } @@ -3034,7 +3034,7 @@ static void peep_update_ride_sub_state_2(rct_peep* peep){ vehicle->mini_golf_flags &= ~(1 << 5); - for (int i = 0; i < ride->num_vehicles; ++i){ + for (size_t i = 0; i < ride->num_vehicles; ++i){ if (ride->vehicles[i] == SPRITE_INDEX_NULL) continue; @@ -3096,7 +3096,7 @@ static void peep_update_ride_sub_state_5(rct_peep* peep){ rct_ride* ride = get_ride(peep->current_ride); rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); - for (int i = peep->current_car; i != 0; --i){ + for (sint32 i = peep->current_car; i != 0; --i){ vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); } @@ -3155,7 +3155,7 @@ static void peep_update_ride_sub_state_7(rct_peep* peep){ rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); uint8 ride_station = vehicle->current_station; - for (int i = peep->current_car; i != 0; --i){ + for (sint32 i = peep->current_car; i != 0; --i){ vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train); } @@ -4264,7 +4264,7 @@ static const uint32 loc_992A18[9] = { * rct2: 0x006C0E8B * Also used by inspecting. */ -static void peep_update_fixing(int steps, rct_peep* peep){ +static void peep_update_fixing(sint32 steps, rct_peep* peep){ rct_ride* ride = get_ride(peep->current_ride); if (ride->type == RIDE_TYPE_NULL) @@ -4342,7 +4342,7 @@ static void peep_update_fixing(int steps, rct_peep* peep){ break; } - int subState = peep->sub_state; + sint32 subState = peep->sub_state; uint32 ebp = loc_992A18[8]; if (peep->state != PEEP_STATE_INSPECTING) { @@ -4522,7 +4522,7 @@ static bool peep_update_fixing_sub_state_7(bool firstRun, rct_peep *peep, rct_ri return false; } - int direction = map_element_get_direction(mapElement); + sint32 direction = map_element_get_direction(mapElement); rct_xy16 offset = _992A3C[direction]; stationX += 16 + offset.x; @@ -4765,7 +4765,7 @@ static bool peep_update_fixing_sub_state_12(bool firstRun, rct_peep *peep, rct_r /** * rct2: 0x006C1504 */ -static bool peep_update_fixing_sub_state_13(bool firstRun, int steps, rct_peep *peep, rct_ride *ride) { +static bool peep_update_fixing_sub_state_13(bool firstRun, sint32 steps, rct_peep *peep, rct_ride *ride) { sint16 tmp_x, tmp_y, tmp_xy_distance; if (!firstRun) { @@ -4858,7 +4858,7 @@ static bool peep_update_fixing_sub_state_14(bool firstRun, rct_peep *peep, rct_r /** * rct2: 0x6B7588 */ -static void sub_6B7588(int rideIndex) { +static void sub_6B7588(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); ride->lifecycle_flags &= ~RIDE_LIFECYCLE_DUE_INSPECTION; @@ -5069,8 +5069,8 @@ static void peep_update_watering(rct_peep* peep){ return; } - int x = peep->next_x + TileDirectionDelta[peep->var_37].x; - int y = peep->next_y + TileDirectionDelta[peep->var_37].y; + sint32 x = peep->next_x + TileDirectionDelta[peep->var_37].x; + sint32 y = peep->next_y + TileDirectionDelta[peep->var_37].y; rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); @@ -5078,7 +5078,7 @@ static void peep_update_watering(rct_peep* peep){ if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SCENERY) continue; - if (abs(((int)peep->next_z) - map_element->base_height) > 4) + if (abs(((sint32)peep->next_z) - map_element->base_height) > 4) continue; rct_scenery_entry* scenery_entry = get_small_scenery_entry(map_element->properties.scenery.type); @@ -5393,7 +5393,7 @@ static void peep_update_entering_park(rct_peep* peep){ * * rct2: 0x00690582 */ -static int peep_update_walking_find_bench(rct_peep* peep){ +static sint32 peep_update_walking_find_bench(rct_peep* peep){ if (!peep_should_find_bench(peep))return 0; rct_map_element* map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); @@ -5416,7 +5416,7 @@ static int peep_update_walking_find_bench(rct_peep* peep){ if (footpath_element_path_scenery_is_ghost(map_element)) return 0; - int edges = (map_element->properties.path.edges & 0xF) ^ 0xF; + sint32 edges = (map_element->properties.path.edges & 0xF) ^ 0xF; if (edges == 0) return 0; uint8 chosen_edge = scenario_rand() & 0x3; @@ -5455,9 +5455,9 @@ static int peep_update_walking_find_bench(rct_peep* peep){ peep->sub_state = 0; - int ebx = peep->var_37 & 0x7; - int x = (peep->x & 0xFFE0) + _981F2C[ebx].x; - int y = (peep->y & 0xFFE0) + _981F2C[ebx].y; + sint32 ebx = peep->var_37 & 0x7; + sint32 x = (peep->x & 0xFFE0) + _981F2C[ebx].x; + sint32 y = (peep->y & 0xFFE0) + _981F2C[ebx].y; peep->destination_x = x; peep->destination_y = y; @@ -5474,7 +5474,7 @@ static const rct_xy16 _992A4C[] = { { 16, 11 }, }; -static int peep_update_walking_find_bin(rct_peep* peep){ +static sint32 peep_update_walking_find_bin(rct_peep* peep){ if (!peep_has_empty_container(peep)) return 0; if (peep->next_var_29 & 0x18)return 0; @@ -5499,7 +5499,7 @@ static int peep_update_walking_find_bin(rct_peep* peep){ if (footpath_element_path_scenery_is_ghost(map_element)) return 0; - int edges = (map_element->properties.path.edges & 0xF) ^ 0xF; + sint32 edges = (map_element->properties.path.edges & 0xF) ^ 0xF; if (edges == 0) return 0; uint8 chosen_edge = scenario_rand() & 0x3; @@ -5528,9 +5528,9 @@ static int peep_update_walking_find_bin(rct_peep* peep){ peep->sub_state = 0; - int ebx = peep->var_37 & 0x3; - int x = (peep->x & 0xFFE0) + _992A4C[ebx].x; - int y = (peep->y & 0xFFE0) + _992A4C[ebx].y; + sint32 ebx = peep->var_37 & 0x3; + sint32 x = (peep->x & 0xFFE0) + _992A4C[ebx].x; + sint32 y = (peep->y & 0xFFE0) + _992A4C[ebx].y; peep->destination_x = x; peep->destination_y = y; @@ -5580,7 +5580,7 @@ static void peep_update_walking_break_scenery(rct_peep* peep){ if (footpath_element_path_scenery_is_ghost(map_element))return; - int edges = map_element->properties.path.edges & 0xF; + sint32 edges = map_element->properties.path.edges & 0xF; if (edges == 0xF) return; rct_peep* inner_peep; @@ -5591,8 +5591,8 @@ static void peep_update_walking_break_scenery(rct_peep* peep){ if (inner_peep->x == SPRITE_LOCATION_NULL) continue; - int x_diff = abs(inner_peep->x - peep->x); - int y_diff = abs(inner_peep->y - peep->y); + sint32 x_diff = abs(inner_peep->x - peep->x); + sint32 y_diff = abs(inner_peep->y - peep->y); if (max(x_diff, y_diff) < 224)return; } @@ -5840,7 +5840,7 @@ static void peep_update_using_bin(rct_peep* peep){ } uint8 bp = item_standard_litter[cur_container]; - int x, y; + sint32 x, y; x = peep->x + (scenario_rand() & 7) - 3; y = peep->y + (scenario_rand() & 7) - 3; @@ -5871,7 +5871,7 @@ static void peep_update_using_bin(rct_peep* peep){ } uint8 bp = item_extra_litter[cur_container]; - int x, y; + sint32 x, y; x = peep->x + (scenario_rand() & 7) - 3; y = peep->y + (scenario_rand() & 7) - 3; @@ -5969,8 +5969,8 @@ static void peep_update_heading_to_inspect(rct_peep* peep){ uint8 direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK; peep->direction = direction; - int x = peep->next_x + 16 + word_981D6C[direction].x * 53; - int y = peep->next_y + 16 + word_981D6C[direction].y * 53; + sint32 x = peep->next_x + 16 + word_981D6C[direction].x * 53; + sint32 y = peep->next_y + 16 + word_981D6C[direction].y * 53; peep->destination_x = x; peep->destination_y = y; @@ -5995,7 +5995,7 @@ static void peep_update_heading_to_inspect(rct_peep* peep){ return; } - int z = ride->station_heights[peep->current_ride_station] * 8; + sint32 z = ride->station_heights[peep->current_ride_station] * 8; if (delta_y < 20){ z += RideData5[ride->type].z; @@ -6086,8 +6086,8 @@ static void peep_update_answering(rct_peep* peep){ uint8 direction = map_element->type & MAP_ELEMENT_DIRECTION_MASK; peep->direction = direction; - int x = peep->next_x + 16 + word_981D6C[direction].x * 53; - int y = peep->next_y + 16 + word_981D6C[direction].y * 53; + sint32 x = peep->next_x + 16 + word_981D6C[direction].x * 53; + sint32 y = peep->next_y + 16 + word_981D6C[direction].y * 53; peep->destination_x = x; peep->destination_y = y; @@ -6112,7 +6112,7 @@ static void peep_update_answering(rct_peep* peep){ return; } - int z = ride->station_heights[peep->current_ride_station] * 8; + sint32 z = ride->station_heights[peep->current_ride_station] * 8; if (delta_y < 20){ z += RideData5[ride->type].z; @@ -6138,16 +6138,16 @@ static const rct_xy16 _992A5C[] = { * * rct2: 0x006BF483 */ -static int peep_update_patrolling_find_watering(rct_peep* peep){ +static sint32 peep_update_patrolling_find_watering(rct_peep* peep){ if (!(peep->staff_orders & STAFF_ORDERS_WATER_FLOWERS)) return 0; uint8 chosen_position = scenario_rand() & 7; - for (int i = 0; i < 8; ++i, ++chosen_position){ + for (sint32 i = 0; i < 8; ++i, ++chosen_position){ chosen_position &= 7; - int x = peep->next_x + TileDirectionDelta[chosen_position].x; - int y = peep->next_y + TileDirectionDelta[chosen_position].y; + sint32 x = peep->next_x + TileDirectionDelta[chosen_position].x; + sint32 y = peep->next_y + TileDirectionDelta[chosen_position].y; rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); @@ -6203,7 +6203,7 @@ static int peep_update_patrolling_find_watering(rct_peep* peep){ * * rct2: 0x006BF3A1 */ -static int peep_update_patrolling_find_bin(rct_peep* peep){ +static sint32 peep_update_patrolling_find_bin(rct_peep* peep){ if (!(peep->staff_orders & STAFF_ORDERS_EMPTY_BINS)) return 0; @@ -6264,7 +6264,7 @@ static int peep_update_patrolling_find_bin(rct_peep* peep){ * * rct2: 0x006BF322 */ -static int peep_update_patrolling_find_grass(rct_peep* peep){ +static sint32 peep_update_patrolling_find_grass(rct_peep* peep){ if (!(peep->staff_orders & STAFF_ORDERS_MOWING)) return 0; @@ -6295,7 +6295,7 @@ static int peep_update_patrolling_find_grass(rct_peep* peep){ * * rct2: 0x006BF295 */ -static int peep_update_patrolling_find_sweeping(rct_peep* peep){ +static sint32 peep_update_patrolling_find_sweeping(rct_peep* peep){ if (!(peep->staff_orders & STAFF_ORDERS_SWEEPING)) return 0; @@ -6341,7 +6341,7 @@ static void peep_update_patrolling(rct_peep* peep){ rct_map_element* map_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); if (map_element != NULL){ - int water_height = map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + sint32 water_height = map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; if (water_height){ invalidate_sprite_2((rct_sprite*)peep); water_height *= 16; @@ -6464,10 +6464,10 @@ static void peep_update_walking(rct_peep* peep){ LITTER_TYPE_EMPTY_BURGER_BOX, LITTER_TYPE_EMPTY_CUP, }; - int ebp = litter_types[scenario_rand() & 0x3]; - int x = peep->x + (scenario_rand() & 0x7) - 3; - int y = peep->y + (scenario_rand() & 0x7) - 3; - int direction = (scenario_rand() & 0x3); + sint32 ebp = litter_types[scenario_rand() & 0x3]; + sint32 x = peep->x + (scenario_rand() & 0x7) - 3; + sint32 y = peep->y + (scenario_rand() & 0x7) - 3; + sint32 direction = (scenario_rand() & 0x3); litter_create(x, y, peep->z, direction, ebp); } @@ -6479,11 +6479,11 @@ static void peep_update_walking(rct_peep* peep){ ((0xFFFF & scenario_rand()) <= 4096)){ uint8 pos_stnd = 0; - for (int container = peep_empty_container_standard_flag(peep); pos_stnd < 32; pos_stnd++) + for (sint32 container = peep_empty_container_standard_flag(peep); pos_stnd < 32; pos_stnd++) if (container & (1u << pos_stnd)) break; - int bp = 0; + sint32 bp = 0; if (pos_stnd != 32){ peep->item_standard_flags &= ~(1u << pos_stnd); @@ -6491,7 +6491,7 @@ static void peep_update_walking(rct_peep* peep){ } else{ uint8 pos_extr = 0; - for (int container = peep_empty_container_extra_flag(peep); pos_extr < 32; pos_extr++) + for (sint32 container = peep_empty_container_extra_flag(peep); pos_extr < 32; pos_extr++) if (container & (1u << pos_extr)) break; peep->item_extra_flags &= ~(1u << pos_extr); @@ -6501,9 +6501,9 @@ static void peep_update_walking(rct_peep* peep){ peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY; peep_update_sprite_type(peep); - int x = peep->x + (scenario_rand() & 0x7) - 3; - int y = peep->y + (scenario_rand() & 0x7) - 3; - int direction = (scenario_rand() & 0x3); + sint32 x = peep->x + (scenario_rand() & 0x7) - 3; + sint32 y = peep->y + (scenario_rand() & 0x7) - 3; + sint32 direction = (scenario_rand() & 0x3); litter_create(x, y, peep->z, direction, bp); } @@ -6515,7 +6515,7 @@ static void peep_update_walking(rct_peep* peep){ if ((peep->next_var_29 & 0x18) == 8){ rct_map_element* map_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); - int water_height = map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + sint32 water_height = map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; if (water_height){ invalidate_sprite_2((rct_sprite*)peep); water_height *= 16; @@ -6566,7 +6566,7 @@ static void peep_update_walking(rct_peep* peep){ } } - int ebp = 15; + sint32 ebp = 15; if (footpath_element_has_path_scenery(map_element)) { if (!footpath_element_path_scenery_is_ghost(map_element)) { @@ -6576,7 +6576,7 @@ static void peep_update_walking(rct_peep* peep){ } } - int edges = (map_element->properties.path.edges & 0xF) ^ 0xF; + sint32 edges = (map_element->properties.path.edges & 0xF) ^ 0xF; if (edges == 0) return; uint8 chosen_edge = scenario_rand() & 0x3; @@ -6618,9 +6618,9 @@ static void peep_update_walking(rct_peep* peep){ peep->sub_state = 0; - int ebx = peep->var_37 & 0x1F; - int x = (peep->x & 0xFFE0) + _981F4C[ebx].x; - int y = (peep->y & 0xFFE0) + _981F4C[ebx].y; + sint32 ebx = peep->var_37 & 0x1F; + sint32 x = (peep->x & 0xFFE0) + _981F4C[ebx].x; + sint32 y = (peep->y & 0xFFE0) + _981F4C[ebx].y; peep->destination_x = x; peep->destination_y = y; @@ -6640,9 +6640,9 @@ static void peep_update_thoughts(rct_peep* peep){ // 220 ticks in age between them. In order to // allow this when a thought is new it enters // a holding zone. Before it becomes fresh. - int add_fresh = 1; - int fresh_thought = -1; - for (int i = 0; i < PEEP_MAX_THOUGHTS; i++) { + sint32 add_fresh = 1; + sint32 fresh_thought = -1; + for (sint32 i = 0; i < PEEP_MAX_THOUGHTS; i++) { if (peep->thoughts[i].type == PEEP_THOUGHT_TYPE_NONE) break; @@ -6700,7 +6700,7 @@ static void peep_update(rct_peep *peep) } // Walking speed logic - unsigned int stepsToTake = peep->energy; + uint32 stepsToTake = peep->energy; if (stepsToTake < 95 && peep->state == PEEP_STATE_QUEUING) stepsToTake = 95; if ((peep->peep_flags & PEEP_FLAGS_SLOW_WALK) && peep->state != PEEP_STATE_QUEUING) @@ -6711,7 +6711,7 @@ static void peep_update(rct_peep *peep) stepsToTake += stepsToTake / 2; } - unsigned int carryCheck = peep->var_73 + stepsToTake; + uint32 carryCheck = peep->var_73 + stepsToTake; peep->var_73 = carryCheck; if (carryCheck <= 255) { peep_easter_egg_peep_interactions(peep); @@ -6809,7 +6809,7 @@ void peep_problem_warnings_update() rct_ride* ride; uint16 spriteIndex; uint16 guests_in_park = gNumGuestsInPark; - int hunger_counter = 0, lost_counter = 0, noexit_counter = 0, thirst_counter = 0, + sint32 hunger_counter = 0, lost_counter = 0, noexit_counter = 0, thirst_counter = 0, litter_counter = 0, disgust_counter = 0, bathroom_counter = 0 ,vandalism_counter = 0; uint8 *warning_throttle = gPeepWarningThrottle; @@ -6949,7 +6949,7 @@ void peep_update_crowd_noise() rct_viewport *viewport; uint16 spriteIndex; rct_peep *peep; - int visiblePeeps; + sint32 visiblePeeps; if (gGameSoundsOff) return; @@ -7149,7 +7149,7 @@ static const uint8 tshirt_colours[] = { * * rct2: 0x0069A05D */ -rct_peep *peep_generate(int x, int y, int z) +rct_peep *peep_generate(sint32 x, sint32 y, sint32 z) { if (gSpriteListCount[SPRITE_LIST_NULL] < 400) return NULL; @@ -7506,7 +7506,7 @@ static const bool peep_allow_pick_up[] = { * rct2: 0x00698827 * returns 1 on pickup (CF not set) */ -int peep_can_be_picked_up(rct_peep* peep){ +sint32 peep_can_be_picked_up(rct_peep* peep){ return peep_allow_pick_up[peep->state]; } @@ -7526,7 +7526,7 @@ enum{ PEEP_FACE_OFFSET_VERY_VERY_HAPPY, }; -const int face_sprite_small[] = { +const sint32 face_sprite_small[] = { SPR_PEEP_SMALL_FACE_ANGRY, SPR_PEEP_SMALL_FACE_VERY_VERY_SICK, SPR_PEEP_SMALL_FACE_VERY_SICK, @@ -7542,7 +7542,7 @@ const int face_sprite_small[] = { SPR_PEEP_SMALL_FACE_VERY_VERY_HAPPY, }; -const int face_sprite_large[] = { +const sint32 face_sprite_large[] = { SPR_PEEP_LARGE_FACE_ANGRY_0, SPR_PEEP_LARGE_FACE_VERY_VERY_SICK_0, SPR_PEEP_LARGE_FACE_VERY_SICK_0, @@ -7558,7 +7558,7 @@ const int face_sprite_large[] = { SPR_PEEP_LARGE_FACE_VERY_VERY_HAPPY, }; -static int get_face_sprite_offset(rct_peep *peep){ +static sint32 get_face_sprite_offset(rct_peep *peep){ // ANGRY if (peep->angriness > 0) return PEEP_FACE_OFFSET_ANGRY; @@ -7578,9 +7578,9 @@ static int get_face_sprite_offset(rct_peep *peep){ // TIRED if (peep->energy < 70) return PEEP_FACE_OFFSET_TIRED; - int offset = PEEP_FACE_OFFSET_VERY_VERY_UNHAPPY; + sint32 offset = PEEP_FACE_OFFSET_VERY_VERY_UNHAPPY; //There are 7 different happiness based faces - for (int i = 37; peep->happiness >= i; i += 37) + for (sint32 i = 37; peep->happiness >= i; i += 37) { offset++; } @@ -7592,7 +7592,7 @@ static int get_face_sprite_offset(rct_peep *peep){ * Function split into large and small sprite * rct2: 0x00698721 */ -int get_peep_face_sprite_small(rct_peep *peep){ +sint32 get_peep_face_sprite_small(rct_peep *peep){ return face_sprite_small[get_face_sprite_offset(peep)]; } @@ -7600,7 +7600,7 @@ int get_peep_face_sprite_small(rct_peep *peep){ * Function split into large and small sprite * rct2: 0x00698721 */ -int get_peep_face_sprite_large(rct_peep *peep){ +sint32 get_peep_face_sprite_large(rct_peep *peep){ return face_sprite_large[get_face_sprite_offset(peep)]; } @@ -7611,7 +7611,7 @@ int get_peep_face_sprite_large(rct_peep *peep){ * @param index (eax) * @param ride (esi) */ -int peep_check_easteregg_name(int index, rct_peep *peep) +sint32 peep_check_easteregg_name(sint32 index, rct_peep *peep) { char buffer[256]; @@ -7619,10 +7619,10 @@ int peep_check_easteregg_name(int index, rct_peep *peep) return _stricmp(buffer, gPeepEasterEggNames[index]) == 0; } -int peep_get_easteregg_name_id(rct_peep *peep) +sint32 peep_get_easteregg_name_id(rct_peep *peep) { char buffer[256]; - int i; + sint32 i; format_string(buffer, 256, peep->name_string_idx, &peep->id); @@ -7634,7 +7634,7 @@ int peep_get_easteregg_name_id(rct_peep *peep) } -int peep_is_mechanic(rct_peep *peep) +sint32 peep_is_mechanic(rct_peep *peep) { return ( peep->sprite_identifier == SPRITE_IDENTIFIER_PEEP && @@ -7643,7 +7643,7 @@ int peep_is_mechanic(rct_peep *peep) ); } -bool peep_has_item(rct_peep *peep, int peepItem) +bool peep_has_item(rct_peep *peep, sint32 peepItem) { if (peepItem < 32) { return peep->item_standard_flags & (1u << peepItem); @@ -7652,7 +7652,7 @@ bool peep_has_item(rct_peep *peep, int peepItem) } } -static int peep_has_food_standard_flag(rct_peep* peep){ +static sint32 peep_has_food_standard_flag(rct_peep* peep){ return peep->item_standard_flags &( PEEP_ITEM_DRINK | PEEP_ITEM_BURGER | @@ -7670,7 +7670,7 @@ static int peep_has_food_standard_flag(rct_peep* peep){ PEEP_ITEM_LEMONADE); } -static int peep_has_food_extra_flag(rct_peep* peep){ +static sint32 peep_has_food_extra_flag(rct_peep* peep){ return peep->item_extra_flags &( PEEP_ITEM_PRETZEL | PEEP_ITEM_CHOCOLATE | @@ -7693,19 +7693,19 @@ static int peep_has_food_extra_flag(rct_peep* peep){ * To simplify check of 0x36BA3E0 and 0x11FF78 * returns 0 on no food. */ -int peep_has_food(rct_peep* peep){ +sint32 peep_has_food(rct_peep* peep){ return peep_has_food_standard_flag(peep) || peep_has_food_extra_flag(peep); } -static int peep_has_drink_standard_flag(rct_peep* peep){ +static sint32 peep_has_drink_standard_flag(rct_peep* peep){ return peep->item_standard_flags &( PEEP_ITEM_DRINK | PEEP_ITEM_COFFEE | PEEP_ITEM_LEMONADE); } -static int peep_has_drink_extra_flag(rct_peep* peep){ +static sint32 peep_has_drink_extra_flag(rct_peep* peep){ return peep->item_extra_flags &( PEEP_ITEM_CHOCOLATE | PEEP_ITEM_ICED_TEA | @@ -7719,12 +7719,12 @@ static int peep_has_drink_extra_flag(rct_peep* peep){ * To simplify check of NOT(0x12BA3C0 and 0x118F48) * returns 0 on no food. */ -static int peep_has_drink(rct_peep* peep){ +static sint32 peep_has_drink(rct_peep* peep){ return peep_has_drink_standard_flag(peep) || peep_has_drink_extra_flag(peep); } -static int peep_empty_container_standard_flag(rct_peep* peep){ +static sint32 peep_empty_container_standard_flag(rct_peep* peep){ return peep->item_standard_flags &( PEEP_ITEM_EMPTY_CAN | PEEP_ITEM_EMPTY_BURGER_BOX | @@ -7735,7 +7735,7 @@ static int peep_empty_container_standard_flag(rct_peep* peep){ ); } -static int peep_empty_container_extra_flag(rct_peep* peep){ +static sint32 peep_empty_container_extra_flag(rct_peep* peep){ return peep->item_extra_flags &( PEEP_ITEM_EMPTY_BOWL_RED | PEEP_ITEM_EMPTY_DRINK_CARTON | @@ -7744,13 +7744,13 @@ static int peep_empty_container_extra_flag(rct_peep* peep){ ); } -static int peep_has_empty_container(rct_peep* peep){ +static sint32 peep_has_empty_container(rct_peep* peep){ return peep_empty_container_standard_flag(peep) || peep_empty_container_extra_flag(peep); } /* Simplifies 0x690582. Returns 1 if should find bench*/ -static int peep_should_find_bench(rct_peep* peep){ +static sint32 peep_should_find_bench(rct_peep* peep){ if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)){ if (peep_has_food(peep)){ if (peep->hunger < 128 || peep->happiness < 128){ @@ -7788,7 +7788,7 @@ void peep_insert_new_thought(rct_peep *peep, uint8 thought_type, uint8 thought_a invalidate_sprite_2((rct_sprite*)peep); } - for (int i = 0; i < PEEP_MAX_THOUGHTS; ++i){ + for (sint32 i = 0; i < PEEP_MAX_THOUGHTS; ++i){ rct_peep_thought* thought = &peep->thoughts[i]; // Remove the oldest thought by setting it to NONE. if (thought->type == PEEP_THOUGHT_TYPE_NONE) break; @@ -7839,7 +7839,7 @@ static void peep_stop_purchase_thought(rct_peep* peep, uint8 ride_type){ } //Remove the related thought - for (int i = 0; i < PEEP_MAX_THOUGHTS; ++i){ + for (sint32 i = 0; i < PEEP_MAX_THOUGHTS; ++i){ rct_peep_thought* thought = &peep->thoughts[i]; if (thought->type == PEEP_THOUGHT_TYPE_NONE) break; @@ -7901,7 +7901,7 @@ void sub_693BAB(rct_peep* peep) { * * rct2: 0x00693CBB */ -static int peep_update_queue_position(rct_peep* peep){ +static sint32 peep_update_queue_position(rct_peep* peep){ peep->time_in_queue++; if (peep->next_in_queue == SPRITE_INDEX_NULL) return 0; @@ -7970,7 +7970,7 @@ static int peep_update_queue_position(rct_peep* peep){ * * rct2: 0x00693EF2 */ -static int peep_return_to_center_of_tile(rct_peep* peep){ +static sint32 peep_return_to_center_of_tile(rct_peep* peep){ peep->direction ^= (1 << 1); peep->destination_x = (peep->x & 0xFFE0) + 16; peep->destination_y = (peep->y & 0xFFE0) + 16; @@ -7982,7 +7982,7 @@ static int peep_return_to_center_of_tile(rct_peep* peep){ * * rct2: 0x00693f2C */ -static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element){ +static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element){ uint8 entranceType = map_element->properties.entrance.type; uint8 rideIndex = map_element->properties.entrance.ride_index; @@ -8213,7 +8213,7 @@ static int peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rct_m * * rct2: 0x006946D8 */ -static int peep_footpath_move_forward(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element, bool vandalism){ +static sint32 peep_footpath_move_forward(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element, bool vandalism){ peep->next_x = (x & 0xFFE0); peep->next_y = (y & 0xFFE0); peep->next_z = map_element->base_height; @@ -8349,7 +8349,7 @@ static int peep_footpath_move_forward(rct_peep* peep, sint16 x, sint16 y, rct_ma * * rct2: 0x0069455E */ -static int peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element){ +static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element){ // 0x00F1AEE2 bool vandalism_present = false; @@ -8447,7 +8447,7 @@ static int peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_map_e * * rct2: 0x00693F70 */ -static int peep_interact_with_shop(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element){ +static sint32 peep_interact_with_shop(rct_peep* peep, sint16 x, sint16 y, rct_map_element* map_element){ uint8 rideIndex = map_element->properties.track.ride_index; rct_ride* ride = get_ride(rideIndex); @@ -8521,7 +8521,7 @@ static int peep_interact_with_shop(rct_peep* peep, sint16 x, sint16 y, rct_map_e * * rct2: 0x0069524E */ -static int peep_move_one_tile(uint8 direction, rct_peep* peep){ +static sint32 peep_move_one_tile(uint8 direction, rct_peep* peep){ assert(direction <= 3); sint16 x = peep->next_x; sint16 y = peep->next_y; @@ -8547,7 +8547,7 @@ static int peep_move_one_tile(uint8 direction, rct_peep* peep){ * * rct2: 0x00694C41 */ -static int guest_surface_path_finding(rct_peep* peep){ +static sint32 guest_surface_path_finding(rct_peep* peep){ sint16 x = peep->next_x; sint16 y = peep->next_y; sint16 z = peep->next_z; @@ -8635,7 +8635,7 @@ static rct_map_element* get_banner_on_path(rct_map_element *path_element) return NULL; } -static int banner_clear_path_edges(rct_map_element *mapElement, int edges) +static sint32 banner_clear_path_edges(rct_map_element *mapElement, sint32 edges) { if (_peepPathFindIsStaff) return edges; rct_map_element *bannerElement = get_banner_on_path(mapElement); @@ -8650,15 +8650,15 @@ static int banner_clear_path_edges(rct_map_element *mapElement, int edges) /** * Gets the connected edges of a path that are permitted (i.e. no 'no entry' signs) */ -static int path_get_permitted_edges(rct_map_element *mapElement) +static sint32 path_get_permitted_edges(rct_map_element *mapElement) { return banner_clear_path_edges(mapElement, mapElement->properties.path.edges) & 0x0F; } -static bool is_valid_path_z_and_direction(rct_map_element *mapElement, int currentZ, int currentDirection) +static bool is_valid_path_z_and_direction(rct_map_element *mapElement, sint32 currentZ, sint32 currentDirection) { if (footpath_element_is_sloped(mapElement)) { - int slopeDirection = footpath_element_get_slope_direction(mapElement); + sint32 slopeDirection = footpath_element_get_slope_direction(mapElement); if (slopeDirection == currentDirection) { if (currentZ != mapElement->base_height) return false; } else { @@ -8731,10 +8731,10 @@ static uint8 footpath_element_next_in_direction(sint16 x, sint16 y, sint16 z, rc */ static uint8 footpath_element_dest_in_dir( sint16 x, sint16 y, sint16 z, rct_map_element *inputMapElement, uint8 chosenDirection, uint8 *outRideIndex, - int level + sint32 level ) { rct_map_element *mapElement; - int direction; + sint32 direction; if (level > 25) return PATH_SEARCH_LIMIT_REACHED; @@ -8747,7 +8747,7 @@ static uint8 footpath_element_dest_in_dir( switch (map_element_get_type(mapElement)) { case MAP_ELEMENT_TYPE_TRACK: if (z != mapElement->base_height) continue; - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) { *outRideIndex = rideIndex; @@ -8841,7 +8841,7 @@ static uint8 footpath_element_destination_in_direction(sint16 x, sint16 y, sint1 * * rct2: 0x00695225 */ -static int guest_path_find_aimless(rct_peep* peep, uint8 edges){ +static sint32 guest_path_find_aimless(rct_peep* peep, uint8 edges){ if (scenario_rand() & 1){ // If possible go straight if (edges & (1 << peep->direction)){ @@ -8899,14 +8899,14 @@ static uint8 peep_pathfind_get_max_number_junctions(rct_peep* peep){ static bool path_is_thin_junction(rct_map_element *path, sint16 x, sint16 y, uint8 z) { uint8 edges = path_get_permitted_edges(path); - int test_edge = bitscanforward(edges); + sint32 test_edge = bitscanforward(edges); if (test_edge == -1) return false; bool thin_junction = false; - int thin_count = 0; + sint32 thin_count = 0; do { - int fp_result = footpath_element_next_in_direction(x, y, z, path, test_edge); + sint32 fp_result = footpath_element_next_in_direction(x, y, z, path, test_edge); /* Ignore non-paths (e.g. ride entrances, shops), wide paths * and ride queues (per ignoreQueues) when counting @@ -9002,7 +9002,7 @@ static bool path_is_thin_junction(rct_map_element *path, sint16 x, sint16 y, uin * * rct2: 0x0069A997 */ -static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep *peep, rct_map_element *currentMapElement, bool inPatrolArea, uint8 counter, uint16 *endScore, int test_edge, uint8 *endJunctions, rct_xyz8 junctionList[16], uint8 directionList[16], rct_xyz8 *endXYZ, uint8 *endSteps) { +static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep *peep, rct_map_element *currentMapElement, bool inPatrolArea, uint8 counter, uint16 *endScore, sint32 test_edge, uint8 *endJunctions, rct_xyz8 junctionList[16], uint8 directionList[16], rct_xyz8 *endXYZ, uint8 *endSteps) { uint8 searchResult = PATH_SEARCH_FAILED; x += TileDirectionDelta[test_edge].x; @@ -9068,7 +9068,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep } case MAP_ELEMENT_TYPE_ENTRANCE: if (z != mapElement->base_height) continue; - int direction; + sint32 direction; searchResult = PATH_SEARCH_OTHER; switch (mapElement->properties.entrance.type) { case ENTRANCE_TYPE_RIDE_ENTRANCE: @@ -9335,7 +9335,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep bool pathLoop = false; /* Check the peep->pathfind_history to see if this junction has * already been visited by the peep while heading for this goal. */ - for (int i = 0; i < 4; ++i) { + for (sint32 i = 0; i < 4; ++i) { if (peep->pathfind_history[i].x == x >> 5 && peep->pathfind_history[i].y == y >> 5 && peep->pathfind_history[i].z == z) { @@ -9358,7 +9358,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep /* Check the _peepPathFindHistory to see if this junction has been * previously passed through in the current search path. * i.e. this is a loop in the current search path. */ - for (int junctionNum = _peepPathFindNumJunctions + 1; junctionNum <= _peepPathFindMaxJunctions; junctionNum++) { + for (sint32 junctionNum = _peepPathFindNumJunctions + 1; junctionNum <= _peepPathFindMaxJunctions; junctionNum++) { if ((_peepPathFindHistory[junctionNum].location.x == (uint8)(x >> 5)) && (_peepPathFindHistory[junctionNum].location.y == (uint8)(y >> 5)) && (_peepPathFindHistory[junctionNum].location.z == (uint8)z)) { @@ -9489,7 +9489,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep * * rct2: 0x0069A5F0 */ -int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) +sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) { // The max number of thin junctions searched - a per-search-path limit. _peepPathFindMaxJunctions = peep_pathfind_get_max_number_junctions(peep); @@ -9577,7 +9577,7 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) /* If the peep remembers walking through this junction * previously while heading for its goal, retrieve the * directions it has not yet tried. */ - for (int i = 0; i < 4; ++i) { + for (sint32 i = 0; i < 4; ++i) { if (peep->pathfind_history[i].x == x / 32 && peep->pathfind_history[i].y == y / 32 && peep->pathfind_history[i].z == z) { @@ -9645,7 +9645,7 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) // Peep has tried all edges. if (edges == 0) return -1; - int chosen_edge = bitscanforward(edges); + sint32 chosen_edge = bitscanforward(edges); // Peep has multiple edges still to try. if (edges & ~(1 << chosen_edge)) { @@ -9667,8 +9667,8 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) * edge that gives the best (i.e. smallest) value (best_score) * or for different edges with equal value, the edge with the * least steps (best_sub). */ - int numEdges = bitcount(edges); - for (int test_edge = chosen_edge; test_edge != -1; test_edge = bitscanforward(edges)) { + sint32 numEdges = bitcount(edges); + for (sint32 test_edge = chosen_edge; test_edge != -1; test_edge = bitscanforward(edges)) { edges &= ~(1 << test_edge); uint8 height = z; @@ -9784,7 +9784,7 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) } if (isThin) { - for (int i = 0; i < 4; ++i) { + for (sint32 i = 0; i < 4; ++i) { if (peep->pathfind_history[i].x == x >> 5 && peep->pathfind_history[i].y == y >> 5 && peep->pathfind_history[i].z == z @@ -9806,7 +9806,7 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) /* Peep does not remember this junction, so forget a junction * and remember this junction. */ - int i = peep->pathfind_goal.direction++; + sint32 i = peep->pathfind_goal.direction++; peep->pathfind_goal.direction &= 3; peep->pathfind_history[i].x = x >> 5; peep->pathfind_history[i].y = y >> 5; @@ -9831,7 +9831,7 @@ int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep) * * rct2: 0x006952C0 */ -static int guest_path_find_entering_park(rct_peep *peep, rct_map_element *map_element, uint8 edges){ +static sint32 guest_path_find_entering_park(rct_peep *peep, rct_map_element *map_element, uint8 edges){ uint8 chosenEntrance = 0xFF; uint16 nearestDist = 0xFFFF; for (uint8 entranceNum = 0; entranceNum < 4; ++entranceNum){ @@ -9859,7 +9859,7 @@ static int guest_path_find_entering_park(rct_peep *peep, rct_map_element *map_el gPeepPathFindIgnoreForeignQueues = true; gPeepPathFindQueueRideIndex = 255; - int chosenDirection = peep_pathfind_choose_direction(peep->next_x, peep->next_y, peep->next_z, peep); + sint32 chosenDirection = peep_pathfind_choose_direction(peep->next_x, peep->next_y, peep->next_z, peep); if (chosenDirection == -1) return guest_path_find_aimless(peep, edges); @@ -9871,7 +9871,7 @@ static int guest_path_find_entering_park(rct_peep *peep, rct_map_element *map_el * * rct2: 0x0069536C */ -static int guest_path_find_leaving_park(rct_peep *peep, rct_map_element *map_element, uint8 edges){ +static sint32 guest_path_find_leaving_park(rct_peep *peep, rct_map_element *map_element, uint8 edges){ rct2_peep_spawn* peepSpawn = &gPeepSpawns[0]; // Peeps for whatever reason return to their original spawn point // this in future should look for the nearest. @@ -9902,7 +9902,7 @@ static int guest_path_find_leaving_park(rct_peep *peep, rct_map_element *map_ele * * rct2: 0x00695161 */ -static int guest_path_find_park_entrance(rct_peep* peep, rct_map_element *map_element, uint8 edges){ +static sint32 guest_path_find_park_entrance(rct_peep* peep, rct_map_element *map_element, uint8 edges){ uint8 entranceNum; // Resolves already-corrupt guests (e.g. loaded from save) @@ -9949,7 +9949,7 @@ static int guest_path_find_park_entrance(rct_peep* peep, rct_map_element *map_el pathfind_logging_enable(peep); #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 - int chosenDirection = peep_pathfind_choose_direction(peep->next_x, peep->next_y, peep->next_z, peep); + sint32 chosenDirection = peep_pathfind_choose_direction(peep->next_x, peep->next_y, peep->next_z, peep); #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 pathfind_logging_disable(); @@ -10088,7 +10088,7 @@ static void get_ride_queue_end(sint16 *x, sint16 *y, sint16 *z){ * * rct2: 0x00694C35 */ -static int guest_path_finding(rct_peep* peep) +static sint32 guest_path_finding(rct_peep* peep) { sint16 x, y, z; @@ -10123,7 +10123,7 @@ static int guest_path_finding(rct_peep* peep) /* If this mapElement is adjacent to any non-wide paths, * remove all of the edges to wide paths. */ uint8 adjustedEdges = edges; - for (int chosenDirection = 0; chosenDirection < 4; chosenDirection++) { + for (sint32 chosenDirection = 0; chosenDirection < 4; chosenDirection++) { // If there is no path in that direction try another if (!(adjustedEdges & (1 << chosenDirection))) continue; @@ -10192,7 +10192,7 @@ static int guest_path_finding(rct_peep* peep) * dead end paths, paths to ride exits, etc. */ if (!peep_has_food(peep) && (scenario_rand() & 0xFFFF) >= 2184) { uint8 adjustedEdges = edges; - for (int chosenDirection = 0; chosenDirection < 4; chosenDirection++) { + for (sint32 chosenDirection = 0; chosenDirection < 4; chosenDirection++) { // If there is no path in that direction try another if (!(adjustedEdges & (1 << chosenDirection))) continue; @@ -10270,7 +10270,7 @@ static int guest_path_finding(rct_peep* peep) uint16 closestDist = 0xFFFF; uint8 closestStationNum = 0; - int numEntranceStations = 0; + sint32 numEntranceStations = 0; uint8 entranceStations = 0; for (uint8 stationNum = 0; stationNum < 4; ++stationNum){ @@ -10307,7 +10307,7 @@ static int guest_path_finding(rct_peep* peep) * appropriate. */ if (numEntranceStations > 1 && (ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS)) { - int select = peep->no_of_rides % numEntranceStations; + sint32 select = peep->no_of_rides % numEntranceStations; while (select > 0) { closestStationNum = bitscanforward(entranceStations); entranceStations &= ~(1 << closestStationNum); @@ -10364,7 +10364,7 @@ static int guest_path_finding(rct_peep* peep) * * rct2: 0x00693C9E */ -static int sub_693C9E(rct_peep *peep) +static sint32 sub_693C9E(rct_peep *peep) { _unk_F1EE18 = 0; _unk_F1AEF1 = peep->action; @@ -10497,24 +10497,24 @@ static void peep_spend_money(rct_peep *peep, money16 *peep_expend_type, money32 audio_play_sound_at_location(SOUND_PURCHASE, peep->x, peep->y, peep->z); } -static void peep_set_has_ridden(rct_peep *peep, int rideIndex) +static void peep_set_has_ridden(rct_peep *peep, sint32 rideIndex) { peep->rides_been_on[rideIndex / 8] |= 1 << (rideIndex % 8); rct_ride *ride = get_ride(rideIndex); peep_set_has_ridden_ride_type(peep, ride->type); } -static bool peep_has_ridden(rct_peep *peep, int rideIndex) +static bool peep_has_ridden(rct_peep *peep, sint32 rideIndex) { return peep->rides_been_on[rideIndex / 8] & (1 << (rideIndex % 8)); } -static void peep_set_has_ridden_ride_type(rct_peep *peep, int rideType) +static void peep_set_has_ridden_ride_type(rct_peep *peep, sint32 rideType) { peep->ride_types_been_on[rideType / 8] |= 1 << (rideType % 8); } -static bool peep_has_ridden_ride_type(rct_peep *peep, int rideType) +static bool peep_has_ridden_ride_type(rct_peep *peep, sint32 rideType) { return peep->ride_types_been_on[rideType / 8] & (1 << (rideType % 8)); } @@ -10524,7 +10524,7 @@ static bool peep_has_ridden_ride_type(rct_peep *peep, int rideType) * ride's satisfaction value. * rct2: 0x0069545B */ -static void peep_on_enter_ride(rct_peep *peep, int rideIndex) +static void peep_on_enter_ride(rct_peep *peep, sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -10767,7 +10767,7 @@ static bool peep_really_liked_ride(rct_peep *peep, rct_ride *ride) * * rct2: 0x0069576E */ -static void peep_on_exit_ride(rct_peep *peep, int rideIndex) +static void peep_on_exit_ride(rct_peep *peep, sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -10805,7 +10805,7 @@ static void peep_on_exit_ride(rct_peep *peep, int rideIndex) if (peep_really_liked_ride(peep, ride)) { peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_WAS_GREAT, rideIndex); - int laugh = scenario_rand() & 7; + sint32 laugh = scenario_rand() & 7; if (laugh < 3) { audio_play_sound_at_location(SOUND_LAUGH_1 + laugh, peep->x, peep->y, peep->z); } @@ -10819,7 +10819,7 @@ static void peep_on_exit_ride(rct_peep *peep, int rideIndex) * * rct2: 0x00695444 */ -static void peep_on_enter_or_exit_ride(rct_peep *peep, int rideIndex, int flags) +static void peep_on_enter_or_exit_ride(rct_peep *peep, sint32 rideIndex, sint32 flags) { if (flags & 1) { peep_on_exit_ride(peep, rideIndex); @@ -10841,7 +10841,7 @@ static void peep_on_enter_or_exit_ride(rct_peep *peep, int rideIndex, int flags) * * rct2: 0x0069AF1E */ -static bool sub_69AF1E(rct_peep *peep, int rideIndex, int shopItem, money32 price) +static bool sub_69AF1E(rct_peep *peep, sint32 rideIndex, sint32 shopItem, money32 price) { rct_ride* ride = get_ride(rideIndex); money32 value; @@ -10860,7 +10860,7 @@ static bool sub_69AF1E(rct_peep *peep, int rideIndex, int shopItem, money32 pric } if (shop_item_is_food_or_drink(shopItem)) { - int food = -1; + sint32 food = -1; if ((food = peep_has_food_standard_flag(peep)) != 0) { peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_HAVENT_FINISHED, bitscanforward(food)); return 0; @@ -10955,7 +10955,7 @@ loc_69B119: } } - int happinessGrowth = value * 4; + sint32 happinessGrowth = value * 4; peep->happiness_growth_rate = min((peep->happiness_growth_rate + happinessGrowth), 255); peep->happiness = min((peep->happiness + happinessGrowth), 255); } @@ -11079,7 +11079,7 @@ loc_69B221: * * rct2: 0x0069AEB7 */ -static bool peep_should_use_cash_machine(rct_peep *peep, int rideIndex) +static bool peep_should_use_cash_machine(rct_peep *peep, sint32 rideIndex) { if (gParkFlags & PARK_FLAGS_NO_MONEY) return false; if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK) return false; @@ -11133,7 +11133,7 @@ static void peep_give_passing_peeps_purple_clothes(rct_peep *peep) for (; spriteIndex != SPRITE_INDEX_NULL; spriteIndex = otherPeep->next_in_quadrant) { otherPeep = GET_PEEP(spriteIndex); if (otherPeep->type == PEEP_TYPE_GUEST) { - int zDiff = abs(otherPeep->z - peep->z); + sint32 zDiff = abs(otherPeep->z - peep->z); if (zDiff <= 32) { otherPeep->tshirt_colour = COLOUR_BRIGHT_PURPLE; otherPeep->trousers_colour = COLOUR_BRIGHT_PURPLE; @@ -11152,13 +11152,13 @@ static void peep_give_passing_peeps_pizza(rct_peep *peep) for (; spriteIndex != SPRITE_INDEX_NULL; spriteIndex = otherPeep->next_in_quadrant) { otherPeep = GET_PEEP(spriteIndex); if (otherPeep->type == PEEP_TYPE_GUEST) { - int zDiff = abs(otherPeep->z - peep->z); + sint32 zDiff = abs(otherPeep->z - peep->z); if (zDiff <= 32) { if (!(otherPeep->item_standard_flags & PEEP_ITEM_PIZZA)) { otherPeep->item_standard_flags |= PEEP_ITEM_PIZZA; - int peepDirection = (peep->sprite_direction >> 3) ^ 2; - int otherPeepOppositeDirection = otherPeep->sprite_direction >> 3; + sint32 peepDirection = (peep->sprite_direction >> 3) ^ 2; + sint32 otherPeepOppositeDirection = otherPeep->sprite_direction >> 3; if (peepDirection == otherPeepOppositeDirection) { if (otherPeep->action == PEEP_ACTION_NONE_1 || otherPeep->action == PEEP_ACTION_NONE_2) { invalidate_sprite_2((rct_sprite*)peep); @@ -11185,7 +11185,7 @@ static void peep_make_passing_peeps_sick(rct_peep *peep) for (; spriteIndex != SPRITE_INDEX_NULL; spriteIndex = otherPeep->next_in_quadrant) { otherPeep = GET_PEEP(spriteIndex); if (otherPeep->type == PEEP_TYPE_GUEST) { - int zDiff = abs(otherPeep->z - peep->z); + sint32 zDiff = abs(otherPeep->z - peep->z); if (zDiff <= 32) { if (peep != otherPeep) { if (otherPeep->action == PEEP_ACTION_NONE_1 || otherPeep->action == PEEP_ACTION_NONE_2) { @@ -11210,7 +11210,7 @@ static void peep_give_passing_peeps_ice_cream(rct_peep *peep) for (; spriteIndex != SPRITE_INDEX_NULL; spriteIndex = otherPeep->next_in_quadrant) { otherPeep = GET_PEEP(spriteIndex); if (otherPeep->type == PEEP_TYPE_GUEST) { - int zDiff = abs(otherPeep->z - peep->z); + sint32 zDiff = abs(otherPeep->z - peep->z); if (zDiff <= 32) { if (peep != otherPeep) { if (!(otherPeep->item_standard_flags & PEEP_ITEM_ICE_CREAM)) { @@ -11547,7 +11547,7 @@ bool loc_690FD0(rct_peep *peep, uint8 *rideToView, uint8 *rideSeatToView, rct_ma * is. * rct2: 0x00694921 */ -static int peep_get_height_on_slope(rct_peep *peep, int x, int y) +static sint32 peep_get_height_on_slope(rct_peep *peep, sint32 x, sint32 y) { if (x == MAP_LOCATION_NULL) return 0; @@ -11556,12 +11556,12 @@ static int peep_get_height_on_slope(rct_peep *peep, int x, int y) return map_element_height(x, y) & 0xFFFF; } - int z = peep->next_z * 8; + sint32 z = peep->next_z * 8; return z + map_height_from_slope(x, y, peep->next_var_29); } -static bool peep_has_voucher_for_free_ride(rct_peep *peep, int rideIndex) +static bool peep_has_voucher_for_free_ride(rct_peep *peep, sint32 rideIndex) { return peep->item_standard_flags & PEEP_ITEM_VOUCHER && @@ -11587,7 +11587,7 @@ static void peep_reset_ride_heading(rct_peep *peep) * ride/shop, or they may just be thinking about it. * rct2: 0x006960AB */ -static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNum, int flags) +static bool peep_should_go_on_ride(rct_peep *peep, sint32 rideIndex, sint32 entranceNum, sint32 flags) { rct_ride *ride = get_ride(rideIndex); @@ -11635,9 +11635,9 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu if (ride->last_peep_in_queue[entranceNum] != 0xFFFF) { rct_peep *lastPeepInQueue = GET_PEEP(ride->last_peep_in_queue[entranceNum]); if (abs(lastPeepInQueue->z - peep->z) <= 6) { - int dx = abs(lastPeepInQueue->x - peep->x); - int dy = abs(lastPeepInQueue->y - peep->y); - int maxD = max(dx, dy); + sint32 dx = abs(lastPeepInQueue->x - peep->x); + sint32 dy = abs(lastPeepInQueue->y - peep->y); + sint32 maxD = max(dx, dy); // Unlike normal paths, peeps cannot overlap when queueing for a ride. // This check enforces a minimum distance between peeps entering the queue. @@ -11835,7 +11835,7 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu return false; } -static void peep_ride_is_too_intense(rct_peep *peep, int rideIndex, bool peepAtRide) +static void peep_ride_is_too_intense(rct_peep *peep, sint32 rideIndex, bool peepAtRide) { rct_ride *ride = get_ride(rideIndex); @@ -11849,7 +11849,7 @@ static void peep_ride_is_too_intense(rct_peep *peep, int rideIndex, bool peepAtR peep_chose_not_to_go_on_ride(peep, rideIndex, peepAtRide, true); } -static void peep_chose_not_to_go_on_ride(rct_peep *peep, int rideIndex, bool peepAtRide, bool updateLastRide) +static void peep_chose_not_to_go_on_ride(rct_peep *peep, sint32 rideIndex, bool peepAtRide, bool updateLastRide) { if (peepAtRide && updateLastRide) { peep->previous_ride = rideIndex; @@ -11866,7 +11866,7 @@ static void peep_chose_not_to_go_on_ride(rct_peep *peep, int rideIndex, bool pee * Does not effect peeps that walk up to the queue entrance. * This flag is reset the next time a peep successfully joins the queue. */ -static void peep_tried_to_enter_full_queue(rct_peep *peep, int rideIndex) +static void peep_tried_to_enter_full_queue(rct_peep *peep, sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -11879,7 +11879,7 @@ static void peep_tried_to_enter_full_queue(rct_peep *peep, int rideIndex) } } -static bool peep_should_go_to_shop(rct_peep *peep, int rideIndex, bool peepAtShop) +static bool peep_should_go_to_shop(rct_peep *peep, sint32 rideIndex, bool peepAtShop) { rct_ride *ride = get_ride(rideIndex); @@ -11954,7 +11954,7 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) if (peep_has_food(peep)) return; if (peep->x == MAP_LOCATION_NULL) return; - for (int i = 0; i < countof(_peepRideConsideration); i++) { + for (sint32 i = 0; i < countof(_peepRideConsideration); i++) { _peepRideConsideration[i] = 0; } @@ -11963,7 +11963,7 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) // rides they haven't been on before. if (peep->item_standard_flags & PEEP_ITEM_MAP) { // Consider rides that peep hasn't been on yet - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (!peep_has_ridden(peep, i)) { _peepRideConsideration[i >> 5] |= (1u << (i & 0x1F)); @@ -11971,16 +11971,16 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) } } else { // Take nearby rides into consideration - int cx = floor2(peep->x, 32); - int cy = floor2(peep->y, 32); - for (int x = cx - 320; x <= cx + 320; x += 32) { - for (int y = cy - 320; y <= cy + 320; y += 32) { + sint32 cx = floor2(peep->x, 32); + sint32 cy = floor2(peep->y, 32); + for (sint32 x = cx - 320; x <= cx + 320; x += 32) { + for (sint32 y = cy - 320; y <= cy + 320; y += 32) { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; _peepRideConsideration[rideIndex >> 5] |= (1u << (rideIndex & 0x1F)); } while (!map_element_is_last_for_tile(mapElement++)); } @@ -11988,7 +11988,7 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) } // Always take the big rides into consideration (realistic as you can usually see them from anywhere in the park) - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride->lifecycle_flags == RIDE_LIFECYCLE_TESTED) continue; if (!ride_has_ratings(ride)) continue; @@ -12001,8 +12001,8 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) // Filter the considered rides uint8 *potentialRides = _peepPotentialRides; uint8 *nextPotentialRide = potentialRides; - int numPotentialRides = 0; - for (int i = 0; i < MAX_RIDES; i++) { + sint32 numPotentialRides = 0; + for (sint32 i = 0; i < MAX_RIDES; i++) { if (!(_peepRideConsideration[i >> 5] & (1u << (i & 0x1F)))) continue; @@ -12016,9 +12016,9 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) } // Pick the most exciting ride - int mostExcitingRideIndex = -1; + sint32 mostExcitingRideIndex = -1; ride_rating mostExcitingRideRating = 0; - for (int i = 0; i < numPotentialRides; i++) { + for (sint32 i = 0; i < numPotentialRides; i++) { ride = get_ride(potentialRides[i]); if (!ride_has_ratings(ride)) continue; if (ride->excitement > mostExcitingRideRating) { @@ -12051,7 +12051,7 @@ static void peep_pick_ride_to_go_on(rct_peep *peep) * * rct2: 0x00695B70 */ -static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType) +static void peep_head_for_nearest_ride_type(rct_peep *peep, sint32 rideType) { rct_ride *ride; @@ -12067,14 +12067,14 @@ static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType) } } - for (int i = 0; i < countof(_peepRideConsideration); i++) { + for (sint32 i = 0; i < countof(_peepRideConsideration); i++) { _peepRideConsideration[i] = 0; } // FIX Originally checked for a toy,.likely a mistake and should be a map if ((peep->item_standard_flags & PEEP_ITEM_MAP) && rideType != RIDE_TYPE_FIRST_AID) { // Consider all rides in the park - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride->type == rideType) { _peepRideConsideration[i >> 5] |= (1u << (i & 0x1F)); @@ -12082,16 +12082,16 @@ static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType) } } else { // Take nearby rides into consideration - int cx = floor2(peep->x, 32); - int cy = floor2(peep->y, 32); - for (int x = cx - 320; x <= cx + 320; x += 32) { - for (int y = cy - 320; y <= cy + 320; y += 32) { + sint32 cx = floor2(peep->x, 32); + sint32 cy = floor2(peep->y, 32); + for (sint32 x = cx - 320; x <= cx + 320; x += 32) { + for (sint32 y = cy - 320; y <= cy + 320; y += 32) { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; ride = get_ride(rideIndex); if (ride->type == rideType) { _peepRideConsideration[rideIndex >> 5] |= (1u << (rideIndex & 0x1F)); @@ -12105,8 +12105,8 @@ static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType) // Filter the considered rides uint8 *potentialRides = _peepPotentialRides; uint8 *nextPotentialRide = potentialRides; - int numPotentialRides = 0; - for (int i = 0; i < MAX_RIDES; i++) { + sint32 numPotentialRides = 0; + for (sint32 i = 0; i < MAX_RIDES; i++) { if (!(_peepRideConsideration[i >> 5] & (1u << (i & 0x1F)))) continue; @@ -12120,13 +12120,13 @@ static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType) } // Pick the closest ride - int closestRideIndex = -1; - int closestRideDistance = INT_MAX; - for (int i = 0; i < numPotentialRides; i++) { + sint32 closestRideIndex = -1; + sint32 closestRideDistance = INT_MAX; + for (sint32 i = 0; i < numPotentialRides; i++) { ride = get_ride(potentialRides[i]); - int rideX = (ride->station_starts[0] & 0xFF) * 32; - int rideY = (ride->station_starts[0] >> 8) * 32; - int distance = abs(rideX - peep->x) + abs(rideY - peep->y); + sint32 rideX = (ride->station_starts[0] & 0xFF) * 32; + sint32 rideY = (ride->station_starts[0] >> 8) * 32; + sint32 distance = abs(rideX - peep->x) + abs(rideY - peep->y); if (distance < closestRideDistance) { closestRideIndex = potentialRides[i]; closestRideDistance = distance; @@ -12154,7 +12154,7 @@ static void peep_head_for_nearest_ride_type(rct_peep *peep, int rideType) * * rct2: 0x006958D0 */ -static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFlags) +static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, sint32 rideTypeFlags) { rct_ride *ride; @@ -12174,14 +12174,14 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl return; } - for (int i = 0; i < countof(_peepRideConsideration); i++) { + for (sint32 i = 0; i < countof(_peepRideConsideration); i++) { _peepRideConsideration[i] = 0; } // FIX Originally checked for a toy,.likely a mistake and should be a map if (peep->item_standard_flags & PEEP_ITEM_MAP) { // Consider all rides in the park - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride_type_has_flag(ride->type, rideTypeFlags)) { _peepRideConsideration[i >> 5] |= (1u << (i & 0x1F)); @@ -12189,16 +12189,16 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl } } else { // Take nearby rides into consideration - int cx = floor2(peep->x, 32); - int cy = floor2(peep->y, 32); - for (int x = cx - 320; x <= cx + 320; x += 32) { - for (int y = cy - 320; y <= cy + 320; y += 32) { + sint32 cx = floor2(peep->x, 32); + sint32 cy = floor2(peep->y, 32); + for (sint32 x = cx - 320; x <= cx + 320; x += 32) { + for (sint32 y = cy - 320; y <= cy + 320; y += 32) { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, rideTypeFlags)) { _peepRideConsideration[rideIndex >> 5] |= (1u << (rideIndex & 0x1F)); @@ -12212,8 +12212,8 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl // Filter the considered rides uint8 *potentialRides = _peepPotentialRides; uint8 *nextPotentialRide = potentialRides; - int numPotentialRides = 0; - for (int i = 0; i < MAX_RIDES; i++) { + sint32 numPotentialRides = 0; + for (sint32 i = 0; i < MAX_RIDES; i++) { if (!(_peepRideConsideration[i >> 5] & (1u << (i & 0x1F)))) continue; @@ -12227,13 +12227,13 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep *peep, int rideTypeFl } // Pick the closest ride - int closestRideIndex = -1; - int closestRideDistance = INT_MAX; - for (int i = 0; i < numPotentialRides; i++) { + sint32 closestRideIndex = -1; + sint32 closestRideDistance = INT_MAX; + for (sint32 i = 0; i < numPotentialRides; i++) { ride = get_ride(potentialRides[i]); - int rideX = (ride->station_starts[0] & 0xFF) * 32; - int rideY = (ride->station_starts[0] >> 8) * 32; - int distance = abs(rideX - peep->x) + abs(rideY - peep->y); + sint32 rideX = (ride->station_starts[0] & 0xFF) * 32; + sint32 rideY = (ride->station_starts[0] >> 8) * 32; + sint32 distance = abs(rideX - peep->x) + abs(rideY - peep->y); if (distance < closestRideDistance) { closestRideIndex = potentialRides[i]; closestRideDistance = distance; @@ -12292,7 +12292,7 @@ static void peep_give_real_name(rct_peep *peep) peep->name_string_idx = dx; } -static int peep_compare(const void *sprite_index_a, const void *sprite_index_b) +static sint32 peep_compare(const void *sprite_index_a, const void *sprite_index_b) { rct_peep const *peep_a = GET_PEEP(*(uint16*)sprite_index_a); rct_peep const *peep_b = GET_PEEP(*(uint16*)sprite_index_b); @@ -12418,7 +12418,7 @@ void peep_sort() // Create a copy of the peep list and sort it using peep_compare uint16 *peep_list = (uint16*)malloc(num_peeps * sizeof(uint16)); - int i = 0; + sint32 i = 0; FOR_ALL_PEEPS(sprite_index, peep) { peep_list[i++] = peep->sprite_index; } @@ -12488,7 +12488,7 @@ static bool peep_heading_for_ride_or_park_exit(rct_peep *peep) return (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK) || peep->guest_heading_to_ride_id != 0xFF; } -money32 set_peep_name(int flags, int state, uint16 sprite_index, uint8* text_1, uint8* text_2, uint8* text_3) { +money32 set_peep_name(sint32 flags, sint32 state, uint16 sprite_index, uint8* text_1, uint8* text_2, uint8* text_3) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; static char newName[128]; @@ -12643,7 +12643,7 @@ money32 set_peep_name(int flags, int state, uint16 sprite_index, uint8* text_1, * * rct2: 0x00698D6C */ -void game_command_set_guest_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) { +void game_command_set_guest_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint16 sprite_index = *ecx & 0xFFFF; if (sprite_index >= MAX_SPRITES) { diff --git a/src/openrct2/peep/peep.h b/src/openrct2/peep/peep.h index 4d4ab61a6e..e6523fa393 100644 --- a/src/openrct2/peep/peep.h +++ b/src/openrct2/peep/peep.h @@ -635,28 +635,28 @@ extern rct_xyz16 gPeepPathFindGoalPosition; extern bool gPeepPathFindIgnoreForeignQueues; extern uint8 gPeepPathFindQueueRideIndex; -int peep_get_staff_count(); -int peep_can_be_picked_up(rct_peep* peep); +sint32 peep_get_staff_count(); +sint32 peep_can_be_picked_up(rct_peep* peep); void peep_update_all(); void peep_problem_warnings_update(); void peep_update_crowd_noise(); void peep_update_days_in_queue(); void peep_applause(); -rct_peep *peep_generate(int x, int y, int z); +rct_peep *peep_generate(sint32 x, sint32 y, sint32 z); void get_arguments_from_action(rct_peep* peep, uint32 *argument_1, uint32* argument_2); void peep_thought_set_format_args(rct_peep_thought *thought); -int get_peep_face_sprite_small(rct_peep *peep); -int get_peep_face_sprite_large(rct_peep *peep); -int peep_check_easteregg_name(int index, rct_peep *peep); -int peep_get_easteregg_name_id(rct_peep *peep); -int peep_is_mechanic(rct_peep *peep); -bool peep_has_item(rct_peep *peep, int peepItem); -int peep_has_food(rct_peep* peep); +sint32 get_peep_face_sprite_small(rct_peep *peep); +sint32 get_peep_face_sprite_large(rct_peep *peep); +sint32 peep_check_easteregg_name(sint32 index, rct_peep *peep); +sint32 peep_get_easteregg_name_id(rct_peep *peep); +sint32 peep_is_mechanic(rct_peep *peep); +bool peep_has_item(rct_peep *peep, sint32 peepItem); +sint32 peep_has_food(rct_peep* peep); void peep_pickup(rct_peep* peep); -void peep_pickup_abort(rct_peep* peep, int old_x); -bool peep_pickup_place(rct_peep* peep, int x, int y, int z, bool apply); -bool peep_pickup_command(unsigned int peepnum, int x, int y, int z, int action, bool apply); -void game_command_pickup_guest(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void peep_pickup_abort(rct_peep* peep, sint32 old_x); +bool peep_pickup_place(rct_peep* peep, sint32 x, sint32 y, sint32 z, bool apply); +bool peep_pickup_command(uint32 peepnum, sint32 x, sint32 y, sint32 z, sint32 action, bool apply); +void game_command_pickup_guest(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); void peep_sprite_remove(rct_peep* peep); void peep_remove(rct_peep* peep); void peep_update_sprite_type(rct_peep* peep); @@ -681,10 +681,10 @@ void peep_update_name_sort(rct_peep *peep); void peep_sort(); void peep_update_names(bool realNames); -money32 set_peep_name(int flags, int state, uint16 sprite_index, uint8* text_1, uint8* text_2, uint8* text_3); -void game_command_set_guest_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +money32 set_peep_name(sint32 flags, sint32 state, uint16 sprite_index, uint8* text_1, uint8* text_2, uint8* text_3); +void game_command_set_guest_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); -int peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep); +sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep *peep); void peep_reset_pathfind_goal(rct_peep *peep); #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 diff --git a/src/openrct2/peep/staff.c b/src/openrct2/peep/staff.c index d7e5ce8300..eb8b60b880 100644 --- a/src/openrct2/peep/staff.c +++ b/src/openrct2/peep/staff.c @@ -42,10 +42,10 @@ colour_t gStaffSecurityColour; */ void staff_reset_modes() { - for (int i = 0; i < 200; i++) + for (sint32 i = 0; i < 200; i++) gStaffModes[i] = STAFF_MODE_NONE; - for (int i = 200; i < 204; i++) + for (sint32 i = 200; i < 204; i++) gStaffModes[i] = STAFF_MODE_WALK; staff_update_greyed_patrol_areas(); @@ -55,7 +55,7 @@ void staff_reset_modes() * * rct2: 0x00669E55 */ -void game_command_update_staff_colour(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_update_staff_colour(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { if (*ebx & GAME_COMMAND_FLAG_APPLY) { uint8 staffType = (*ebx >> 8) & 0xFF; @@ -68,7 +68,7 @@ void game_command_update_staff_colour(int *eax, int *ebx, int *ecx, int *edx, in return; } - int spriteIndex; + sint32 spriteIndex; rct_peep *peep; FOR_ALL_PEEPS(spriteIndex, peep) { if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == staffType) { @@ -151,7 +151,7 @@ static inline void staff_autoposition_new_staff_member(rct_peep *newPeep) invalidate_sprite_2((rct_sprite *)newPeep); } -static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 command_x, sint16 command_y, sint16 command_z, int autoposition, int *newPeep_sprite_index) +static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 command_x, sint16 command_y, sint16 command_z, sint32 autoposition, sint32 *newPeep_sprite_index) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES; gCommandPosition.x = command_x; @@ -171,7 +171,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 return MONEY32_UNDEFINED; } - int i; + sint32 i; for (i = 0; i < STAFF_MAX_COUNT; ++i) { if (!(gStaffModes[i] & 1)) break; @@ -182,7 +182,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 return MONEY32_UNDEFINED; } - int newStaffId = i; + sint32 newStaffId = i; const rct_sprite_bounds *spriteBounds; rct_peep *newPeep = &(create_sprite(flags)->peep); @@ -310,7 +310,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 if ((staff_type == STAFF_TYPE_HANDYMAN) && gConfigGeneral.handymen_mow_default) { uint8 new_orders = newPeep->staff_orders | STAFF_ORDERS_MOWING; - game_do_command(newPeep->x, ((int)new_orders << 8) | 1, newPeep->y, newPeep->sprite_index, GAME_COMMAND_SET_STAFF_ORDER, 0, 0); + game_do_command(newPeep->x, ((sint32)new_orders << 8) | 1, newPeep->y, newPeep->sprite_index, GAME_COMMAND_SET_STAFF_ORDER, 0, 0); } *newPeep_sprite_index = newPeep->sprite_index; @@ -321,7 +321,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 * * rct2: 0x006BEFA1 */ -void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_hire_new_staff_member(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = staff_hire_new_staff_member((*ebx & 0xFF00) >> 8, *ebx & 0xFF, @@ -332,9 +332,9 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx, edi); } -void game_command_callback_hire_new_staff_member(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_hire_new_staff_member(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { - int sprite_index = edi; + sint32 sprite_index = edi; if (sprite_index == SPRITE_INDEX_NULL) { rct_window *window = window_find_by_class(WC_STAFF_LIST); @@ -371,7 +371,7 @@ static const bool peep_slow_walking_types[] = { * * rct2: 0x006C0BB5 */ -void game_command_set_staff_order(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_staff_order(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES; uint8 order_id = *ebx >> 8; @@ -415,11 +415,11 @@ void game_command_set_staff_order(int *eax, int *ebx, int *ecx, int *edx, int *e * * rct2: 0x006C09D1 */ -void game_command_set_staff_patrol(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_staff_patrol(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { if(*ebx & GAME_COMMAND_FLAG_APPLY){ - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint16 sprite_id = *edx; if (sprite_id >= MAX_SPRITES) { @@ -435,12 +435,12 @@ void game_command_set_staff_patrol(int *eax, int *ebx, int *ecx, int *edx, int * return; } rct_peep *peep = &sprite->peep; - int patrolOffset = peep->staff_id * (64 * 64 / 8); + sint32 patrolOffset = peep->staff_id * (64 * 64 / 8); staff_toggle_patrol_area(peep->staff_id, x, y); - int ispatrolling = 0; - for(int i = 0; i < 128; i++){ + sint32 ispatrolling = 0; + for(sint32 i = 0; i < 128; i++){ ispatrolling |= *((uint32*)((uintptr_t)gStaffPatrolAreas + patrolOffset + (i * 4))); } @@ -449,8 +449,8 @@ void game_command_set_staff_patrol(int *eax, int *ebx, int *ecx, int *edx, int * gStaffModes[peep->staff_id] |= 2; } - for(int y2 = 0; y2 < 4; y2++){ - for(int x2 = 0; x2 < 4; x2++){ + for(sint32 y2 = 0; y2 < 4; y2++){ + for(sint32 x2 = 0; x2 < 4; x2++){ map_invalidate_tile_full((x & 0x1F80) + (x2 * 32), (y & 0x1F80) + (y2 * 32)); } } @@ -463,7 +463,7 @@ void game_command_set_staff_patrol(int *eax, int *ebx, int *ecx, int *edx, int * * * rct2: 0x006C0B83 */ -void game_command_fire_staff_member(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_fire_staff_member(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES; if(*ebx & GAME_COMMAND_FLAG_APPLY){ @@ -508,15 +508,15 @@ uint16 hire_new_staff_member(uint8 staffType) { gGameCommandErrorTitle = STR_CANT_HIRE_NEW_STAFF; - int command_x, ebx, command_y, command_z, esi, new_sprite_index, ebp; + sint32 command_x, ebx, command_y, command_z, esi, new_sprite_index, ebp; command_y = command_z = esi = new_sprite_index = ebp = 0; command_x = 0x8000; - int autoposition = gConfigGeneral.auto_staff_placement == ((SDL_GetModState() & KMOD_SHIFT) == 0); + sint32 autoposition = gConfigGeneral.auto_staff_placement == ((SDL_GetModState() & KMOD_SHIFT) == 0); ebx = autoposition << 16 | staffType << 8 | GAME_COMMAND_FLAG_APPLY; game_command_callback = game_command_callback_hire_new_staff_member; - int result = game_do_command_p(GAME_COMMAND_HIRE_NEW_STAFF_MEMBER, &command_x, &ebx, &command_y, &command_z, &esi, &new_sprite_index, &ebp); + sint32 result = game_do_command_p(GAME_COMMAND_HIRE_NEW_STAFF_MEMBER, &command_x, &ebx, &command_y, &command_z, &esi, &new_sprite_index, &ebp); if (result == MONEY32_UNDEFINED) return SPRITE_INDEX_NULL; @@ -532,10 +532,10 @@ void staff_update_greyed_patrol_areas() { rct_peep* peep; - for (int staff_type = 0; staff_type < STAFF_TYPE_COUNT; ++staff_type) + for (sint32 staff_type = 0; staff_type < STAFF_TYPE_COUNT; ++staff_type) { uint32 *addr = (uint32*)((uintptr_t)gStaffPatrolAreas + ((staff_type + STAFF_MAX_COUNT) * 512)); - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { addr[i] = 0; } @@ -546,7 +546,7 @@ void staff_update_greyed_patrol_areas() if (peep->type == PEEP_TYPE_STAFF && staff_type == peep->staff_type) { uint32 *addr2 = (uint32*)((uintptr_t)gStaffPatrolAreas + (peep->staff_id * 512)); - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { addr[i] |= addr2[i]; } } @@ -554,7 +554,7 @@ void staff_update_greyed_patrol_areas() } } -static int staff_is_location_in_patrol_area(rct_peep *peep, int x, int y) +static sint32 staff_is_location_in_patrol_area(rct_peep *peep, sint32 x, sint32 y) { // Patrol quads are stored in a bit map (8 patrol quads per byte) // Each patrol quad is 4x4 @@ -566,7 +566,7 @@ static int staff_is_location_in_patrol_area(rct_peep *peep, int x, int y) * * rct2: 0x006C0905 */ -int staff_is_location_in_patrol(rct_peep *staff, int x, int y) +sint32 staff_is_location_in_patrol(rct_peep *staff, sint32 x, sint32 y) { // Check if location is in the park if (!map_is_location_owned_or_has_rights(x, y)) @@ -630,25 +630,25 @@ void staff_reset_stats() } } -bool staff_is_patrol_area_set(int staffIndex, int x, int y) +bool staff_is_patrol_area_set(sint32 staffIndex, sint32 x, sint32 y) { x = (x & 0x1F80) >> 7; y = (y & 0x1F80) >> 1; - int peepOffset = staffIndex * 128; - int offset = (x | y) >> 5; - int bitIndex = (x | y) & 0x1F; + sint32 peepOffset = staffIndex * 128; + sint32 offset = (x | y) >> 5; + sint32 bitIndex = (x | y) & 0x1F; return gStaffPatrolAreas[peepOffset + offset] & (((uint32)1) << bitIndex); } -void staff_set_patrol_area(int staffIndex, int x, int y, bool value) +void staff_set_patrol_area(sint32 staffIndex, sint32 x, sint32 y, bool value) { x = (x & 0x1F80) >> 7; y = (y & 0x1F80) >> 1; - int peepOffset = staffIndex * 128; - int offset = (x | y) >> 5; - int bitIndex = (x | y) & 0x1F; + sint32 peepOffset = staffIndex * 128; + sint32 offset = (x | y) >> 5; + sint32 bitIndex = (x | y) & 0x1F; uint32 *addr = &gStaffPatrolAreas[peepOffset + offset]; if (value) { *addr |= (1 << bitIndex); @@ -657,14 +657,14 @@ void staff_set_patrol_area(int staffIndex, int x, int y, bool value) } } -void staff_toggle_patrol_area(int staffIndex, int x, int y) +void staff_toggle_patrol_area(sint32 staffIndex, sint32 x, sint32 y) { x = (x & 0x1F80) >> 7; y = (y & 0x1F80) >> 1; - int peepOffset = staffIndex * 128; - int offset = (x | y) >> 5; - int bitIndex = (x | y) & 0x1F; + sint32 peepOffset = staffIndex * 128; + sint32 offset = (x | y) >> 5; + sint32 bitIndex = (x | y) & 0x1F; gStaffPatrolAreas[peepOffset + offset] ^= (1 << bitIndex); } @@ -814,9 +814,9 @@ static uint8 staff_handyman_direction_to_uncut_grass(rct_peep* peep, uint8 valid * * rct2: 0x006BFD9C */ -static int staff_handyman_direction_rand_surface(rct_peep* peep, uint8 validDirections) { +static sint32 staff_handyman_direction_rand_surface(rct_peep* peep, uint8 validDirections) { uint8 direction = scenario_rand() & 3; - for (int i = 0; i < 4; ++i, ++direction) { + for (sint32 i = 0; i < 4; ++i, ++direction) { direction &= 3; if (!(validDirections & (1 << direction))) continue; @@ -842,7 +842,7 @@ static int staff_handyman_direction_rand_surface(rct_peep* peep, uint8 validDire * * rct2: 0x006BFBA8 */ -static int staff_path_finding_handyman(rct_peep* peep) +static sint32 staff_path_finding_handyman(rct_peep* peep) { peep->var_E2++; @@ -926,7 +926,7 @@ static int staff_path_finding_handyman(rct_peep* peep) static uint8 staff_direction_surface(rct_peep* peep, uint8 initialDirection) { uint8 direction = initialDirection; - for (int i = 0; i < 3; ++i) { + for (sint32 i = 0; i < 3; ++i) { // Looks left and right from initial direction switch (i) { case 1: @@ -1018,7 +1018,7 @@ static uint8 staff_mechanic_direction_path_rand(rct_peep* peep, uint8 pathDirect // Modified from original to spam scenario_rand less uint8 direction = scenario_rand() & 3; - for (int i = 0; i < 4; ++i, ++direction) { + for (sint32 i = 0; i < 4; ++i, ++direction) { direction &= 3; if (pathDirections & (1 << direction)) return direction; @@ -1112,7 +1112,7 @@ static uint8 staff_mechanic_direction_path(rct_peep* peep, uint8 validDirections pathfind_logging_enable(peep); #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 - int pathfindDirection = peep_pathfind_choose_direction(peep->next_x, peep->next_y, peep->next_z, peep); + sint32 pathfindDirection = peep_pathfind_choose_direction(peep->next_x, peep->next_y, peep->next_z, peep); #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 pathfind_logging_disable(); @@ -1138,7 +1138,7 @@ static uint8 staff_mechanic_direction_path(rct_peep* peep, uint8 validDirections * * rct2: 0x006BFF2C */ -static int staff_path_finding_mechanic(rct_peep* peep) { +static sint32 staff_path_finding_mechanic(rct_peep* peep) { uint8 validDirections = staff_get_valid_patrol_directions(peep, peep->next_x, peep->next_y); uint8 direction = 0xFF; if (peep->next_var_29 & 0x18) { @@ -1203,7 +1203,7 @@ static uint8 staff_direction_path(rct_peep* peep, uint8 validDirections, rct_map pathDirections |= (1 << direction); direction = scenario_rand() & 3; - for (int i = 0; i < 4; ++i, ++direction) { + for (sint32 i = 0; i < 4; ++i, ++direction) { direction &= 3; if (pathDirections & (1 << direction)) return direction; @@ -1217,7 +1217,7 @@ static uint8 staff_direction_path(rct_peep* peep, uint8 validDirections, rct_map * * rct2: 0x006C0351 */ -static int staff_path_finding_misc(rct_peep* peep) { +static sint32 staff_path_finding_misc(rct_peep* peep) { uint8 validDirections = staff_get_valid_patrol_directions(peep, peep->next_x, peep->next_y); uint8 direction = 0xFF; @@ -1295,7 +1295,7 @@ static void staff_entertainer_update_nearby_peeps(rct_peep* peep) { * * rct2: 0x006C05AE */ -static int staff_path_finding_entertainer(rct_peep* peep) { +static sint32 staff_path_finding_entertainer(rct_peep* peep) { if (((scenario_rand() & 0xFFFF) <= 0x4000) && (peep->action == PEEP_ACTION_NONE_1 || peep->action == PEEP_ACTION_NONE_2)) { @@ -1318,7 +1318,7 @@ static int staff_path_finding_entertainer(rct_peep* peep) { * * rct2: 0x006BF926 */ -int staff_path_finding(rct_peep* peep) { +sint32 staff_path_finding(rct_peep* peep) { switch (peep->staff_type) { case STAFF_TYPE_HANDYMAN: return staff_path_finding_handyman(peep); @@ -1335,7 +1335,7 @@ int staff_path_finding(rct_peep* peep) { } } -void game_command_set_staff_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) { +void game_command_set_staff_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint16 sprite_index = *ecx & 0xFFFF; if (sprite_index >= MAX_SPRITES) { @@ -1358,13 +1358,13 @@ void game_command_set_staff_name(int *eax, int *ebx, int *ecx, int *edx, int *es ); } -void game_command_pickup_staff(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_pickup_staff(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int peepnum = *eax; - int x = *edi; - int y = *ebp; - int z = *edx; - int action = *ecx; + sint32 peepnum = *eax; + sint32 x = *edi; + sint32 y = *ebp; + sint32 z = *edx; + sint32 action = *ecx; if (peep_pickup_command(peepnum, x, y, z, action, *ebx & GAME_COMMAND_FLAG_APPLY)) { *ebx = 0; } diff --git a/src/openrct2/peep/staff.h b/src/openrct2/peep/staff.h index 70182108af..e72a3830d3 100644 --- a/src/openrct2/peep/staff.h +++ b/src/openrct2/peep/staff.h @@ -67,25 +67,25 @@ extern colour_t gStaffHandymanColour; extern colour_t gStaffMechanicColour; extern colour_t gStaffSecurityColour; -void game_command_update_staff_colour(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_hire_new_staff_member(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_callback_hire_new_staff_member(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -void game_command_set_staff_order(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_staff_patrol(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_fire_staff_member(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_staff_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_pickup_staff(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void game_command_update_staff_colour(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_hire_new_staff_member(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_callback_hire_new_staff_member(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +void game_command_set_staff_order(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_staff_patrol(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_fire_staff_member(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_staff_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_pickup_staff(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); void staff_reset_modes(); void update_staff_colour(uint8 staffType, uint16 colour); uint16 hire_new_staff_member(uint8 staffType); void staff_update_greyed_patrol_areas(); -int staff_is_location_in_patrol(rct_peep *mechanic, int x, int y); -int staff_path_finding(rct_peep* peep); +sint32 staff_is_location_in_patrol(rct_peep *mechanic, sint32 x, sint32 y); +sint32 staff_path_finding(rct_peep* peep); void staff_reset_stats(); -bool staff_is_patrol_area_set(int staffIndex, int x, int y); -void staff_set_patrol_area(int staffIndex, int x, int y, bool value); -void staff_toggle_patrol_area(int staffIndex, int x, int y); +bool staff_is_patrol_area_set(sint32 staffIndex, sint32 x, sint32 y); +void staff_set_patrol_area(sint32 staffIndex, sint32 x, sint32 y, bool value); +void staff_toggle_patrol_area(sint32 staffIndex, sint32 x, sint32 y); colour_t staff_get_colour(uint8 staffType); bool staff_set_colour(uint8 staffType, colour_t value); diff --git a/src/openrct2/platform/linux.c b/src/openrct2/platform/linux.c index 39feab07a8..90eff32baf 100644 --- a/src/openrct2/platform/linux.c +++ b/src/openrct2/platform/linux.c @@ -64,7 +64,7 @@ void platform_get_exe_path(utf8 *outPath, size_t outSize) exePath[bytesRead - 1] = '\0'; #elif defined(__FREEBSD__) size_t exeLen = sizeof(exePath); - const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + const sint32 mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; if (sysctl(mib, 4, exePath, &exeLen, NULL, 0) == -1) { log_fatal("failed to get process path"); @@ -173,9 +173,9 @@ uint16 platform_get_locale_language(){ // longest on my system is 29 with codeset and modifier, so 32 for the pattern should be more than enough char pattern[32]; //strip the codeset and modifier part - int length = strlen(langString); + sint32 length = strlen(langString); { - for(int i = 0; i < length; ++i){ + for(sint32 i = 0; i < length; ++i){ if(langString[i] == '.' || langString[i] == '@'){ length = i; break; @@ -193,7 +193,7 @@ uint16 platform_get_locale_language(){ } // Iterate through all available languages - for(int i = 1; i < LANGUAGE_COUNT; ++i){ + for(sint32 i = 1; i < LANGUAGE_COUNT; ++i){ if(!fnmatch(pattern, LanguagesDescriptors[i].locale, 0)){ return i; } @@ -214,7 +214,7 @@ uint16 platform_get_locale_language(){ if(strip != NULL){ pattern[strip - pattern] = '*'; pattern[strip - pattern +1] = '\0'; // pattern is now "language*" - for(int i = 1; i < LANGUAGE_COUNT; ++i){ + for(sint32 i = 1; i < LANGUAGE_COUNT; ++i){ if(!fnmatch(pattern, LanguagesDescriptors[i].locale, 0)){ return i; } @@ -253,7 +253,7 @@ uint8 platform_get_locale_measurement_format(){ return MEASUREMENT_FORMAT_METRIC; } -static void execute_cmd(char *command, int *exit_value, char *buf, size_t *buf_size) { +static void execute_cmd(char *command, sint32 *exit_value, char *buf, size_t *buf_size) { FILE *f; size_t n_chars; @@ -286,7 +286,7 @@ static void execute_cmd(char *command, int *exit_value, char *buf, size_t *buf_s } static dialog_type get_dialog_app(char *cmd, size_t *cmd_size) { - int exit_value; + sint32 exit_value; size_t size; dialog_type dtype; @@ -318,7 +318,7 @@ static dialog_type get_dialog_app(char *cmd, size_t *cmd_size) { } bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, size_t outSize) { - int exit_value; + sint32 exit_value; char executable[MAX_PATH]; char cmd[MAX_PATH]; char result[MAX_PATH]; @@ -345,7 +345,7 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, { bool first = true; - for (int j = 0; j < countof(desc->filters); j++) { + for (sint32 j = 0; j < countof(desc->filters); j++) { if (desc->filters[j].pattern && desc->filters[j].name) { char filterTemp[100] = { 0 }; if (first) { @@ -368,8 +368,8 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, // kdialog wants filters space-delimited and we don't expect ';' anywhere else, // this is much easier and quicker to do than being overly careful about replacing // it only where truly needed. - int filterSize = strlen(filter); - for (int i = 0; i < filterSize + 3; i++) { + sint32 filterSize = strlen(filter); + for (sint32 i = 0; i < filterSize + 3; i++) { if (filter[i] == ';') { filter[i] = ' '; } @@ -390,10 +390,10 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, } // Zenity seems to be case sensitive, while Kdialog isn't. - for (int j = 0; j < countof(desc->filters); j++) { + for (sint32 j = 0; j < countof(desc->filters); j++) { if (desc->filters[j].pattern && desc->filters[j].name) { - int regexIterator = 0; - for(int i = 0; i <= strlen(desc->filters[j].pattern); i++) { + sint32 regexIterator = 0; + for(sint32 i = 0; i <= strlen(desc->filters[j].pattern); i++) { if (isalpha(desc->filters[j].pattern[i])) { filterPatternRegex[regexIterator+0] = '['; filterPatternRegex[regexIterator+1] = (char)toupper(desc->filters[j].pattern[i]); @@ -462,7 +462,7 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, utf8 *platform_open_directory_browser(utf8 *title) { size_t size; dialog_type dtype; - int exit_value; + sint32 exit_value; char cmd[MAX_PATH]; char executable[MAX_PATH]; char result[MAX_PATH]; diff --git a/src/openrct2/platform/platform.h b/src/openrct2/platform/platform.h index ad5001abb0..e3c96fb41f 100644 --- a/src/openrct2/platform/platform.h +++ b/src/openrct2/platform/platform.h @@ -64,7 +64,7 @@ #endif typedef struct resolution { - int width, height; + sint32 width, height; } resolution_t; typedef struct file_info { @@ -87,12 +87,12 @@ typedef struct rct2_time { } rct2_time; typedef struct openrct2_cursor { - int x, y; - unsigned char left, middle, right, any; - int wheel; - int old; + sint32 x, y; + uint8 left, middle, right, any; + sint32 wheel; + sint32 old; bool touch, touchIsDouble; - unsigned int touchDownTimestamp; + uint32 touchDownTimestamp; } openrct2_cursor; enum { @@ -117,18 +117,18 @@ typedef struct file_dialog_desc { } file_dialog_desc; extern openrct2_cursor gCursorState; -extern const unsigned char *gKeysState; -extern unsigned char *gKeysPressed; -extern unsigned int gLastKeyPressed; +extern const uint8 *gKeysState; +extern uint8 *gKeysPressed; +extern uint32 gLastKeyPressed; extern textinputbuffer gTextInput; extern bool gTextInputCompositionActive; extern utf8 gTextInputComposition[32]; -extern int gTextInputCompositionStart; -extern int gTextInputCompositionLength; +extern sint32 gTextInputCompositionStart; +extern sint32 gTextInputCompositionLength; -extern int gResolutionsAllowAnyAspectRatio; -extern int gNumResolutions; +extern sint32 gResolutionsAllowAnyAspectRatio; +extern sint32 gNumResolutions; extern resolution_t *gResolutions; extern SDL_Window *gWindow; @@ -138,20 +138,20 @@ extern bool gSteamOverlayActive; // Platform shared definitions void platform_update_fullscreen_resolutions(); -void platform_get_closest_resolution(int inWidth, int inHeight, int *outWidth, int *outHeight); +void platform_get_closest_resolution(sint32 inWidth, sint32 inHeight, sint32 *outWidth, sint32 *outHeight); void platform_init(); void platform_draw(); void platform_draw_require_end(); void platform_free(); void platform_trigger_resize(); -void platform_update_palette(const uint8 *colours, int start_index, int num_colours); -void platform_set_fullscreen_mode(int mode); +void platform_update_palette(const uint8 *colours, sint32 start_index, sint32 num_colours); +void platform_set_fullscreen_mode(sint32 mode); void platform_toggle_windowed_mode(); void platform_set_cursor(uint8 cursor); void platform_refresh_video(); void platform_process_messages(); -int platform_scancode_to_rct_keycode(int sdl_key); -void platform_start_text_input(utf8 *buffer, int max_length); +sint32 platform_scancode_to_rct_keycode(sint32 sdl_key); +void platform_start_text_input(utf8 *buffer, sint32 max_length); void platform_stop_text_input(); bool platform_is_input_active(); void platform_get_date_utc(rct2_date *out_date); @@ -168,26 +168,26 @@ time_t platform_file_get_modified_time(const utf8* path); bool platform_ensure_directory_exists(const utf8 *path); bool platform_directory_delete(const utf8 *path); bool platform_lock_single_instance(); -int platform_enumerate_files_begin(const utf8 *pattern); -bool platform_enumerate_files_next(int handle, file_info *outFileInfo); -void platform_enumerate_files_end(int handle); -int platform_enumerate_directories_begin(const utf8 *directory); -bool platform_enumerate_directories_next(int handle, utf8 *path); -void platform_enumerate_directories_end(int handle); +sint32 platform_enumerate_files_begin(const utf8 *pattern); +bool platform_enumerate_files_next(sint32 handle, file_info *outFileInfo); +void platform_enumerate_files_end(sint32 handle); +sint32 platform_enumerate_directories_begin(const utf8 *directory); +bool platform_enumerate_directories_next(sint32 handle, utf8 *path); +void platform_enumerate_directories_end(sint32 handle); void platform_init_window_icon(); // Returns the bitmask of the GetLogicalDrives function for windows, 0 for other systems -int platform_get_drives(); +sint32 platform_get_drives(); bool platform_file_copy(const utf8 *srcPath, const utf8 *dstPath, bool overwrite); bool platform_file_move(const utf8 *srcPath, const utf8 *dstPath); bool platform_file_delete(const utf8 *path); void platform_hide_cursor(); void platform_show_cursor(); -void platform_get_cursor_position(int *x, int *y); -void platform_get_cursor_position_scaled(int *x, int *y); -void platform_set_cursor_position(int x, int y); -unsigned int platform_get_ticks(); +void platform_get_cursor_position(sint32 *x, sint32 *y); +void platform_get_cursor_position_scaled(sint32 *x, sint32 *y); +void platform_set_cursor_position(sint32 x, sint32 y); +uint32 platform_get_ticks(); void platform_resolve_user_data_path(); void platform_resolve_openrct_data_path(); void platform_get_openrct_data_path(utf8 *outPath, size_t outSize); @@ -220,13 +220,13 @@ void core_init(); #include #undef GetMessage - int windows_get_registry_install_info(rct2_install_info *installInfo, char *source, char *font, uint8 charset); + sint32 windows_get_registry_install_info(rct2_install_info *installInfo, char *source, char *font, uint8 charset); HWND windows_get_window_handle(); void platform_setup_file_associations(); void platform_remove_file_associations(); // This function cannot be marked as 'static', even though it may seem to be, // as it requires external linkage, which 'static' prevents - __declspec(dllexport) int StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow); + __declspec(dllexport) sint32 StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, sint32 nCmdShow); #endif // __WINDOWS__ #if defined(__LINUX__) || defined(__MACOSX__) || defined(__FREEBSD__) diff --git a/src/openrct2/platform/posix.c b/src/openrct2/platform/posix.c index f4befe18d1..e3c1a14a0c 100644 --- a/src/openrct2/platform/posix.c +++ b/src/openrct2/platform/posix.c @@ -49,11 +49,11 @@ utf8 _openrctDataDirectoryPath[MAX_PATH] = { 0 }; * The function that is called directly from the host application (rct2.exe)'s WinMain. * This will be removed when OpenRCT2 can be built as a stand alone application. */ -int main(int argc, const char **argv) +sint32 main(sint32 argc, const char **argv) { core_init(); - int run_game = cmdline_run(argv, argc); + sint32 run_game = cmdline_run(argv, argc); if (run_game == 1) { openrct2_launch(); @@ -145,7 +145,7 @@ bool platform_directory_exists(const utf8 *path) char buffer[MAX_PATH]; platform_utf8_to_multibyte(path, buffer, MAX_PATH); struct stat dirinfo; - int result = stat(buffer, &dirinfo); + sint32 result = stat(buffer, &dirinfo); log_verbose("checking dir %s, result = %d, is_dir = %d", buffer, result, S_ISDIR(dirinfo.st_mode)); if ((result != 0) || !S_ISDIR(dirinfo.st_mode)) { @@ -272,7 +272,7 @@ bool platform_lock_single_instance() // take care of that, because flock keeps the lock as long as the // file is open and closes it automatically on file close. // This is intentional. - int pidFile = open(pidFilePath, O_CREAT | O_RDWR, 0666); + sint32 pidFile = open(pidFilePath, O_CREAT | O_RDWR, 0666); if (pidFile == -1) { log_warning("Cannot open lock file for writing."); @@ -294,24 +294,24 @@ typedef struct enumerate_file_info { char pattern[MAX_PATH]; struct dirent **fileListTemp; char **paths; - int cnt; - int handle; + sint32 cnt; + sint32 handle; void* data; } enumerate_file_info; static enumerate_file_info _enumerateFileInfoList[8] = { 0 }; char *g_file_pattern; -static int winfilter(const struct dirent *d) +static sint32 winfilter(const struct dirent *d) { - int entry_length = strnlen(d->d_name, MAX_PATH); + sint32 entry_length = strnlen(d->d_name, MAX_PATH); char *name_upper = malloc(entry_length + 1); if (name_upper == NULL) { log_error("out of memory"); return 0; } - for (int i = 0; i < entry_length; i++) + for (sint32 i = 0; i < entry_length; i++) { name_upper[i] = (char)toupper(d->d_name[i]); } @@ -322,7 +322,7 @@ static int winfilter(const struct dirent *d) return match; } -int platform_enumerate_files_begin(const utf8 *pattern) +sint32 platform_enumerate_files_begin(const utf8 *pattern) { char npattern[MAX_PATH]; platform_utf8_to_multibyte(pattern, npattern, MAX_PATH); @@ -341,15 +341,15 @@ int platform_enumerate_files_begin(const utf8 *pattern) } - int pattern_length = strlen(file_name); + sint32 pattern_length = strlen(file_name); g_file_pattern = strndup(file_name, pattern_length); - for (int j = 0; j < pattern_length; j++) + for (sint32 j = 0; j < pattern_length; j++) { g_file_pattern[j] = (char)toupper(g_file_pattern[j]); } log_verbose("looking for file matching %s", g_file_pattern); - int cnt; - for (int i = 0; i < countof(_enumerateFileInfoList); i++) { + sint32 cnt; + for (sint32 i = 0; i < countof(_enumerateFileInfoList); i++) { enumFileInfo = &_enumerateFileInfoList[i]; if (!enumFileInfo->active) { safe_strcpy(enumFileInfo->pattern, npattern, sizeof(enumFileInfo->pattern)); @@ -363,11 +363,11 @@ int platform_enumerate_files_begin(const utf8 *pattern) enumFileInfo->paths = malloc(cnt * sizeof(char *)); char **paths = enumFileInfo->paths; // 256 is size of dirent.d_name - const int dir_name_len = strnlen(dir_name, MAX_PATH); - for (int idx = 0; idx < cnt; idx++) + const sint32 dir_name_len = strnlen(dir_name, MAX_PATH); + for (sint32 idx = 0; idx < cnt; idx++) { struct dirent *d = enumFileInfo->fileListTemp[idx]; - const int entry_len = strnlen(d->d_name, MAX_PATH); + const sint32 entry_len = strnlen(d->d_name, MAX_PATH); // 1 for separator, 1 for trailing null size_t path_len = sizeof(char) * min(MAX_PATH, entry_len + dir_name_len + 2); paths[idx] = malloc(path_len); @@ -391,7 +391,7 @@ int platform_enumerate_files_begin(const utf8 *pattern) return -1; } -bool platform_enumerate_files_next(int handle, file_info *outFileInfo) +bool platform_enumerate_files_next(sint32 handle, file_info *outFileInfo) { if (handle < 0) @@ -408,11 +408,11 @@ bool platform_enumerate_files_next(int handle, file_info *outFileInfo) } if (result) { - int entryIdx = enumFileInfo->handle++; + sint32 entryIdx = enumFileInfo->handle++; struct stat fileInfo; log_verbose("trying handle %d", entryIdx); char *fileName = enumFileInfo->paths[entryIdx]; - int statRes; + sint32 statRes; statRes = stat(fileName, &fileInfo); if (statRes == -1) { log_error("failed to stat file '%s'! errno = %i", fileName, errno); @@ -427,15 +427,15 @@ bool platform_enumerate_files_next(int handle, file_info *outFileInfo) } } -void platform_enumerate_files_end(int handle) +void platform_enumerate_files_end(sint32 handle) { if (handle < 0) { return; } enumerate_file_info *enumFileInfo = &_enumerateFileInfoList[handle]; - int cnt = enumFileInfo->cnt; - for (int i = 0; i < cnt; i++) { + sint32 cnt = enumFileInfo->cnt; + for (sint32 i = 0; i < cnt; i++) { free(enumFileInfo->fileListTemp[i]); free(enumFileInfo->paths[i]); } @@ -447,7 +447,7 @@ void platform_enumerate_files_end(int handle) enumFileInfo->active = 0; } -static int dirfilter(const struct dirent *d) +static sint32 dirfilter(const struct dirent *d) { if (d->d_name[0] == '.') { return 0; @@ -464,17 +464,17 @@ static int dirfilter(const struct dirent *d) #endif // defined(_DIRENT_HAVE_D_TYPE) || defined(DT_UNKNOWN) } -int platform_enumerate_directories_begin(const utf8 *directory) +sint32 platform_enumerate_directories_begin(const utf8 *directory) { char npattern[MAX_PATH]; - int length = platform_utf8_to_multibyte(directory, npattern, MAX_PATH) + 1; + sint32 length = platform_utf8_to_multibyte(directory, npattern, MAX_PATH) + 1; enumerate_file_info *enumFileInfo; log_verbose("begin directory listing, path: %s", npattern); // TODO: add some checking for stringness and directoryness - int cnt; - for (int i = 0; i < countof(_enumerateFileInfoList); i++) { + sint32 cnt; + for (sint32 i = 0; i < countof(_enumerateFileInfoList); i++) { enumFileInfo = &_enumerateFileInfoList[i]; if (!enumFileInfo->active) { safe_strcpy(enumFileInfo->pattern, npattern, length); @@ -488,11 +488,11 @@ int platform_enumerate_directories_begin(const utf8 *directory) enumFileInfo->paths = malloc(cnt * sizeof(char *)); char **paths = enumFileInfo->paths; // 256 is size of dirent.d_name - const int dir_name_len = strnlen(npattern, MAX_PATH); - for (int idx = 0; idx < cnt; idx++) + const sint32 dir_name_len = strnlen(npattern, MAX_PATH); + for (sint32 idx = 0; idx < cnt; idx++) { struct dirent *d = enumFileInfo->fileListTemp[idx]; - const int entry_len = strnlen(d->d_name, MAX_PATH); + const sint32 entry_len = strnlen(d->d_name, MAX_PATH); // 1 for separator, 1 for trailing null size_t path_len = sizeof(char) * min(MAX_PATH, entry_len + dir_name_len + 2); paths[idx] = malloc(path_len); @@ -510,7 +510,7 @@ int platform_enumerate_directories_begin(const utf8 *directory) return -1; } -bool platform_enumerate_directories_next(int handle, utf8 *path) +bool platform_enumerate_directories_next(sint32 handle, utf8 *path) { if (handle < 0) { @@ -528,10 +528,10 @@ bool platform_enumerate_directories_next(int handle, utf8 *path) } if (result) { - int entryIdx = enumFileInfo->handle++; + sint32 entryIdx = enumFileInfo->handle++; struct stat fileInfo; char *fileName = enumFileInfo->paths[entryIdx]; - int statRes; + sint32 statRes; statRes = stat(fileName, &fileInfo); if (statRes == -1) { log_error("failed to stat file '%s'! errno = %i", fileName, errno); @@ -546,15 +546,15 @@ bool platform_enumerate_directories_next(int handle, utf8 *path) } } -void platform_enumerate_directories_end(int handle) +void platform_enumerate_directories_end(sint32 handle) { if (handle < 0) { return; } enumerate_file_info *enumFileInfo = &_enumerateFileInfoList[handle]; - int cnt = enumFileInfo->cnt; - for (int i = 0; i < cnt; i++) { + sint32 cnt = enumFileInfo->cnt; + for (sint32 i = 0; i < cnt; i++) { free(enumFileInfo->fileListTemp[i]); free(enumFileInfo->paths[i]); } @@ -566,7 +566,7 @@ void platform_enumerate_directories_end(int handle) enumFileInfo->active = 0; } -int platform_get_drives(){ +sint32 platform_get_drives(){ // POSIX systems do not know drives. Return 0. return 0; } @@ -632,21 +632,21 @@ bool platform_file_move(const utf8 *srcPath, const utf8 *dstPath) bool platform_file_delete(const utf8 *path) { - int ret = unlink(path); + sint32 ret = unlink(path); return ret == 0; } static wchar_t *regular_to_wchar(const char* src) { - int len = strnlen(src, MAX_PATH); + sint32 len = strnlen(src, MAX_PATH); wchar_t *w_buffer = malloc((len + 1) * sizeof(wchar_t)); mbtowc (NULL, NULL, 0); /* reset mbtowc */ - int max = len; - int i = 0; + sint32 max = len; + sint32 i = 0; while (max > 0) { - int length; + sint32 length; length = mbtowc(&w_buffer[i], &src[i], max); if (length < 1) { @@ -697,7 +697,7 @@ void platform_resolve_user_data_path() platform_posix_sub_user_data_path(buffer, MAX_PATH, homedir); log_verbose("OpenRCT2 user data directory = '%s'", buffer); - int len = strnlen(buffer, MAX_PATH); + sint32 len = strnlen(buffer, MAX_PATH); wchar_t *w_buffer = regular_to_wchar(buffer); w_buffer[len] = '\0'; utf8 *path = widechar_to_utf8(w_buffer); @@ -763,7 +763,7 @@ void platform_get_user_directory(utf8 *outPath, const utf8 *subDirectory, size_t safe_strcat_path(buffer, subDirectory, sizeof(buffer)); path_end_with_separator(buffer, sizeof(buffer)); } - int len = strnlen(buffer, MAX_PATH); + sint32 len = strnlen(buffer, MAX_PATH); wchar_t *w_buffer = regular_to_wchar(buffer); w_buffer[len] = '\0'; utf8 *path = widechar_to_utf8(w_buffer); diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c index 24ab2c8a87..5b6ce1bc79 100644 --- a/src/openrct2/platform/shared.c +++ b/src/openrct2/platform/shared.c @@ -35,22 +35,22 @@ #include "../world/climate.h" #include "platform.h" -typedef void(*update_palette_func)(const uint8*, int, int); +typedef void(*update_palette_func)(const uint8*, sint32, sint32); openrct2_cursor gCursorState; -const unsigned char *gKeysState; -unsigned char *gKeysPressed; -unsigned int gLastKeyPressed; +const uint8 *gKeysState; +uint8 *gKeysPressed; +uint32 gLastKeyPressed; textinputbuffer gTextInput; bool gTextInputCompositionActive; utf8 gTextInputComposition[32]; -int gTextInputCompositionStart; -int gTextInputCompositionLength; +sint32 gTextInputCompositionStart; +sint32 gTextInputCompositionLength; -int gNumResolutions = 0; +sint32 gNumResolutions = 0; resolution_t *gResolutions = NULL; -int gResolutionsAllowAnyAspectRatio = 0; +sint32 gResolutionsAllowAnyAspectRatio = 0; SDL_Window *gWindow = NULL; SDL_Renderer *gRenderer = NULL; @@ -61,19 +61,19 @@ uint32 gPaletteHWMapped[256]; bool gSteamOverlayActive = false; -static const int _fullscreen_modes[] = { 0, SDL_WINDOW_FULLSCREEN, SDL_WINDOW_FULLSCREEN_DESKTOP }; -static unsigned int _lastGestureTimestamp; +static const sint32 _fullscreen_modes[] = { 0, SDL_WINDOW_FULLSCREEN, SDL_WINDOW_FULLSCREEN_DESKTOP }; +static uint32 _lastGestureTimestamp; static float _gestureRadius; static void platform_create_window(); -static int resolution_sort_func(const void *pa, const void *pb) +static sint32 resolution_sort_func(const void *pa, const void *pb) { const resolution_t *a = (resolution_t*)pa; const resolution_t *b = (resolution_t*)pb; - int areaA = a->width * a->height; - int areaB = b->width * b->height; + sint32 areaA = a->width * a->height; + sint32 areaB = b->width * b->height; if (areaA == areaB) return 0; if (areaA < areaB) return -1; @@ -83,8 +83,8 @@ static int resolution_sort_func(const void *pa, const void *pb) void platform_update_fullscreen_resolutions() { // Query number of display modes - int displayIndex = SDL_GetWindowDisplayIndex(gWindow); - int numDisplayModes = SDL_GetNumDisplayModes(displayIndex); + sint32 displayIndex = SDL_GetWindowDisplayIndex(gWindow); + sint32 numDisplayModes = SDL_GetNumDisplayModes(displayIndex); // Get desktop aspect ratio SDL_DisplayMode mode; @@ -99,7 +99,7 @@ void platform_update_fullscreen_resolutions() gNumResolutions = 0; float desktopAspectRatio = (float)mode.w / mode.h; - for (int i = 0; i < numDisplayModes; i++) { + for (sint32 i = 0; i < numDisplayModes; i++) { SDL_GetDisplayMode(displayIndex, i, &mode); float aspectRatio = (float)mode.w / mode.h; @@ -115,13 +115,13 @@ void platform_update_fullscreen_resolutions() // Remove duplicates resolution_t *resPlace = &gResolutions[0]; - for (int i = 1; i < gNumResolutions; i++) { + for (sint32 i = 1; i < gNumResolutions; i++) { resolution_t *resLook = &gResolutions[i]; if (resLook->width != resPlace->width || resLook->height != resPlace->height) *++resPlace = *resLook; } - gNumResolutions = (int)(resPlace - &gResolutions[0]) + 1; + gNumResolutions = (sint32)(resPlace - &gResolutions[0]) + 1; // Update config fullscreen resolution if not set if (gConfigGeneral.fullscreen_width == -1 || gConfigGeneral.fullscreen_height == -1) { @@ -130,13 +130,13 @@ void platform_update_fullscreen_resolutions() } } -void platform_get_closest_resolution(int inWidth, int inHeight, int *outWidth, int *outHeight) +void platform_get_closest_resolution(sint32 inWidth, sint32 inHeight, sint32 *outWidth, sint32 *outHeight) { - int closestWidth = 640, closestHeight = 480; + sint32 closestWidth = 640, closestHeight = 480; - int closestAreaDiff = -1; - int destinationArea = inWidth * inHeight; - for (int i = 0; i < gNumResolutions; i++) { + sint32 closestAreaDiff = -1; + sint32 destinationArea = inWidth * inHeight; + for (sint32 i = 0; i < gNumResolutions; i++) { // Check if exact match if (gResolutions[i].width == inWidth && gResolutions[i].height == inHeight) { closestWidth = gResolutions[i].width; @@ -146,7 +146,7 @@ void platform_get_closest_resolution(int inWidth, int inHeight, int *outWidth, i } // Check if area is closer to best match - int areaDiff = abs((gResolutions[i].width * gResolutions[i].height) - destinationArea); + sint32 areaDiff = abs((gResolutions[i].width * gResolutions[i].height) - destinationArea); if (closestAreaDiff == -1 || areaDiff < closestAreaDiff) { closestAreaDiff = areaDiff; closestWidth = gResolutions[i].width; @@ -170,11 +170,11 @@ void platform_draw() } } -static void platform_resize(int width, int height) +static void platform_resize(sint32 width, sint32 height) { uint32 flags; - int dst_w = (int)(width / gConfigGeneral.window_scale); - int dst_h = (int)(height / gConfigGeneral.window_scale); + sint32 dst_w = (sint32)(width / gConfigGeneral.window_scale); + sint32 dst_h = (sint32)(height / gConfigGeneral.window_scale); gScreenWidth = dst_w; gScreenHeight = dst_h; @@ -192,7 +192,7 @@ static void platform_resize(int width, int height) // Check if the window has been resized in windowed mode and update the config file accordingly // This is called in rct2_update and is only called after resizing a window has finished - const int nonWindowFlags = + const sint32 nonWindowFlags = SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED | SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP; if (!(flags & nonWindowFlags)) { if (width != gConfigGeneral.window_width || height != gConfigGeneral.window_height) { @@ -219,7 +219,7 @@ void platform_trigger_resize() snprintf(scale_quality_buffer, sizeof(scale_quality_buffer), "%u", scale_quality); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, scale_quality_buffer); - int w, h; + sint32 w, h; SDL_GetWindowSize(gWindow, &w, &h); platform_resize(w, h); } @@ -242,16 +242,16 @@ static uint8 lerp(uint8 a, uint8 b, float t) if (t <= 0) return a; if (t >= 1) return b; - int range = b - a; - int amount = (int)(range * t); + sint32 range = b - a; + sint32 amount = (sint32)(range * t); return (uint8)(a + amount); } -void platform_update_palette(const uint8* colours, int start_index, int num_colours) +void platform_update_palette(const uint8* colours, sint32 start_index, sint32 num_colours) { colours += start_index * 4; - for (int i = start_index; i < num_colours + start_index; i++) { + for (sint32 i = start_index; i < num_colours + start_index; i++) { uint8 r = colours[2]; uint8 g = colours[1]; uint8 b = colours[0]; @@ -327,8 +327,8 @@ void platform_process_messages() } break; case SDL_MOUSEMOTION: - gCursorState.x = (int)(e.motion.x / gConfigGeneral.window_scale); - gCursorState.y = (int)(e.motion.y / gConfigGeneral.window_scale); + gCursorState.x = (sint32)(e.motion.x / gConfigGeneral.window_scale); + gCursorState.y = (sint32)(e.motion.y / gConfigGeneral.window_scale); break; case SDL_MOUSEWHEEL: if (gConsoleOpen) { @@ -339,8 +339,8 @@ void platform_process_messages() break; case SDL_MOUSEBUTTONDOWN: { - int x = (int)(e.button.x / gConfigGeneral.window_scale); - int y = (int)(e.button.y / gConfigGeneral.window_scale); + sint32 x = (sint32)(e.button.x / gConfigGeneral.window_scale); + sint32 y = (sint32)(e.button.y / gConfigGeneral.window_scale); switch (e.button.button) { case SDL_BUTTON_LEFT: store_mouse_input(MOUSE_STATE_LEFT_PRESS, x, y); @@ -360,8 +360,8 @@ void platform_process_messages() } case SDL_MOUSEBUTTONUP: { - int x = (int)(e.button.x / gConfigGeneral.window_scale); - int y = (int)(e.button.y / gConfigGeneral.window_scale); + sint32 x = (sint32)(e.button.x / gConfigGeneral.window_scale); + sint32 y = (sint32)(e.button.y / gConfigGeneral.window_scale); switch (e.button.button) { case SDL_BUTTON_LEFT: store_mouse_input(MOUSE_STATE_LEFT_RELEASE, x, y); @@ -382,13 +382,13 @@ void platform_process_messages() // Apple sends touchscreen events for trackpads, so ignore these events on macOS #ifndef __MACOSX__ case SDL_FINGERMOTION: - gCursorState.x = (int)(e.tfinger.x * gScreenWidth); - gCursorState.y = (int)(e.tfinger.y * gScreenHeight); + gCursorState.x = (sint32)(e.tfinger.x * gScreenWidth); + gCursorState.y = (sint32)(e.tfinger.y * gScreenHeight); break; case SDL_FINGERDOWN: { - int x = (int)(e.tfinger.x * gScreenWidth); - int y = (int)(e.tfinger.y * gScreenHeight); + sint32 x = (sint32)(e.tfinger.x * gScreenWidth); + sint32 y = (sint32)(e.tfinger.y * gScreenHeight); gCursorState.touchIsDouble = (!gCursorState.touchIsDouble && e.tfinger.timestamp - gCursorState.touchDownTimestamp < TOUCH_DOUBLE_TIMEOUT); @@ -408,8 +408,8 @@ void platform_process_messages() } case SDL_FINGERUP: { - int x = (int)(e.tfinger.x * gScreenWidth); - int y = (int)(e.tfinger.y * gScreenHeight); + sint32 x = (sint32)(e.tfinger.x * gScreenWidth); + sint32 y = (sint32)(e.tfinger.y * gScreenHeight); if (gCursorState.touchIsDouble) { store_mouse_input(MOUSE_STATE_RIGHT_RELEASE, x, y); @@ -506,8 +506,8 @@ void platform_process_messages() _gestureRadius += e.mgesture.dDist; // Zoom gesture - const int tolerance = 128; - int gesturePixels = (int)(_gestureRadius * gScreenWidth); + const sint32 tolerance = 128; + sint32 gesturePixels = (sint32)(_gestureRadius * gScreenWidth); if (abs(gesturePixels) > tolerance) { _gestureRadius = 0; main_window_zoom(gesturePixels > 0, true); @@ -549,7 +549,7 @@ void platform_process_messages() gCursorState.any = gCursorState.left | gCursorState.middle | gCursorState.right; // Updates the state of the keys - int numKeys = 256; + sint32 numKeys = 256; gKeysState = SDL_GetKeyboardState(&numKeys); } @@ -562,8 +562,8 @@ static void platform_close_window() void platform_init() { platform_create_window(); - gKeysPressed = malloc(sizeof(unsigned char) * 256); - memset(gKeysPressed, 0, sizeof(unsigned char) * 256); + gKeysPressed = malloc(sizeof(uint8) * 256); + memset(gKeysPressed, 0, sizeof(uint8) * 256); // Set the highest palette entry to white. // This fixes a bug with the TT:rainbow road due to the @@ -576,7 +576,7 @@ void platform_init() static void platform_create_window() { - int width, height; + sint32 width, height; if (SDL_Init(SDL_INIT_VIDEO) < 0) { log_fatal("SDL_Init %s", SDL_GetError()); @@ -622,7 +622,7 @@ static void platform_create_window() platform_trigger_resize(); } -int platform_scancode_to_rct_keycode(int sdl_key) +sint32 platform_scancode_to_rct_keycode(sint32 sdl_key) { char keycode = (char)SDL_GetKeyFromScancode((SDL_Scancode)sdl_key); @@ -643,7 +643,7 @@ void platform_free() SDL_Quit(); } -void platform_start_text_input(utf8* buffer, int max_length) +void platform_start_text_input(utf8* buffer, sint32 max_length) { // TODO This doesn't work, and position could be improved to where text entry is SDL_Rect rect = { 10, 10, 100, 100 }; @@ -666,9 +666,9 @@ void platform_stop_text_input() gTextInputCompositionActive = false; } -void platform_set_fullscreen_mode(int mode) +void platform_set_fullscreen_mode(sint32 mode) { - int width, height; + sint32 width, height; mode = _fullscreen_modes[mode]; @@ -695,7 +695,7 @@ void platform_set_fullscreen_mode(int mode) void platform_toggle_windowed_mode() { - int targetMode = gConfigGeneral.fullscreen_mode == 0 ? 2 : 0; + sint32 targetMode = gConfigGeneral.fullscreen_mode == 0 ? 2 : 0; platform_set_fullscreen_mode(targetMode); gConfigGeneral.fullscreen_mode = targetMode; config_save_default(); @@ -732,26 +732,26 @@ void platform_show_cursor() SDL_ShowCursor(SDL_ENABLE); } -void platform_get_cursor_position(int *x, int *y) +void platform_get_cursor_position(sint32 *x, sint32 *y) { SDL_GetMouseState(x, y); } -void platform_get_cursor_position_scaled(int *x, int *y) +void platform_get_cursor_position_scaled(sint32 *x, sint32 *y) { platform_get_cursor_position(x, y); // Compensate for window scaling. - *x = (int) ceilf(*x / gConfigGeneral.window_scale); - *y = (int) ceilf(*y / gConfigGeneral.window_scale); + *x = (sint32) ceilf(*x / gConfigGeneral.window_scale); + *y = (sint32) ceilf(*y / gConfigGeneral.window_scale); } -void platform_set_cursor_position(int x, int y) +void platform_set_cursor_position(sint32 x, sint32 y) { SDL_WarpMouseInWindow(NULL, x, y); } -unsigned int platform_get_ticks() +uint32 platform_get_ticks() { return SDL_GetTicks(); } @@ -761,7 +761,7 @@ uint8 platform_get_currency_value(const char *currCode) { return CURRENCY_POUNDS; } - for (int currency = 0; currency < CURRENCY_END; ++currency) { + for (sint32 currency = 0; currency < CURRENCY_END; ++currency) { if (strncmp(currCode, CurrencyDescriptors[currency].isoCode, 3) == 0) { return currency; } diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c index 4a0443ebdb..718a8a5922 100644 --- a/src/openrct2/platform/windows.c +++ b/src/openrct2/platform/windows.c @@ -48,7 +48,7 @@ static utf8 _userDataDirectoryPath[MAX_PATH] = { 0 }; static utf8 _openrctDataDirectoryPath[MAX_PATH] = { 0 }; -utf8 **windows_get_command_line_args(int *outNumArgs); +utf8 **windows_get_command_line_args(sint32 *outNumArgs); #define OPENRCT2_DLL_MODULE_NAME "openrct2.dll" @@ -57,7 +57,7 @@ static HMODULE _dllModule = NULL; /** * Windows entry point to OpenRCT2 with a console window using a traditional C main function. */ -int RunOpenRCT2(int argc, char * * argv) +sint32 RunOpenRCT2(int argc, char * * argv) { HINSTANCE hInstance = GetModuleHandle(NULL); _dllModule = hInstance; @@ -104,9 +104,9 @@ BOOL APIENTRY DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved) * The function that is called directly from the host application (rct2.exe)'s WinMain. This will be removed when OpenRCT2 can * be built as a stand alone application. */ -__declspec(dllexport) int StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +__declspec(dllexport) sint32 StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, sint32 nCmdShow) { - int argc, runGame; + sint32 argc, runGame; char **argv; if (_dllModule == NULL) { @@ -120,7 +120,7 @@ __declspec(dllexport) int StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInsta runGame = cmdline_run((const char **)argv, argc); // Free argv - for (int i = 0; i < argc; i++) { + for (sint32 i = 0; i < argc; i++) { free(argv[i]); } free(argv); @@ -137,7 +137,7 @@ __declspec(dllexport) int StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInsta utf8 **windows_get_command_line_args(int *outNumArgs) { - int argc; + sint32 argc; // Get command line arguments as widechar LPWSTR commandLine = GetCommandLineW(); @@ -145,7 +145,7 @@ utf8 **windows_get_command_line_args(int *outNumArgs) // Convert to UTF-8 utf8 **argvUtf8 = (utf8**)malloc(argc * sizeof(utf8*)); - for (int i = 0; i < argc; i++) { + for (sint32 i = 0; i < argc; i++) { argvUtf8[i] = widechar_to_utf8(argvW[i]); } LocalFree(argvW); @@ -235,7 +235,7 @@ bool platform_directory_delete(const utf8 *path) fileop.lpszProgressTitle = NULL; fileop.hNameMappings = NULL; - int ret = SHFileOperationW(&fileop); + sint32 ret = SHFileOperationW(&fileop); return (ret == 0); } @@ -268,9 +268,9 @@ typedef struct { } enumerate_file_info; static enumerate_file_info _enumerateFileInfoList[8] = { 0 }; -int platform_enumerate_files_begin(const utf8 *pattern) +sint32 platform_enumerate_files_begin(const utf8 *pattern) { - int i; + sint32 i; enumerate_file_info *enumFileInfo; wchar_t *wPattern = utf8_to_widechar(pattern); @@ -334,7 +334,7 @@ static bool match_wildcard(const wchar_t *fileName, const wchar_t *pattern) return *pattern == '\0'; } -bool platform_enumerate_files_next(int handle, file_info *outFileInfo) +bool platform_enumerate_files_next(sint32 handle, file_info *outFileInfo) { bool result; enumerate_file_info *enumFileInfo; @@ -374,7 +374,7 @@ bool platform_enumerate_files_next(int handle, file_info *outFileInfo) } } -void platform_enumerate_files_end(int handle) +void platform_enumerate_files_end(sint32 handle) { enumerate_file_info *enumFileInfo; @@ -387,9 +387,9 @@ void platform_enumerate_files_end(int handle) SafeFree(enumFileInfo->outFilename); } -int platform_enumerate_directories_begin(const utf8 *directory) +sint32 platform_enumerate_directories_begin(const utf8 *directory) { - int i; + sint32 i; enumerate_file_info *enumFileInfo; wchar_t *wDirectory = utf8_to_widechar(directory); @@ -405,7 +405,7 @@ int platform_enumerate_directories_begin(const utf8 *directory) wcsncpy(enumFileInfo->pattern, wDirectory, MAX_PATH); // Ensure pattern ends with a slash - int patternLength = lstrlenW(enumFileInfo->pattern); + sint32 patternLength = lstrlenW(enumFileInfo->pattern); wchar_t lastChar = enumFileInfo->pattern[patternLength - 1]; if (lastChar != '\\' && lastChar != '/') { wcsncat(enumFileInfo->pattern, L"\\", MAX_PATH); @@ -425,7 +425,7 @@ int platform_enumerate_directories_begin(const utf8 *directory) return INVALID_HANDLE; } -bool platform_enumerate_directories_next(int handle, utf8 *path) +bool platform_enumerate_directories_next(sint32 handle, utf8 *path) { enumerate_file_info *enumFileInfo; HANDLE fileHandle; @@ -461,7 +461,7 @@ bool platform_enumerate_directories_next(int handle, utf8 *path) return true; } -void platform_enumerate_directories_end(int handle) +void platform_enumerate_directories_end(sint32 handle) { enumerate_file_info *enumFileInfo; @@ -473,7 +473,7 @@ void platform_enumerate_directories_end(int handle) enumFileInfo->active = false; } -int platform_get_drives() +sint32 platform_get_drives() { return GetLogicalDrives(); } @@ -625,7 +625,7 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, utf8 filters[256]; utf8 *ch = filters; - for (int i = 0; i < countof(desc->filters); i++) { + for (sint32 i = 0; i < countof(desc->filters); i++) { if (desc->filters[i].name != NULL) { safe_strcpy(ch, desc->filters[i].name, sizeof(filters) - (ch - filters)); ch = strchr(ch, 0) + 1; @@ -677,7 +677,7 @@ bool platform_open_common_file_dialog(utf8 *outFilename, file_dialog_desc *desc, // If there is no extension, append the pattern const utf8 *outFilenameExtension = path_get_extension(outFilename); if (str_is_null_or_empty(outFilenameExtension)) { - int filterIndex = openFileName.nFilterIndex - 1; + sint32 filterIndex = openFileName.nFilterIndex - 1; assert(filterIndex >= 0); assert(filterIndex < countof(desc->filters)); @@ -732,7 +732,7 @@ utf8 *platform_open_directory_browser(utf8 *title) // Copy the path directory to the buffer if (SHGetPathFromIDListW(pidl, pszBuffer)) { // Store pszBuffer (and the path) in the outPath - int outPathCapacity = lstrlenW(pszBuffer) * 4 + 1; + sint32 outPathCapacity = lstrlenW(pszBuffer) * 4 + 1; outPath = (utf8*)malloc(outPathCapacity); WideCharToMultiByte(CP_UTF8, 0, pszBuffer, countof(pszBuffer), outPath, outPathCapacity, NULL, NULL); } @@ -745,7 +745,7 @@ utf8 *platform_open_directory_browser(utf8 *title) * * rct2: 0x00407978 */ -int windows_get_registry_install_info(rct2_install_info *installInfo, char *source, char *font, uint8 charset) +sint32 windows_get_registry_install_info(rct2_install_info *installInfo, char *source, char *font, uint8 charset) { char subkeyInfogrames[MAX_PATH], subkeyFishTechGroup[MAX_PATH], keyName[100]; HKEY hKey; @@ -773,7 +773,7 @@ int windows_get_registry_install_info(rct2_install_info *installInfo, char *sour size = 4; RegQueryValueExA(hKey, "InstallLevel", 0, &type, (LPBYTE)&installInfo->installLevel, &size); - for (int i = 0; i <= 15; i++) { + for (sint32 i = 0; i <= 15; i++) { snprintf(keyName, 100, "AddonPack%d", i); size = sizeof(installInfo->expansionPackNames[i]); if (RegQueryValueExA(hKey, keyName, 0, &type, (LPBYTE)installInfo->expansionPackNames[i], &size) == ERROR_SUCCESS) @@ -979,7 +979,7 @@ void platform_get_exe_path(utf8 *outPath, size_t outSize) *exeDelimiter = L'\0'; wcscpy_s(tempPath, MAX_PATH, exePath); _wfullpath(exePath, tempPath, MAX_PATH); - WideCharToMultiByte(CP_UTF8, 0, exePath, MAX_PATH, outPath, (int) outSize, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, exePath, MAX_PATH, outPath, (sint32) outSize, NULL, NULL); } bool platform_get_font_path(TTFFontDescriptor *font, utf8 *buffer, size_t size) @@ -1062,7 +1062,7 @@ static bool windows_setup_file_association( wchar_t exePathW[MAX_PATH]; wchar_t dllPathW[MAX_PATH]; - int printResult; + sint32 printResult; GetModuleFileNameW(NULL, exePathW, sizeof(exePathW)); GetModuleFileNameW(_dllModule, dllPathW, sizeof(dllPathW)); diff --git a/src/openrct2/rct1.c b/src/openrct2/rct1.c index d7acf55c77..3efc42f7a5 100644 --- a/src/openrct2/rct1.c +++ b/src/openrct2/rct1.c @@ -33,7 +33,7 @@ bool rct1_read_sc4(const char *path, rct1_s4 *s4) return 0; } - int fileType = sawyercoding_detect_file_type(buffer, length); + sint32 fileType = sawyercoding_detect_file_type(buffer, length); decodedBuffer = malloc(sizeof(rct1_s4)); decodedLength = (fileType & FILE_VERSION_MASK) == FILE_VERSION_RCT1 ? @@ -84,7 +84,7 @@ bool rideTypeShouldLoseSeparateFlag(const rct_ride_entry *rideEntry) } bool remove_flag = true; - for (int j = 0; j < 3; j++) { + for (sint32 j = 0; j < 3; j++) { if (rideEntry->ride_type[j] == RIDE_TYPE_NULL) { continue; } diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index f2875119ff..a65bf5e522 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -1010,7 +1010,7 @@ bool rct1_read_sc4(const char *path, rct1_s4 *s4); bool rct1_read_sv4(const char *path, rct1_s4 *s4); void rct1_import_s4(rct1_s4 *s4); void rct1_fix_landscape(); -int vehicle_preference_compare(uint8 rideType, const char * a, const char * b); +sint32 vehicle_preference_compare(uint8 rideType, const char * a, const char * b); bool rideTypeShouldLoseSeparateFlag(const rct_ride_entry *rideEntry); bool rct1_load_saved_game(const char *path); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 0ae593e0fd..c1fbcc69ec 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -328,10 +328,10 @@ private: uint16 var_06 = mapElement->properties.fence.item[1] | (mapElement->properties.fence.item[2] << 8); - for (int edge = 0; edge < 4; edge++) + for (sint32 edge = 0; edge < 4; edge++) { - int typeA = (var_05 >> (edge * 2)) & 3; - int typeB = (var_06 >> (edge * 4)) & 0x0F; + sint32 typeA = (var_05 >> (edge * 2)) & 3; + sint32 typeB = (var_06 >> (edge * 4)) & 0x0F; if (typeB != 0x0F) { uint8 type = typeA | (typeB << 2); @@ -363,7 +363,7 @@ private: void AddAvailableEntriesFromSceneryGroups() { - for (int sceneryTheme = 0; sceneryTheme <= RCT1_SCENERY_THEME_PAGODA; sceneryTheme++) + for (sint32 sceneryTheme = 0; sceneryTheme <= RCT1_SCENERY_THEME_PAGODA; sceneryTheme++) { if (sceneryTheme != 0 && _sceneryThemeTypeToEntryMap[sceneryTheme] == 255) continue; @@ -516,7 +516,7 @@ private: void ImportRides() { - for (int i = 0; i < MAX_RIDES; i++) + for (sint32 i = 0; i < MAX_RIDES; i++) { if (_s4.rides[i].type != RIDE_TYPE_NULL) { @@ -585,7 +585,7 @@ private: // Station dst->overall_view = src->overall_view; - for (int i = 0; i < RCT1_MAX_STATIONS; i++) + for (sint32 i = 0; i < RCT1_MAX_STATIONS; i++) { dst->station_starts[i] = src->station_starts[i]; dst->station_heights[i] = src->station_height[i] / 2; @@ -603,7 +603,7 @@ private: } dst->num_stations = src->num_stations; - for (int i = 0; i < 32; i++) + for (sint32 i = 0; i < 32; i++) { dst->vehicles[i] = SPRITE_INDEX_NULL; } @@ -675,7 +675,7 @@ private: } else { - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) { dst->track_colour_main[i] = RCT1::GetColour(src->track_colour_main[i]); dst->track_colour_additional[i] = RCT1::GetColour(src->track_colour_additional[i]); @@ -693,7 +693,7 @@ private: } else { - for (int i = 0; i < 12; i++) + for (sint32 i = 0; i < 12; i++) { dst->vehicle_colours[i].body_colour = RCT1::GetColour(src->vehicle_colours[i].body); dst->vehicle_colours[i].trim_colour = RCT1::GetColour(src->vehicle_colours[i].trim); @@ -715,7 +715,7 @@ private: dst->max_speed = src->max_speed; dst->average_speed = src->average_speed; - for (int i = 0; i < RCT1_MAX_STATIONS; i++) { + for (sint32 i = 0; i < RCT1_MAX_STATIONS; i++) { dst->time[i] = src->time[i]; dst->length[i] = src->length[i]; } @@ -770,11 +770,11 @@ private: void FixNumPeepsInQueue() { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { - for (int stationIndex = 0; stationIndex < RCT1_MAX_STATIONS; stationIndex++) + for (sint32 stationIndex = 0; stationIndex < RCT1_MAX_STATIONS; stationIndex++) { ride->queue_length[stationIndex] = 0; } @@ -783,7 +783,7 @@ private: void ImportRideMeasurements() { - for (int i = 0; i < MAX_RIDE_MEASUREMENTS; i++) + for (sint32 i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { rct_ride_measurement * dst = get_ride_measurement(i); rct_ride_measurement * src = &_s4.ride_measurements[i]; @@ -795,7 +795,7 @@ private: { // Not yet supported // *dst = *src; - // for (int i = 0; i < RIDE_MEASUREMENT_MAX_ITEMS; i++) + // for (sint32 i = 0; i < RIDE_MEASUREMENT_MAX_ITEMS; i++) // { // dst->altitude[i] /= 2; // } @@ -810,7 +810,7 @@ private: void ImportPeeps() { - for (int i = 0; i < RCT1_MAX_SPRITES; i++) + for (size_t i = 0; i < RCT1_MAX_SPRITES; i++) { if (_s4.sprites[i].unknown.sprite_identifier == SPRITE_IDENTIFIER_PEEP) { @@ -936,18 +936,18 @@ private: dst->voucher_arguments = src->voucher_arguments; dst->voucher_type = src->voucher_type; - for (int i = 0; i < 32; i++) + for (size_t i = 0; i < 32; i++) { dst->rides_been_on[i] = src->rides_been_on[i]; } - for (int i = 0; i < 16; i++) + for (size_t i = 0; i < 16; i++) { dst->ride_types_been_on[i] = src->ride_types_been_on[i]; } dst->photo1_ride_ref = src->photo1_ride_ref; - for (int i = 0; i < PEEP_MAX_THOUGHTS; i++) + for (size_t i = 0; i < PEEP_MAX_THOUGHTS; i++) { dst->thoughts[i] = src->thoughts[i]; } @@ -1003,7 +1003,7 @@ private: void ImportLitter() { - for (int i = 0; i < RCT1_MAX_SPRITES; i++) + for (size_t i = 0; i < RCT1_MAX_SPRITES; i++) { if (_s4.sprites[i].unknown.sprite_identifier == SPRITE_IDENTIFIER_LITTER) { @@ -1031,7 +1031,7 @@ private: void ImportMiscSprites() { - for (int i = 0; i < RCT1_MAX_SPRITES; i++) + for (size_t i = 0; i < RCT1_MAX_SPRITES; i++) { if (_s4.sprites[i].unknown.sprite_identifier == SPRITE_IDENTIFIER_MISC) { @@ -1125,7 +1125,7 @@ private: void ImportPeepSpawns() { - for (int i = 0; i < 2; i++) + for (size_t i = 0; i < 2; i++) { gPeepSpawns[i] = _s4.peep_spawn[i]; } @@ -1135,7 +1135,7 @@ private: { // This is sketchy, ideally we should try to re-create them rct_map_animation * s4Animations = (rct_map_animation*)_s4.map_animations; - for (int i = 0; i < 1000; i++) + for (size_t i = 0; i < 1000; i++) { gAnimatedObjects[i] = s4Animations[i]; gAnimatedObjects[i].baseZ /= 2; @@ -1158,14 +1158,14 @@ private: gParkValue = _s4.park_value; gCurrentProfit = _s4.profit; - for (int i = 0; i < 128; i++) + for (size_t i = 0; i < 128; i++) { gCashHistory[i] = _s4.cash_history[i]; gParkValueHistory[i] = _s4.park_value_history[i]; gWeeklyProfitHistory[i] = _s4.weekly_profit_history[i]; } - for (int i = 0; i < 14 * 16; i++) + for (size_t i = 0; i < 14 * 16; i++) { gExpenditureTable[i] = _s4.expenditure[i]; } @@ -1175,7 +1175,7 @@ private: gTotalIncomeFromAdmissions = _s4.admission_total_income; // TODO marketing campaigns not working - for (int i = 0; i < 6; i++) + for (size_t i = 0; i < 6; i++) { gMarketingCampaignDaysLeft[i] = _s4.marketing_status[i]; gMarketingCampaignRideIndex[i] = _s4.marketing_assoc[i]; @@ -1263,7 +1263,7 @@ private: Memory::Set(_researchRideTypeUsed, 0, sizeof(_researchRideTypeUsed)); // The first six scenery groups are always available - for (int i = 0; i < 6; i++) + for (size_t i = 0; i < 6; i++) { research_insert_scenery_group_entry(i, true); } @@ -1432,26 +1432,26 @@ private: // Park rating gParkRating = _s4.park_rating; - for (int i = 0; i < 32; i++) + for (size_t i = 0; i < 32; i++) { gParkRatingHistory[i] = _s4.park_rating_history[i]; } // Awards - for (int i = 0; i < MAX_AWARDS; i++) + for (size_t i = 0; i < MAX_AWARDS; i++) { gCurrentAwards[i] = _s4.awards[i]; } // Number of guests history - for (int i = 0; i < 32; i++) + for (size_t i = 0; i < 32; i++) { gGuestsInParkHistory[i] = _s4.guests_in_park_history[i]; } // News items rct_news_item *newsItems = gNewsItems; - for (int i = 0; i < MAX_NEWS_ITEMS; i++) + for (size_t i = 0; i < MAX_NEWS_ITEMS; i++) { newsItems[i] = _s4.messages[i]; } @@ -1502,7 +1502,7 @@ private: String::Set(gS6Info.name, sizeof(gS6Info.name), _s4.scenario_name); String::Set(gS6Info.details, sizeof(gS6Info.details), ""); - int scNumber = GetSCNumber(); + sint32 scNumber = GetSCNumber(); if (scNumber != -1) { source_desc sourceDesc; @@ -1543,14 +1543,14 @@ private: void ClearExtraTileEntries() { // Reset the map tile pointers - for (int i = 0; i < 0x10000; i++) + for (size_t i = 0; i < 0x10000; i++) { gMapElementTilePointers[i] = (rct_map_element *)-1; } // Get the first free map element rct_map_element * nextFreeMapElement = gMapElements; - for (int i = 0; i < 128 * 128; i++) + for (size_t i = 0; i < 128 * 128; i++) { do { } while (!map_element_is_last_for_tile(nextFreeMapElement++)); } @@ -1559,17 +1559,17 @@ private: rct_map_element * * tilePointer = gMapElementTilePointers; // 128 rows of map data from RCT1 map - for (int x = 0; x < 128; x++) + for (sint32 x = 0; x < 128; x++) { // Assign the first half of this row - for (int y = 0; y < 128; y++) + for (sint32 y = 0; y < 128; y++) { *tilePointer++ = mapElement; do { } while (!map_element_is_last_for_tile(mapElement++)); } // Fill the rest of the row with blank tiles - for (int y = 0; y < 128; y++) + for (sint32 y = 0; y < 128; y++) { nextFreeMapElement->type = MAP_ELEMENT_TYPE_SURFACE; nextFreeMapElement->flags = MAP_ELEMENT_FLAG_LAST_TILE; @@ -1584,7 +1584,7 @@ private: } // 128 extra rows left to fill with blank tiles - for (int y = 0; y < 128 * 256; y++) + for (sint32 y = 0; y < 128 * 256; y++) { nextFreeMapElement->type = MAP_ELEMENT_TYPE_SURFACE; nextFreeMapElement->flags = MAP_ELEMENT_FLAG_LAST_TILE; @@ -1605,7 +1605,7 @@ private: colour_t colour; // The following code would be worth doing if we were able to import sprites - // for (int i = 0; i < MAX_SPRITES; i++) + // for (size_t i = 0; i < MAX_SPRITES; i++) // { // rct_unk_sprite * sprite = &(g_sprite_list[i].unknown); // switch (sprite->sprite_identifier) { @@ -1750,9 +1750,9 @@ private: void FixWalls() { - for (int x = 0; x < 128; x++) + for (sint32 x = 0; x < 128; x++) { - for (int y = 0; y < 128; y++) + for (sint32 y = 0; y < 128; y++) { rct_map_element * mapElement = map_get_first_element_at(x, y); do @@ -1766,17 +1766,17 @@ private: uint16 var_06 = originalMapElement.properties.fence.item[1] | (originalMapElement.properties.fence.item[2] << 8); - for (int edge = 0; edge < 4; edge++) + for (sint32 edge = 0; edge < 4; edge++) { - int typeA = (var_05 >> (edge * 2)) & 3; - int typeB = (var_06 >> (edge * 4)) & 0x0F; + sint32 typeA = (var_05 >> (edge * 2)) & 3; + sint32 typeB = (var_06 >> (edge * 4)) & 0x0F; if (typeB != 0x0F) { - int type = typeA | (typeB << 2); - int colourA = ((originalMapElement.type & 0xC0) >> 3) | + sint32 type = typeA | (typeB << 2); + sint32 colourA = ((originalMapElement.type & 0xC0) >> 3) | (originalMapElement.properties.fence.type >> 5); - int colourB = 0; - int colourC = 0; + sint32 colourB = 0; + sint32 colourC = 0; ConvertWall(&type, &colourA, &colourB, &colourC); type = _wallTypeToEntryMap[type]; @@ -1791,7 +1791,7 @@ private: } } - void ConvertWall(int * type, int * colourA, int * colourB, int * colourC) + void ConvertWall(sint32 * type, sint32 * colourA, sint32 * colourB, sint32 * colourC) { switch (*type) { case 12: // creepy gate @@ -1829,9 +1829,9 @@ private: void FixBanners() { - for (int x = 0; x < 128; x++) + for (sint32 x = 0; x < 128; x++) { - for (int y = 0; y < 128; y++) + for (sint32 y = 0; y < 128; y++) { rct_map_element * mapElement = map_get_first_element_at(x, y); do @@ -1886,7 +1886,7 @@ private: void FixEntrancePositions() { - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) { gParkEntranceX[i] = MAP_LOCATION_NULL; } @@ -1962,7 +1962,7 @@ private: } } - int GetSCNumber() + sint32 GetSCNumber() { const utf8 * fileName = Path::GetFileName(_s4Path); if (tolower(fileName[0]) == 's' && tolower(fileName[1]) == 'c') { @@ -1982,7 +1982,7 @@ private: } else { - int digits = atoi(digitBuffer); + sint32 digits = atoi(digitBuffer); return digits == 0 ? -1 : digits; } } @@ -2055,7 +2055,7 @@ extern "C" * which picture is shown on the new ride tab and which train type is selected * by default. */ - int vehicle_preference_compare(uint8 rideType, const char * a, const char * b) + sint32 vehicle_preference_compare(uint8 rideType, const char * a, const char * b) { std::vector rideEntryOrder = RCT1::GetPreferedRideEntryOrder(rideType); for (const char * object : rideEntryOrder) diff --git a/src/openrct2/rct2.c b/src/openrct2/rct2.c index 9680855b29..09693b6ea3 100644 --- a/src/openrct2/rct2.c +++ b/src/openrct2/rct2.c @@ -154,7 +154,7 @@ bool rct2_init() log_verbose("initialising game"); gScenarioTicks = 0; - util_srand((unsigned int)time(0)); + util_srand((uint32)time(0)); config_reset_shortcut_keys(); config_shortcut_keys_load(); @@ -209,7 +209,7 @@ bool rct2_init() * * rct2: 0x00683499 */ -int rct2_init_directories() +sint32 rct2_init_directories() { // windows_get_registry_install_info((rct2_install_info*)0x009AA10C, "RollerCoaster Tycoon 2 Setup", "MS Sans Serif", 0); @@ -268,7 +268,7 @@ void substitute_path(char *dest, size_t size, const char *path, const char *file * * rct2: 0x00674B42 */ -int rct2_startup_checks() +sint32 rct2_startup_checks() { if (!check_file_paths()) return 0; @@ -304,8 +304,8 @@ void rct2_draw(rct_drawpixelinfo *dpi) } static time_t _lastSecond; -static int _currentFPS; -static int _frames; +static sint32 _currentFPS; +static sint32 _frames; static void rct2_measure_fps() { @@ -323,8 +323,8 @@ static void rct2_measure_fps() static void rct2_draw_fps(rct_drawpixelinfo *dpi) { - int x = gScreenWidth / 2; - int y = 2; + sint32 x = gScreenWidth / 2; + sint32 y = 2; // Measure FPS rct2_measure_fps(); @@ -339,7 +339,7 @@ static void rct2_draw_fps(rct_drawpixelinfo *dpi) snprintf(ch, 64 - (ch - buffer), "%d", _currentFPS); // Draw Text - int stringWidth = gfx_get_string_width(buffer); + sint32 stringWidth = gfx_get_string_width(buffer); x = x - (stringWidth / 2); gfx_draw_string(dpi, buffer, 0, x, y); @@ -390,9 +390,9 @@ bool rct2_open_file(const char *path) * * rct2: 0x00674C95 */ -int check_file_paths() +sint32 check_file_paths() { - for (int pathId = 0; pathId < PATH_ID_END; pathId++) { + for (sint32 pathId = 0; pathId < PATH_ID_END; pathId++) { if (!check_file_path(pathId)) { return 0; } @@ -404,7 +404,7 @@ int check_file_paths() * * rct2: 0x00674CA5 */ -int check_file_path(int pathId) +sint32 check_file_path(sint32 pathId) { const utf8* path = get_file_path(pathId); SDL_RWops *file = SDL_RWFromFile(path, "rb"); @@ -441,7 +441,7 @@ int check_file_path(int pathId) void rct2_update() { - int tickCount = SDL_GetTicks(); + sint32 tickCount = SDL_GetTicks(); gTicksSinceLastUpdate = min(tickCount - gLastTickCount, 500); gLastTickCount = tickCount; if (game_is_not_paused()) { @@ -475,7 +475,7 @@ void rct2_update() * * rct2: 0x00674E6C */ -const utf8 *get_file_path(int pathId) +const utf8 *get_file_path(sint32 pathId) { static utf8 path[MAX_PATH]; safe_strcpy(path, gRCT2AddressAppPath, sizeof(path)); @@ -499,7 +499,7 @@ uint32 get_file_extension_type(const utf8 *path) static void rct2_copy_files_over(const utf8 *originalDirectory, const utf8 *newDirectory, const utf8 *extension) { utf8 *ch, filter[MAX_PATH], oldPath[MAX_PATH], newPath[MAX_PATH]; - int fileEnumHandle; + sint32 fileEnumHandle; file_info fileInfo; if (!platform_ensure_directory_exists(newDirectory)) { diff --git a/src/openrct2/rct2.h b/src/openrct2/rct2.h index e05e67a355..5a64ab48e4 100644 --- a/src/openrct2/rct2.h +++ b/src/openrct2/rct2.h @@ -132,16 +132,16 @@ extern char gRCT2AddressObjectDataPath[]; extern char gRCT2AddressTracksPath[]; bool rct2_init(); -int rct2_init_directories(); -int rct2_startup_checks(); +sint32 rct2_init_directories(); +sint32 rct2_startup_checks(); void rct2_dispose(); void rct2_update(); void substitute_path(char *dest, size_t size, const char *path, const char *filename); -int check_mutex(); -int check_file_paths(); -int check_file_path(int pathId); -int check_files_integrity(); -const char *get_file_path(int pathId); +sint32 check_mutex(); +sint32 check_file_paths(); +sint32 check_file_path(sint32 pathId); +sint32 check_files_integrity(); +const char *get_file_path(sint32 pathId); void rct2_quit(); bool rct2_open_file(const char *path); diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 13acf28699..0d6cc85cb3 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -233,7 +233,7 @@ void S6Exporter::Export() { _s6.info = gS6Info; - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { const rct_object_entry * entry = get_loaded_object_entry(i); void * entryData = get_loaded_object_chunk(i); @@ -256,12 +256,12 @@ void S6Exporter::Export() memcpy(_s6.map_elements, gMapElements, sizeof(_s6.map_elements)); _s6.next_free_map_element_pointer_index = gNextFreeMapElementPointerIndex; - for (int i = 0; i < MAX_SPRITES; i++) + for (sint32 i = 0; i < MAX_SPRITES; i++) { memcpy(&_s6.sprites[i], get_sprite(i), sizeof(rct_sprite)); } - for (int i = 0; i < NUM_SPRITE_LISTS; i++) + for (sint32 i = 0; i < NUM_SPRITE_LISTS; i++) { _s6.sprite_lists_head[i] = gSpriteListHead[i]; _s6.sprite_lists_count[i] = gSpriteListCount[i]; @@ -457,7 +457,7 @@ uint32 S6Exporter::GetLoanHash(money32 initialCash, money32 bankLoan, uint32 max // Save game state without modifying any of the state for multiplayer -int scenario_save_network(SDL_RWops * rw, const std::vector &objects) +sint32 scenario_save_network(SDL_RWops * rw, const std::vector &objects) { viewport_set_saved_view(); @@ -519,7 +519,7 @@ static bool object_is_custom(const ObjectRepositoryItem * object) && !(object->ObjectEntry.flags & 0xF0)); } -int scenario_write_packed_objects(SDL_RWops* rw, std::vector &objects) +sint32 scenario_write_packed_objects(SDL_RWops* rw, std::vector &objects) { log_verbose("exporting packed objects"); for (const auto &object : objects) @@ -574,7 +574,7 @@ extern "C" * rct2: 0x006754F5 * @param flags bit 0: pack objects, 1: save as scenario */ - int scenario_save(SDL_RWops* rw, int flags) + sint32 scenario_save(SDL_RWops* rw, sint32 flags) { if (flags & S6_SAVE_FLAG_SCENARIO) { diff --git a/src/openrct2/rct2/S6Exporter.h b/src/openrct2/rct2/S6Exporter.h index f6807cfb75..30b8a904f3 100644 --- a/src/openrct2/rct2/S6Exporter.h +++ b/src/openrct2/rct2/S6Exporter.h @@ -29,8 +29,8 @@ extern "C" struct ObjectRepositoryItem; -int scenario_save_network(SDL_RWops* rw, const std::vector &objects); -int scenario_write_packed_objects(SDL_RWops* rw, std::vector &objects); +sint32 scenario_save_network(SDL_RWops* rw, const std::vector &objects); +sint32 scenario_write_packed_objects(SDL_RWops* rw, std::vector &objects); std::vector scenario_get_packable_objects(); /** diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index c3c7b79143..e2754a4ffb 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -172,12 +172,12 @@ void S6Importer::Import() memcpy(gMapElements, _s6.map_elements, sizeof(_s6.map_elements)); gNextFreeMapElementPointerIndex = _s6.next_free_map_element_pointer_index; - for (int i = 0; i < MAX_SPRITES; i++) + for (sint32 i = 0; i < MAX_SPRITES; i++) { memcpy(get_sprite(i), &_s6.sprites[i], sizeof(rct_sprite)); } - for (int i = 0; i < NUM_SPRITE_LISTS; i++) + for (sint32 i = 0; i < NUM_SPRITE_LISTS; i++) { gSpriteListHead[i] = _s6.sprite_lists_head[i]; gSpriteListCount[i] = _s6.sprite_lists_count[i]; @@ -479,7 +479,7 @@ extern "C" * rct2: 0x00676053 * scenario (ebx) */ - int scenario_load(const char * path) + sint32 scenario_load(const char * path) { bool result = false; auto s6Importer = new S6Importer(); @@ -514,7 +514,7 @@ extern "C" return result; } - int game_load_network(SDL_RWops* rw) + sint32 game_load_network(SDL_RWops* rw) { bool result = false; auto s6Importer = new S6Importer(); diff --git a/src/openrct2/rct2/addresses.c b/src/openrct2/rct2/addresses.c index 6aed725f01..25957a73d3 100644 --- a/src/openrct2/rct2/addresses.c +++ b/src/openrct2/rct2/addresses.c @@ -30,11 +30,11 @@ // This variable serves a purpose of identifying a crash if it has happened inside original code. // When switching to original code, stack frame pointer is modified and prevents breakpad from providing stack trace. -volatile int _originalAddress = 0; +volatile sint32 _originalAddress = 0; -int DISABLE_OPT RCT2_CALLPROC_X(int address, int _eax, int _ebx, int _ecx, int _edx, int _esi, int _edi, int _ebp) +sint32 DISABLE_OPT RCT2_CALLPROC_X(sint32 address, sint32 _eax, sint32 _ebx, sint32 _ecx, sint32 _edx, sint32 _esi, sint32 _edi, sint32 _ebp) { - int result = 0; + sint32 result = 0; _originalAddress = address; #if defined(PLATFORM_X86) && !defined(NO_RCT2) #ifdef _MSC_VER @@ -86,9 +86,9 @@ int DISABLE_OPT RCT2_CALLPROC_X(int address, int _eax, int _ebx, int _ecx, int _ return result & 0xFF00; } -int DISABLE_OPT RCT2_CALLFUNC_X(int address, int *_eax, int *_ebx, int *_ecx, int *_edx, int *_esi, int *_edi, int *_ebp) +sint32 DISABLE_OPT RCT2_CALLFUNC_X(sint32 address, sint32 *_eax, sint32 *_ebx, sint32 *_ecx, sint32 *_edx, sint32 *_esi, sint32 *_edi, sint32 *_ebp) { - int result = 0; + sint32 result = 0; _originalAddress = address; #if defined(PLATFORM_X86) && !defined(NO_RCT2) #ifdef _MSC_VER diff --git a/src/openrct2/rct2/addresses.h b/src/openrct2/rct2/addresses.h index 10b57cb1be..2e66b25130 100644 --- a/src/openrct2/rct2/addresses.h +++ b/src/openrct2/rct2/addresses.h @@ -626,7 +626,7 @@ * P = Parity flag * All other bits are undefined. */ -int RCT2_CALLPROC_X(int address, int _eax, int _ebx, int _ecx, int _edx, int _esi, int _edi, int _ebp); +sint32 RCT2_CALLPROC_X(sint32 address, sint32 _eax, sint32 _ebx, sint32 _ecx, sint32 _edx, sint32 _esi, sint32 _edi, sint32 _ebp); /** * Returns the flags register @@ -640,7 +640,7 @@ int RCT2_CALLPROC_X(int address, int _eax, int _ebx, int _ecx, int _edx, int _es * P = Parity flag * All other bits are undefined. */ -int RCT2_CALLFUNC_X(int address, int *_eax, int *_ebx, int *_ecx, int *_edx, int *_esi, int *_edi, int *_ebp); +sint32 RCT2_CALLFUNC_X(sint32 address, sint32 *_eax, sint32 *_ebx, sint32 *_ecx, sint32 *_edx, sint32 *_esi, sint32 *_edi, sint32 *_ebp); #endif diff --git a/src/openrct2/rct2/hook.c b/src/openrct2/rct2/hook.c index 35c10d6526..379058c2b2 100644 --- a/src/openrct2/rct2/hook.c +++ b/src/openrct2/rct2/hook.c @@ -28,8 +28,8 @@ #include "hook.h" void* _hookTableAddress = 0; -int _hookTableOffset = 0; -int _maxHooks = 1000; +sint32 _hookTableOffset = 0; +sint32 _maxHooks = 1000; #define HOOK_BYTE_COUNT (140) registers gHookRegisters = {0}; @@ -42,9 +42,9 @@ registers gHookRegisters = {0}; *(data + 2) = ((addr) & 0x00ff0000) >> 16; \ *(data + 3) = ((addr) & 0xff000000) >> 24; -static void hookfunc(uintptr_t address, uintptr_t hookAddress, int stacksize) +static void hookfunc(uintptr_t address, uintptr_t hookAddress, sint32 stacksize) { - int i = 0; + sint32 i = 0; uint8 data[HOOK_BYTE_COUNT] = {0}; uintptr_t registerAddress = (uintptr_t) &gHookRegisters; @@ -180,9 +180,9 @@ void addhook(uintptr_t address, hook_function *function) if (_hookTableOffset > _maxHooks) { return; } - unsigned int hookaddress = (unsigned int)_hookTableAddress + (_hookTableOffset * HOOK_BYTE_COUNT); + uint32 hookaddress = (uint32)_hookTableAddress + (_hookTableOffset * HOOK_BYTE_COUNT); uint8 data[9]; - int i = 0; + sint32 i = 0; data[i++] = 0xE9; // jmp write_address_strictalias(&data[i], hookaddress - address - i - 4); @@ -193,7 +193,7 @@ void addhook(uintptr_t address, hook_function *function) WriteProcessMemory(GetCurrentProcess(), (LPVOID)address, data, i, 0); #else // We own the pages with PROT_WRITE | PROT_EXEC, we can simply just memcpy the data - int err = mprotect((void *)0x401000, 0x8a4000 - 0x401000, PROT_READ | PROT_WRITE); + sint32 err = mprotect((void *)0x401000, 0x8a4000 - 0x401000, PROT_READ | PROT_WRITE); if (err != 0) { perror("mprotect"); diff --git a/src/openrct2/rct2/interop.c b/src/openrct2/rct2/interop.c index ac4ece0d2c..591b3d5f3e 100644 --- a/src/openrct2/rct2/interop.c +++ b/src/openrct2/rct2/interop.c @@ -38,7 +38,7 @@ #include "interop.h" #if defined(USE_MMAP) && (defined(__unix__) || defined(__MACOSX__)) && !defined(NO_RCT2) - static int fdData = -1; + static sint32 fdData = -1; #endif #if !defined(NO_RCT2) static char * segments = (char *)(GOOD_PLACE_FOR_DATA_SEGMENT); @@ -58,8 +58,8 @@ bool rct2_interop_setup_segment() { // OpenRCT2 on Linux and macOS is wired to have the original Windows PE sections loaded // necessary. Windows does not need to do this as OpenRCT2 runs as a DLL loaded from the Windows PE. - int len = 0x01429000 - 0x8a4000; // 0xB85000, 12079104 bytes or around 11.5MB - int err = 0; + sint32 len = 0x01429000 - 0x8a4000; // 0xB85000, 12079104 bytes or around 11.5MB + sint32 err = 0; // in some configurations err and len may be unused UNUSED(err); UNUSED(len); @@ -117,9 +117,9 @@ bool rct2_interop_setup_segment() #endif // defined(USE_MMAP) && (defined(__unix__) || defined(__MACOSX__)) #if defined(__unix__) && !defined(NO_RCT2) - int pageSize = getpagesize(); - int numPages = (len + pageSize - 1) / pageSize; - unsigned char *dummy = malloc(numPages); + sint32 pageSize = getpagesize(); + sint32 numPages = (len + pageSize - 1) / pageSize; + uint8 *dummy = malloc(numPages); err = mincore((void *)segments, len, dummy); bool pagesMissing = false; @@ -138,7 +138,7 @@ bool rct2_interop_setup_segment() perror("mincore"); #endif // __LINUX__ } else { - for (int i = 0; i < numPages; i++) + for (sint32 i = 0; i < numPages; i++) { if (dummy[i] != 1) { diff --git a/src/openrct2/ride/cable_lift.c b/src/openrct2/ride/cable_lift.c index cc30096837..c0561c285f 100644 --- a/src/openrct2/ride/cable_lift.c +++ b/src/openrct2/ride/cable_lift.c @@ -27,7 +27,7 @@ static void cable_lift_update_departing(rct_vehicle *vehicle); static void cable_lift_update_travelling(rct_vehicle *vehicle); static void cable_lift_update_arriving(rct_vehicle *vehicle); -rct_vehicle *cable_lift_segment_create(int rideIndex, int x, int y, int z, int direction, uint16 var_44, sint32 remaining_distance, bool head) +rct_vehicle *cable_lift_segment_create(sint32 rideIndex, sint32 x, sint32 y, sint32 z, sint32 direction, uint16 var_44, sint32 remaining_distance, bool head) { rct_ride *ride = get_ride(rideIndex); rct_vehicle *current = &(create_sprite(1)->vehicle); @@ -66,7 +66,7 @@ rct_vehicle *cable_lift_segment_create(int rideIndex, int x, int y, int z, int d current->scream_sound_id = 0xFF; current->vehicle_sprite_type = 0; current->bank_rotation = 0; - for (int j = 0; j < 32; j++) { + for (sint32 j = 0; j < 32; j++) { current->peep[j] = SPRITE_INDEX_NULL; } current->var_CD = 0; @@ -243,8 +243,8 @@ static bool sub_6DF01A_loop(rct_vehicle* vehicle) { rct_xy_element input; rct_xy_element output; - int outputZ; - int outputDirection; + sint32 outputZ; + sint32 outputDirection; input.x = vehicle->track_x; input.y = vehicle->track_y; @@ -390,7 +390,7 @@ static bool sub_6DF21B_loop(rct_vehicle* vehicle) { * * rct2: 0x006DEF56 */ -int cable_lift_update_track_motion(rct_vehicle *cableLift) +sint32 cable_lift_update_track_motion(rct_vehicle *cableLift) { _vehicleF64E2C = 0; gCurrentVehicle = cableLift; diff --git a/src/openrct2/ride/cable_lift.h b/src/openrct2/ride/cable_lift.h index 84ebe378f0..e4e1842ddb 100644 --- a/src/openrct2/ride/cable_lift.h +++ b/src/openrct2/ride/cable_lift.h @@ -20,8 +20,8 @@ #include "../common.h" #include "vehicle.h" -rct_vehicle *cable_lift_segment_create(int rideIndex, int x, int y, int z, int direction, uint16 var_44, sint32 remaining_distance, bool head); +rct_vehicle *cable_lift_segment_create(sint32 rideIndex, sint32 x, sint32 y, sint32 z, sint32 direction, uint16 var_44, sint32 remaining_distance, bool head); void cable_lift_update(rct_vehicle *vehicle); -int cable_lift_update_track_motion(rct_vehicle *cableLift); +sint32 cable_lift_update_track_motion(rct_vehicle *cableLift); #endif diff --git a/src/openrct2/ride/coaster/air_powered_vertical_coaster.c b/src/openrct2/ride/coaster/air_powered_vertical_coaster.c index 06dd8e9d5e..1fbb07b4ae 100644 --- a/src/openrct2/ride/coaster/air_powered_vertical_coaster.c +++ b/src/openrct2/ride/coaster/air_powered_vertical_coaster.c @@ -179,7 +179,7 @@ static uint32 air_powered_vertical_rc_get_support_colour() } /** rct2: 0x008AFAD4 */ -static void air_powered_vertical_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE, @@ -199,7 +199,7 @@ static void air_powered_vertical_rc_track_flat(uint8 rideIndex, uint8 trackSeque paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -222,7 +222,7 @@ static void air_powered_vertical_rc_track_station(uint8 rideIndex, uint8 trackSe paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -272,14 +272,14 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(uint8 rideIndex, paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; air_powered_vertical_rc_track_right_quarter_turn_5(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x008AFB74 */ -static void air_powered_vertical_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE }, @@ -305,7 +305,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x008AFB84 */ -static void air_powered_vertical_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE }, @@ -330,18 +330,18 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(uint8 rideIndex, ui paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { air_powered_vertical_rc_track_flat_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFBA4 */ -static void air_powered_vertical_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { air_powered_vertical_rc_track_flat_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -400,14 +400,14 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(uint8 ride paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; air_powered_vertical_rc_track_banked_right_quarter_turn_5(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x008AFBD4 */ -static void air_powered_vertical_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_SW_NE, @@ -431,12 +431,12 @@ static void air_powered_vertical_rc_track_left_bank(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { air_powered_vertical_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void air_powered_vertical_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE, @@ -456,7 +456,7 @@ static void air_powered_vertical_rc_track_brakes(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 32, 0x20); } -static void air_powered_vertical_rc_track_vertical_slope_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_vertical_slope_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 trackImageIds[7][4] = { { @@ -644,7 +644,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(uint8 rideIndex, uin } } -static void air_powered_vertical_rc_track_vertical_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_vertical_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_1 }, @@ -675,7 +675,7 @@ static void air_powered_vertical_rc_track_vertical_up(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 80, 0x20); } -static void air_powered_vertical_rc_track_vertical_top(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_vertical_top(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { air_powered_vertical_rc_track_vertical_top(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); @@ -749,17 +749,17 @@ static void air_powered_vertical_rc_track_vertical_top(uint8 rideIndex, uint8 tr paint_util_set_general_support_height(height + 80, 0x20); } -static void air_powered_vertical_rc_track_vertical_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_vertical_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { air_powered_vertical_rc_track_vertical_up(rideIndex, trackSequence ^ 1, (direction + 2) & 3, height, mapElement); } -static void air_powered_vertical_rc_track_vertical_slope_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void air_powered_vertical_rc_track_vertical_slope_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { air_powered_vertical_rc_track_vertical_slope_up(rideIndex, 6 - trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/bobsleigh_coaster.c b/src/openrct2/ride/coaster/bobsleigh_coaster.c index df1bf1b71f..6d409d38a0 100644 --- a/src/openrct2/ride/coaster/bobsleigh_coaster.c +++ b/src/openrct2/ride/coaster/bobsleigh_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x006FE5B4 */ -static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -67,7 +67,7 @@ static void bobsleigh_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 paint_util_set_general_support_height(height + 32, 0x20); } -static void bobsleigh_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { 14580, SPR_STATION_BASE_B_SW_NE }, @@ -86,7 +86,7 @@ static void bobsleigh_rc_track_station(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x006FE5C4 */ -static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -143,7 +143,7 @@ static void bobsleigh_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x006FE5D4 */ -static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -200,7 +200,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x006FE5E4 */ -static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -257,25 +257,25 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x006FE5F4 */ -static void bobsleigh_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE604 */ -static void bobsleigh_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE614 */ -static void bobsleigh_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE624 */ -static void bobsleigh_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -411,14 +411,14 @@ static void bobsleigh_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS } /** rct2: 0x006FE634 */ -static void bobsleigh_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x006FE644 */ -static void bobsleigh_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -447,7 +447,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x006FE654 */ -static void bobsleigh_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -476,7 +476,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x006FE664 */ -static void bobsleigh_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -505,7 +505,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x006FE674 */ -static void bobsleigh_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -534,7 +534,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x006FE684 */ -static void bobsleigh_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -670,14 +670,14 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x006FE694 */ -static void bobsleigh_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bobsleigh_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x006FE6A4 */ -static void bobsleigh_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -710,7 +710,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x006FE6B4 */ -static void bobsleigh_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -743,7 +743,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x006FE6C4 */ -static void bobsleigh_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -776,7 +776,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x006FE6D4 */ -static void bobsleigh_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -809,31 +809,31 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x006FE6E4 */ -static void bobsleigh_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE6F4 */ -static void bobsleigh_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE704 */ -static void bobsleigh_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE714 */ -static void bobsleigh_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE724 */ -static void bobsleigh_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -862,13 +862,13 @@ static void bobsleigh_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x006FE734 */ -static void bobsleigh_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bobsleigh_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE744 */ -static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -980,7 +980,7 @@ static void bobsleigh_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x006FE754 */ -static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1092,7 +1092,7 @@ static void bobsleigh_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x006FE794 */ -static void bobsleigh_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1181,14 +1181,14 @@ static void bobsleigh_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS } /** rct2: 0x006FE7A4 */ -static void bobsleigh_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x006FE7B4 */ -static void bobsleigh_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1277,14 +1277,14 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 t } /** rct2: 0x006FE7C4 */ -static void bobsleigh_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x006FE7D4 */ -static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1455,7 +1455,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x006FE7E4 */ -static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1626,7 +1626,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x006FE7F4 */ -static void bobsleigh_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -1637,7 +1637,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_small(uint8 rideIndex } /** rct2: 0x006FE804 */ -static void bobsleigh_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -1648,7 +1648,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_small(uint8 rideInde } /** rct2: 0x006FE814 */ -static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1913,7 +1913,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x006FE824 */ -static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2178,7 +2178,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x006FE834 */ -static void bobsleigh_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2189,7 +2189,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_large(uint8 rideIndex } /** rct2: 0x006FE844 */ -static void bobsleigh_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2200,7 +2200,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_large(uint8 rideInde } /** rct2: 0x006FE854 */ -static void bobsleigh_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2223,7 +2223,7 @@ static void bobsleigh_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x006FE864 */ -static void bobsleigh_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void bobsleigh_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2245,7 +2245,7 @@ static void bobsleigh_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/bolliger_mabillard_track.c b/src/openrct2/ride/coaster/bolliger_mabillard_track.c index faf4a629e5..58e1ac6340 100644 --- a/src/openrct2/ride/coaster/bolliger_mabillard_track.c +++ b/src/openrct2/ride/coaster/bolliger_mabillard_track.c @@ -27,7 +27,7 @@ #include "../track_paint.h" #include "bolliger_mabillard_track.h" -void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -67,7 +67,7 @@ void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { static const uint32 imageIds[4][3] = { { 17154, 17150, SPR_STATION_BASE_A_SW_NE }, @@ -92,7 +92,7 @@ void bolliger_mabillard_track_station(uint8 rideIndex, uint8 trackSequence, uint paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -140,7 +140,7 @@ void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -188,7 +188,7 @@ void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui paint_util_set_general_support_height(height + 104, 0x20); } -void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -236,7 +236,7 @@ void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -288,7 +288,7 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 72, 0x20); } -void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -340,7 +340,7 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 72, 0x20); } -void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -388,37 +388,37 @@ void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -533,13 +533,13 @@ void bolliger_mabillard_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSe } } -void bolliger_mabillard_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -565,7 +565,7 @@ void bolliger_mabillard_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -591,7 +591,7 @@ void bolliger_mabillard_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -617,7 +617,7 @@ void bolliger_mabillard_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -643,7 +643,7 @@ void bolliger_mabillard_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -763,13 +763,13 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -799,7 +799,7 @@ void bolliger_mabillard_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -829,7 +829,7 @@ void bolliger_mabillard_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -859,7 +859,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -889,27 +889,27 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -933,12 +933,12 @@ void bolliger_mabillard_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1053,7 +1053,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uin } } -void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1168,19 +1168,19 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, ui } } -void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1275,7 +1275,7 @@ void bolliger_mabillard_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } } -void bolliger_mabillard_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1370,7 +1370,7 @@ void bolliger_mabillard_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, } } -void bolliger_mabillard_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1553,7 +1553,7 @@ void bolliger_mabillard_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeq } } -void bolliger_mabillard_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1724,7 +1724,7 @@ void bolliger_mabillard_track_right_vertical_loop(uint8 rideIndex, uint8 trackSe track_paint_util_right_vertical_loop_segments(direction, trackSequence); } -void bolliger_mabillard_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1800,13 +1800,13 @@ void bolliger_mabillard_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSe } } -void bolliger_mabillard_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1884,13 +1884,13 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 tr } } -void bolliger_mabillard_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -1951,7 +1951,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uin } } -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -2015,19 +2015,19 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, ui } } -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -2177,7 +2177,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(uint8 rideIndex, u } } -void bolliger_mabillard_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -2327,7 +2327,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(uint8 rideIndex, } } -void bolliger_mabillard_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2337,7 +2337,7 @@ void bolliger_mabillard_track_left_half_banked_helix_down_small(uint8 rideIndex, bolliger_mabillard_track_right_half_banked_helix_up_small(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2347,7 +2347,7 @@ void bolliger_mabillard_track_right_half_banked_helix_down_small(uint8 rideIndex bolliger_mabillard_track_left_half_banked_helix_up_small(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -2575,7 +2575,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(uint8 rideIndex, u } } -void bolliger_mabillard_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -2809,7 +2809,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(uint8 rideIndex, } } -void bolliger_mabillard_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2819,7 +2819,7 @@ void bolliger_mabillard_track_left_half_banked_helix_down_large(uint8 rideIndex, bolliger_mabillard_track_right_half_banked_helix_up_large(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2829,7 +2829,7 @@ void bolliger_mabillard_track_right_half_banked_helix_down_large(uint8 rideIndex bolliger_mabillard_track_left_half_banked_helix_up_large(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -2854,7 +2854,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uin paint_util_set_general_support_height(height + 104, 0x20); } -void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -2879,17 +2879,17 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, ui paint_util_set_general_support_height(height + 104, 0x20); } -void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -2909,7 +2909,7 @@ void bolliger_mabillard_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -2937,7 +2937,7 @@ void bolliger_mabillard_track_25_deg_up_left_banked(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -2965,7 +2965,7 @@ void bolliger_mabillard_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -2999,17 +2999,17 @@ void bolliger_mabillard_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3036,12 +3036,12 @@ void bolliger_mabillard_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, ui } } -void bolliger_mabillard_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3071,12 +3071,12 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -3104,7 +3104,7 @@ void bolliger_mabillard_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 80, 0x20); } -void bolliger_mabillard_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3133,7 +3133,7 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3223,7 +3223,7 @@ void bolliger_mabillard_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSe } } -void bolliger_mabillard_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3313,19 +3313,19 @@ void bolliger_mabillard_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackS } } -void bolliger_mabillard_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3415,7 +3415,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 tr } } -void bolliger_mabillard_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3505,19 +3505,19 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 t } } -void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3611,7 +3611,7 @@ void bolliger_mabillard_track_diag_flat(uint8 rideIndex, uint8 trackSequence, ui } } -void bolliger_mabillard_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3705,7 +3705,7 @@ void bolliger_mabillard_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequenc } } -void bolliger_mabillard_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3799,7 +3799,7 @@ void bolliger_mabillard_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequenc } } -void bolliger_mabillard_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3893,7 +3893,7 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -3987,7 +3987,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4081,7 +4081,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4175,7 +4175,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4269,7 +4269,7 @@ void bolliger_mabillard_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSeque } } -void bolliger_mabillard_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4363,7 +4363,7 @@ void bolliger_mabillard_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSeque } } -void bolliger_mabillard_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4455,7 +4455,7 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 tr paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4549,7 +4549,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, u } } -void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4643,7 +4643,7 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, u } } -void bolliger_mabillard_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4737,7 +4737,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 tr } } -void bolliger_mabillard_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4831,7 +4831,7 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -4925,7 +4925,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5019,7 +5019,7 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 tr } } -void bolliger_mabillard_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5113,7 +5113,7 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 tr } } -void bolliger_mabillard_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5166,7 +5166,7 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5219,7 +5219,7 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 tra } } -void bolliger_mabillard_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5272,7 +5272,7 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trac } } -void bolliger_mabillard_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5325,7 +5325,7 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 tra } } -void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5378,7 +5378,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5431,7 +5431,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint } } -void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5484,7 +5484,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5537,7 +5537,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint } } -void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5588,7 +5588,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uin paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5639,7 +5639,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, ui paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5692,7 +5692,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uin } } -void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5745,7 +5745,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, ui } } -void bolliger_mabillard_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5797,7 +5797,7 @@ void bolliger_mabillard_track_diag_left_bank(uint8 rideIndex, uint8 trackSequenc } } -void bolliger_mabillard_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5849,7 +5849,7 @@ void bolliger_mabillard_track_diag_right_bank(uint8 rideIndex, uint8 trackSequen } } -void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5911,7 +5911,7 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 r } } -void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -5976,7 +5976,7 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 } } -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6041,7 +6041,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 } } -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6103,7 +6103,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(uin } } -void bolliger_mabillard_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6123,7 +6123,7 @@ void bolliger_mabillard_track_block_brakes(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6184,7 +6184,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideInd } } -void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6248,19 +6248,19 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIn } } -void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6375,7 +6375,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideInd } } -void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6490,19 +6490,19 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIn } } -void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6531,7 +6531,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6560,7 +6560,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideInde paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6589,7 +6589,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6618,27 +6618,27 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideInde paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6666,7 +6666,7 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ri paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6694,7 +6694,7 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(uint8 paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6722,7 +6722,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ri paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6750,27 +6750,27 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(uint8 paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6799,7 +6799,7 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uin paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6828,7 +6828,7 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, ui paint_util_set_general_support_height(height + 48, 0x20); } -void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6857,7 +6857,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uin paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -6886,27 +6886,27 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, ui paint_util_set_general_support_height(height + 40, 0x20); } -void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6935,7 +6935,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uin } } -void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -6964,18 +6964,18 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, ui } } -void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement, supportType); } /* The following track elements used to be specific to the Vertical Roller Coaster */ -void bolliger_mabillard_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -7023,7 +7023,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 64, 0x20); } -void bolliger_mabillard_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -7071,17 +7071,17 @@ void bolliger_mabillard_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 72, 0x20); } -void bolliger_mabillard_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -7110,7 +7110,7 @@ void bolliger_mabillard_track_brake_for_drop(uint8 rideIndex, uint8 trackSequenc } /* The following track elements used to be specific to the Steel Twister */ -void bolliger_mabillard_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7199,12 +7199,12 @@ void bolliger_mabillard_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, } } -void bolliger_mabillard_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_half_loop_up(rideIndex, 3 - trackSequence, direction, height, mapElement, supportType); } -void bolliger_mabillard_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7280,7 +7280,7 @@ void bolliger_mabillard_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequ } } -void bolliger_mabillard_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7355,17 +7355,17 @@ void bolliger_mabillard_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSeq } } -void bolliger_mabillard_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_corkscrew_up(rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7467,7 +7467,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 } /** rct2: 0x008AC104 */ -void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7568,17 +7568,17 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_60_deg_up_long_base(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_flat_long_base(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7665,7 +7665,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 } } -void bolliger_mabillard_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7752,17 +7752,17 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint } } -void bolliger_mabillard_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_barrel_roll_up_to_down(rideIndex, 2 - trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_barrel_roll_up_to_down(rideIndex, 2 - trackSequence, (direction + 2) & 3, height, mapElement, supportType); } -void bolliger_mabillard_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (direction) { case 0: @@ -7788,7 +7788,7 @@ void bolliger_mabillard_track_powered_lift(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 56, 0x20); } -void bolliger_mabillard_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -7932,7 +7932,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(uint8 rideIndex, uint8 tra } } -void bolliger_mabillard_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -8076,17 +8076,17 @@ void bolliger_mabillard_track_right_large_half_loop_up(uint8 rideIndex, uint8 tr } } -void bolliger_mabillard_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_large_half_loop_up(rideIndex, 6 - trackSequence, direction, height, mapElement, supportType); } -void bolliger_mabillard_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_large_half_loop_up(rideIndex, 6 - trackSequence, direction, height, mapElement, supportType); } -void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { switch (trackSequence) { case 0: @@ -8149,7 +8149,7 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 ride } } -void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType) +void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(rideIndex, 2 - trackSequence, direction, height, mapElement, supportType); } diff --git a/src/openrct2/ride/coaster/bolliger_mabillard_track.h b/src/openrct2/ride/coaster/bolliger_mabillard_track.h index 37fdf5c2d0..03d4953e5d 100644 --- a/src/openrct2/ride/coaster/bolliger_mabillard_track.h +++ b/src/openrct2/ride/coaster/bolliger_mabillard_track.h @@ -14,185 +14,185 @@ *****************************************************************************/ #pragma endregion -void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); +void bolliger_mabillard_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); /* Previously specific to the Vertical RC */ -void bolliger_mabillard_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); +void bolliger_mabillard_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); /* Previously specific to the Steel Twister */ -void bolliger_mabillard_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); -void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, int supportType); +void bolliger_mabillard_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); diff --git a/src/openrct2/ride/coaster/compact_inverted_coaster.c b/src/openrct2/ride/coaster/compact_inverted_coaster.c index 614d923624..baddb67390 100644 --- a/src/openrct2/ride/coaster/compact_inverted_coaster.c +++ b/src/openrct2/ride/coaster/compact_inverted_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008AE6E0 */ -static void compact_inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -63,7 +63,7 @@ static void compact_inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008AE950, 0x008AE960, 0x008AE970 */ -static void compact_inverted_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -83,7 +83,7 @@ static void compact_inverted_rc_track_station(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AE6F0 */ -static void compact_inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -144,7 +144,7 @@ static void compact_inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AE700 */ -static void compact_inverted_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -187,7 +187,7 @@ static void compact_inverted_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AE710 */ -static void compact_inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -248,7 +248,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AE720 */ -static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -295,7 +295,7 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x008AE730 */ -static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -360,7 +360,7 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008AE740 */ -static void compact_inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -421,43 +421,43 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008AE750 */ -static void compact_inverted_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE760 */ -static void compact_inverted_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE770 */ -static void compact_inverted_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE780 */ -static void compact_inverted_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE790 */ -static void compact_inverted_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE7A0 */ -static void compact_inverted_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE7B0 */ -static void compact_inverted_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -577,14 +577,14 @@ static void compact_inverted_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x008AE7C0 */ -static void compact_inverted_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AE7D0 */ -static void compact_inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -611,7 +611,7 @@ static void compact_inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 t } /** rct2: 0x008AE7E0 */ -static void compact_inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -638,7 +638,7 @@ static void compact_inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x008AE7F0 */ -static void compact_inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -665,7 +665,7 @@ static void compact_inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008AE800 */ -static void compact_inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -692,7 +692,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x008AE810 */ -static void compact_inverted_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -812,14 +812,14 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(uint8 rideIndex } /** rct2: 0x008AE820 */ -static void compact_inverted_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AE830 */ -static void compact_inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -863,7 +863,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008AE840 */ -static void compact_inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -907,7 +907,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008AE850 */ -static void compact_inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -951,7 +951,7 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, ui } /** rct2: 0x008AE860 */ -static void compact_inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -995,31 +995,31 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, u } /** rct2: 0x008AE870 */ -static void compact_inverted_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE880 */ -static void compact_inverted_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE890 */ -static void compact_inverted_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE8A0 */ -static void compact_inverted_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE8B0 */ -static void compact_inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1046,13 +1046,13 @@ static void compact_inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AE8C0 */ -static void compact_inverted_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE8D0 */ -static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1172,7 +1172,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIn } /** rct2: 0x008AE8E0 */ -static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1292,21 +1292,21 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideI } /** rct2: 0x008AE8F0 */ -static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AE900 */ -static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AE910 */ -static void compact_inverted_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1422,7 +1422,7 @@ static void compact_inverted_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008AE920 */ -static void compact_inverted_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1538,7 +1538,7 @@ static void compact_inverted_rc_track_s_bend_right(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AE930 */ -static void compact_inverted_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1738,7 +1738,7 @@ static void compact_inverted_rc_track_left_vertical_loop(uint8 rideIndex, uint8 } /** rct2: 0x008AE940 */ -static void compact_inverted_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1938,7 +1938,7 @@ static void compact_inverted_rc_track_right_vertical_loop(uint8 rideIndex, uint8 } /** rct2: 0x008AE980 */ -static void compact_inverted_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2019,14 +2019,14 @@ static void compact_inverted_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 } /** rct2: 0x008AE990 */ -static void compact_inverted_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AE9A0 */ -static void compact_inverted_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2107,14 +2107,14 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, } /** rct2: 0x008AE9B0 */ -static void compact_inverted_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AE9C0 */ -static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2180,7 +2180,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIn } /** rct2: 0x008AE9D0 */ -static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2246,21 +2246,21 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideI } /** rct2: 0x008AE9E0 */ -static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AE9F0 */ -static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AEA00 */ -static void compact_inverted_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2336,7 +2336,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(uint8 rideIndex, uin } /** rct2: 0x008AEA10 */ -static void compact_inverted_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2412,7 +2412,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(uint8 rideIndex, ui } /** rct2: 0x008AEA20 */ -static void compact_inverted_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2488,7 +2488,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(uint8 rideIndex, uin } /** rct2: 0x008AEA30 */ -static void compact_inverted_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2564,7 +2564,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(uint8 rideIndex, ui } /** rct2: 0x008AEA40 */ -static void compact_inverted_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2665,13 +2665,13 @@ static void compact_inverted_rc_track_half_loop_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AEA50 */ -static void compact_inverted_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_half_loop_up(rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008AEA60 */ -static void compact_inverted_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2747,7 +2747,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AEA70 */ -static void compact_inverted_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2823,19 +2823,19 @@ static void compact_inverted_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 } /** rct2: 0x008AEA80 */ -static void compact_inverted_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_right_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AEA90 */ -static void compact_inverted_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_left_corkscrew_up(rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AEAD0 */ -static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2861,7 +2861,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIn } /** rct2: 0x008AEAB0 */ -static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2887,19 +2887,19 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideI } /** rct2: 0x008AEAC0 */ -static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AEAE0 */ -static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AEAA0 */ -static void compact_inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2922,7 +2922,7 @@ static void compact_inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008AEAF0 */ -static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3042,7 +3042,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(uint8 r } /** rct2: 0x008AEB00 */ -static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3162,7 +3162,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(uint8 } /** rct2: 0x008AEB10 */ -static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3282,7 +3282,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(uint8 } /** rct2: 0x008AEB20 */ -static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3402,7 +3402,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(uint } /** rct2: 0x008AEB30 */ -static void compact_inverted_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3437,7 +3437,7 @@ static void compact_inverted_rc_track_on_ride_photo(uint8 rideIndex, uint8 track } /** rct2: 0x008AEDB0 */ -static void compact_inverted_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3482,13 +3482,13 @@ static void compact_inverted_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AEDC0 */ -static void compact_inverted_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AED70 */ -static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3536,13 +3536,13 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, ui } /** rct2: 0x008AED80 */ -static void compact_inverted_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { compact_inverted_rc_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AED90 */ -static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -3588,7 +3588,7 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x008AEDA0 */ -static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3635,7 +3635,7 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex } /** rct2: 0x008AEB40 */ -static void compact_inverted_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3740,7 +3740,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x008AEB50 */ -static void compact_inverted_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3845,21 +3845,21 @@ static void compact_inverted_rc_track_right_eighth_to_diag(uint8 rideIndex, uint } /** rct2: 0x008AEB60 */ -static void compact_inverted_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AEB70 */ -static void compact_inverted_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008AED30 */ -static void compact_inverted_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3964,7 +3964,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, } /** rct2: 0x008AED40 */ -static void compact_inverted_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4069,21 +4069,21 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, } /** rct2: 0x008AED50 */ -static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AED60 */ -static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008AEB80 */ -static void compact_inverted_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4174,7 +4174,7 @@ static void compact_inverted_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AEBB0 */ -static void compact_inverted_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4265,7 +4265,7 @@ static void compact_inverted_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008AEC10 */ -static void compact_inverted_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4324,7 +4324,7 @@ static void compact_inverted_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008AEB90 */ -static void compact_inverted_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4415,7 +4415,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008AEBF0 */ -static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4474,7 +4474,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideInde } /** rct2: 0x008AEC00 */ -static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4533,7 +4533,7 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideInde } /** rct2: 0x008AEBA0 */ -static void compact_inverted_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4624,7 +4624,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, ui } /** rct2: 0x008AEBE0 */ -static void compact_inverted_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4715,7 +4715,7 @@ static void compact_inverted_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 tr } /** rct2: 0x008AEC40 */ -static void compact_inverted_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4774,7 +4774,7 @@ static void compact_inverted_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 tr } /** rct2: 0x008AEBC0 */ -static void compact_inverted_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4862,7 +4862,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, } /** rct2: 0x008AEC20 */ -static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4921,7 +4921,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(uint8 ride } /** rct2: 0x008AEC30 */ -static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4980,7 +4980,7 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(uint8 ride } /** rct2: 0x008AEBD0 */ -static void compact_inverted_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5071,7 +5071,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, } /** rct2: 0x008AEC70 */ -static void compact_inverted_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5130,7 +5130,7 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(uint8 rideIndex, ui } /** rct2: 0x008AEC80 */ -static void compact_inverted_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5189,7 +5189,7 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(uint8 rideIndex, u } /** rct2: 0x008AEC90 */ -static void compact_inverted_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5248,7 +5248,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(uint8 rideIndex, ui } /** rct2: 0x008AECA0 */ -static void compact_inverted_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5307,7 +5307,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(uint8 rideIndex, u } /** rct2: 0x008AECD0 */ -static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5366,7 +5366,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(uint8 rideInde } /** rct2: 0x008AECE0 */ -static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5425,7 +5425,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(uint8 rideInd } /** rct2: 0x008AECB0 */ -static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5484,7 +5484,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(uint8 rideInde } /** rct2: 0x008AECC0 */ -static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5543,7 +5543,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(uint8 rideInd } /** rct2: 0x008AECF0 */ -static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5599,7 +5599,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIn } /** rct2: 0x008AED00 */ -static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5655,7 +5655,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(uint8 rideI } /** rct2: 0x008AED10 */ -static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5714,7 +5714,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIn } /** rct2: 0x008AED20 */ -static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5773,7 +5773,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(uint8 rideI } /** rct2: 0x008AEC50 */ -static void compact_inverted_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5832,7 +5832,7 @@ static void compact_inverted_rc_track_diag_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008AEC60 */ -static void compact_inverted_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5891,7 +5891,7 @@ static void compact_inverted_rc_track_diag_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008AEAA0 */ -static void compact_inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void compact_inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5913,7 +5913,7 @@ static void compact_inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackS paint_util_set_general_support_height(height + 48, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_compact_inverted_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_compact_inverted_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/corkscrew_roller_coaster.c b/src/openrct2/ride/coaster/corkscrew_roller_coaster.c index bfb2949fab..c89d3b4e05 100644 --- a/src/openrct2/ride/coaster/corkscrew_roller_coaster.c +++ b/src/openrct2/ride/coaster/corkscrew_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A7AF8 */ -static void corkscrew_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -68,7 +68,7 @@ static void corkscrew_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A7D68, 0x008A7D78, 0x008A7D88 */ -static void corkscrew_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 16236, 16232, SPR_STATION_BASE_A_SW_NE }, @@ -91,7 +91,7 @@ static void corkscrew_rc_track_station(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A7B08 */ -static void corkscrew_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -140,7 +140,7 @@ static void corkscrew_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A7B18 */ -static void corkscrew_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -189,7 +189,7 @@ static void corkscrew_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A7B28 */ -static void corkscrew_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -238,7 +238,7 @@ static void corkscrew_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7B38 */ -static void corkscrew_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -291,7 +291,7 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7B48 */ -static void corkscrew_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -344,7 +344,7 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7B58 */ -static void corkscrew_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -393,43 +393,43 @@ static void corkscrew_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7B68 */ -static void corkscrew_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7B78 */ -static void corkscrew_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7B88 */ -static void corkscrew_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7B98 */ -static void corkscrew_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7BA8 */ -static void corkscrew_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7BB8 */ -static void corkscrew_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7BC8 */ -static void corkscrew_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -545,14 +545,14 @@ static void corkscrew_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A7BD8 */ -static void corkscrew_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7BE8 */ -static void corkscrew_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -579,7 +579,7 @@ static void corkscrew_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7BF8 */ -static void corkscrew_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -606,7 +606,7 @@ static void corkscrew_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A7C08 */ -static void corkscrew_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -633,7 +633,7 @@ static void corkscrew_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7C18 */ -static void corkscrew_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -660,7 +660,7 @@ static void corkscrew_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A7C28 */ -static void corkscrew_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -778,14 +778,14 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x008A7C38 */ -static void corkscrew_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7C48 */ -static void corkscrew_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -816,7 +816,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7C58 */ -static void corkscrew_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -847,7 +847,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x008A7C68 */ -static void corkscrew_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -878,7 +878,7 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7C78 */ -static void corkscrew_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -909,31 +909,31 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x008A7C88 */ -static void corkscrew_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7C98 */ -static void corkscrew_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CA8 */ -static void corkscrew_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CB8 */ -static void corkscrew_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CC8 */ -static void corkscrew_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -958,13 +958,13 @@ static void corkscrew_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A7CD8 */ -static void corkscrew_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CE8 */ -static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1080,7 +1080,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A7CF8 */ -static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1196,21 +1196,21 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008A7D08 */ -static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7D18 */ -static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7D28 */ -static void corkscrew_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1306,7 +1306,7 @@ static void corkscrew_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A7D38 */ -static void corkscrew_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1402,7 +1402,7 @@ static void corkscrew_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A7D48 */ -static void corkscrew_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1586,7 +1586,7 @@ static void corkscrew_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A7D58 */ -static void corkscrew_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1758,7 +1758,7 @@ static void corkscrew_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A7D98 */ -static void corkscrew_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1835,14 +1835,14 @@ static void corkscrew_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A7DA8 */ -static void corkscrew_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7DB8 */ -static void corkscrew_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1921,14 +1921,14 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 t } /** rct2: 0x008A7DC8 */ -static void corkscrew_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7DD8 */ -static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1990,7 +1990,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A7DE8 */ -static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2055,21 +2055,21 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008A7DF8 */ -static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7E08 */ -static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7E18 */ -static void corkscrew_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2159,13 +2159,13 @@ static void corkscrew_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A7E28 */ -static void corkscrew_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_half_loop_up(rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A7E38 */ -static void corkscrew_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2242,7 +2242,7 @@ static void corkscrew_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7E48 */ -static void corkscrew_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2318,19 +2318,19 @@ static void corkscrew_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A7E58 */ -static void corkscrew_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_right_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7E68 */ -static void corkscrew_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_left_corkscrew_up(rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7E78 */ -static void corkscrew_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2481,7 +2481,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x008A7E88 */ -static void corkscrew_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2632,7 +2632,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x008A7E98 */ -static void corkscrew_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2643,7 +2643,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_small(uint8 rideIndex } /** rct2: 0x008A7EA8 */ -static void corkscrew_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2654,7 +2654,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_small(uint8 rideInde } /** rct2: 0x008A7EB8 */ -static void corkscrew_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2883,7 +2883,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x008A7EC8 */ -static void corkscrew_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3112,7 +3112,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x008A7ED8 */ -static void corkscrew_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3123,7 +3123,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_large(uint8 rideIndex } /** rct2: 0x008A7EE8 */ -static void corkscrew_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3134,7 +3134,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_large(uint8 rideInde } /** rct2: 0x008A7F18 */ -static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3160,7 +3160,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A7EF8 */ -static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3186,19 +3186,19 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, u } /** rct2: 0x008A7F08 */ -static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7F28 */ -static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7F38 */ -static void corkscrew_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3219,7 +3219,7 @@ static void corkscrew_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008A7F48 */ -static void corkscrew_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3254,7 +3254,7 @@ static void corkscrew_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A8198 */ -static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3356,7 +3356,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint } /** rct2: 0x008A81A8 */ -static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3458,19 +3458,19 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint } /** rct2: 0x008A81B8 */ -static void corkscrew_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_flat_to_60_deg_up_long_base(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A81C8 */ -static void corkscrew_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { corkscrew_rc_track_60_deg_up_to_flat_long_base(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7F68 */ -static void corkscrew_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3561,7 +3561,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A7F78 */ -static void corkscrew_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3652,21 +3652,21 @@ static void corkscrew_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 track } /** rct2: 0x008A7F88 */ -static void corkscrew_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7F98 */ -static void corkscrew_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A7FA8 */ -static void corkscrew_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3757,7 +3757,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 t } /** rct2: 0x008A7FB8 */ -static void corkscrew_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3848,21 +3848,21 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x008A7FC8 */ -static void corkscrew_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7FD8 */ -static void corkscrew_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A7F58 */ -static void corkscrew_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3957,7 +3957,7 @@ static void corkscrew_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A8008 */ -static void corkscrew_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4052,7 +4052,7 @@ static void corkscrew_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A8068 */ -static void corkscrew_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4147,7 +4147,7 @@ static void corkscrew_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A7FE8 */ -static void corkscrew_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4242,7 +4242,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A8048 */ -static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4337,7 +4337,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A8058 */ -static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4432,7 +4432,7 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A7FF8 */ -static void corkscrew_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4527,7 +4527,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A8038 */ -static void corkscrew_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4622,7 +4622,7 @@ static void corkscrew_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A8098 */ -static void corkscrew_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4717,7 +4717,7 @@ static void corkscrew_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A8018 */ -static void corkscrew_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4810,7 +4810,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 t } /** rct2: 0x008A8078 */ -static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4905,7 +4905,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, } /** rct2: 0x008A8088 */ -static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5000,7 +5000,7 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, } /** rct2: 0x008A8028 */ -static void corkscrew_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5095,7 +5095,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008A80C8 */ -static void corkscrew_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5149,7 +5149,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A80D8 */ -static void corkscrew_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5203,7 +5203,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x008A80E8 */ -static void corkscrew_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5257,7 +5257,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A80F8 */ -static void corkscrew_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5311,7 +5311,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x008A8128 */ -static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5365,7 +5365,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A8138 */ -static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5419,7 +5419,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A8108 */ -static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5473,7 +5473,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint } /** rct2: 0x008A8118 */ -static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5527,7 +5527,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uin } /** rct2: 0x008A8148 */ -static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5579,7 +5579,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, ui } /** rct2: 0x008A8158 */ -static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5631,7 +5631,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x008A8168 */ -static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5685,7 +5685,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, ui } /** rct2: 0x008A8178 */ -static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5739,7 +5739,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, u } /** rct2: 0x008A80A8 */ -static void corkscrew_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5792,7 +5792,7 @@ static void corkscrew_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A80B8 */ -static void corkscrew_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5845,7 +5845,7 @@ static void corkscrew_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A8188 */ -static void corkscrew_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void corkscrew_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5863,7 +5863,7 @@ static void corkscrew_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/flying_roller_coaster.c b/src/openrct2/ride/coaster/flying_roller_coaster.c index 9f525cf909..ede664decb 100644 --- a/src/openrct2/ride/coaster/flying_roller_coaster.c +++ b/src/openrct2/ride/coaster/flying_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x007C6FF4 */ -static void flying_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -102,7 +102,7 @@ static void flying_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir } /** rct2: 0x007C7244, 0x007C7254, 0x007C7264 */ -static void flying_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_inverted(mapElement)) { static const uint32 imageIds[4][3] = { @@ -140,7 +140,7 @@ static void flying_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x007C7004 */ -static void flying_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -228,7 +228,7 @@ static void flying_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x007C7014 */ -static void flying_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -281,7 +281,7 @@ static void flying_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x007C7024 */ -static void flying_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -369,7 +369,7 @@ static void flying_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x007C7034 */ -static void flying_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -426,7 +426,7 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C7044 */ -static void flying_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -501,7 +501,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C7054 */ -static void flying_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -589,43 +589,43 @@ static void flying_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x007C7064 */ -static void flying_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7074 */ -static void flying_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7084 */ -static void flying_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7094 */ -static void flying_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C70A4 */ -static void flying_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C70B4 */ -static void flying_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C70C4 */ -static void flying_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -859,14 +859,14 @@ static void flying_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x007C70D4 */ -static void flying_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C70E4 */ -static void flying_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -918,7 +918,7 @@ static void flying_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x007C70F4 */ -static void flying_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -970,7 +970,7 @@ static void flying_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x007C7104 */ -static void flying_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1022,7 +1022,7 @@ static void flying_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x007C7114 */ -static void flying_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1074,7 +1074,7 @@ static void flying_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x007C7124 */ -static void flying_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -1310,14 +1310,14 @@ static void flying_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 tr } /** rct2: 0x007C7134 */ -static void flying_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C7144 */ -static void flying_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1390,7 +1390,7 @@ static void flying_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C7154 */ -static void flying_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1463,7 +1463,7 @@ static void flying_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x007C7164 */ -static void flying_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1536,7 +1536,7 @@ static void flying_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C7174 */ -static void flying_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1609,31 +1609,31 @@ static void flying_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 track } /** rct2: 0x007C7184 */ -static void flying_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7194 */ -static void flying_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71A4 */ -static void flying_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71B4 */ -static void flying_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71C4 */ -static void flying_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1683,13 +1683,13 @@ static void flying_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x007C71D4 */ -static void flying_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71E4 */ -static void flying_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -1923,7 +1923,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x007C71F4 */ -static void flying_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2157,21 +2157,21 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x007C7204 */ -static void flying_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x007C7214 */ -static void flying_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C7224 */ -static void flying_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2381,7 +2381,7 @@ static void flying_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x007C7234 */ -static void flying_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2591,7 +2591,7 @@ static void flying_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x007C7274 */ -static void flying_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2747,14 +2747,14 @@ static void flying_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x007C7284 */ -static void flying_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C7294 */ -static void flying_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2912,14 +2912,14 @@ static void flying_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x007C72A4 */ -static void flying_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C72B4 */ -static void flying_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3045,7 +3045,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x007C72C4 */ -static void flying_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3174,21 +3174,21 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x007C72D4 */ -static void flying_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x007C72E4 */ -static void flying_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C7314 */ -static void flying_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3488,7 +3488,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uin } /** rct2: 0x007C7324 */ -static void flying_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3788,7 +3788,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, ui } /** rct2: 0x007C7334 */ -static void flying_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -3799,7 +3799,7 @@ static void flying_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, u } /** rct2: 0x007C7344 */ -static void flying_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -3810,7 +3810,7 @@ static void flying_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x007C7354 */ -static void flying_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4266,7 +4266,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uin } /** rct2: 0x007C7364 */ -static void flying_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4722,7 +4722,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, ui } /** rct2: 0x007C7374 */ -static void flying_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -4733,7 +4733,7 @@ static void flying_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, u } /** rct2: 0x007C7384 */ -static void flying_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -4744,7 +4744,7 @@ static void flying_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x007C73B4 */ -static void flying_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -4792,7 +4792,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x007C7394 */ -static void flying_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -4839,19 +4839,19 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint } /** rct2: 0x007C73A4 */ -static void flying_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x007C73C4 */ -static void flying_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C73D4 */ -static void flying_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -4893,7 +4893,7 @@ static void flying_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x007C7674 */ -static void flying_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5131,7 +5131,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, } /** rct2: 0x007C7684 */ -static void flying_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5369,7 +5369,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, } /** rct2: 0x007C7694 */ -static void flying_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5607,7 +5607,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex } /** rct2: 0x007C76A4 */ -static void flying_rc_track_right_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5845,7 +5845,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(uint8 rideInde } /** rct2: 0x007C78B4 */ -static void flying_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -5916,7 +5916,7 @@ static void flying_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSe } /** rct2: 0x007C78C4 */ -static void flying_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -5987,7 +5987,7 @@ static void flying_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C73E4 */ -static void flying_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -6055,19 +6055,19 @@ static void flying_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007C78D4 */ -static void flying_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C78E4 */ -static void flying_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7404 */ -static void flying_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6261,7 +6261,7 @@ static void flying_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x007C7414 */ -static void flying_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6455,21 +6455,21 @@ static void flying_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x007C7424 */ -static void flying_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7434 */ -static void flying_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x007C7444 */ -static void flying_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6663,7 +6663,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trac } /** rct2: 0x007C7454 */ -static void flying_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6857,21 +6857,21 @@ static void flying_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 tra } /** rct2: 0x007C7464 */ -static void flying_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7474 */ -static void flying_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x007C73F4 */ -static void flying_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7055,7 +7055,7 @@ static void flying_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x007C74A4 */ -static void flying_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7239,7 +7239,7 @@ static void flying_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007C7504 */ -static void flying_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7391,7 +7391,7 @@ static void flying_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007C7484 */ -static void flying_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7575,7 +7575,7 @@ static void flying_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C74E4 */ -static void flying_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7727,7 +7727,7 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x007C74F4 */ -static void flying_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7879,7 +7879,7 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x007C7494 */ -static void flying_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8063,7 +8063,7 @@ static void flying_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C74D4 */ -static void flying_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8215,7 +8215,7 @@ static void flying_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x007C7534 */ -static void flying_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8367,7 +8367,7 @@ static void flying_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x007C74B4 */ -static void flying_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8512,7 +8512,7 @@ static void flying_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trac } /** rct2: 0x007C7514 */ -static void flying_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8664,7 +8664,7 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uin } /** rct2: 0x007C7524 */ -static void flying_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8816,7 +8816,7 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x007C74C4 */ -static void flying_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8968,7 +8968,7 @@ static void flying_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x007C7564 */ -static void flying_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9079,7 +9079,7 @@ static void flying_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C7574 */ -static void flying_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9190,7 +9190,7 @@ static void flying_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 track } /** rct2: 0x007C7584 */ -static void flying_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9301,7 +9301,7 @@ static void flying_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C7594 */ -static void flying_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9412,7 +9412,7 @@ static void flying_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 track } /** rct2: 0x007C75C4 */ -static void flying_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9523,7 +9523,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x007C75D4 */ -static void flying_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9634,7 +9634,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x007C75A4 */ -static void flying_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9745,7 +9745,7 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 t } /** rct2: 0x007C75B4 */ -static void flying_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9856,7 +9856,7 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x007C75E4 */ -static void flying_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9960,7 +9960,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x007C75F4 */ -static void flying_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10064,7 +10064,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint } /** rct2: 0x007C7604 */ -static void flying_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10175,7 +10175,7 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x007C7614 */ -static void flying_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10286,7 +10286,7 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint } /** rct2: 0x007C7544 */ -static void flying_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10396,7 +10396,7 @@ static void flying_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007C7554 */ -static void flying_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10506,7 +10506,7 @@ static void flying_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x007C7624 */ -static void flying_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10656,7 +10656,7 @@ static void flying_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x007C7634 */ -static void flying_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10806,7 +10806,7 @@ static void flying_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x007C7644 */ -static void flying_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10956,7 +10956,7 @@ static void flying_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSe } /** rct2: 0x007C7654 */ -static void flying_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11106,7 +11106,7 @@ static void flying_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackS } /** rct2: 0x007C72F4 */ -static void flying_rc_track_flyer_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flyer_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11284,7 +11284,7 @@ static void flying_rc_track_flyer_half_loop_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x007C7304 */ -static void flying_rc_track_flyer_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flyer_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11462,7 +11462,7 @@ static void flying_rc_track_flyer_half_loop_down(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x007C7664 */ -static void flying_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -11502,7 +11502,7 @@ static void flying_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x007C76B4 */ -static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11628,7 +11628,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex } /** rct2: 0x007C76C4 */ -static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11757,21 +11757,21 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideInde } /** rct2: 0x007C76D4 */ -static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x007C76E4 */ -static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C76F4 */ -static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -12005,7 +12005,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex } /** rct2: 0x007C7704 */ -static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -12239,21 +12239,21 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideInde } /** rct2: 0x007C7714 */ -static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x007C7724 */ -static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C7734 */ -static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12325,7 +12325,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, } /** rct2: 0x007C7744 */ -static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12397,7 +12397,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, } /** rct2: 0x007C7754 */ -static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12469,7 +12469,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x007C7764 */ -static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12541,31 +12541,31 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x007C7774 */ -static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7784 */ -static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7794 */ -static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C77A4 */ -static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C77B4 */ -static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12636,7 +12636,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ride } /** rct2: 0x007C77C4 */ -static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12707,7 +12707,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ri } /** rct2: 0x007C77F4 */ -static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12778,7 +12778,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ride } /** rct2: 0x007C7804 */ -static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12849,31 +12849,31 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ri } /** rct2: 0x007C7814 */ -static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7824 */ -static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C77D4 */ -static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C77E4 */ -static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7834 */ -static void flying_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -12945,7 +12945,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x007C7844 */ -static void flying_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -13017,7 +13017,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x007C7854 */ -static void flying_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -13089,7 +13089,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x007C7864 */ -static void flying_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -13161,30 +13161,30 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x007C7874 */ -static void flying_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7884 */ -static void flying_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7894 */ -static void flying_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C78A4 */ -static void flying_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void flying_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { flying_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_flying_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_flying_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/giga_coaster.c b/src/openrct2/ride/coaster/giga_coaster.c index 99c87d799d..d5975901d0 100644 --- a/src/openrct2/ride/coaster/giga_coaster.c +++ b/src/openrct2/ride/coaster/giga_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008AD674 */ -static void giga_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -81,7 +81,7 @@ static void giga_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direc paint_util_set_general_support_height(height + 32, 0x20); } -static void giga_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 18084, 18076, SPR_STATION_BASE_A_SW_NE }, @@ -104,7 +104,7 @@ static void giga_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 di } /** rct2: 0x008AD684 */ -static void giga_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -171,7 +171,7 @@ static void giga_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008AD694 */ -static void giga_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -220,7 +220,7 @@ static void giga_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008AD6A4 */ -static void giga_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -287,7 +287,7 @@ static void giga_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008AD6B4 */ -static void giga_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -340,7 +340,7 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008AD6C4 */ -static void giga_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -393,7 +393,7 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008AD6D4 */ -static void giga_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { switch (direction) { @@ -460,43 +460,43 @@ static void giga_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008AD6E4 */ -static void giga_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD6F4 */ -static void giga_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD704 */ -static void giga_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD714 */ -static void giga_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD724 */ -static void giga_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD734 */ -static void giga_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD744 */ -static void giga_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -612,14 +612,14 @@ static void giga_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AD754 */ -static void giga_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AD764 */ -static void giga_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -646,7 +646,7 @@ static void giga_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008AD774 */ -static void giga_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -673,7 +673,7 @@ static void giga_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008AD784 */ -static void giga_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -700,7 +700,7 @@ static void giga_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008AD794 */ -static void giga_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -727,7 +727,7 @@ static void giga_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008AD7A4 */ -static void giga_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -845,14 +845,14 @@ static void giga_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trac } /** rct2: 0x008AD7B4 */ -static void giga_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AD7C4 */ -static void giga_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -883,7 +883,7 @@ static void giga_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008AD7D4 */ -static void giga_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -914,7 +914,7 @@ static void giga_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008AD7E4 */ -static void giga_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -945,7 +945,7 @@ static void giga_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008AD7F4 */ -static void giga_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -976,31 +976,31 @@ static void giga_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008AD804 */ -static void giga_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD814 */ -static void giga_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD824 */ -static void giga_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD834 */ -static void giga_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD844 */ -static void giga_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1025,13 +1025,13 @@ static void giga_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008AD854 */ -static void giga_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD864 */ -static void giga_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1147,7 +1147,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AD874 */ -static void giga_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1263,21 +1263,21 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008AD884 */ -static void giga_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AD894 */ -static void giga_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AD8A4 */ -static void giga_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1373,7 +1373,7 @@ static void giga_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008AD8B4 */ -static void giga_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1469,7 +1469,7 @@ static void giga_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008AD8F4 */ -static void giga_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1546,14 +1546,14 @@ static void giga_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AD904 */ -static void giga_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AD914 */ -static void giga_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1632,14 +1632,14 @@ static void giga_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AD924 */ -static void giga_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AD934 */ -static void giga_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1701,7 +1701,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AD944 */ -static void giga_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1766,21 +1766,21 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008AD954 */ -static void giga_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AD964 */ -static void giga_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AD974 */ -static void giga_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1931,7 +1931,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 } /** rct2: 0x008AD984 */ -static void giga_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2082,7 +2082,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint } /** rct2: 0x008AD994 */ -static void giga_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2093,7 +2093,7 @@ static void giga_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uin } /** rct2: 0x008AD9A4 */ -static void giga_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2104,7 +2104,7 @@ static void giga_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, ui } /** rct2: 0x008AD9B4 */ -static void giga_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2333,7 +2333,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 } /** rct2: 0x008AD9C4 */ -static void giga_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2568,7 +2568,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint } /** rct2: 0x008AD9D4 */ -static void giga_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2579,7 +2579,7 @@ static void giga_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uin } /** rct2: 0x008AD9E4 */ -static void giga_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2590,7 +2590,7 @@ static void giga_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, ui } /** rct2: 0x008ADA14 */ -static void giga_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2616,7 +2616,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AD9F4 */ -static void giga_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2642,19 +2642,19 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008ADA04 */ -static void giga_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ADA24 */ -static void giga_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ADA34 */ -static void giga_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2677,7 +2677,7 @@ static void giga_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 dir } /** rct2: 0x008ADC84 */ -static void giga_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2706,7 +2706,7 @@ static void giga_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008ADC94 */ -static void giga_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2735,7 +2735,7 @@ static void giga_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008ADA44 */ -static void giga_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2770,19 +2770,19 @@ static void giga_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008ADCA4 */ -static void giga_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADCB4 */ -static void giga_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADED4 */ -static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2964,7 +2964,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 tra } /** rct2: 0x008ADEE4 */ -static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3066,19 +3066,19 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 tra } /** rct2: 0x008ADEF4 */ -static void giga_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_flat_to_60_deg_up_long_base(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADF04 */ -static void giga_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_60_deg_up_to_flat_long_base(rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADF14 */ -static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3191,7 +3191,7 @@ static void giga_rc_track_cable_lift_hill(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008ADA64 */ -static void giga_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3282,7 +3282,7 @@ static void giga_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008ADA74 */ -static void giga_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3373,21 +3373,21 @@ static void giga_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008ADA84 */ -static void giga_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADA94 */ -static void giga_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008ADAA4 */ -static void giga_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3478,7 +3478,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x008ADAB4 */ -static void giga_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3569,21 +3569,21 @@ static void giga_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 track } /** rct2: 0x008ADAC4 */ -static void giga_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADAD4 */ -static void giga_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008ADA54 */ -static void giga_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3678,7 +3678,7 @@ static void giga_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008ADB04 */ -static void giga_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3773,7 +3773,7 @@ static void giga_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008ADB64 */ -static void giga_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3826,7 +3826,7 @@ static void giga_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008ADAE4 */ -static void giga_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3921,7 +3921,7 @@ static void giga_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008ADB44 */ -static void giga_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3974,7 +3974,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008ADB54 */ -static void giga_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4027,7 +4027,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008ADAF4 */ -static void giga_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4122,7 +4122,7 @@ static void giga_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008ADB34 */ -static void giga_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4217,7 +4217,7 @@ static void giga_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008ADB94 */ -static void giga_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4270,7 +4270,7 @@ static void giga_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008ADB14 */ -static void giga_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4363,7 +4363,7 @@ static void giga_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackS } /** rct2: 0x008ADB74 */ -static void giga_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4416,7 +4416,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008ADB84 */ -static void giga_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4469,7 +4469,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008ADB24 */ -static void giga_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4564,7 +4564,7 @@ static void giga_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008ADBC4 */ -static void giga_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4618,7 +4618,7 @@ static void giga_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008ADBD4 */ -static void giga_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4672,7 +4672,7 @@ static void giga_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008ADBE4 */ -static void giga_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4726,7 +4726,7 @@ static void giga_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008ADBF4 */ -static void giga_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4780,7 +4780,7 @@ static void giga_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008ADC24 */ -static void giga_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4834,7 +4834,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008ADC34 */ -static void giga_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4888,7 +4888,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x008ADC04 */ -static void giga_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4942,7 +4942,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008ADC14 */ -static void giga_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4996,7 +4996,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x008ADC44 */ -static void giga_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5048,7 +5048,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 t } /** rct2: 0x008ADC54 */ -static void giga_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5100,7 +5100,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008ADC64 */ -static void giga_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5154,7 +5154,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 t } /** rct2: 0x008ADC74 */ -static void giga_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5208,7 +5208,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x008ADBA4 */ -static void giga_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5261,7 +5261,7 @@ static void giga_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008ADBB4 */ -static void giga_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5314,7 +5314,7 @@ static void giga_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008ADEC4 */ -static void giga_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5337,7 +5337,7 @@ static void giga_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008ADCC4 */ -static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5399,7 +5399,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ADCD4 */ -static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5464,21 +5464,21 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ADCE4 */ -static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ADCF4 */ -static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ADD04 */ -static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5594,7 +5594,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ADD14 */ -static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5710,21 +5710,21 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ADD24 */ -static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ADD34 */ -static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ADD44 */ -static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5754,7 +5754,7 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008ADD54 */ -static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5784,7 +5784,7 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008ADD64 */ -static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5814,7 +5814,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008ADD74 */ -static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5844,31 +5844,31 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008ADD84 */ -static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADD94 */ -static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADDA4 */ -static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADDB4 */ -static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADDC4 */ -static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5897,7 +5897,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIn } /** rct2: 0x008ADDD4 */ -static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5926,7 +5926,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ride } /** rct2: 0x008ADE04 */ -static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5955,7 +5955,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIn } /** rct2: 0x008ADE14 */ -static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5984,31 +5984,31 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ride } /** rct2: 0x008ADE24 */ -static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADE34 */ -static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADDE4 */ -static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADDF4 */ -static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADE44 */ -static void giga_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6038,7 +6038,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008ADE54 */ -static void giga_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6068,7 +6068,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008ADE64 */ -static void giga_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6098,7 +6098,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008ADE74 */ -static void giga_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6128,30 +6128,30 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x008ADE84 */ -static void giga_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADE94 */ -static void giga_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADEA4 */ -static void giga_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADEB4 */ -static void giga_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void giga_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { giga_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_giga_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_giga_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/heartline_twister_coaster.c b/src/openrct2/ride/coaster/heartline_twister_coaster.c index 28b3d28a0a..da83945128 100644 --- a/src/openrct2/ride/coaster/heartline_twister_coaster.c +++ b/src/openrct2/ride/coaster/heartline_twister_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x0087694C */ -static void heartline_twister_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -73,7 +73,7 @@ static void heartline_twister_rc_track_flat(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -static void heartline_twister_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 19732, SPR_STATION_BASE_B_SW_NE }, @@ -92,7 +92,7 @@ static void heartline_twister_rc_track_station(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0087695C */ -static void heartline_twister_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -151,7 +151,7 @@ static void heartline_twister_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008769FC */ -static void heartline_twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -210,7 +210,7 @@ static void heartline_twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x0087696C */ -static void heartline_twister_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -269,7 +269,7 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008769BC */ -static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -328,7 +328,7 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, u } /** rct2: 0x008769CC */ -static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -387,7 +387,7 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, u } /** rct2: 0x0087697C */ -static void heartline_twister_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -446,43 +446,43 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x0087698C */ -static void heartline_twister_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { heartline_twister_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00876A0C */ -static void heartline_twister_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { heartline_twister_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0087699C */ -static void heartline_twister_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { heartline_twister_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008769DC */ -static void heartline_twister_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { heartline_twister_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008769EC */ -static void heartline_twister_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { heartline_twister_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008769AC */ -static void heartline_twister_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { heartline_twister_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00876A6C */ -static void heartline_twister_rc_track_heartline_transfer_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_heartline_transfer_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -607,7 +607,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(uint8 rideIndex, ui } /** rct2: 0x00876A7C */ -static void heartline_twister_rc_track_heartline_transfer_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_heartline_transfer_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -732,7 +732,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(uint8 rideIndex, } /** rct2: 0x00876A4C */ -static void heartline_twister_rc_track_left_heartline_roll(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_left_heartline_roll(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -897,7 +897,7 @@ static void heartline_twister_rc_track_left_heartline_roll(uint8 rideIndex, uint } /** rct2: 0x00876A5C */ -static void heartline_twister_rc_track_right_heartline_roll(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void heartline_twister_rc_track_right_heartline_roll(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1061,7 +1061,7 @@ static void heartline_twister_rc_track_right_heartline_roll(uint8 rideIndex, uin } } -TRACK_PAINT_FUNCTION get_track_paint_function_heartline_twister_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_heartline_twister_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/inverted_hairpin_coaster.c b/src/openrct2/ride/coaster/inverted_hairpin_coaster.c index 54bc12a7a8..fe29de372a 100644 --- a/src/openrct2/ride/coaster/inverted_hairpin_coaster.c +++ b/src/openrct2/ride/coaster/inverted_hairpin_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x00890CB4 */ -static void inverted_hairpin_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -67,7 +67,7 @@ static void inverted_hairpin_rc_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x00890D84, 0x00890D94, 0x00890DA4 */ -static void inverted_hairpin_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE }, @@ -87,7 +87,7 @@ static void inverted_hairpin_rc_track_station(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x00890CC4 */ -static void inverted_hairpin_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -148,7 +148,7 @@ static void inverted_hairpin_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x00890CD4 */ -static void inverted_hairpin_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -191,7 +191,7 @@ static void inverted_hairpin_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x00890CE4 */ -static void inverted_hairpin_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -252,7 +252,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x00890CF4 */ -static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -299,7 +299,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x00890D04 */ -static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -364,7 +364,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x00890D14 */ -static void inverted_hairpin_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -425,43 +425,43 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x00890D24 */ -static void inverted_hairpin_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D34 */ -static void inverted_hairpin_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D44 */ -static void inverted_hairpin_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D54 */ -static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D64 */ -static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D74 */ -static void inverted_hairpin_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890DB4 */ -static void inverted_hairpin_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -542,14 +542,14 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 } /** rct2: 0x00890DC4 */ -static void inverted_hairpin_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00890DD4 */ -static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -615,7 +615,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIn } /** rct2: 0x00890DE4 */ -static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -681,21 +681,21 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideI } /** rct2: 0x00890DF4 */ -static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x00890E04 */ -static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00890E64 */ -static void inverted_hairpin_rc_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -731,13 +731,13 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(uint8 rideIndex, uint8 } /** rct2: 0x00890E74 */ -static void inverted_hairpin_rc_track_right_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_right_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_left_quarter_turn_1(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00890E24 */ -static void inverted_hairpin_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -784,7 +784,7 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x00890E34 */ -static void inverted_hairpin_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -847,19 +847,19 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x00890E44 */ -static void inverted_hairpin_rc_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_60_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890E54 */ -static void inverted_hairpin_rc_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_hairpin_rc_track_flat_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890E14 */ -static void inverted_hairpin_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -882,7 +882,7 @@ static void inverted_hairpin_rc_track_brakes(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x00890E84 */ -static void inverted_hairpin_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_hairpin_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -904,7 +904,7 @@ static void inverted_hairpin_rc_track_block_brakes(uint8 rideIndex, uint8 trackS paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_inverted_hairpin_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_inverted_hairpin_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/inverted_impulse_coaster.c b/src/openrct2/ride/coaster/inverted_impulse_coaster.c index 25a6aeeb6d..2752ed4278 100644 --- a/src/openrct2/ride/coaster/inverted_impulse_coaster.c +++ b/src/openrct2/ride/coaster/inverted_impulse_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008B0460 */ -static void inverted_impulse_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -50,7 +50,7 @@ static void inverted_impulse_rc_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008B0470, 0x008B0480, 0x008B0490 */ -static void inverted_impulse_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE }, @@ -70,7 +70,7 @@ static void inverted_impulse_rc_track_station(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008B04A0 */ -static void inverted_impulse_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -114,7 +114,7 @@ static void inverted_impulse_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008B04B0 */ -static void inverted_impulse_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -140,7 +140,7 @@ static void inverted_impulse_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008B04C0 */ -static void inverted_impulse_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -182,7 +182,7 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008B04D0 */ -static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -210,7 +210,7 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x008B04E0 */ -static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -238,7 +238,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008B04F0 */ -static void inverted_impulse_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -280,43 +280,43 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008B0500 */ -static void inverted_impulse_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0510 */ -static void inverted_impulse_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0520 */ -static void inverted_impulse_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0530 */ -static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0540 */ -static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0550 */ -static void inverted_impulse_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B05A0 */ -static void inverted_impulse_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -344,13 +344,13 @@ static void inverted_impulse_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008B05B0 */ -static void inverted_impulse_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0560 */ -static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -381,13 +381,13 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, ui } /** rct2: 0x008B0570 */ -static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0580 */ -static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -416,7 +416,7 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x008B0590 */ -static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -446,7 +446,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex } /** rct2: 0x008B05C0 */ -static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -477,7 +477,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIn } /** rct2: 0x008B05D0 */ -static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -508,18 +508,18 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideI } /** rct2: 0x008B05E0 */ -static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008B05F0 */ -static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_inverted_impulse_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_inverted_impulse_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/inverted_roller_coaster.c b/src/openrct2/ride/coaster/inverted_roller_coaster.c index 9977907d01..2047c1435c 100644 --- a/src/openrct2/ride/coaster/inverted_roller_coaster.c +++ b/src/openrct2/ride/coaster/inverted_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A92E8 */ -static void inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -63,7 +63,7 @@ static void inverted_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x008A9558, 0x008A9568, 0x008A9578 */ -static void inverted_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, @@ -83,7 +83,7 @@ static void inverted_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008A92F8 */ -static void inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -144,7 +144,7 @@ static void inverted_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A9308 */ -static void inverted_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -170,7 +170,7 @@ static void inverted_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A9318 */ -static void inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -231,7 +231,7 @@ static void inverted_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A9328 */ -static void inverted_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -259,7 +259,7 @@ static void inverted_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9338 */ -static void inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -305,7 +305,7 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9348 */ -static void inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -366,43 +366,43 @@ static void inverted_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A9358 */ -static void inverted_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9368 */ -static void inverted_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9378 */ -static void inverted_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9388 */ -static void inverted_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9398 */ -static void inverted_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A93A8 */ -static void inverted_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A93B8 */ -static void inverted_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -522,14 +522,14 @@ static void inverted_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A93C8 */ -static void inverted_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A93D8 */ -static void inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -556,7 +556,7 @@ static void inverted_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A93E8 */ -static void inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -583,7 +583,7 @@ static void inverted_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A93F8 */ -static void inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -610,7 +610,7 @@ static void inverted_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A9408 */ -static void inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -637,7 +637,7 @@ static void inverted_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A9418 */ -static void inverted_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -757,14 +757,14 @@ static void inverted_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x008A9428 */ -static void inverted_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A9438 */ -static void inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -808,7 +808,7 @@ static void inverted_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9448 */ -static void inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -852,7 +852,7 @@ static void inverted_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A9458 */ -static void inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -896,7 +896,7 @@ static void inverted_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9468 */ -static void inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -940,31 +940,31 @@ static void inverted_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A9478 */ -static void inverted_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9488 */ -static void inverted_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9498 */ -static void inverted_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A94A8 */ -static void inverted_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A94B8 */ -static void inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -991,13 +991,13 @@ static void inverted_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A94C8 */ -static void inverted_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A94D8 */ -static void inverted_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1117,7 +1117,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A94E8 */ -static void inverted_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1237,21 +1237,21 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A94F8 */ -static void inverted_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A9508 */ -static void inverted_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A9518 */ -static void inverted_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1367,7 +1367,7 @@ static void inverted_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A9528 */ -static void inverted_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1483,7 +1483,7 @@ static void inverted_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A9538 */ -static void inverted_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1683,7 +1683,7 @@ static void inverted_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A9548 */ -static void inverted_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1883,7 +1883,7 @@ static void inverted_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A9588 */ -static void inverted_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1964,14 +1964,14 @@ static void inverted_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A9598 */ -static void inverted_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A95A8 */ -static void inverted_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2052,14 +2052,14 @@ static void inverted_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x008A95B8 */ -static void inverted_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A95C8 */ -static void inverted_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2125,7 +2125,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A95D8 */ -static void inverted_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2191,21 +2191,21 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A95E8 */ -static void inverted_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A95F8 */ -static void inverted_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A9608 */ -static void inverted_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2281,7 +2281,7 @@ static void inverted_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 track } /** rct2: 0x008A9618 */ -static void inverted_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2357,7 +2357,7 @@ static void inverted_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9628 */ -static void inverted_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2433,7 +2433,7 @@ static void inverted_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 track } /** rct2: 0x008A9638 */ -static void inverted_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2509,7 +2509,7 @@ static void inverted_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9648 */ -static void inverted_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2610,13 +2610,13 @@ static void inverted_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A9658 */ -static void inverted_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_half_loop_up(rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A9668 */ -static void inverted_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2692,7 +2692,7 @@ static void inverted_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A9678 */ -static void inverted_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2768,19 +2768,19 @@ static void inverted_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A9688 */ -static void inverted_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A9698 */ -static void inverted_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_corkscrew_up(rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A96D8 */ -static void inverted_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2806,7 +2806,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A96B8 */ -static void inverted_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2832,19 +2832,19 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A96C8 */ -static void inverted_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A96E8 */ -static void inverted_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A96A8 */ -static void inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2867,7 +2867,7 @@ static void inverted_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A96F8 */ -static void inverted_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2987,7 +2987,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(uint8 rideIndex } /** rct2: 0x008A9708 */ -static void inverted_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_banked_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3107,7 +3107,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(uint8 rideInde } /** rct2: 0x008A9718 */ -static void inverted_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3227,7 +3227,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(uint8 rideInd } /** rct2: 0x008A9728 */ -static void inverted_rc_track_right_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_quarter_banked_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3347,7 +3347,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(uint8 rideIn } /** rct2: 0x008A9A38 */ -static void inverted_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3391,7 +3391,7 @@ static void inverted_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 track } /** rct2: 0x008A9A48 */ -static void inverted_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3435,7 +3435,7 @@ static void inverted_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9738 */ -static void inverted_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3470,19 +3470,19 @@ static void inverted_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A9A58 */ -static void inverted_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9A68 */ -static void inverted_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9748 */ -static void inverted_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3587,7 +3587,7 @@ static void inverted_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A9758 */ -static void inverted_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3692,21 +3692,21 @@ static void inverted_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A9768 */ -static void inverted_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9778 */ -static void inverted_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A9938 */ -static void inverted_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3811,7 +3811,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 tr } /** rct2: 0x008A9948 */ -static void inverted_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3916,21 +3916,21 @@ static void inverted_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 t } /** rct2: 0x008A9958 */ -static void inverted_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9968 */ -static void inverted_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A9788 */ -static void inverted_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4021,7 +4021,7 @@ static void inverted_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A97B8 */ -static void inverted_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4112,7 +4112,7 @@ static void inverted_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A9818 */ -static void inverted_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4171,7 +4171,7 @@ static void inverted_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A9798 */ -static void inverted_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4262,7 +4262,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A97F8 */ -static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4321,7 +4321,7 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A9808 */ -static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4380,7 +4380,7 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A97A8 */ -static void inverted_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4471,7 +4471,7 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008A97E8 */ -static void inverted_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4562,7 +4562,7 @@ static void inverted_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A9848 */ -static void inverted_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4621,7 +4621,7 @@ static void inverted_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A97C8 */ -static void inverted_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4709,7 +4709,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 tr } /** rct2: 0x008A9828 */ -static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4768,7 +4768,7 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, u } /** rct2: 0x008A9838 */ -static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4827,7 +4827,7 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x008A97D8 */ -static void inverted_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4918,7 +4918,7 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x008A9878 */ -static void inverted_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4977,7 +4977,7 @@ static void inverted_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008A9888 */ -static void inverted_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5036,7 +5036,7 @@ static void inverted_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A9898 */ -static void inverted_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5095,7 +5095,7 @@ static void inverted_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008A98A8 */ -static void inverted_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5154,7 +5154,7 @@ static void inverted_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A98D8 */ -static void inverted_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5213,7 +5213,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A98E8 */ -static void inverted_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5272,7 +5272,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A98B8 */ -static void inverted_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5331,7 +5331,7 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x008A98C8 */ -static void inverted_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5390,7 +5390,7 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint } /** rct2: 0x008A98F8 */ -static void inverted_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5446,7 +5446,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x008A9908 */ -static void inverted_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5502,7 +5502,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, ui } /** rct2: 0x008A9918 */ -static void inverted_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5561,7 +5561,7 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x008A9928 */ -static void inverted_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5620,7 +5620,7 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, ui } /** rct2: 0x008A9858 */ -static void inverted_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5679,7 +5679,7 @@ static void inverted_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A9868 */ -static void inverted_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5738,7 +5738,7 @@ static void inverted_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A9978 */ -static void inverted_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5881,7 +5881,7 @@ static void inverted_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A9988 */ -static void inverted_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6024,19 +6024,19 @@ static void inverted_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 tr } /** rct2: 0x008A9998 */ -static void inverted_rc_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_large_half_loop_up(rideIndex, 6 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A99A8 */ -static void inverted_rc_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_large_half_loop_up(rideIndex, 6 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A96A8 */ -static void inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6059,7 +6059,7 @@ static void inverted_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A9A78 */ -static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6125,7 +6125,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideInd } /** rct2: 0x008A9A88 */ -static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6191,21 +6191,21 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIn } /** rct2: 0x008A9A98 */ -static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A9AA8 */ -static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A9BB8 */ -static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6325,7 +6325,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideInd } /** rct2: 0x008A9BC8 */ -static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6445,21 +6445,21 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIn } /** rct2: 0x008A9BD8 */ -static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A9BE8 */ -static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A9AB8 */ -static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6503,7 +6503,7 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex } /** rct2: 0x008A9AC8 */ -static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6547,7 +6547,7 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideInde } /** rct2: 0x008A9AD8 */ -static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6591,7 +6591,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex } /** rct2: 0x008A9AE8 */ -static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6635,31 +6635,31 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideInde } /** rct2: 0x008A9AF8 */ -static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9B08 */ -static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9B18 */ -static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9B28 */ -static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9B38 */ -static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6703,7 +6703,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ri } /** rct2: 0x008A9B48 */ -static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6747,7 +6747,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 } /** rct2: 0x008A9B58 */ -static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6791,7 +6791,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ri } /** rct2: 0x008A9B68 */ -static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6835,31 +6835,31 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 } /** rct2: 0x008A9B78 */ -static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9B88 */ -static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9B98 */ -static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9BA8 */ -static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A99B8 */ -static void inverted_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6903,7 +6903,7 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A99C8 */ -static void inverted_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6947,7 +6947,7 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A99D8 */ -static void inverted_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6991,7 +6991,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uin } /** rct2: 0x008A99E8 */ -static void inverted_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -7035,30 +7035,30 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, ui } /** rct2: 0x008A99F8 */ -static void inverted_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9A08 */ -static void inverted_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9A18 */ -static void inverted_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9A28 */ -static void inverted_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void inverted_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { inverted_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_inverted_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_inverted_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/junior_roller_coaster.c b/src/openrct2/ride/coaster/junior_roller_coaster.c index 5dd737d132..7a902e361e 100644 --- a/src/openrct2/ride/coaster/junior_roller_coaster.c +++ b/src/openrct2/ride/coaster/junior_roller_coaster.c @@ -1861,7 +1861,7 @@ void junior_rc_paint_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 paint_util_push_tunnel_rotated(direction, height + tunnel_height[direction], tunnel_type[direction]); if (track_paint_util_should_paint_supports(gPaintMapPosition)) { - int supportType = (direction & 1) ? 2 : 1; + sint32 supportType = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(supportType, 4, 8, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -1881,7 +1881,7 @@ void junior_rc_paint_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequenc } if (track_paint_util_should_paint_supports(gPaintMapPosition)) { - int supportType = (direction & 1) ? 2 : 1; + sint32 supportType = (direction & 1) ? 2 : 1; uint16 ax = (direction == 0) ? 5 : 3; metal_a_supports_paint_setup(supportType, 4, ax, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -1915,7 +1915,7 @@ void junior_rc_paint_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequenc } if (track_paint_util_should_paint_supports(gPaintMapPosition)) { - int supportType = (direction & 1) ? 2 : 1; + sint32 supportType = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(supportType, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -1930,11 +1930,11 @@ static const sint8 junior_rc_track_right_quarter_turn_5_tiles_support_height_off {0, 0, 0, 0, 0, 0, 0}, }; -static void junior_rc_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesBoundOffsets, get_current_rotation()); - int supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; + sint32 supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; switch (trackSequence) { case 0: metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, supportHeight, gTrackColours[SCHEME_SUPPORTS]); @@ -1974,7 +1974,7 @@ static void junior_rc_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, ui static const uint8 junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[] = {6, 4, 5, 3, 1, 2, 0}; /* rct2: 0x0051917A */ -static void junior_rc_left_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_left_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_5_tiles_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } @@ -1982,7 +1982,7 @@ static void junior_rc_left_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uin /** * rct2: 0x008AAFC0, 0x00521593, 0x005216A1, 0x005217AF, 0x00521884 */ -static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2011,7 +2011,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 track const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2022,7 +2022,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 track /** * rct2: 0x008AAFD0, 0x00521959, 0x00521A2E, 0x00521B03, 0x00521C11 */ -static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2051,7 +2051,7 @@ static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trac const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2059,12 +2059,12 @@ static void junior_rc_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 32, 0x20); } -static void junior_rc_left_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_flat_to_right_bank_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } -static void junior_rc_right_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_flat_to_left_bank_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2132,7 +2132,7 @@ const rct_xyz16 junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets[4][5] }; /* rct2: 0x008AB010, 0x0052304C */ -static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { uint8 thickness = 1; if (direction == 2 && (trackSequence == 0 || trackSequence == 6)) { thickness = 26; @@ -2148,7 +2148,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(uint8 rideIn sub_98197C(imageId, 0, 0, 1, 32, 26, height, 27, 0, height, get_current_rotation()); } - int supportHeight = height; + sint32 supportHeight = height; switch (trackSequence) { case 0: metal_a_supports_paint_setup((direction & 1) ? 2 : 1, 4, 0, supportHeight, gTrackColours[SCHEME_SUPPORTS]); @@ -2186,7 +2186,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(uint8 rideIn } /* rct2: 0x008AB000 */ -static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence]; junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } @@ -2194,7 +2194,7 @@ static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(uint8 rideInd /** * rct2: 0x008AB020, 0x00522073, 0x00522182, 0x00522291, 0x00522367 */ -static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2219,7 +2219,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2237,7 +2237,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 /** * rct2: 0x008AB030, 0x0052243D, 0x00522513, 0x005225E9, 0x005226F8 */ -static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2262,7 +2262,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 3, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2280,7 +2280,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 /** * rct2: 0x008AB040, 0x00522807, 0x0052291A, 0x00522A2D, 0x00522B07 */ -static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2320,7 +2320,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8 const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2331,7 +2331,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8 /** * rct2: 0x008AB050, 0x00522BE1, 0x00522CBB, 0x00522D95, 0x00522EA8 */ -static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2371,7 +2371,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8 const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 6, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2382,7 +2382,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8 /** * rct2: 0x008AB060 */ -static void junior_rc_left_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_25_deg_up_to_right_bank_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2390,7 +2390,7 @@ static void junior_rc_left_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint /** * rct2: 0x008AB070 */ -static void junior_rc_right_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_25_deg_up_to_left_bank_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2398,7 +2398,7 @@ static void junior_rc_right_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uin /** * rct2: 0x008AB080 */ -static void junior_rc_25_deg_down_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_25_deg_down_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_right_bank_to_25_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2406,7 +2406,7 @@ static void junior_rc_25_deg_down_to_left_bank_paint_setup(uint8 rideIndex, uint /** * rct2: 0x008AB090 */ -static void junior_rc_25_deg_down_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_25_deg_down_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_left_bank_to_25_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2428,7 +2428,7 @@ static const rct_xy16 junior_rc_left_bank_bound_offsets[4] = { /** * rct2: 0x008AB0A0, 0x00521D1F, 0x00521DF4, 0x00521EC9, 0x00521F9E */ -static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -2451,7 +2451,7 @@ static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -2462,7 +2462,7 @@ static void junior_rc_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence /** * rct2: 0x008AB0B0 */ -static void junior_rc_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_left_bank_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2552,29 +2552,29 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(uint8 rideIndex, } /* rct2: 0x008AAE10, 0x00519D88, 0x00519DAC, 0x00519DD0, 0x00519DF4 */ -static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /* rct2: 0x008AAE20, 0x00519E18, 0x0051A148, 0x0051A452, 0x0051A738 */ -static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /* rct2: 0x008AAE30, 0x0051AA42, 0x0051AA68, 0x0051AA8C, 0x0051AAB0 */ -static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(rideIndex, junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 1) & 3, height, mapElement); } /* rct2: 0x008AAE40, 0x0051AAD4, 0x0051AE04, 0x0051B10E, 0x0051B3F4 */ -static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(rideIndex, junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction - 1) & 3, height, mapElement); } /* rct2: 0x008AAE50, 0x0051B6FE, 0x0051B946, 0x0051BB8E, 0x0051BBA8 */ -static void junior_rc_s_bend_left_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_s_bend_left_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -2625,7 +2625,7 @@ static void junior_rc_s_bend_left_paint_setup(uint8 rideIndex, uint8 trackSequen } } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4; break; @@ -2638,7 +2638,7 @@ static void junior_rc_s_bend_left_paint_setup(uint8 rideIndex, uint8 trackSequen } /* rct2: 0x008AAE60, 0x0051BBC0, 0x0051BE06, 0x0051C04E, 0x0051C068 */ -static void junior_rc_s_bend_right_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_s_bend_right_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -2689,7 +2689,7 @@ static void junior_rc_s_bend_right_paint_setup(uint8 rideIndex, uint8 trackSeque } } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC; break; @@ -2702,7 +2702,7 @@ static void junior_rc_s_bend_right_paint_setup(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008AAEB0, 0x0051C0E0, 0x0051C2C1, 0x0051C47F, 0x0051C61D */ -static void junior_rc_right_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_0); @@ -2718,7 +2718,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, ui break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -2730,7 +2730,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, ui } /** rct2: 0x008AAEA0 */ -static void junior_rc_left_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_quarter_turn_3_tiles_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; junior_rc_right_quarter_turn_3_tiles_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); @@ -2783,7 +2783,7 @@ const rct_xyz16 junior_rc_right_quarter_turn_3_tiles_bank_offsets[4][3] = { }; /** rct2: 0x008AA0D0, 0x00523EA0, 0x005240CC, 0x0052430F, 0x00524500*/ -static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 thickness[4][4] = { { @@ -2835,7 +2835,7 @@ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(uint8 rideInde break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -2898,7 +2898,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(uint8 rideIndex, break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 3: blockedSegments = SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8; break; @@ -2962,7 +2962,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(uint8 rideInde break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 3: blockedSegments = SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8; break; @@ -2976,21 +2976,21 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(uint8 rideInde } /** rct2: 0x008AA0C0 */ -static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x008AAED0, 0x0051C83C, 0x0051C9EC, 0x0051CB76, 0x0051CCDC*/ -static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAEF0, 0x0051CEC8, 0x0051D078, 0x0051D202, 0x0051D368*/ -static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); @@ -2999,21 +2999,21 @@ static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(uint8 r static const uint8 junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = {3, 1, 2, 0}; /** rct2: 0x008AAEC0 */ -static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x008AAEE0 */ -static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x008AB0F0, 0x0052B3A4, 0x0052B5F8, 0x0052B863, 0x0052BA78 */ -static void junior_rc_right_half_banked_helix_up_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_half_banked_helix_up_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3047,7 +3047,7 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(uint8 rideInd paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC | SEGMENT_D4; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4; break; @@ -3058,7 +3058,7 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(uint8 rideInd } /** rct2: 0x008AB110, 0x0052BD80, 0x0052BFD4, 0x0052C23B, 0x0052C450 */ -static void junior_rc_right_half_banked_helix_down_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_half_banked_helix_down_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3092,7 +3092,7 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(uint8 rideI paint_util_push_tunnel_right(height + 8, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC | SEGMENT_D4; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4; break; @@ -3103,7 +3103,7 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(uint8 rideI } /** rct2: 0x008AB0E0 */ -static void junior_rc_left_half_banked_helix_up_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_half_banked_helix_up_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence > 3) { trackSequence -= 4; @@ -3115,7 +3115,7 @@ static void junior_rc_left_half_banked_helix_up_small_paint_setup(uint8 rideInde } /** rct2: 0x008AB100 */ -static void junior_rc_left_half_banked_helix_down_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_half_banked_helix_down_small_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence > 3) { trackSequence -= 4; @@ -3127,7 +3127,7 @@ static void junior_rc_left_half_banked_helix_down_small_paint_setup(uint8 rideIn } /** rct2: 0x008AB130, 0x0052C7BC, 0x0052CB6B, 0x0052CF32, 0x0052D2B3 */ -static void junior_rc_right_half_banked_helix_up_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_half_banked_helix_up_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3173,7 +3173,7 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(uint8 rideInd } /** rct2: 0x008AB150, 0x0052D778, 0x0052DB27, 0x0052DEEA, 0x0052E26B */ -static void junior_rc_right_half_banked_helix_down_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_half_banked_helix_down_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3219,7 +3219,7 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(uint8 rideI } /** rct2: 0x008AB120 */ -static void junior_rc_left_half_banked_helix_up_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_half_banked_helix_up_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence > 6) { trackSequence -= 7; @@ -3231,7 +3231,7 @@ static void junior_rc_left_half_banked_helix_up_large_paint_setup(uint8 rideInde } /** rct2: 0x008AB140 */ -static void junior_rc_left_half_banked_helix_down_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_half_banked_helix_down_large_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence > 6) { trackSequence -= 7; @@ -3245,7 +3245,7 @@ static void junior_rc_left_half_banked_helix_down_large_paint_setup(uint8 rideIn /** * rct2: 0x008AAF00, 0x0051851C, 0x005185D8 */ -static void junior_rc_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -3263,7 +3263,7 @@ static void junior_rc_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, ui const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -3274,7 +3274,7 @@ static void junior_rc_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, ui /** * rct2: 0x008AB280, 0x00518694, 0x00518759 */ -static void junior_rc_block_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_block_brake_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id; @@ -3294,7 +3294,7 @@ static void junior_rc_block_brake_paint_setup(uint8 rideIndex, uint8 trackSequen const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; if (track_paint_util_should_paint_supports(pos)) { - int edi = (direction & 1) ? 2 : 1; + sint32 edi = (direction & 1) ? 2 : 1; metal_a_supports_paint_setup(edi, 4, 0, height, gTrackColours[SCHEME_SUPPORTS]); } @@ -3303,7 +3303,7 @@ static void junior_rc_block_brake_paint_setup(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AAF80 */ -static void junior_rc_left_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(defaultEighthToDiagThickness, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_left_eight_to_diag, 0, defaultLeftEighthToDiagBoundLengths, defaultLeftEighthToDiagBoundOffsets, get_current_rotation()); @@ -3326,7 +3326,7 @@ static void junior_rc_left_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 tra paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4; break; @@ -3340,7 +3340,7 @@ static void junior_rc_left_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 tra } /** rct2: 0x008AAF90 */ -static void junior_rc_right_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(defaultEighthToDiagThickness, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_right_eight_to_diag, 0, defaultRightEighthToDiagBoundLengths, defaultRightEighthToDiagBoundOffsets, get_current_rotation()); @@ -3363,7 +3363,7 @@ static void junior_rc_right_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 tr paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC; break; @@ -3377,7 +3377,7 @@ static void junior_rc_right_eighth_to_diag_paint_setup(uint8 rideIndex, uint8 tr } /** rct2: 0x008AAFA0 */ -static void junior_rc_left_eighth_to_orthogonal_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_eighth_to_orthogonal_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 map[] = {4, 2, 3, 1, 0}; trackSequence = map[trackSequence]; @@ -3385,7 +3385,7 @@ static void junior_rc_left_eighth_to_orthogonal_paint_setup(uint8 rideIndex, uin } /** rct2: 0x008AAFB0 */ -static void junior_rc_right_eighth_to_orthogonal_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_eighth_to_orthogonal_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 map[] = {4, 2, 3, 1, 0}; trackSequence = map[trackSequence]; @@ -3474,7 +3474,7 @@ static const sint8 junior_rc_left_eighth_to_diag_bank_thickness[4][4] = { }; /** rct2: 0x008AB160 */ -static void junior_rc_left_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(junior_rc_left_eighth_to_diag_bank_thickness, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_left_eight_to_diag_bank, 0, junior_rc_left_eighth_to_diag_bank_bound_lengths, junior_rc_left_eighth_to_diag_bank_bound_offsets, get_current_rotation()); @@ -3497,7 +3497,7 @@ static void junior_rc_left_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uint paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4; break; @@ -3592,7 +3592,7 @@ static const sint8 junior_rc_right_eighth_to_diag_bank_thickness[4][4] = { }; /** rct2: 0x008AB170 */ -static void junior_rc_right_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(junior_rc_right_eighth_to_diag_bank_thickness, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_right_eight_to_diag_bank, 0, junior_rc_right_eighth_to_diag_bank_bound_lengths, junior_rc_right_eighth_to_diag_bank_bound_offsets, get_current_rotation()); @@ -3615,7 +3615,7 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uin paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC; break; @@ -3629,7 +3629,7 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(uint8 rideIndex, uin } /** rct2: 0x008AB180 */ -static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 map[] = {4, 2, 3, 1, 0}; trackSequence = map[trackSequence]; @@ -3637,14 +3637,14 @@ static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(uint8 rideIndex } /** rct2: 0x008AB190 */ -static void junior_rc_right_eighth_to_orthogonal_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_right_eighth_to_orthogonal_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 map[] = {4, 2, 3, 1, 0}; trackSequence = map[trackSequence]; junior_rc_left_eighth_to_diag_bank_paint_setup(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } -static const int junior_rc_diag_blocked_segments[] = { +static const sint32 junior_rc_diag_blocked_segments[] = { SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4 | SEGMENT_BC, SEGMENT_C4 | SEGMENT_CC | SEGMENT_C8 | SEGMENT_B4, SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4, @@ -3661,7 +3661,7 @@ void junior_rc_paint_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -3674,7 +3674,7 @@ void junior_rc_paint_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } @@ -3687,7 +3687,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSe metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -3700,7 +3700,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSe metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } @@ -3714,7 +3714,7 @@ void junior_rc_paint_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } @@ -3727,7 +3727,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 track metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } @@ -3740,62 +3740,62 @@ void junior_rc_paint_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 track metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } /** rct2: 0x008AAF10 */ -static void junior_rc_diag_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAF40 */ -static void junior_rc_diag_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAF20 */ -static void junior_rc_diag_flat_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_flat_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAF30 */ -static void junior_rc_diag_25_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAF70 */ -static void junior_rc_diag_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAF50 */ -static void junior_rc_diag_flat_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_flat_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AAF60 */ -static void junior_rc_diag_25_deg_down_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_down_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /** rct2: 0x008AB1C0 */ -static void junior_rc_diag_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3808,13 +3808,13 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup(uint8 rideIndex, uint8 metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x008AB1D0 */ -static void junior_rc_diag_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3827,13 +3827,13 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup(uint8 rideIndex, uint8 metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x008AB1E0 */ -static void junior_rc_diag_left_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_left_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_flat, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3846,13 +3846,13 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup(uint8 rideIndex, uint8 metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x008AB1F0 */ -static void junior_rc_diag_right_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_right_bank_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_flat, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3865,13 +3865,13 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup(uint8 rideIndex, uint8 metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x008AB220 */ -static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_25_deg_up, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3884,13 +3884,13 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(uint8 rideIndex, u metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } /** rct2: 0x008AB230 */ -static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_25_deg_up, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3903,13 +3903,13 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(uint8 rideIndex, metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } /** rct2: 0x008AB200 */ -static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3922,13 +3922,13 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(uint8 rideIndex, u metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AB210 */ -static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3941,13 +3941,13 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(uint8 rideIndex, metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AB200 */ -static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_25_deg_down, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3960,13 +3960,13 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(uint8 rideIndex, metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AB210 */ -static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_25_deg_down, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3979,13 +3979,13 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(uint8 rideIndex metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AB220 */ -static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -3998,13 +3998,13 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(uint8 rideIndex, metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } /** rct2: 0x008AB230 */ -static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_diag_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, 0, get_current_rotation()); @@ -4017,7 +4017,7 @@ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(uint8 rideIndex metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -4037,7 +4037,7 @@ const rct_xyz16 junior_rc_diag_right_bank_bound_offsets[4] = { }; /** rct2: 0x008AB1A0 */ -static void junior_rc_diag_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_left_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 thickness = direction == 0 ? 0 : 1; track_paint_util_diag_tiles_paint(thickness, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, junior_rc_diag_left_bank_bound_offsets, get_current_rotation()); @@ -4046,13 +4046,13 @@ static void junior_rc_diag_left_bank_paint_setup(uint8 rideIndex, uint8 trackSeq metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x008AB1B0 */ -static void junior_rc_diag_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_right_bank_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 thickness = direction == 2 ? 0 : 1; track_paint_util_diag_tiles_paint(thickness, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, junior_rc_diag_right_bank_bound_offsets, get_current_rotation()); @@ -4061,7 +4061,7 @@ static void junior_rc_diag_right_bank_paint_setup(uint8 rideIndex, uint8 trackSe metal_a_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } @@ -4138,13 +4138,13 @@ void junior_rc_paint_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 paint_util_set_general_support_height(height + 104, 0x20); } -static void junior_rc_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void junior_rc_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_60_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -4231,13 +4231,13 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSe paint_util_set_general_support_height(height + 72, 0x20); } -static void junior_rc_25_deg_up_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void junior_rc_25_deg_up_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_60_deg_down_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_60_deg_down_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_25_deg_up_to_60_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -4302,13 +4302,13 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSe paint_util_set_general_support_height(height + 72, 0x20); } -static void junior_rc_60_deg_up_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void junior_rc_60_deg_up_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_25_deg_down_to_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_25_deg_down_to_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_60_deg_up_to_25_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -4320,7 +4320,7 @@ void junior_rc_paint_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 36, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); } @@ -4333,7 +4333,7 @@ void junior_rc_paint_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 28, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 104, 0x20); } @@ -4346,7 +4346,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tr metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 16, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); } @@ -4370,7 +4370,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tr metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 21, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); } @@ -4394,7 +4394,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 17, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); } @@ -4407,42 +4407,42 @@ void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint metal_b_supports_paint_setup((direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = junior_rc_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 72, 0x20); } -static void junior_rc_diag_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_diag_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } -static void junior_rc_diag_60_deg_down_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void junior_rc_diag_60_deg_down_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); @@ -4483,7 +4483,7 @@ static const rct_xy16 junior_rc_60_deg_up_to_flat_tile_offsets[4][2] = { {{13, -9}, { 0 }} }; -static void junior_rc_flat_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void junior_rc_flat_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { uint32 image_id = gTrackColours[SCHEME_TRACK]; @@ -4547,12 +4547,12 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 72, 0x20); } -static void junior_rc_60_deg_down_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void junior_rc_60_deg_down_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_flat_to_60_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void junior_rc_60_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_60_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { uint32 image_id = gTrackColours[SCHEME_TRACK]; @@ -4615,62 +4615,62 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 72, 0x20); } -static void junior_rc_flat_to_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void junior_rc_flat_to_60_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_60_deg_up_to_flat_paint_setup(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /* rct2: 0x00518394 */ -static void junior_rc_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement){ +static void junior_rc_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement){ bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /* rct2: 0x00515629, 0x00514D22, 0x005151B9 */ -static void paint_junior_rc_station_track(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void paint_junior_rc_station_track(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_paint_station(rideIndex, trackSequence, direction, height, mapElement, RIDE_TYPE_JUNIOR_ROLLER_COASTER); } /* rct2: 0x0051881E */ -static void junior_rc_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /* rct2: 0x00518B42 */ -static void junior_rc_flat_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_flat_to_25_deg_up_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /* rct2: 0x00518E56 */ -static void junior_rc_25_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_25_deg_up_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); } /* rct2: 0x005189B0 */ -static void junior_rc_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_25_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /* rct2: 0x00518FE8 */ -static void junior_rc_flat_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_flat_to_25_deg_down_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_25_deg_up_to_flat_paint_setup(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /* rct2: 0x00518CCC */ -static void junior_rc_25_deg_down_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) { +static void junior_rc_25_deg_down_to_flat_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { junior_rc_flat_to_25_deg_up_paint_setup(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /* 0x008AAA0C */ -TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: return junior_rc_flat_paint_setup; diff --git a/src/openrct2/ride/coaster/lay_down_roller_coaster.c b/src/openrct2/ride/coaster/lay_down_roller_coaster.c index 1066ad872d..b3824c44ef 100644 --- a/src/openrct2/ride/coaster/lay_down_roller_coaster.c +++ b/src/openrct2/ride/coaster/lay_down_roller_coaster.c @@ -28,7 +28,7 @@ #include "../track_paint.h" /** rct2: 0x0082491C */ -static void lay_down_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -103,7 +103,7 @@ static void lay_down_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x00824B8C, 0x00824B9C, 0x00824BAC */ -static void lay_down_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_inverted(mapElement)) { static const uint32 imageIds[4][3] = { @@ -142,7 +142,7 @@ static void lay_down_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x0082492C */ -static void lay_down_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -250,7 +250,7 @@ static void lay_down_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x0082493C */ -static void lay_down_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -323,7 +323,7 @@ static void lay_down_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x0082494C */ -static void lay_down_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -431,7 +431,7 @@ static void lay_down_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x0082495C */ -static void lay_down_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -510,7 +510,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x0082496C */ -static void lay_down_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -607,7 +607,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x0082497C */ -static void lay_down_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -715,43 +715,43 @@ static void lay_down_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x0082498C */ -static void lay_down_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0082499C */ -static void lay_down_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249AC */ -static void lay_down_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249BC */ -static void lay_down_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249CC */ -static void lay_down_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249DC */ -static void lay_down_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249EC */ -static void lay_down_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -985,14 +985,14 @@ static void lay_down_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008249FC */ -static void lay_down_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824A0C */ -static void lay_down_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1044,7 +1044,7 @@ static void lay_down_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x00824A1C */ -static void lay_down_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1096,7 +1096,7 @@ static void lay_down_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x00824A2C */ -static void lay_down_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1148,7 +1148,7 @@ static void lay_down_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x00824A3C */ -static void lay_down_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1200,7 +1200,7 @@ static void lay_down_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x00824A4C */ -static void lay_down_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -1436,14 +1436,14 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x00824A5C */ -static void lay_down_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824A6C */ -static void lay_down_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1516,7 +1516,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x00824A7C */ -static void lay_down_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1589,7 +1589,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x00824A8C */ -static void lay_down_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1662,7 +1662,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x00824A9C */ -static void lay_down_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1735,31 +1735,31 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x00824AAC */ -static void lay_down_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824ABC */ -static void lay_down_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824ACC */ -static void lay_down_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824ADC */ -static void lay_down_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824AEC */ -static void lay_down_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1809,13 +1809,13 @@ static void lay_down_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x00824AFC */ -static void lay_down_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824B0C */ -static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2049,7 +2049,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x00824B1C */ -static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2283,21 +2283,21 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x00824B2C */ -static void lay_down_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x00824B3C */ -static void lay_down_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824B4C */ -static void lay_down_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2507,7 +2507,7 @@ static void lay_down_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x00824B5C */ -static void lay_down_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2717,7 +2717,7 @@ static void lay_down_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x00824B6C */ -static void lay_down_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3083,7 +3083,7 @@ static void lay_down_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x00824B7C */ -static void lay_down_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3423,7 +3423,7 @@ static void lay_down_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSe } /** rct2: 0x00824BBC */ -static void lay_down_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3579,14 +3579,14 @@ static void lay_down_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSe } /** rct2: 0x00824BCC */ -static void lay_down_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824BDC */ -static void lay_down_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3744,14 +3744,14 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x00824BEC */ -static void lay_down_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824BFC */ -static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3877,7 +3877,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x00824C0C */ -static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4006,21 +4006,21 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x00824C1C */ -static void lay_down_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x00824C2C */ -static void lay_down_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824C9C */ -static void lay_down_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4320,7 +4320,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, u } /** rct2: 0x00824CAC */ -static void lay_down_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4620,7 +4620,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x00824CBC */ -static void lay_down_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -4631,7 +4631,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x00824CCC */ -static void lay_down_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -4642,7 +4642,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_small(uint8 rideIndex } /** rct2: 0x00824CDC */ -static void lay_down_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5098,7 +5098,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, u } /** rct2: 0x00824CEC */ -static void lay_down_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5554,7 +5554,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x00824CFC */ -static void lay_down_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -5565,7 +5565,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x00824D0C */ -static void lay_down_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -5576,7 +5576,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_large(uint8 rideIndex } /** rct2: 0x00824D3C */ -static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -5623,7 +5623,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uin } /** rct2: 0x00824D1C */ -static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -5671,19 +5671,19 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, ui } /** rct2: 0x00824D2C */ -static void lay_down_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x00824D4C */ -static void lay_down_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824D5C */ -static void lay_down_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -5725,7 +5725,7 @@ static void lay_down_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x00824D6C */ -static void lay_down_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -5793,7 +5793,7 @@ static void lay_down_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x00824D8C */ -static void lay_down_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5987,7 +5987,7 @@ static void lay_down_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSe } /** rct2: 0x00824D9C */ -static void lay_down_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6181,21 +6181,21 @@ static void lay_down_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x00824DAC */ -static void lay_down_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824DBC */ -static void lay_down_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x00824DCC */ -static void lay_down_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6389,7 +6389,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 tr } /** rct2: 0x00824DDC */ -static void lay_down_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6583,21 +6583,21 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 t } /** rct2: 0x00824DEC */ -static void lay_down_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824DFC */ -static void lay_down_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x00824D7C */ -static void lay_down_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6781,7 +6781,7 @@ static void lay_down_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x00824E2C */ -static void lay_down_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6965,7 +6965,7 @@ static void lay_down_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x00824E8C */ -static void lay_down_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7117,7 +7117,7 @@ static void lay_down_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x00824E0C */ -static void lay_down_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7301,7 +7301,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x00824E6C */ -static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7453,7 +7453,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x00824E7C */ -static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7605,7 +7605,7 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x00824E1C */ -static void lay_down_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7789,7 +7789,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x00824E5C */ -static void lay_down_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7941,7 +7941,7 @@ static void lay_down_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00824EBC */ -static void lay_down_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8093,7 +8093,7 @@ static void lay_down_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00824E3C */ -static void lay_down_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8238,7 +8238,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 tr } /** rct2: 0x00824E9C */ -static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8390,7 +8390,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, u } /** rct2: 0x00824EAC */ -static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8542,7 +8542,7 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x00824E4C */ -static void lay_down_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8694,7 +8694,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x00824EEC */ -static void lay_down_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8805,7 +8805,7 @@ static void lay_down_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x00824EFC */ -static void lay_down_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8916,7 +8916,7 @@ static void lay_down_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x00824F0C */ -static void lay_down_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9027,7 +9027,7 @@ static void lay_down_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x00824F1C */ -static void lay_down_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9138,7 +9138,7 @@ static void lay_down_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x00824F4C */ -static void lay_down_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9249,7 +9249,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x00824F5C */ -static void lay_down_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9360,7 +9360,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x00824F2C */ -static void lay_down_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9471,7 +9471,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x00824F3C */ -static void lay_down_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9582,7 +9582,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint } /** rct2: 0x00824F6C */ -static void lay_down_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9686,7 +9686,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x00824F7C */ -static void lay_down_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9790,7 +9790,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, ui } /** rct2: 0x00824F8C */ -static void lay_down_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9901,7 +9901,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x00824F9C */ -static void lay_down_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10012,7 +10012,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, ui } /** rct2: 0x00824ECC */ -static void lay_down_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10122,7 +10122,7 @@ static void lay_down_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x00824EDC */ -static void lay_down_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10232,7 +10232,7 @@ static void lay_down_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x00824FAC */ -static void lay_down_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10382,7 +10382,7 @@ static void lay_down_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x00824FBC */ -static void lay_down_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10532,7 +10532,7 @@ static void lay_down_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x00824FCC */ -static void lay_down_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10682,7 +10682,7 @@ static void lay_down_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 track } /** rct2: 0x00824FDC */ -static void lay_down_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -10832,7 +10832,7 @@ static void lay_down_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trac } /** rct2: 0x00824C3C */ -static void lay_down_rc_track_flyer_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flyer_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11010,7 +11010,7 @@ static void lay_down_rc_track_flyer_half_loop_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x00824C4C */ -static void lay_down_rc_track_flyer_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_flyer_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11188,7 +11188,7 @@ static void lay_down_rc_track_flyer_half_loop_down(uint8 rideIndex, uint8 trackS } /** rct2: 0x00824C5C */ -static void lay_down_rc_track_left_flyer_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_flyer_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11352,7 +11352,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(uint8 rideIndex, uint8 tra } /** rct2: 0x00824C6C */ -static void lay_down_rc_track_right_flyer_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_flyer_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11502,7 +11502,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(uint8 rideIndex, uint8 tr } /** rct2: 0x00824C7C */ -static void lay_down_rc_track_left_flyer_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_left_flyer_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -11652,13 +11652,13 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(uint8 rideIndex, uint8 t } /** rct2: 0x00824C8C */ -static void lay_down_rc_track_right_flyer_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_right_flyer_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lay_down_rc_track_left_flyer_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x00824FEC */ -static void lay_down_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lay_down_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -11697,7 +11697,7 @@ static void lay_down_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, } } -TRACK_PAINT_FUNCTION get_track_paint_function_lay_down_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_lay_down_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/lim_launched_roller_coaster.c b/src/openrct2/ride/coaster/lim_launched_roller_coaster.c index ae3d4b850f..490751d129 100644 --- a/src/openrct2/ride/coaster/lim_launched_roller_coaster.c +++ b/src/openrct2/ride/coaster/lim_launched_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */ -static void lim_launched_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 15018, 15020, SPR_STATION_BASE_B_SW_NE }, @@ -50,7 +50,7 @@ static void lim_launched_rc_track_station(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A65E0 */ -static void lim_launched_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -226,7 +226,7 @@ static void lim_launched_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trac } /** rct2: 0x008A65F0 */ -static void lim_launched_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -390,7 +390,7 @@ static void lim_launched_rc_track_right_vertical_loop(uint8 rideIndex, uint8 tra } /** rct2: 0x008A6D10 */ -static void lim_launched_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -475,7 +475,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(uint8 rideIndex, uint8 t } /** rct2: 0x008A6D20 */ -static void lim_launched_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -560,7 +560,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(uint8 rideIndex, uint8 } /** rct2: 0x008A6D30 */ -static void lim_launched_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -645,7 +645,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(uint8 rideIndex, uint8 t } /** rct2: 0x008A6D40 */ -static void lim_launched_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -730,7 +730,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(uint8 rideIndex, uint8 } /** rct2: 0x008A6CD0 */ -static void lim_launched_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -807,7 +807,7 @@ static void lim_launched_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 track } /** rct2: 0x008A6CE0 */ -static void lim_launched_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -883,19 +883,19 @@ static void lim_launched_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A6CF0 */ -static void lim_launched_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_right_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6D00 */ -static void lim_launched_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_left_corkscrew_up(rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6D80 */ -static void lim_launched_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -916,7 +916,7 @@ static void lim_launched_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A6C10 */ -static void lim_launched_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -944,13 +944,13 @@ static void lim_launched_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A6C20 */ -static void lim_launched_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6C30 */ -static void lim_launched_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -981,13 +981,13 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A6C40 */ -static void lim_launched_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6C50 */ -static void lim_launched_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1016,7 +1016,7 @@ static void lim_launched_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A6C60 */ -static void lim_launched_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1046,7 +1046,7 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, ui } /** rct2: 0x008A6C70 */ -static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1110,13 +1110,13 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 } /** rct2: 0x008A6C80 */ -static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(rideIndex, 2 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A6D90 */ -static void lim_launched_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1136,7 +1136,7 @@ static void lim_launched_rc_track_block_brakes(uint8 rideIndex, uint8 trackSeque paint_util_set_general_support_height(height + 32, 0x20); } -static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1166,7 +1166,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, } /** rct2: 0x008A6CA0 */ -static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1196,18 +1196,18 @@ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex } /** rct2: 0x008A6CB0 */ -static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_right_quarter_turn_1_90_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6CC0 */ -static void lim_launched_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void lim_launched_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { lim_launched_rc_track_left_quarter_turn_1_90_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_lim_launched_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_lim_launched_rc(sint32 trackType, sint32 direction) { switch (trackType) { diff --git a/src/openrct2/ride/coaster/looping_roller_coaster.c b/src/openrct2/ride/coaster/looping_roller_coaster.c index 684fd75591..bccc7e897a 100644 --- a/src/openrct2/ride/coaster/looping_roller_coaster.c +++ b/src/openrct2/ride/coaster/looping_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A6370 */ -static void looping_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -67,7 +67,7 @@ static void looping_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 di paint_util_set_general_support_height(height + 32, 0x20); } -static void looping_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { 15016, SPR_STATION_BASE_B_SW_NE }, @@ -86,7 +86,7 @@ static void looping_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A6380 */ -static void looping_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -135,7 +135,7 @@ static void looping_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A6390 */ -static void looping_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -184,7 +184,7 @@ static void looping_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A63A0 */ -static void looping_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -233,7 +233,7 @@ static void looping_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A63B0 */ -static void looping_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -286,7 +286,7 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008A63C0 */ -static void looping_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -339,7 +339,7 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008A63D0 */ -static void looping_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -388,43 +388,43 @@ static void looping_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A63E0 */ -static void looping_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A63F0 */ -static void looping_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6400 */ -static void looping_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6410 */ -static void looping_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6420 */ -static void looping_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6430 */ -static void looping_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6440 */ -static void looping_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -540,14 +540,14 @@ static void looping_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A6450 */ -static void looping_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6460 */ -static void looping_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -574,7 +574,7 @@ static void looping_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A6470 */ -static void looping_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -601,7 +601,7 @@ static void looping_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A6480 */ -static void looping_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -628,7 +628,7 @@ static void looping_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A6490 */ -static void looping_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -655,7 +655,7 @@ static void looping_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A64A0 */ -static void looping_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -773,14 +773,14 @@ static void looping_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 t } /** rct2: 0x008A64B0 */ -static void looping_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A64C0 */ -static void looping_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -811,7 +811,7 @@ static void looping_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008A64D0 */ -static void looping_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -842,7 +842,7 @@ static void looping_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A64E0 */ -static void looping_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -873,7 +873,7 @@ static void looping_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 track } /** rct2: 0x008A64F0 */ -static void looping_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -904,31 +904,31 @@ static void looping_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008A6500 */ -static void looping_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6510 */ -static void looping_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6520 */ -static void looping_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6530 */ -static void looping_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6540 */ -static void looping_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -953,13 +953,13 @@ static void looping_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A6550 */ -static void looping_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6560 */ -static void looping_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1075,7 +1075,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A6570 */ -static void looping_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1191,21 +1191,21 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A6580 */ -static void looping_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6590 */ -static void looping_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A65A0 */ -static void looping_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1301,7 +1301,7 @@ static void looping_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A65B0 */ -static void looping_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1397,7 +1397,7 @@ static void looping_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A65C0 */ -static void looping_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1581,7 +1581,7 @@ static void looping_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A65D0 */ -static void looping_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1759,7 +1759,7 @@ static void looping_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A6630 */ -static void looping_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1836,14 +1836,14 @@ static void looping_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A6640 */ -static void looping_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6650 */ -static void looping_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1922,14 +1922,14 @@ static void looping_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A6660 */ -static void looping_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6670 */ -static void looping_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1991,7 +1991,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A6680 */ -static void looping_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2056,21 +2056,21 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A6690 */ -static void looping_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A66A0 */ -static void looping_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A66B0 */ -static void looping_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2221,7 +2221,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, ui } /** rct2: 0x008A66C0 */ -static void looping_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2372,7 +2372,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, u } /** rct2: 0x008A66D0 */ -static void looping_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2383,7 +2383,7 @@ static void looping_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x008A66E0 */ -static void looping_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2394,7 +2394,7 @@ static void looping_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x008A66F0 */ -static void looping_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2623,7 +2623,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, ui } /** rct2: 0x008A6700 */ -static void looping_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2852,7 +2852,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, u } /** rct2: 0x008A6710 */ -static void looping_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2863,7 +2863,7 @@ static void looping_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x008A6720 */ -static void looping_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2874,7 +2874,7 @@ static void looping_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x008A6750 */ -static void looping_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2900,7 +2900,7 @@ static void looping_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A6730 */ -static void looping_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2926,19 +2926,19 @@ static void looping_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A6740 */ -static void looping_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6760 */ -static void looping_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6770 */ -static void looping_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2961,7 +2961,7 @@ static void looping_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A6A40 */ -static void looping_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2990,7 +2990,7 @@ static void looping_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A6A50 */ -static void looping_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3019,7 +3019,7 @@ static void looping_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 track } /** rct2: 0x008A6780 */ -static void looping_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3054,19 +3054,19 @@ static void looping_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A6A60 */ -static void looping_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A70 */ -static void looping_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6860 */ -static void looping_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3157,7 +3157,7 @@ static void looping_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A6870 */ -static void looping_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3248,21 +3248,21 @@ static void looping_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A6880 */ -static void looping_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6890 */ -static void looping_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A68A0 */ -static void looping_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3353,7 +3353,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 tra } /** rct2: 0x008A68B0 */ -static void looping_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3444,21 +3444,21 @@ static void looping_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 tr } /** rct2: 0x008A68C0 */ -static void looping_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A68D0 */ -static void looping_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A6790 */ -static void looping_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3553,7 +3553,7 @@ static void looping_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A67C0 */ -static void looping_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3648,7 +3648,7 @@ static void looping_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A67F0 */ -static void looping_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3743,7 +3743,7 @@ static void looping_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A67A0 */ -static void looping_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3838,7 +3838,7 @@ static void looping_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008A67D0 */ -static void looping_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3933,7 +3933,7 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A67E0 */ -static void looping_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4028,7 +4028,7 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A67B0 */ -static void looping_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4123,7 +4123,7 @@ static void looping_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 track } /** rct2: 0x008A6820 */ -static void looping_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4218,7 +4218,7 @@ static void looping_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A6850 */ -static void looping_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4313,7 +4313,7 @@ static void looping_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A6800 */ -static void looping_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4406,7 +4406,7 @@ static void looping_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 tra } /** rct2: 0x008A6830 */ -static void looping_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4501,7 +4501,7 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, ui } /** rct2: 0x008A6840 */ -static void looping_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4596,7 +4596,7 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, ui } /** rct2: 0x008A6810 */ -static void looping_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4691,7 +4691,7 @@ static void looping_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A6900 */ -static void looping_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4745,7 +4745,7 @@ static void looping_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 track } /** rct2: 0x008A6910 */ -static void looping_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4799,7 +4799,7 @@ static void looping_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008A6920 */ -static void looping_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4853,7 +4853,7 @@ static void looping_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 track } /** rct2: 0x008A6930 */ -static void looping_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4907,7 +4907,7 @@ static void looping_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008A6960 */ -static void looping_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4961,7 +4961,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A6970 */ -static void looping_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5015,7 +5015,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A6940 */ -static void looping_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5069,7 +5069,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x008A6950 */ -static void looping_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5123,7 +5123,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x008A6980 */ -static void looping_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5175,7 +5175,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint } /** rct2: 0x008A6990 */ -static void looping_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5227,7 +5227,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x008A69A0 */ -static void looping_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5281,7 +5281,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint } /** rct2: 0x008A69B0 */ -static void looping_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5335,7 +5335,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uin } /** rct2: 0x008A68E0 */ -static void looping_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5388,7 +5388,7 @@ static void looping_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A68F0 */ -static void looping_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5441,7 +5441,7 @@ static void looping_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A6C00 */ -static void looping_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5464,7 +5464,7 @@ static void looping_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A6BC0 */ -static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5526,7 +5526,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideInde } /** rct2: 0x008A6BD0 */ -static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5591,21 +5591,21 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideInd } /** rct2: 0x008A6BE0 */ -static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6BF0 */ -static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6B80 */ -static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5721,7 +5721,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideInde } /** rct2: 0x008A6B90 */ -static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5837,21 +5837,21 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideInd } /** rct2: 0x008A6BA0 */ -static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6BB0 */ -static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6A80 */ -static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5881,7 +5881,7 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A6A90 */ -static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5911,7 +5911,7 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex } /** rct2: 0x008A6AA0 */ -static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5941,7 +5941,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A6AB0 */ -static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5971,31 +5971,31 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex } /** rct2: 0x008A6AC0 */ -static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6AD0 */ -static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6AE0 */ -static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6AF0 */ -static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6B00 */ -static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6024,7 +6024,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rid } /** rct2: 0x008A6B10 */ -static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6053,7 +6053,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 r } /** rct2: 0x008A6B40 */ -static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6082,7 +6082,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rid } /** rct2: 0x008A6B50 */ -static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6111,31 +6111,31 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 r } /** rct2: 0x008A6B60 */ -static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6B70 */ -static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6B20 */ -static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6B30 */ -static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A69C0 */ -static void looping_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6165,7 +6165,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A69D0 */ -static void looping_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6195,7 +6195,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A69E0 */ -static void looping_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6225,7 +6225,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x008A69F0 */ -static void looping_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6255,30 +6255,30 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uin } /** rct2: 0x008A6A00 */ -static void looping_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A10 */ -static void looping_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A20 */ -static void looping_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A30 */ -static void looping_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void looping_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { looping_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/mine_ride.c b/src/openrct2/ride/coaster/mine_ride.c index 84faadba2b..320f1e259c 100644 --- a/src/openrct2/ride/coaster/mine_ride.c +++ b/src/openrct2/ride/coaster/mine_ride.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008B08D0 */ -static void mine_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -50,7 +50,7 @@ static void mine_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir paint_util_set_general_support_height(height + 32, 0x20); } -static void mine_ride_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 19338, SPR_STATION_BASE_A_SW_NE }, @@ -69,7 +69,7 @@ static void mine_ride_track_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008B08E0 */ -static void mine_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -107,7 +107,7 @@ static void mine_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008B08F0 */ -static void mine_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -145,7 +145,7 @@ static void mine_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008B0900 */ -static void mine_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -183,25 +183,25 @@ static void mine_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008B0910 */ -static void mine_ride_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0920 */ -static void mine_ride_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0930 */ -static void mine_ride_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0940 */ -static void mine_ride_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -323,14 +323,14 @@ static void mine_ride_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008B0950 */ -static void mine_ride_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_ride_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008B0960 */ -static void mine_ride_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -366,7 +366,7 @@ static void mine_ride_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008B0970 */ -static void mine_ride_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -402,7 +402,7 @@ static void mine_ride_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008B0980 */ -static void mine_ride_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -438,7 +438,7 @@ static void mine_ride_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008B0990 */ -static void mine_ride_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -474,7 +474,7 @@ static void mine_ride_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008B09A0 */ -static void mine_ride_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -598,14 +598,14 @@ static void mine_ride_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 tr } /** rct2: 0x008B09B0 */ -static void mine_ride_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_ride_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008B09C0 */ -static void mine_ride_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -645,7 +645,7 @@ static void mine_ride_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008B09D0 */ -static void mine_ride_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -685,7 +685,7 @@ static void mine_ride_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008B09E0 */ -static void mine_ride_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -725,7 +725,7 @@ static void mine_ride_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x008B09F0 */ -static void mine_ride_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -765,31 +765,31 @@ static void mine_ride_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 track } /** rct2: 0x008B0A00 */ -static void mine_ride_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A10 */ -static void mine_ride_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A20 */ -static void mine_ride_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A30 */ -static void mine_ride_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A40 */ -static void mine_ride_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -823,13 +823,13 @@ static void mine_ride_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008B0A50 */ -static void mine_ride_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_ride_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A60 */ -static void mine_ride_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -931,7 +931,7 @@ static void mine_ride_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008B0A70 */ -static void mine_ride_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1033,7 +1033,7 @@ static void mine_ride_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008B0AB0 */ -static void mine_ride_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1116,14 +1116,14 @@ static void mine_ride_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008B0AC0 */ -static void mine_ride_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_ride_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008B0AD0 */ -static void mine_ride_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1208,14 +1208,14 @@ static void mine_ride_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008B0AE0 */ -static void mine_ride_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_ride_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008B0AF0 */ -static void mine_ride_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1378,7 +1378,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(uint8 rideIndex, uin } /** rct2: 0x008B0B00 */ -static void mine_ride_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1541,7 +1541,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(uint8 rideIndex, ui } /** rct2: 0x008B0B10 */ -static void mine_ride_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -1552,7 +1552,7 @@ static void mine_ride_track_left_half_banked_helix_down_small(uint8 rideIndex, u } /** rct2: 0x008B0B20 */ -static void mine_ride_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -1563,7 +1563,7 @@ static void mine_ride_track_right_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x008B0B30 */ -static void mine_ride_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1804,7 +1804,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(uint8 rideIndex, uin } /** rct2: 0x008B0B40 */ -static void mine_ride_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2045,7 +2045,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(uint8 rideIndex, ui } /** rct2: 0x008B0B50 */ -static void mine_ride_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2056,7 +2056,7 @@ static void mine_ride_track_left_half_banked_helix_down_large(uint8 rideIndex, u } /** rct2: 0x008B0B60 */ -static void mine_ride_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2067,7 +2067,7 @@ static void mine_ride_track_right_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x008B0B70 */ -static void mine_ride_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2102,7 +2102,7 @@ static void mine_ride_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008B0B90 */ -static void mine_ride_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2196,7 +2196,7 @@ static void mine_ride_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008B0BA0 */ -static void mine_ride_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2290,21 +2290,21 @@ static void mine_ride_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008B0BB0 */ -static void mine_ride_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0BC0 */ -static void mine_ride_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008B0BD0 */ -static void mine_ride_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2398,7 +2398,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trac } /** rct2: 0x008B0BE0 */ -static void mine_ride_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2492,21 +2492,21 @@ static void mine_ride_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 tra } /** rct2: 0x008B0BF0 */ -static void mine_ride_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0C00 */ -static void mine_ride_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008B0B80 */ -static void mine_ride_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2559,7 +2559,7 @@ static void mine_ride_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008B0C30 */ -static void mine_ride_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2612,7 +2612,7 @@ static void mine_ride_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008B0C10 */ -static void mine_ride_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2665,7 +2665,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008B0C20 */ -static void mine_ride_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2718,7 +2718,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008B0C60 */ -static void mine_ride_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2771,7 +2771,7 @@ static void mine_ride_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008B0C40 */ -static void mine_ride_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2822,7 +2822,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trac } /** rct2: 0x008B0C50 */ -static void mine_ride_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2875,7 +2875,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008B0C90 */ -static void mine_ride_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2929,7 +2929,7 @@ static void mine_ride_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x008B0CA0 */ -static void mine_ride_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2983,7 +2983,7 @@ static void mine_ride_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 track } /** rct2: 0x008B0CB0 */ -static void mine_ride_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3037,7 +3037,7 @@ static void mine_ride_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008B0CC0 */ -static void mine_ride_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3091,7 +3091,7 @@ static void mine_ride_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 track } /** rct2: 0x008B0CF0 */ -static void mine_ride_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3145,7 +3145,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008B0D00 */ -static void mine_ride_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3199,7 +3199,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008B0CD0 */ -static void mine_ride_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3253,7 +3253,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 t } /** rct2: 0x008B0CE0 */ -static void mine_ride_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3307,7 +3307,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x008B0D10 */ -static void mine_ride_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3359,7 +3359,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008B0D20 */ -static void mine_ride_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3411,7 +3411,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint } /** rct2: 0x008B0D30 */ -static void mine_ride_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3465,7 +3465,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x008B0D40 */ -static void mine_ride_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3519,7 +3519,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint } /** rct2: 0x008B0C70 */ -static void mine_ride_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3572,7 +3572,7 @@ static void mine_ride_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008B0C80 */ -static void mine_ride_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_ride_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3624,7 +3624,7 @@ static void mine_ride_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence } } -TRACK_PAINT_FUNCTION get_track_paint_function_mine_ride(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_mine_ride(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/mine_train_coaster.c b/src/openrct2/ride/coaster/mine_train_coaster.c index 45fd3b94e4..3c6ac89807 100644 --- a/src/openrct2/ride/coaster/mine_train_coaster.c +++ b/src/openrct2/ride/coaster/mine_train_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x0071BFA4 */ -static void mine_train_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -68,7 +68,7 @@ static void mine_train_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x0071C154, 0x0071C164, 0x0071C174 */ -static void mine_train_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 20064, 20060, SPR_STATION_BASE_B_SW_NE }, @@ -91,7 +91,7 @@ static void mine_train_rc_track_station(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x0071BFB4 */ -static void mine_train_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -142,7 +142,7 @@ static void mine_train_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0071BFC4 */ -static void mine_train_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -172,7 +172,7 @@ static void mine_train_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0071BFD4 */ -static void mine_train_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -223,7 +223,7 @@ static void mine_train_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0071BFE4 */ -static void mine_train_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -255,7 +255,7 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x0071BFF4 */ -static void mine_train_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -287,7 +287,7 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C004 */ -static void mine_train_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -338,43 +338,43 @@ static void mine_train_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0071C014 */ -static void mine_train_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C024 */ -static void mine_train_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C034 */ -static void mine_train_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C044 */ -static void mine_train_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C054 */ -static void mine_train_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C064 */ -static void mine_train_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C0B4 */ -static void mine_train_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -510,14 +510,14 @@ static void mine_train_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 track } /** rct2: 0x0071C0C4 */ -static void mine_train_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0071C074 */ -static void mine_train_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -545,7 +545,7 @@ static void mine_train_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0071C084 */ -static void mine_train_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -573,7 +573,7 @@ static void mine_train_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x0071C094 */ -static void mine_train_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -601,7 +601,7 @@ static void mine_train_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0071C0A4 */ -static void mine_train_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -629,7 +629,7 @@ static void mine_train_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x0071C0D4 */ -static void mine_train_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -767,14 +767,14 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint } /** rct2: 0x0071C0E4 */ -static void mine_train_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0071C204 */ -static void mine_train_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -806,7 +806,7 @@ static void mine_train_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C214 */ -static void mine_train_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -838,7 +838,7 @@ static void mine_train_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x0071C224 */ -static void mine_train_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -870,7 +870,7 @@ static void mine_train_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C234 */ -static void mine_train_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -902,31 +902,31 @@ static void mine_train_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 t } /** rct2: 0x0071C244 */ -static void mine_train_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C254 */ -static void mine_train_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C264 */ -static void mine_train_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C274 */ -static void mine_train_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C304 */ -static void mine_train_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -952,13 +952,13 @@ static void mine_train_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0071C314 */ -static void mine_train_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mine_train_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C0F4 */ -static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1094,7 +1094,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, u } /** rct2: 0x0071C104 */ -static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1230,21 +1230,21 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, } /** rct2: 0x0071C114 */ -static void mine_train_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x0071C124 */ -static void mine_train_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0071C134 */ -static void mine_train_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1350,7 +1350,7 @@ static void mine_train_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x0071C144 */ -static void mine_train_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1456,7 +1456,7 @@ static void mine_train_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x0071C184 */ -static void mine_train_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1553,14 +1553,14 @@ static void mine_train_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 track } /** rct2: 0x0071C194 */ -static void mine_train_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0071C1A4 */ -static void mine_train_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1659,14 +1659,14 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 } /** rct2: 0x0071C1B4 */ -static void mine_train_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0071C1C4 */ -static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1749,7 +1749,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, u } /** rct2: 0x0071C1D4 */ -static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1832,21 +1832,21 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, } /** rct2: 0x0071C1E4 */ -static void mine_train_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x0071C1F4 */ -static void mine_train_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0071C284 */ -static void mine_train_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2041,7 +2041,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x0071C294 */ -static void mine_train_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2236,7 +2236,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(uint8 rideIndex } /** rct2: 0x0071C2A4 */ -static void mine_train_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2247,7 +2247,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_small(uint8 rideInde } /** rct2: 0x0071C2B4 */ -static void mine_train_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2258,7 +2258,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_small(uint8 rideInd } /** rct2: 0x0071C2C4 */ -static void mine_train_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2537,7 +2537,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x0071C2D4 */ -static void mine_train_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2812,7 +2812,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(uint8 rideIndex } /** rct2: 0x0071C2E4 */ -static void mine_train_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2823,7 +2823,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_large(uint8 rideInde } /** rct2: 0x0071C2F4 */ -static void mine_train_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2834,7 +2834,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_large(uint8 rideInd } /** rct2: 0x0071C324 */ -static void mine_train_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2854,7 +2854,7 @@ static void mine_train_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x0071C334 */ -static void mine_train_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2881,7 +2881,7 @@ static void mine_train_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x0071C354 */ -static void mine_train_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2993,7 +2993,7 @@ static void mine_train_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 track } /** rct2: 0x0071C364 */ -static void mine_train_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3105,21 +3105,21 @@ static void mine_train_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trac } /** rct2: 0x0071C374 */ -static void mine_train_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C384 */ -static void mine_train_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x0071C394 */ -static void mine_train_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3231,7 +3231,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x0071C3A4 */ -static void mine_train_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3343,21 +3343,21 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x0071C3B4 */ -static void mine_train_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C3C4 */ -static void mine_train_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x0071C344 */ -static void mine_train_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3472,7 +3472,7 @@ static void mine_train_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0071C414 */ -static void mine_train_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3587,7 +3587,7 @@ static void mine_train_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0071C474 */ -static void mine_train_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3650,7 +3650,7 @@ static void mine_train_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0071C3F4 */ -static void mine_train_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3765,7 +3765,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C454 */ -static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3828,7 +3828,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uin } /** rct2: 0x0071C464 */ -static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3891,7 +3891,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x0071C404 */ -static void mine_train_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4006,7 +4006,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C444 */ -static void mine_train_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4121,7 +4121,7 @@ static void mine_train_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x0071C4A4 */ -static void mine_train_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4184,7 +4184,7 @@ static void mine_train_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x0071C424 */ -static void mine_train_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4297,7 +4297,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x0071C484 */ -static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4360,7 +4360,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, } /** rct2: 0x0071C494 */ -static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4423,7 +4423,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, } /** rct2: 0x0071C434 */ -static void mine_train_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4538,7 +4538,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x0071C4D4 */ -static void mine_train_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4602,7 +4602,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C4B4 */ -static void mine_train_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4666,7 +4666,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 t } /** rct2: 0x0071C4C4 */ -static void mine_train_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4730,7 +4730,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x0071C4E4 */ -static void mine_train_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4794,7 +4794,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x0071C514 */ -static void mine_train_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4858,7 +4858,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x0071C524 */ -static void mine_train_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4922,7 +4922,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x0071C4F4 */ -static void mine_train_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4986,7 +4986,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x0071C504 */ -static void mine_train_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5050,7 +5050,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, ui } /** rct2: 0x0071C534 */ -static void mine_train_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5109,7 +5109,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x0071C544 */ -static void mine_train_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5168,7 +5168,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, } /** rct2: 0x0071C554 */ -static void mine_train_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5232,7 +5232,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, u } /** rct2: 0x0071C564 */ -static void mine_train_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5296,7 +5296,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, } /** rct2: 0x0071C3D4 */ -static void mine_train_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5359,7 +5359,7 @@ static void mine_train_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0071C3E4 */ -static void mine_train_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5422,7 +5422,7 @@ static void mine_train_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x0071C574 */ -static void mine_train_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mine_train_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5441,7 +5441,7 @@ static void mine_train_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequenc paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_mine_train_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_mine_train_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/mini_roller_coaster.c b/src/openrct2/ride/coaster/mini_roller_coaster.c index 71640a5355..ecd889e0db 100644 --- a/src/openrct2/ride/coaster/mini_roller_coaster.c +++ b/src/openrct2/ride/coaster/mini_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A4ABC */ -static void mini_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -79,7 +79,7 @@ static void mini_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direc paint_util_set_general_support_height(height + 32, 0x20); } -static void mini_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 18746, 18742, SPR_STATION_BASE_A_SW_NE }, @@ -102,7 +102,7 @@ static void mini_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 di } /** rct2: 0x008A4ACC */ -static void mini_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -169,7 +169,7 @@ static void mini_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A4ADC */ -static void mini_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -207,7 +207,7 @@ static void mini_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A4AEC */ -static void mini_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -274,7 +274,7 @@ static void mini_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A4AFC */ -static void mini_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -314,7 +314,7 @@ static void mini_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4B0C */ -static void mini_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -354,7 +354,7 @@ static void mini_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4B1C */ -static void mini_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -421,43 +421,43 @@ static void mini_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A4B2C */ -static void mini_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B3C */ -static void mini_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B4C */ -static void mini_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B5C */ -static void mini_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B6C */ -static void mini_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B7C */ -static void mini_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B8C */ -static void mini_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -579,14 +579,14 @@ static void mini_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A4B9C */ -static void mini_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4BAC */ -static void mini_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -622,7 +622,7 @@ static void mini_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A4BBC */ -static void mini_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -658,7 +658,7 @@ static void mini_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A4BCC */ -static void mini_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -694,7 +694,7 @@ static void mini_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A4BDC */ -static void mini_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -730,7 +730,7 @@ static void mini_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A4BEC */ -static void mini_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -854,14 +854,14 @@ static void mini_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trac } /** rct2: 0x008A4BFC */ -static void mini_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4C0C */ -static void mini_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -901,7 +901,7 @@ static void mini_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4C1C */ -static void mini_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -941,7 +941,7 @@ static void mini_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A4C2C */ -static void mini_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -981,7 +981,7 @@ static void mini_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4C3C */ -static void mini_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1021,31 +1021,31 @@ static void mini_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A4C4C */ -static void mini_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C5C */ -static void mini_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C6C */ -static void mini_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C7C */ -static void mini_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C8C */ -static void mini_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1079,13 +1079,13 @@ static void mini_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A4C9C */ -static void mini_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4CAC */ -static void mini_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1207,7 +1207,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008A4CBC */ -static void mini_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1329,21 +1329,21 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A4CCC */ -static void mini_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A4CDC */ -static void mini_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4CEC */ -static void mini_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1445,7 +1445,7 @@ static void mini_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008A4CFC */ -static void mini_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1547,7 +1547,7 @@ static void mini_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A4D3C */ -static void mini_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1630,14 +1630,14 @@ static void mini_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A4D4C */ -static void mini_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4D5C */ -static void mini_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1722,14 +1722,14 @@ static void mini_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A4D6C */ -static void mini_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4D7C */ -static void mini_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1797,7 +1797,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008A4D8C */ -static void mini_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1865,21 +1865,21 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A4D9C */ -static void mini_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A4DAC */ -static void mini_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4DBC */ -static void mini_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2042,7 +2042,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 } /** rct2: 0x008A4DCC */ -static void mini_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2205,7 +2205,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint } /** rct2: 0x008A4DDC */ -static void mini_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2216,7 +2216,7 @@ static void mini_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uin } /** rct2: 0x008A4DEC */ -static void mini_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2227,7 +2227,7 @@ static void mini_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, ui } /** rct2: 0x008A4DFC */ -static void mini_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2468,7 +2468,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 } /** rct2: 0x008A4E0C */ -static void mini_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2709,7 +2709,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint } /** rct2: 0x008A4E1C */ -static void mini_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2720,7 +2720,7 @@ static void mini_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uin } /** rct2: 0x008A4E2C */ -static void mini_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -2731,7 +2731,7 @@ static void mini_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, ui } /** rct2: 0x008A4E5C */ -static void mini_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2757,7 +2757,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008A4E3C */ -static void mini_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2783,19 +2783,19 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A4E4C */ -static void mini_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A4E6C */ -static void mini_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4E7C */ -static void mini_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2819,7 +2819,7 @@ static void mini_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 dir } /** rct2: 0x008A50CC */ -static void mini_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2857,7 +2857,7 @@ static void mini_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A50DC */ -static void mini_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2895,7 +2895,7 @@ static void mini_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4E8C */ -static void mini_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2930,19 +2930,19 @@ static void mini_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A50EC */ -static void mini_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A50FC */ -static void mini_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4EAC */ -static void mini_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3036,7 +3036,7 @@ static void mini_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A4EBC */ -static void mini_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3130,21 +3130,21 @@ static void mini_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A4ECC */ -static void mini_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4EDC */ -static void mini_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A4EEC */ -static void mini_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3238,7 +3238,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A4EFC */ -static void mini_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3332,21 +3332,21 @@ static void mini_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 track } /** rct2: 0x008A4F0C */ -static void mini_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4F1C */ -static void mini_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A4E9C */ -static void mini_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3441,7 +3441,7 @@ static void mini_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A4F4C */ -static void mini_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3536,7 +3536,7 @@ static void mini_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A4FAC */ -static void mini_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3589,7 +3589,7 @@ static void mini_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A4F2C */ -static void mini_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3684,7 +3684,7 @@ static void mini_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4F8C */ -static void mini_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3737,7 +3737,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A4F9C */ -static void mini_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3790,7 +3790,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A4F3C */ -static void mini_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3885,7 +3885,7 @@ static void mini_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A4F7C */ -static void mini_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3980,7 +3980,7 @@ static void mini_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A4FDC */ -static void mini_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4033,7 +4033,7 @@ static void mini_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A4F5C */ -static void mini_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4126,7 +4126,7 @@ static void mini_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A4FBC */ -static void mini_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4179,7 +4179,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008A4FCC */ -static void mini_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4232,7 +4232,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008A4F6C */ -static void mini_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4327,7 +4327,7 @@ static void mini_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A500C */ -static void mini_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4381,7 +4381,7 @@ static void mini_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A501C */ -static void mini_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4435,7 +4435,7 @@ static void mini_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A502C */ -static void mini_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4489,7 +4489,7 @@ static void mini_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A503C */ -static void mini_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4543,7 +4543,7 @@ static void mini_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A506C */ -static void mini_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4597,7 +4597,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A507C */ -static void mini_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4651,7 +4651,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x008A504C */ -static void mini_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4705,7 +4705,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A505C */ -static void mini_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4759,7 +4759,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x008A508C */ -static void mini_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4811,7 +4811,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 t } /** rct2: 0x008A509C */ -static void mini_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4863,7 +4863,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008A50AC */ -static void mini_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4917,7 +4917,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 t } /** rct2: 0x008A50BC */ -static void mini_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4971,7 +4971,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x008A4FEC */ -static void mini_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5024,7 +5024,7 @@ static void mini_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A4FFC */ -static void mini_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5077,7 +5077,7 @@ static void mini_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A530C */ -static void mini_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5101,7 +5101,7 @@ static void mini_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A510C */ -static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5169,7 +5169,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A511C */ -static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5237,21 +5237,21 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A512C */ -static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A513C */ -static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A514C */ -static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5373,7 +5373,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A515C */ -static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5495,21 +5495,21 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A516C */ -static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A517C */ -static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A518C */ -static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5548,7 +5548,7 @@ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A519C */ -static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5587,7 +5587,7 @@ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008A51AC */ -static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5626,7 +5626,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A51BC */ -static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5665,31 +5665,31 @@ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, u } /** rct2: 0x008A51CC */ -static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A51DC */ -static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A51EC */ -static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A51FC */ -static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A520C */ -static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5727,7 +5727,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIn } /** rct2: 0x008A521C */ -static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5765,7 +5765,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ride } /** rct2: 0x008A524C */ -static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5803,7 +5803,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIn } /** rct2: 0x008A525C */ -static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5841,31 +5841,31 @@ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ride } /** rct2: 0x008A526C */ -static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A527C */ -static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A522C */ -static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A523C */ -static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A528C */ -static void mini_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5904,7 +5904,7 @@ static void mini_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008A529C */ -static void mini_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5943,7 +5943,7 @@ static void mini_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A52AC */ -static void mini_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5982,7 +5982,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008A52BC */ -static void mini_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -6021,30 +6021,30 @@ static void mini_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x008A52CC */ -static void mini_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A52DC */ -static void mini_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A52EC */ -static void mini_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A52FC */ -static void mini_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void mini_rc_track_left_curved_lift_hill(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_left_curved_lift_hill(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6111,7 +6111,7 @@ static void mini_rc_track_left_curved_lift_hill(uint8 rideIndex, uint8 trackSequ } } -static void mini_rc_track_right_curved_lift_hill(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_rc_track_right_curved_lift_hill(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6178,7 +6178,7 @@ static void mini_rc_track_right_curved_lift_hill(uint8 rideIndex, uint8 trackSeq } } -TRACK_PAINT_FUNCTION get_track_paint_function_mini_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_mini_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/mini_suspended_coaster.c b/src/openrct2/ride/coaster/mini_suspended_coaster.c index 4a8786b1ea..1681940632 100644 --- a/src/openrct2/ride/coaster/mini_suspended_coaster.c +++ b/src/openrct2/ride/coaster/mini_suspended_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008AFE9C */ -static void mini_suspended_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -72,7 +72,7 @@ static void mini_suspended_rc_track_flat(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008AFF4C, 0x008AFF5C, 0x008AFF6C */ -static void mini_suspended_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE }, @@ -92,7 +92,7 @@ static void mini_suspended_rc_track_station(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008AFEAC */ -static void mini_suspended_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -153,7 +153,7 @@ static void mini_suspended_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AFEBC */ -static void mini_suspended_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -214,7 +214,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008AFECC */ -static void mini_suspended_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -275,25 +275,25 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008AFEDC */ -static void mini_suspended_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_suspended_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFEEC */ -static void mini_suspended_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_suspended_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFEFC */ -static void mini_suspended_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { mini_suspended_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFF0C */ -static void mini_suspended_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -431,14 +431,14 @@ static void mini_suspended_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 t } /** rct2: 0x008AFF1C */ -static void mini_suspended_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_suspended_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AFF2C */ -static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -572,7 +572,7 @@ static void mini_suspended_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AFF3C */ -static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -706,7 +706,7 @@ static void mini_suspended_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008AFF7C */ -static void mini_suspended_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -805,14 +805,14 @@ static void mini_suspended_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 t } /** rct2: 0x008AFF8C */ -static void mini_suspended_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_suspended_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AFFAC */ -static void mini_suspended_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -926,7 +926,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 t } /** rct2: 0x008AFFBC */ -static void mini_suspended_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1040,21 +1040,21 @@ static void mini_suspended_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x008AFFCC */ -static void mini_suspended_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_suspended_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFFDC */ -static void mini_suspended_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_suspended_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008AFF9C */ -static void mini_suspended_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1145,7 +1145,7 @@ static void mini_suspended_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008B000C */ -static void mini_suspended_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1236,7 +1236,7 @@ static void mini_suspended_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AFFEC */ -static void mini_suspended_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1327,7 +1327,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008AFFFC */ -static void mini_suspended_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1418,7 +1418,7 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x008B003C */ -static void mini_suspended_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1509,7 +1509,7 @@ static void mini_suspended_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trac } /** rct2: 0x008B001C */ -static void mini_suspended_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1597,7 +1597,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, ui } /** rct2: 0x008B002C */ -static void mini_suspended_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void mini_suspended_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1687,7 +1687,7 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, ui } } -TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c b/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c index c5cb58bacf..25f0410c2c 100644 --- a/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c +++ b/src/openrct2/ride/coaster/multi_dimension_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x00792D88 */ -static void multi_dimension_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -85,7 +85,7 @@ static void multi_dimension_rc_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x00792F98, 0x00792FA8, 0x00792FB8 */ -static void multi_dimension_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -128,7 +128,7 @@ static void multi_dimension_rc_track_station(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x00792D98 */ -static void multi_dimension_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -219,7 +219,7 @@ static void multi_dimension_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00792DA8 */ -static void multi_dimension_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -272,7 +272,7 @@ static void multi_dimension_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00792DB8 */ -static void multi_dimension_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -363,7 +363,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x00792DC8 */ -static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -420,7 +420,7 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uin } /** rct2: 0x00792DD8 */ -static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -495,7 +495,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x00792DE8 */ -static void multi_dimension_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { if (track_element_is_lift_hill(mapElement)) { @@ -586,43 +586,43 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x00792DF8 */ -static void multi_dimension_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E08 */ -static void multi_dimension_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E18 */ -static void multi_dimension_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E28 */ -static void multi_dimension_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E38 */ -static void multi_dimension_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E48 */ -static void multi_dimension_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E58 */ -static void multi_dimension_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -856,14 +856,14 @@ static void multi_dimension_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x00792E68 */ -static void multi_dimension_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00792E78 */ -static void multi_dimension_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -915,7 +915,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x00792E88 */ -static void multi_dimension_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -967,7 +967,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 t } /** rct2: 0x00792E98 */ -static void multi_dimension_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1019,7 +1019,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x00792EA8 */ -static void multi_dimension_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1071,7 +1071,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x00792EB8 */ -static void multi_dimension_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -1307,14 +1307,14 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, } /** rct2: 0x00792EC8 */ -static void multi_dimension_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; multi_dimension_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00792ED8 */ -static void multi_dimension_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1387,7 +1387,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x00792EE8 */ -static void multi_dimension_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1460,7 +1460,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x00792EF8 */ -static void multi_dimension_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1533,7 +1533,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x00792F08 */ -static void multi_dimension_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1606,31 +1606,31 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, ui } /** rct2: 0x00792F18 */ -static void multi_dimension_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F28 */ -static void multi_dimension_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F38 */ -static void multi_dimension_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F48 */ -static void multi_dimension_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F58 */ -static void multi_dimension_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -1680,13 +1680,13 @@ static void multi_dimension_rc_track_left_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00792F68 */ -static void multi_dimension_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F78 */ -static void multi_dimension_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -1896,7 +1896,7 @@ static void multi_dimension_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x00792F88 */ -static void multi_dimension_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2106,7 +2106,7 @@ static void multi_dimension_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSe } /** rct2: 0x00792FC8 */ -static void multi_dimension_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2262,14 +2262,14 @@ static void multi_dimension_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 } /** rct2: 0x00792FD8 */ -static void multi_dimension_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00792FE8 */ -static void multi_dimension_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2427,14 +2427,14 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, u } /** rct2: 0x00792FF8 */ -static void multi_dimension_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00793008 */ -static void multi_dimension_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -2734,7 +2734,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(uint8 rideI } /** rct2: 0x00793018 */ -static void multi_dimension_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3034,7 +3034,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(uint8 ride } /** rct2: 0x00793028 */ -static void multi_dimension_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -3045,7 +3045,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_small(uint8 rid } /** rct2: 0x00793038 */ -static void multi_dimension_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -3056,7 +3056,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_small(uint8 ri } /** rct2: 0x00793048 */ -static void multi_dimension_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3512,7 +3512,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(uint8 rideI } /** rct2: 0x00793058 */ -static void multi_dimension_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -3968,7 +3968,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(uint8 ride } /** rct2: 0x00793068 */ -static void multi_dimension_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3979,7 +3979,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_large(uint8 rid } /** rct2: 0x00793078 */ -static void multi_dimension_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3990,7 +3990,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_large(uint8 ri } /** rct2: 0x00793088 */ -static void multi_dimension_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -4032,7 +4032,7 @@ static void multi_dimension_rc_track_brakes(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x00793098 */ -static void multi_dimension_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -4100,7 +4100,7 @@ static void multi_dimension_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackS } /** rct2: 0x00793328 */ -static void multi_dimension_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4154,13 +4154,13 @@ static void multi_dimension_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00793338 */ -static void multi_dimension_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00793348 */ -static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4220,13 +4220,13 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uin } /** rct2: 0x00793358 */ -static void multi_dimension_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { multi_dimension_rc_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00793368 */ -static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -4282,7 +4282,7 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uin } /** rct2: 0x00793378 */ -static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4340,7 +4340,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, } /** rct2: 0x007930B8 */ -static void multi_dimension_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4534,7 +4534,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x007930C8 */ -static void multi_dimension_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4728,21 +4728,21 @@ static void multi_dimension_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x007930D8 */ -static void multi_dimension_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007930E8 */ -static void multi_dimension_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x007930F8 */ -static void multi_dimension_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -4936,7 +4936,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, u } /** rct2: 0x00793108 */ -static void multi_dimension_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5130,21 +5130,21 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, } /** rct2: 0x00793118 */ -static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00793128 */ -static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x007930A8 */ -static void multi_dimension_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5328,7 +5328,7 @@ static void multi_dimension_rc_track_diag_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00793158 */ -static void multi_dimension_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5512,7 +5512,7 @@ static void multi_dimension_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x007931B8 */ -static void multi_dimension_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5622,7 +5622,7 @@ static void multi_dimension_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x00793138 */ -static void multi_dimension_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5806,7 +5806,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x00793198 */ -static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -5916,7 +5916,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex } /** rct2: 0x007931A8 */ -static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6026,7 +6026,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex } /** rct2: 0x00793148 */ -static void multi_dimension_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6210,7 +6210,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uin } /** rct2: 0x00793188 */ -static void multi_dimension_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6362,7 +6362,7 @@ static void multi_dimension_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 tra } /** rct2: 0x007931E8 */ -static void multi_dimension_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6472,7 +6472,7 @@ static void multi_dimension_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 tra } /** rct2: 0x00793168 */ -static void multi_dimension_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6620,7 +6620,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x007931C8 */ -static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6730,7 +6730,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideI } /** rct2: 0x007931D8 */ -static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6840,7 +6840,7 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideI } /** rct2: 0x00793178 */ -static void multi_dimension_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -6992,7 +6992,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, u } /** rct2: 0x00793218 */ -static void multi_dimension_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7103,7 +7103,7 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x00793228 */ -static void multi_dimension_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7214,7 +7214,7 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(uint8 rideIndex, ui } /** rct2: 0x00793238 */ -static void multi_dimension_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7325,7 +7325,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uin } /** rct2: 0x00793248 */ -static void multi_dimension_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7436,7 +7436,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(uint8 rideIndex, ui } /** rct2: 0x00793278 */ -static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7547,7 +7547,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex } /** rct2: 0x00793288 */ -static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7658,7 +7658,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(uint8 rideInde } /** rct2: 0x00793258 */ -static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7769,7 +7769,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex } /** rct2: 0x00793268 */ -static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7880,7 +7880,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(uint8 rideInde } /** rct2: 0x00793298 */ -static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -7984,7 +7984,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(uint8 rideInd } /** rct2: 0x007932A8 */ -static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8088,7 +8088,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIn } /** rct2: 0x007932B8 */ -static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8199,7 +8199,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(uint8 rideInd } /** rct2: 0x007932C8 */ -static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8310,7 +8310,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIn } /** rct2: 0x007931F8 */ -static void multi_dimension_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8420,7 +8420,7 @@ static void multi_dimension_rc_track_diag_left_bank(uint8 rideIndex, uint8 track } /** rct2: 0x00793208 */ -static void multi_dimension_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8530,7 +8530,7 @@ static void multi_dimension_rc_track_diag_right_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x007932D8 */ -static void multi_dimension_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8680,7 +8680,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(uint8 rideIndex, uint8 } /** rct2: 0x007932E8 */ -static void multi_dimension_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8830,7 +8830,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(uint8 rideIndex, uint8 } /** rct2: 0x007932F8 */ -static void multi_dimension_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_left_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -8980,7 +8980,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(uint8 rideIndex, uint } /** rct2: 0x00793308 */ -static void multi_dimension_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_right_flyer_twist_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9130,7 +9130,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(uint8 rideIndex, uin } /** rct2: 0x00793398 */ -static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9260,7 +9260,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo } /** rct2: 0x00793318 */ -static void multi_dimension_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (direction) { @@ -9300,7 +9300,7 @@ static void multi_dimension_rc_track_block_brakes(uint8 rideIndex, uint8 trackSe } /** rct2: 0x00793388 */ -static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9426,7 +9426,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter } /** rct2: 0x00793398 */ -static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9556,7 +9556,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(u } /** rct2: 0x00793388 */ -static void multi_dimension_rc_track_elem_255(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void multi_dimension_rc_track_elem_255(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (!track_element_is_inverted(mapElement)) { switch (trackSequence) { @@ -9681,7 +9681,7 @@ static void multi_dimension_rc_track_elem_255(uint8 rideIndex, uint8 trackSequen } } -TRACK_PAINT_FUNCTION get_track_paint_function_multi_dimension_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_multi_dimension_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/reverse_freefall_coaster.c b/src/openrct2/ride/coaster/reverse_freefall_coaster.c index fc4bb437e9..77493f28b1 100644 --- a/src/openrct2/ride/coaster/reverse_freefall_coaster.c +++ b/src/openrct2/ride/coaster/reverse_freefall_coaster.c @@ -355,7 +355,7 @@ static void paint_reverse_freefall_rc_vertical(uint8 rideIndex, uint8 trackSeque } } -TRACK_PAINT_FUNCTION get_track_paint_function_reverse_freefall_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_reverse_freefall_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/reverser_roller_coaster.c b/src/openrct2/ride/coaster/reverser_roller_coaster.c index 5f232c2120..1210a06be0 100644 --- a/src/openrct2/ride/coaster/reverser_roller_coaster.c +++ b/src/openrct2/ride/coaster/reverser_roller_coaster.c @@ -32,7 +32,7 @@ * * rct2: 0x006D4453 */ -void vehicle_visual_reverser(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_reverser(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { rct_vehicle *v1 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); rct_vehicle *v2 = GET_VEHICLE(vehicle->next_vehicle_on_ride); @@ -46,7 +46,7 @@ void vehicle_visual_reverser(int x, int imageDirection, int y, int z, rct_vehicl #endif /** rct2: 0x0086E65C */ -static void reverser_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -80,7 +80,7 @@ static void reverser_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d paint_util_set_general_support_height(height + 32, 0x20); } -static void reverser_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 21506, SPR_STATION_BASE_A_SW_NE }, @@ -99,7 +99,7 @@ static void reverser_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x0086E66C */ -static void reverser_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -150,7 +150,7 @@ static void reverser_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x0086E67C */ -static void reverser_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -201,7 +201,7 @@ static void reverser_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x0086E68C */ -static void reverser_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -252,25 +252,25 @@ static void reverser_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x0086E69C */ -static void reverser_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { reverser_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0086E6AC */ -static void reverser_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { reverser_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0086E6BC */ -static void reverser_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { reverser_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0086E6CC */ -static void reverser_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -406,14 +406,14 @@ static void reverser_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0086E6DC */ -static void reverser_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; reverser_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0086E6EC */ -static void reverser_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -519,7 +519,7 @@ static void reverser_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0086E6FC */ -static void reverser_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -625,7 +625,7 @@ static void reverser_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0086E73C */ -static void reverser_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -708,14 +708,14 @@ static void reverser_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0086E74C */ -static void reverser_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; reverser_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0086E75C */ -static void reverser_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -735,7 +735,7 @@ static void reverser_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x0086E76C */ -static void reverser_rc_track_left_reverser(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_left_reverser(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -885,7 +885,7 @@ static void reverser_rc_track_left_reverser(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x0086E77C */ -static void reverser_rc_track_right_reverser(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void reverser_rc_track_right_reverser(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1034,7 +1034,7 @@ static void reverser_rc_track_right_reverser(uint8 rideIndex, uint8 trackSequenc } } -TRACK_PAINT_FUNCTION get_track_paint_function_reverser_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_reverser_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/side_friction_roller_coaster.c b/src/openrct2/ride/coaster/side_friction_roller_coaster.c index 20ac21a148..c0e5f265e2 100644 --- a/src/openrct2/ride/coaster/side_friction_roller_coaster.c +++ b/src/openrct2/ride/coaster/side_friction_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x0077839C */ -static void side_friction_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -74,7 +74,7 @@ static void side_friction_rc_track_flat(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x007784AC, 0x007784BC, 0x007784CC */ -static void side_friction_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { 21610, @@ -92,7 +92,7 @@ static void side_friction_rc_track_station(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007783AC */ -static void side_friction_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -151,7 +151,7 @@ static void side_friction_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x007783CC */ -static void side_friction_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -210,7 +210,7 @@ static void side_friction_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x007783FC */ -static void side_friction_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -269,25 +269,25 @@ static void side_friction_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x0077840C */ -static void side_friction_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { side_friction_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077842C */ -static void side_friction_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { side_friction_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077845C */ -static void side_friction_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { side_friction_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077846C */ -static void side_friction_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -443,14 +443,14 @@ static void side_friction_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 tr } /** rct2: 0x0077847C */ -static void side_friction_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; side_friction_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0077848C */ -static void side_friction_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -572,7 +572,7 @@ static void side_friction_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0077849C */ -static void side_friction_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -694,7 +694,7 @@ static void side_friction_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x007784DC */ -static void side_friction_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -789,14 +789,14 @@ static void side_friction_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 tr } /** rct2: 0x007784EC */ -static void side_friction_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; side_friction_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007784FC */ -static void side_friction_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -818,7 +818,7 @@ static void side_friction_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007785DC */ -static void side_friction_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -946,7 +946,7 @@ static void side_friction_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 tr } /** rct2: 0x007785EC */ -static void side_friction_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1074,21 +1074,21 @@ static void side_friction_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 t } /** rct2: 0x007785FC */ -static void side_friction_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; side_friction_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077860C */ -static void side_friction_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; side_friction_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x0077850C */ -static void side_friction_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1207,7 +1207,7 @@ static void side_friction_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x0077853C */ -static void side_friction_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1326,7 +1326,7 @@ static void side_friction_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x0077851C */ -static void side_friction_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1445,7 +1445,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x0077852C */ -static void side_friction_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1564,7 +1564,7 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x0077859C */ -static void side_friction_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1683,7 +1683,7 @@ static void side_friction_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 track } /** rct2: 0x0077857C */ -static void side_friction_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1797,7 +1797,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x0077858C */ -static void side_friction_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void side_friction_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1915,7 +1915,7 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uin } } -TRACK_PAINT_FUNCTION get_track_paint_function_side_friction_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_side_friction_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/stand_up_roller_coaster.c b/src/openrct2/ride/coaster/stand_up_roller_coaster.c index dd49486fab..55dab80971 100644 --- a/src/openrct2/ride/coaster/stand_up_roller_coaster.c +++ b/src/openrct2/ride/coaster/stand_up_roller_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A7114 */ -static void stand_up_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -68,7 +68,7 @@ static void stand_up_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x008A7384, 0x008A7394, 0x008A73A4 */ -static void stand_up_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 25567, 25571, SPR_STATION_BASE_A_SW_NE }, @@ -91,7 +91,7 @@ static void stand_up_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008A7124 */ -static void stand_up_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -140,7 +140,7 @@ static void stand_up_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A7134 */ -static void stand_up_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -189,7 +189,7 @@ static void stand_up_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A7144 */ -static void stand_up_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -238,7 +238,7 @@ static void stand_up_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A7154 */ -static void stand_up_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -291,7 +291,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7164 */ -static void stand_up_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -344,7 +344,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7174 */ -static void stand_up_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -393,43 +393,43 @@ static void stand_up_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A7184 */ -static void stand_up_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7194 */ -static void stand_up_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71A4 */ -static void stand_up_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71B4 */ -static void stand_up_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71C4 */ -static void stand_up_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71D4 */ -static void stand_up_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71E4 */ -static void stand_up_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -545,14 +545,14 @@ static void stand_up_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A71F4 */ -static void stand_up_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7204 */ -static void stand_up_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -577,7 +577,7 @@ static void stand_up_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A7214 */ -static void stand_up_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -602,7 +602,7 @@ static void stand_up_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7224 */ -static void stand_up_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -627,7 +627,7 @@ static void stand_up_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A7234 */ -static void stand_up_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -652,7 +652,7 @@ static void stand_up_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7244 */ -static void stand_up_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -770,14 +770,14 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x008A7254 */ -static void stand_up_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_banked_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7264 */ -static void stand_up_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -806,7 +806,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7274 */ -static void stand_up_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -835,7 +835,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7284 */ -static void stand_up_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -864,7 +864,7 @@ static void stand_up_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7294 */ -static void stand_up_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -893,31 +893,31 @@ static void stand_up_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A72A4 */ -static void stand_up_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72B4 */ -static void stand_up_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72C4 */ -static void stand_up_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72D4 */ -static void stand_up_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72E4 */ -static void stand_up_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -942,13 +942,13 @@ static void stand_up_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A72F4 */ -static void stand_up_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7304 */ -static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1151,7 +1151,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A7314 */ -static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1354,21 +1354,21 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A7324 */ -static void stand_up_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7334 */ -static void stand_up_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7344 */ -static void stand_up_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1464,7 +1464,7 @@ static void stand_up_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A7354 */ -static void stand_up_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1560,7 +1560,7 @@ static void stand_up_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A7364 */ -static void stand_up_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1739,7 +1739,7 @@ static void stand_up_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeq /** rct2: 0x008A7374 */ -static void stand_up_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1911,7 +1911,7 @@ static void stand_up_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A73B4 */ -static void stand_up_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1988,14 +1988,14 @@ static void stand_up_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A73C4 */ -static void stand_up_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A73D4 */ -static void stand_up_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2074,14 +2074,14 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 tr } /** rct2: 0x008A73E4 */ -static void stand_up_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A73F4 */ -static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2179,7 +2179,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008A7404 */ -static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2283,21 +2283,21 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, ui } /** rct2: 0x008A7414 */ -static void stand_up_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7424 */ -static void stand_up_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7434 */ -static void stand_up_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2387,13 +2387,13 @@ static void stand_up_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A7444 */ -static void stand_up_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_half_loop_up(rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A7454 */ -static void stand_up_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2470,7 +2470,7 @@ static void stand_up_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A7464 */ -static void stand_up_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2546,19 +2546,19 @@ static void stand_up_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A7474 */ -static void stand_up_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_right_corkscrew_up(rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7484 */ -static void stand_up_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { stand_up_rc_track_left_corkscrew_up(rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7734 */ -static void stand_up_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2709,7 +2709,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, u } /** rct2: 0x008A7744 */ -static void stand_up_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2860,7 +2860,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, } /** rct2: 0x008A7754 */ -static void stand_up_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2871,7 +2871,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x008A7764 */ -static void stand_up_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -2882,7 +2882,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_small(uint8 rideIndex } /** rct2: 0x008A76F4 */ -static void stand_up_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3111,7 +3111,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, u } /** rct2: 0x008A7704 */ -static void stand_up_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3340,7 +3340,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, } /** rct2: 0x008A7714 */ -static void stand_up_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3351,7 +3351,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x008A7724 */ -static void stand_up_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3362,7 +3362,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_large(uint8 rideIndex } /** rct2: 0x008A7494 */ -static void stand_up_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3383,7 +3383,7 @@ static void stand_up_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008A74A4 */ -static void stand_up_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3418,7 +3418,7 @@ static void stand_up_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A74B4 */ -static void stand_up_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3509,7 +3509,7 @@ static void stand_up_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A74C4 */ -static void stand_up_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3600,21 +3600,21 @@ static void stand_up_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A74D4 */ -static void stand_up_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A74E4 */ -static void stand_up_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A76A4 */ -static void stand_up_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3705,7 +3705,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 tr } /** rct2: 0x008A76B4 */ -static void stand_up_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3796,21 +3796,21 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 t } /** rct2: 0x008A76C4 */ -static void stand_up_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A76D4 */ -static void stand_up_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A74F4 */ -static void stand_up_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3905,7 +3905,7 @@ static void stand_up_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008A7524 */ -static void stand_up_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4000,7 +4000,7 @@ static void stand_up_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A7584 */ -static void stand_up_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4095,7 +4095,7 @@ static void stand_up_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A7504 */ -static void stand_up_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4190,7 +4190,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7564 */ -static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4285,7 +4285,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A7574 */ -static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4380,7 +4380,7 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A7514 */ -static void stand_up_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4475,7 +4475,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7554 */ -static void stand_up_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4570,7 +4570,7 @@ static void stand_up_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A75B4 */ -static void stand_up_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4665,7 +4665,7 @@ static void stand_up_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A7534 */ -static void stand_up_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4758,7 +4758,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 tr } /** rct2: 0x008A7594 */ -static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4853,7 +4853,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, u } /** rct2: 0x008A75A4 */ -static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4948,7 +4948,7 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x008A7544 */ -static void stand_up_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5043,7 +5043,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x008A75E4 */ -static void stand_up_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5097,7 +5097,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008A75F4 */ -static void stand_up_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5151,7 +5151,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7604 */ -static void stand_up_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5205,7 +5205,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008A7614 */ -static void stand_up_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5259,7 +5259,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A7644 */ -static void stand_up_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5313,7 +5313,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A7654 */ -static void stand_up_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5367,7 +5367,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008A7624 */ -static void stand_up_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5421,7 +5421,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x008A7634 */ -static void stand_up_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5475,7 +5475,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint } /** rct2: 0x008A7664 */ -static void stand_up_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5527,7 +5527,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x008A7674 */ -static void stand_up_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5579,7 +5579,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, ui } /** rct2: 0x008A7684 */ -static void stand_up_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5633,7 +5633,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uin } /** rct2: 0x008A7694 */ -static void stand_up_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5687,7 +5687,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, ui } /** rct2: 0x008A75C4 */ -static void stand_up_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5740,7 +5740,7 @@ static void stand_up_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A75D4 */ -static void stand_up_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5793,7 +5793,7 @@ static void stand_up_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A76E4 */ -static void stand_up_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void stand_up_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -5813,7 +5813,7 @@ static void stand_up_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/steeplechase.c b/src/openrct2/ride/coaster/steeplechase.c index ce1157f124..014926da36 100644 --- a/src/openrct2/ride/coaster/steeplechase.c +++ b/src/openrct2/ride/coaster/steeplechase.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A59A8 */ -static void steeplechase_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -61,7 +61,7 @@ static void steeplechase_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 paint_util_set_general_support_height(height + 32, 0x20); } -static void steeplechase_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { 28635, SPR_STATION_BASE_B_SW_NE }, @@ -80,7 +80,7 @@ static void steeplechase_track_station(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008A59B8 */ -static void steeplechase_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -131,7 +131,7 @@ static void steeplechase_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A59C8 */ -static void steeplechase_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -182,7 +182,7 @@ static void steeplechase_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A59D8 */ -static void steeplechase_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -233,25 +233,25 @@ static void steeplechase_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008A59E8 */ -static void steeplechase_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { steeplechase_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A59F8 */ -static void steeplechase_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { steeplechase_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5A08 */ -static void steeplechase_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { steeplechase_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5A18 */ -static void steeplechase_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -373,14 +373,14 @@ static void steeplechase_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A5A28 */ -static void steeplechase_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; steeplechase_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A5A38 */ -static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -482,7 +482,7 @@ static void steeplechase_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008A5A48 */ -static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -584,7 +584,7 @@ static void steeplechase_track_s_bend_right(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A5A88 */ -static void steeplechase_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -667,14 +667,14 @@ static void steeplechase_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A5A98 */ -static void steeplechase_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; steeplechase_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A5AA8 */ -static void steeplechase_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -694,7 +694,7 @@ static void steeplechase_track_brakes(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008A5AD8 */ -static void steeplechase_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -788,7 +788,7 @@ static void steeplechase_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackS } /** rct2: 0x008A5AE8 */ -static void steeplechase_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -882,21 +882,21 @@ static void steeplechase_track_right_eighth_to_diag(uint8 rideIndex, uint8 track } /** rct2: 0x008A5AF8 */ -static void steeplechase_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; steeplechase_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5B08 */ -static void steeplechase_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; steeplechase_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A5AC8 */ -static void steeplechase_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -991,7 +991,7 @@ static void steeplechase_track_diag_flat(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008A5B38 */ -static void steeplechase_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1086,7 +1086,7 @@ static void steeplechase_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A5B18 */ -static void steeplechase_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1181,7 +1181,7 @@ static void steeplechase_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A5B28 */ -static void steeplechase_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1276,7 +1276,7 @@ static void steeplechase_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A5B68 */ -static void steeplechase_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1371,7 +1371,7 @@ static void steeplechase_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A5B48 */ -static void steeplechase_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1464,7 +1464,7 @@ static void steeplechase_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 t } /** rct2: 0x008A5B58 */ -static void steeplechase_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1559,7 +1559,7 @@ static void steeplechase_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008A5AB8 */ -static void steeplechase_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void steeplechase_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1578,7 +1578,7 @@ static void steeplechase_track_block_brakes(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/suspended_swinging_coaster.c b/src/openrct2/ride/coaster/suspended_swinging_coaster.c index 3ba2050ed5..75de0af037 100644 --- a/src/openrct2/ride/coaster/suspended_swinging_coaster.c +++ b/src/openrct2/ride/coaster/suspended_swinging_coaster.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008A8958 */ -static void suspended_swinging_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -63,7 +63,7 @@ static void suspended_swinging_rc_track_flat(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008A8AA8, 0x008A8AB8, 0x008A8AC8 */ -static void suspended_swinging_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE }, @@ -83,7 +83,7 @@ static void suspended_swinging_rc_track_station(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008A8968 */ -static void suspended_swinging_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -144,7 +144,7 @@ static void suspended_swinging_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A8978 */ -static void suspended_swinging_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -170,7 +170,7 @@ static void suspended_swinging_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A8988 */ -static void suspended_swinging_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -231,7 +231,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008A8998 */ -static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -259,7 +259,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, } /** rct2: 0x008A89A8 */ -static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -324,7 +324,7 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A89B8 */ -static void suspended_swinging_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { switch (direction) { @@ -385,43 +385,43 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x008A89C8 */ -static void suspended_swinging_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_swinging_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A89D8 */ -static void suspended_swinging_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_swinging_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A89E8 */ -static void suspended_swinging_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_swinging_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A89F8 */ -static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_swinging_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A8A08 */ -static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_swinging_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A8A18 */ -static void suspended_swinging_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_swinging_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A8A28 */ -static void suspended_swinging_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -541,14 +541,14 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(uint8 rideIndex, uin } /** rct2: 0x008A8A38 */ -static void suspended_swinging_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A8A48 */ -static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -668,7 +668,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(uint8 ride } /** rct2: 0x008A8A58 */ -static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -788,21 +788,21 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(uint8 rid } /** rct2: 0x008A8A68 */ -static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A8A78 */ -static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A8A88 */ -static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -918,7 +918,7 @@ static void suspended_swinging_rc_track_s_bend_left(uint8 rideIndex, uint8 track } /** rct2: 0x008A8A98 */ -static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1034,7 +1034,7 @@ static void suspended_swinging_rc_track_s_bend_right(uint8 rideIndex, uint8 trac } /** rct2: 0x008A8AD8 */ -static void suspended_swinging_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1115,14 +1115,14 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(uint8 rideIndex, uin } /** rct2: 0x008A8AE8 */ -static void suspended_swinging_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A8AF8 */ -static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1188,7 +1188,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(uint8 ride } /** rct2: 0x008A8B08 */ -static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1254,21 +1254,21 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(uint8 rid } /** rct2: 0x008A8B18 */ -static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A8B28 */ -static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A8B38 */ -static void suspended_swinging_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -1291,7 +1291,7 @@ static void suspended_swinging_rc_track_brakes(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008A8B48 */ -static void suspended_swinging_rc_track_left_quarter_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1411,7 +1411,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(uint8 rideIn } /** rct2: 0x008A8B58 */ -static void suspended_swinging_rc_track_right_quarter_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_helix_large_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1531,7 +1531,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(uint8 rideI } /** rct2: 0x008A8B68 */ -static void suspended_swinging_rc_track_left_quarter_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_quarter_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1651,7 +1651,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(uint8 ride } /** rct2: 0x008A8B78 */ -static void suspended_swinging_rc_track_right_quarter_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_quarter_helix_large_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1771,7 +1771,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(uint8 rid } /** rct2: 0x008A8B88 */ -static void suspended_swinging_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1876,7 +1876,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(uint8 rideIndex, uin } /** rct2: 0x008A8B98 */ -static void suspended_swinging_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1981,21 +1981,21 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(uint8 rideIndex, ui } /** rct2: 0x008A8BA8 */ -static void suspended_swinging_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_swinging_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A8BB8 */ -static void suspended_swinging_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_swinging_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008A8BC8 */ -static void suspended_swinging_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2086,7 +2086,7 @@ static void suspended_swinging_rc_track_diag_flat(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008A8BF8 */ -static void suspended_swinging_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2177,7 +2177,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x008A8C58 */ -static void suspended_swinging_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2236,7 +2236,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x008A8BD8 */ -static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2327,7 +2327,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x008A8C38 */ -static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2386,7 +2386,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIn } /** rct2: 0x008A8C48 */ -static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2445,7 +2445,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIn } /** rct2: 0x008A8BE8 */ -static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2536,7 +2536,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, } /** rct2: 0x008A8C28 */ -static void suspended_swinging_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2627,7 +2627,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008A8C88 */ -static void suspended_swinging_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2670,7 +2670,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008A8C08 */ -static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2758,7 +2758,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex } /** rct2: 0x008A8C68 */ -static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2817,7 +2817,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(uint8 ri } /** rct2: 0x008A8C78 */ -static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2876,7 +2876,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(uint8 ri } /** rct2: 0x008A8C18 */ -static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2967,7 +2967,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex } /** rct2: 0x008A8B38 */ -static void suspended_swinging_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_swinging_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -2989,7 +2989,7 @@ static void suspended_swinging_rc_track_block_brakes(uint8 rideIndex, uint8 trac paint_util_set_general_support_height(height + 48, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_suspended_swinging_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_suspended_swinging_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/twister_roller_coaster.c b/src/openrct2/ride/coaster/twister_roller_coaster.c index ea9f3b356a..a825b5e34b 100644 --- a/src/openrct2/ride/coaster/twister_roller_coaster.c +++ b/src/openrct2/ride/coaster/twister_roller_coaster.c @@ -29,1068 +29,1068 @@ /** rct2: 0x008AB6A4 */ -static void twister_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8F4, 0x008AB904, 0x008AB914 */ -static void twister_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_station(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6B4 */ -static void twister_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6C4 */ -static void twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6D4 */ -static void twister_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6E4 */ -static void twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6F4 */ -static void twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB704 */ -static void twister_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB714 */ -static void twister_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB724 */ -static void twister_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB734 */ -static void twister_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB744 */ -static void twister_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB754 */ -static void twister_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB764 */ -static void twister_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB774 */ -static void twister_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB784 */ -static void twister_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB794 */ -static void twister_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB7A4 */ -static void twister_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB7B4 */ -static void twister_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB7C4 */ -static void twister_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB7D4 */ -static void twister_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_banked_left_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB7E4 */ -static void twister_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_banked_right_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB7F4 */ -static void twister_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB804 */ -static void twister_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB814 */ -static void twister_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB824 */ -static void twister_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB834 */ -static void twister_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB844 */ -static void twister_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB854 */ -static void twister_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB864 */ -static void twister_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB874 */ -static void twister_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB884 */ -static void twister_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB894 */ -static void twister_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8A4 */ -static void twister_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8B4 */ -static void twister_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8C4 */ -static void twister_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8D4 */ -static void twister_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_s_bend_left(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8E4 */ -static void twister_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_s_bend_right(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA84 */ -static void twister_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_vertical_loop(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA94 */ -static void twister_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_vertical_loop(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB924 */ -static void twister_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB934 */ -static void twister_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB944 */ -static void twister_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB954 */ -static void twister_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB964 */ -static void twister_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB974 */ -static void twister_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB984 */ -static void twister_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB994 */ -static void twister_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB9A4 */ -static void twister_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB9B4 */ -static void twister_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB9C4 */ -static void twister_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB9D4 */ -static void twister_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB9E4 */ -static void twister_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB9F4 */ -static void twister_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA04 */ -static void twister_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA14 */ -static void twister_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA44 */ -static void twister_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA24 */ -static void twister_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA34 */ -static void twister_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA54 */ -static void twister_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA64 */ -static void twister_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_brakes(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE04 */ -static void twister_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_left_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE14 */ -static void twister_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_right_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABA74 */ -static void twister_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_on_ride_photo(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE24 */ -static void twister_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_left_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE34 */ -static void twister_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_right_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE44 */ -static void twister_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE54 */ -static void twister_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE64 */ -static void twister_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE74 */ -static void twister_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE84 */ -static void twister_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE94 */ -static void twister_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABAB4 */ -static void twister_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABAC4 */ -static void twister_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABAD4 */ -static void twister_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABAE4 */ -static void twister_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABAF4 */ -static void twister_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB04 */ -static void twister_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB14 */ -static void twister_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB24 */ -static void twister_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABAA4 */ -static void twister_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB54 */ -static void twister_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABBB4 */ -static void twister_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB34 */ -static void twister_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB94 */ -static void twister_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABBA4 */ -static void twister_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB44 */ -static void twister_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB84 */ -static void twister_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABBE4 */ -static void twister_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB64 */ -static void twister_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABBC4 */ -static void twister_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABBD4 */ -static void twister_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB74 */ -static void twister_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC14 */ -static void twister_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC24 */ -static void twister_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC34 */ -static void twister_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC44 */ -static void twister_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC74 */ -static void twister_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC84 */ -static void twister_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC54 */ -static void twister_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC64 */ -static void twister_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC94 */ -static void twister_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABCA4 */ -static void twister_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABCB4 */ -static void twister_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABCC4 */ -static void twister_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABBF4 */ -static void twister_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABC04 */ -static void twister_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD74 */ -static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD84 */ -static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD94 */ -static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABDA4 */ -static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC0E4 */ -static void twister_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_block_brakes(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABEA4 */ -static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABEB4 */ -static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABEC4 */ -static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABED4 */ -static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABEE4 */ -static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABEF4 */ -static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF04 */ -static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF14 */ -static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF24 */ -static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF34 */ -static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF44 */ -static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF54 */ -static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF64 */ -static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF74 */ -static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF84 */ -static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABF94 */ -static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABFA4 */ -static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABFB4 */ -static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABFE4 */ -static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABFF4 */ -static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC004 */ -static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC014 */ -static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABFC4 */ -static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABFD4 */ -static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC024 */ -static void twister_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC034 */ -static void twister_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC044 */ -static void twister_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC054 */ -static void twister_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC064 */ -static void twister_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC074 */ -static void twister_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC084 */ -static void twister_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC094 */ -static void twister_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC0A4 */ -static void twister_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC0B4 */ -static void twister_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC0C4 */ -static void twister_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC0D4 */ -static void twister_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /* The following track elements used to be specific to the Vertical Roller Coaster */ -static void twister_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_brake_for_drop(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -static void twister_rc_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /* The following track elements used to be specific to the Steel Twister */ /** rct2: 0x008ABCD4 */ -static void twister_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_half_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABCE4 */ -static void twister_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_half_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD34 */ -static void twister_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_corkscrew_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD44 */ -static void twister_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_corkscrew_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD54 */ -static void twister_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_corkscrew_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD64 */ -static void twister_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_corkscrew_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC0F4 */ -static void twister_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up_long_base(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC104 */ -static void twister_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC114 */ -static void twister_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_down_long_base(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC124 */ -static void twister_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base122(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABCF4 */ -static void twister_rc_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_up_to_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD04 */ -static void twister_rc_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_up_to_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD14 */ -static void twister_rc_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_down_to_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABD24 */ -static void twister_rc_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_down_to_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABDB4 */ -static void twister_rc_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_powered_lift(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABDC4 */ -static void twister_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABDD4 */ -static void twister_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABDE4 */ -static void twister_rc_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABDF4 */ -static void twister_rc_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC134 */ -static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AC144 */ -static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } -TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/vertical_drop_roller_coaster.c b/src/openrct2/ride/coaster/vertical_drop_roller_coaster.c index e4fe646922..08fa40d3d9 100644 --- a/src/openrct2/ride/coaster/vertical_drop_roller_coaster.c +++ b/src/openrct2/ride/coaster/vertical_drop_roller_coaster.c @@ -20,1056 +20,1056 @@ #include "bolliger_mabillard_track.h" /** rct2: 0x008AA00C */ -static void vertical_drop_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_station(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA01C */ -static void vertical_drop_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA02C */ -static void vertical_drop_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA03C */ -static void vertical_drop_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA04C */ -static void vertical_drop_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA05C */ -static void vertical_drop_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA06C */ -static void vertical_drop_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA07C */ -static void vertical_drop_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA08C */ -static void vertical_drop_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA09C */ -static void vertical_drop_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA0AC */ -static void vertical_drop_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA0BC */ -static void vertical_drop_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA0CC */ -static void vertical_drop_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA0DC */ -static void vertical_drop_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA0EC */ -static void vertical_drop_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA0FC */ -static void vertical_drop_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA10C */ -static void vertical_drop_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA11C */ -static void vertical_drop_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA12C */ -static void vertical_drop_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA13C */ -static void vertical_drop_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_banked_left_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA14C */ -static void vertical_drop_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_banked_right_quarter_turn_5(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA15C */ -static void vertical_drop_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA16C */ -static void vertical_drop_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA17C */ -static void vertical_drop_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA18C */ -static void vertical_drop_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA19C */ -static void vertical_drop_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1AC */ -static void vertical_drop_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1BC */ -static void vertical_drop_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1CC */ -static void vertical_drop_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1DC */ -static void vertical_drop_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1EC */ -static void vertical_drop_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1FC */ -static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA20C */ -static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA21C */ -static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA22C */ -static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA23C */ -static void vertical_drop_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_s_bend_left(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA24C */ -static void vertical_drop_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_s_bend_right(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA49C */ -static void vertical_drop_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_vertical_loop(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA4AC */ -static void vertical_drop_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_vertical_loop(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA28C */ -static void vertical_drop_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA29C */ -static void vertical_drop_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA2AC */ -static void vertical_drop_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA2BC */ -static void vertical_drop_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA2CC */ -static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA2DC */ -static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA2EC */ -static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA2FC */ -static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA30C */ -static void vertical_drop_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA31C */ -static void vertical_drop_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA32C */ -static void vertical_drop_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA33C */ -static void vertical_drop_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_small(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA34C */ -static void vertical_drop_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA35C */ -static void vertical_drop_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA36C */ -static void vertical_drop_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA37C */ -static void vertical_drop_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_large(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA3AC */ -static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA38C */ -static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA39C */ -static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA3BC */ -static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA40C */ -static void vertical_drop_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_brakes(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7EC */ -static void vertical_drop_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_left_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7FC */ -static void vertical_drop_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_right_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA41C */ -static void vertical_drop_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_on_ride_photo(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA80C */ -static void vertical_drop_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_left_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA81C */ -static void vertical_drop_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_right_banked(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA42C */ -static void vertical_drop_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA43C */ -static void vertical_drop_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA44C */ -static void vertical_drop_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_up_to_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA45C */ -static void vertical_drop_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_90_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA46C */ -static void vertical_drop_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_90_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA47C */ -static void vertical_drop_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_down_to_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA4CC */ -static void vertical_drop_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA4DC */ -static void vertical_drop_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA4EC */ -static void vertical_drop_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA4FC */ -static void vertical_drop_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA50C */ -static void vertical_drop_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA51C */ -static void vertical_drop_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_diag(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA52C */ -static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA53C */ -static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_orthogonal(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA4BC */ -static void vertical_drop_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA56C */ -static void vertical_drop_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA5CC */ -static void vertical_drop_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA54C */ -static void vertical_drop_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA5AC */ -static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA5BC */ -static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA55C */ -static void vertical_drop_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA59C */ -static void vertical_drop_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA5FC */ -static void vertical_drop_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA57C */ -static void vertical_drop_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA5DC */ -static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA5EC */ -static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA58C */ -static void vertical_drop_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA62C */ -static void vertical_drop_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA63C */ -static void vertical_drop_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA64C */ -static void vertical_drop_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA65C */ -static void vertical_drop_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA68C */ -static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA69C */ -static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA66C */ -static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA67C */ -static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA6AC */ -static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA6BC */ -static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA6CC */ -static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA6DC */ -static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA60C */ -static void vertical_drop_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA61C */ -static void vertical_drop_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA72C */ -static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA73C */ -static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA74C */ -static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA75C */ -static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA9EC */ -static void vertical_drop_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_block_brakes(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA96C */ -static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA97C */ -static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA98C */ -static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA99C */ -static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA8AC */ -static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA8BC */ -static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA8CC */ -static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA8DC */ -static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA82C */ -static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA83C */ -static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA84C */ -static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA85C */ -static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA86C */ -static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA87C */ -static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA88C */ -static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA89C */ -static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA8EC */ -static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA8FC */ -static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA92C */ -static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA93C */ -static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA94C */ -static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA95C */ -static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA90C */ -static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA91C */ -static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA76C */ -static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA77C */ -static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA78C */ -static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA79C */ -static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7AC */ -static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7BC */ -static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7CC */ -static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7DC */ -static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA9AC */ -static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA9BC */ -static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA9CC */ -static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA9DC */ -static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /* The following elements used to be specific to the vertical_drop RC */ /** rct2: 0x008AA3CC */ -static void vertical_drop_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA3DC */ -static void vertical_drop_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA3EC */ -static void vertical_drop_rc_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA3FC */ -static void vertical_drop_rc_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA48C */ -static void vertical_drop_rc_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_brake_for_drop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_brake_for_drop(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA6EC */ -static void vertical_drop_rc_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA6FC */ -static void vertical_drop_rc_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA70C */ -static void vertical_drop_rc_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA71C */ -static void vertical_drop_rc_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_diag_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /* The following elements used to be specific to the steel twister RC */ -static void vertical_drop_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_half_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_half_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_corkscrew_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_corkscrew_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_corkscrew_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_corkscrew_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_corkscrew_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_corkscrew_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_60_deg_up_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up_long_base(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_up_to_flat_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_flat_to_60_deg_down_long_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_down_long_base(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base122(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_up_to_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_barrel_roll_up_to_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_up_to_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_down_to_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_barrel_roll_down_to_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_down_to_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_powered_lift(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_powered_lift(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_large_half_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_right_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_left_large_half_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } -TRACK_PAINT_FUNCTION get_track_paint_function_vertical_drop_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_vertical_drop_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/virginia_reel.c b/src/openrct2/ride/coaster/virginia_reel.c index 695159d99a..88ef7912c8 100644 --- a/src/openrct2/ride/coaster/virginia_reel.c +++ b/src/openrct2/ride/coaster/virginia_reel.c @@ -175,13 +175,13 @@ static const uint32 virginia_reel_track_pieces_flat_quarter_turn_1_tile[4] = { * * rct2: 0x006D5B48 */ -void vehicle_visual_virginia_reel(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_virginia_reel(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { - int image_id; - int baseImage_id = imageDirection; + sint32 image_id; + sint32 baseImage_id = imageDirection; const uint8 rotation = get_current_rotation(); - int ecx = ((vehicle->var_BA / 8) + (rotation * 8)) & 31; - int j = 0; + sint32 ecx = ((vehicle->var_BA / 8) + (rotation * 8)) & 31; + sint32 j = 0; if (vehicle->vehicle_sprite_type == 0) { baseImage_id = ecx & 7; } else { @@ -214,11 +214,11 @@ void vehicle_visual_virginia_reel(int x, int imageDirection, int y, int z, rct_v if (unk_140E9A8->zoom_level < 2 && vehicle->num_peeps > 0) { uint8 riding_peep_sprites[4] = {0xFF, 0xFF, 0xFF, 0xFF}; - for (int i = 0; i < vehicle->num_peeps; i++) { + for (sint32 i = 0; i < vehicle->num_peeps; i++) { riding_peep_sprites[((ecx / 8) + i) & 3] = vehicle->peep_tshirt_colours[i]; } - int draw_order[4] = {0, 1, 3, 2}; - for (int i = 0; i < countof(draw_order); i++) { + sint32 draw_order[4] = {0, 1, 3, 2}; + for (sint32 i = 0; i < countof(draw_order); i++) { if (riding_peep_sprites[draw_order[i]] != 0xFF) { image_id = (baseImage_id + ((draw_order[i] + 1) * 72)) | (riding_peep_sprites[draw_order[i]] << 19) | 0x20000000; sub_98199C(image_id, 0, 0, bb->length_x, bb->length_y, bb->length_z, z, bb->offset_x, bb->offset_y, bb->offset_z + z, rotation); @@ -230,7 +230,7 @@ void vehicle_visual_virginia_reel(int x, int imageDirection, int y, int z, rct_v } /** rct2: 0x00811264 */ -static void paint_virginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_flat; if (mapElement->type & 0x80) { @@ -253,7 +253,7 @@ static void paint_virginia_reel_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x00811274 */ -static void paint_virginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_25_deg_up; if (mapElement->type & 0x80) { @@ -297,7 +297,7 @@ static void paint_virginia_reel_track_25_deg_up(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x00811294 */ -static void paint_virginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_flat_to_25_deg_up; if (mapElement->type & 0x80) { @@ -340,7 +340,7 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x00811294 */ -static void paint_virginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_25_deg_up_to_flat; if (mapElement->type & 0x80) { @@ -384,25 +384,25 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(uint8 rideIndex, uint8 t } /** rct2: 0x008112A4 */ -static void paint_virginia_reel_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_virginia_reel_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112B4 */ -static void paint_virginia_reel_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_virginia_reel_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112C4 */ -static void paint_virginia_reel_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_virginia_reel_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112D4, 0x008112E4, 0x008112F4 */ -static void paint_virginia_reel_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -434,7 +434,7 @@ static void paint_virginia_reel_station(uint8 rideIndex, uint8 trackSequence, ui static const uint8 virginia_reel_left_quarter_turn_supports[] = {5, 2, 3, 4}; /** rct2: 0x00811304 */ -static void paint_virginia_reel_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], virginia_reel_track_pieces_flat_quarter_turn_3_tiles, get_current_rotation()); track_paint_util_left_quarter_turn_3_tiles_tunnel(height, TUNNEL_6, direction, trackSequence); @@ -456,14 +456,14 @@ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(uint8 rideIndex, static const uint8 virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0}; /** rct2: 0x00811314 */ -static void paint_virginia_reel_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_virginia_reel_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x00811324 */ -static void paint_virginia_reel_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(2, height, 0, direction, gTrackColours[SCHEME_TRACK], virginia_reel_track_pieces_flat_quarter_turn_1_tile, get_current_rotation()); @@ -491,7 +491,7 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(uint8 rideIndex, } /** rct2: 0x00811334 */ -static void paint_virginia_reel_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_virginia_reel_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_virginia_reel_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } @@ -499,7 +499,7 @@ static void paint_virginia_reel_track_right_quarter_turn_1_tile(uint8 rideIndex, /** * rct2: 0x00811184 */ -TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/wild_mouse.c b/src/openrct2/ride/coaster/wild_mouse.c index 7a8e91587f..754cdbc2a7 100644 --- a/src/openrct2/ride/coaster/wild_mouse.c +++ b/src/openrct2/ride/coaster/wild_mouse.c @@ -169,7 +169,7 @@ static const uint32 _wild_mouse_block_brakes_image_ids[4] = { }; /** rct2: 0x0078B1E4 */ -static void wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_SW_NE }, @@ -190,7 +190,7 @@ static void wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 di paint_util_set_general_support_height(height + 32, 0x20); } -static void wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 baseImageIds[4] = { SPR_STATION_BASE_B_SW_NE, @@ -199,7 +199,7 @@ static void wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence, uint8 SPR_STATION_BASE_B_NW_SE, }; - int trackType = mapElement->properties.track.type; + sint32 trackType = mapElement->properties.track.type; sub_98197C_rotated(direction, baseImageIds[direction] | gTrackColours[SCHEME_MISC], 0, 0, 32, 28, 2, height - 2, 0, 2, height); if (trackType == TRACK_ELEM_END_STATION) { sub_98199C_rotated(direction, _wild_mouse_block_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK], 0, 0, 32, 20, 2, height, 0, 0, height); @@ -214,7 +214,7 @@ static void wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x0078B1F4 */ -static void wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_CHAIN_SW_NE }, @@ -239,7 +239,7 @@ static void wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x0078B204 */ -static void wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_CHAIN_SW_NE }, @@ -272,7 +272,7 @@ static void wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x0078B214 */ -static void wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_SW_NE }, @@ -297,7 +297,7 @@ static void wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0078B224 */ -static void wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SW_NE }, @@ -334,7 +334,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x0078B234 */ -static void wild_mouse_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SW_NE }, @@ -371,7 +371,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x0078B244 */ -static void wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_SW_NE }, @@ -396,42 +396,42 @@ static void wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0078B254 */ -static void wild_mouse_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B264 */ -static void wild_mouse_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B274 */ -static void wild_mouse_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B284 */ -static void wild_mouse_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B294 */ -static void wild_mouse_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B2A4 */ -static void wild_mouse_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -466,7 +466,7 @@ static void wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSe break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0; break; case 2: blockedSegments = SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4; break; @@ -476,7 +476,7 @@ static void wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSe paint_util_set_general_support_height(height + 32, 0x20); } -static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][2] = { { @@ -499,7 +499,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, u static const sint16 generalSupportHeights[] = { 72, 56, 56, 72 }; if (trackSequence == 0 || trackSequence == 3) { - int part = trackSequence == 0 ? 0 : 1; + sint32 part = trackSequence == 0 ? 0 : 1; const sprite_bb * sbb = &imageIds[direction][part]; sub_98196C(sbb->sprite_id | gTrackColours[SCHEME_TRACK], (sint8)sbb->offset.x, (sint8)sbb->offset.y, @@ -515,7 +515,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, u break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0; break; case 3: blockedSegments = SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4; break; @@ -524,14 +524,14 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, u paint_util_set_general_support_height(height + generalSupportHeights[trackSequence], 0x20); } -static void wild_mouse_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3_25_deg_down(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x0078B314 */ -static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][2] = { { @@ -554,7 +554,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uin static const sint16 generalSupportHeights[] = { 72, 56, 56, 72 }; if (trackSequence == 0 || trackSequence == 3) { - int part = trackSequence == 0 ? 0 : 1; + sint32 part = trackSequence == 0 ? 0 : 1; const sprite_bb * sbb = &imageIds[direction][part]; sub_98196C(sbb->sprite_id | gTrackColours[SCHEME_TRACK], (sint8)sbb->offset.x, (sint8)sbb->offset.y, @@ -576,7 +576,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uin break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0; break; case 3: blockedSegments = SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4; break; @@ -586,20 +586,20 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x0078B324 */ -static void wild_mouse_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void wild_mouse_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x0078B394 */ -static void wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_WILD_MOUSE_QUARTER_TURN_1_SW_NE, @@ -630,13 +630,13 @@ static void wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x0078B3A4 */ -static void wild_mouse_track_right_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_right_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_left_quarter_turn_1(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0078B354 */ -static void wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SW_NE }, @@ -673,7 +673,7 @@ static void wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0078B364 */ -static void wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SW_NE }, @@ -714,19 +714,19 @@ static void wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x0078B374 */ -static void wild_mouse_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_60_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B384 */ -static void wild_mouse_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wild_mouse_track_flat_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B344 */ -static void wild_mouse_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = _wild_mouse_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); @@ -739,7 +739,7 @@ static void wild_mouse_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x0078B3C4 */ -static void wild_mouse_track_rotation_control_toggle(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_rotation_control_toggle(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE, @@ -759,7 +759,7 @@ static void wild_mouse_track_rotation_control_toggle(uint8 rideIndex, uint8 trac } /** rct2: 0x0078B3B4 */ -static void wild_mouse_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wild_mouse_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = _wild_mouse_block_brakes_image_ids[direction] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); @@ -771,7 +771,7 @@ static void wild_mouse_track_block_brakes(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_wild_mouse(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_wild_mouse(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/wooden_roller_coaster.c b/src/openrct2/ride/coaster/wooden_roller_coaster.c index 3c3e1259be..d7ff518a20 100644 --- a/src/openrct2/ride/coaster/wooden_roller_coaster.c +++ b/src/openrct2/ride/coaster/wooden_roller_coaster.c @@ -433,7 +433,7 @@ static void wooden_rc_track_paint_bb(const sprite_bb_2 *bb, sint16 height) } /** rct2: 0x008AC568 */ -static void wooden_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_SW_NE }, @@ -456,7 +456,7 @@ static void wooden_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir paint_util_set_general_support_height(height + 32, 0x20); } -static void wooden_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 stationImageIds[4][2] = { { SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE }, @@ -465,7 +465,7 @@ static void wooden_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 { SPR_WOODEN_RC_STATION_NW_SE, SPR_WOODEN_RC_STATION_RAILS_NW_SE }, }; - int trackType = mapElement->properties.track.type; + sint32 trackType = mapElement->properties.track.type; if (trackType == TRACK_ELEM_END_STATION) { wooden_rc_track_paint( _wooden_rc_block_brakes_image_ids[direction][0], @@ -483,7 +483,7 @@ static void wooden_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008AC578 */ -static void wooden_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][4] = { { @@ -518,7 +518,7 @@ static void wooden_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008AC588 */ -static void wooden_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_60_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_RAILS_SW_NE }, @@ -545,7 +545,7 @@ static void wooden_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008AC598 */ -static void wooden_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][4] = { { @@ -580,7 +580,7 @@ static void wooden_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AC5A8 */ -static void wooden_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_25_DEG_TO_60_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_SW_NE, 0, 0 }, @@ -608,7 +608,7 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC5B8 */ -static void wooden_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_60_DEG_TO_25_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_SW_NE, 0, 0 }, @@ -636,7 +636,7 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC5C8 */ -static void wooden_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][4] = { { @@ -671,42 +671,42 @@ static void wooden_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AC5D8 */ -static void wooden_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC5E8 */ -static void wooden_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC5F8 */ -static void wooden_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC608 */ -static void wooden_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC618 */ -static void wooden_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC628 */ -static void wooden_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void wooden_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb_2 imageIds[2][4][7] = { { @@ -801,7 +801,7 @@ static void wooden_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSeq wooden_a_supports_paint_setup(supportType[direction][trackSequence], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC; break; @@ -815,14 +815,14 @@ static void wooden_rc_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 32, 0x20); } -static void wooden_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_5(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AC658 */ -static void wooden_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, @@ -842,7 +842,7 @@ static void wooden_rc_track_flat_to_left_bank(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AC668 */ -static void wooden_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_SW_NE, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_SW_NE }, @@ -862,18 +862,18 @@ static void wooden_rc_track_flat_to_right_bank(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008AC678 */ -static void wooden_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_flat_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC688 */ -static void wooden_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_flat_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void wooden_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb_2 imageIds[2][4][7] = { { @@ -968,7 +968,7 @@ static void wooden_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 t wooden_a_supports_paint_setup(supportType[direction][trackSequence], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC; break; @@ -982,14 +982,14 @@ static void wooden_rc_track_banked_right_quarter_turn_5(uint8 rideIndex, uint8 t paint_util_set_general_support_height(height + 32, 0x20); } -static void wooden_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_banked_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_banked_right_quarter_turn_5(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AC6B8 */ -static void wooden_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 }, @@ -1013,7 +1013,7 @@ static void wooden_rc_track_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC6C8 */ -static void wooden_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 }, @@ -1037,7 +1037,7 @@ static void wooden_rc_track_right_bank_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008AC6D8 */ -static void wooden_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, @@ -1061,7 +1061,7 @@ static void wooden_rc_track_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC6E8 */ -static void wooden_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_SW_NE, 0, 0 }, @@ -1085,31 +1085,31 @@ static void wooden_rc_track_25_deg_up_to_right_bank(uint8 rideIndex, uint8 track } /** rct2: 0x008AC6F8 */ -static void wooden_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_to_right_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC708 */ -static void wooden_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_to_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC718 */ -static void wooden_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_right_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC728 */ -static void wooden_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_bank_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC738 */ -static void wooden_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_LEFT_BANK_SW_NE, SPR_WOODEN_RC_LEFT_BANK_RAILS_SW_NE }, @@ -1126,13 +1126,13 @@ static void wooden_rc_track_left_bank(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008AC748 */ -static void wooden_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_bank(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC758 */ -static void wooden_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1310,7 +1310,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008AC768 */ -static void wooden_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1488,21 +1488,21 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008AC778 */ -static void wooden_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AC788 */ -static void wooden_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AC798 */ -static void wooden_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1640,7 +1640,7 @@ static void wooden_rc_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, ui } /** rct2: 0x008AC7A8 */ -static void wooden_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1778,7 +1778,7 @@ static void wooden_rc_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008ACE18 */ -static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1956,7 +1956,7 @@ static void wooden_rc_track_left_vertical_loop(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008ACE28 */ -static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2128,7 +2128,7 @@ static void wooden_rc_track_right_vertical_loop(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AC7E8 */ -static void wooden_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2235,14 +2235,14 @@ static void wooden_rc_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AC7F8 */ -static void wooden_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AC808 */ -static void wooden_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2349,14 +2349,14 @@ static void wooden_rc_track_left_quarter_turn_3_bank(uint8 rideIndex, uint8 trac } /** rct2: 0x008AC818 */ -static void wooden_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_3_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3_bank(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AC828 */ -static void wooden_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2443,7 +2443,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008AC838 */ -static void wooden_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2530,21 +2530,21 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008AC848 */ -static void wooden_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008AC858 */ -static void wooden_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ACAB8 */ -static void wooden_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -2783,7 +2783,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(uint8 rideIndex, uin } /** rct2: 0x008ACAC8 */ -static void wooden_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3022,7 +3022,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(uint8 rideIndex, ui } /** rct2: 0x008ACAD8 */ -static void wooden_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -3033,7 +3033,7 @@ static void wooden_rc_track_left_half_banked_helix_down_small(uint8 rideIndex, u } /** rct2: 0x008ACAE8 */ -static void wooden_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 4) { trackSequence -= 4; @@ -3044,7 +3044,7 @@ static void wooden_rc_track_right_half_banked_helix_down_small(uint8 rideIndex, } /** rct2: 0x008ACAF8 */ -static void wooden_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3395,7 +3395,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(uint8 rideIndex, uin } /** rct2: 0x008ACB08 */ -static void wooden_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -3746,7 +3746,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(uint8 rideIndex, ui } /** rct2: 0x008ACB18 */ -static void wooden_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3757,7 +3757,7 @@ static void wooden_rc_track_left_half_banked_helix_down_large(uint8 rideIndex, u } /** rct2: 0x008ACB28 */ -static void wooden_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence >= 7) { trackSequence -= 7; @@ -3768,7 +3768,7 @@ static void wooden_rc_track_right_half_banked_helix_down_large(uint8 rideIndex, } /** rct2: 0x008ACB98 */ -static void wooden_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3802,7 +3802,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008ACB78 */ -static void wooden_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3836,19 +3836,19 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_up(uint8 rideIndex, uint } /** rct2: 0x008ACB88 */ -static void wooden_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_right_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ACBA8 */ -static void wooden_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_1_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_quarter_turn_1_60_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AC868 */ -static void wooden_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE }, @@ -3865,7 +3865,7 @@ static void wooden_rc_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x008ACC78 */ -static void wooden_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3903,7 +3903,7 @@ static void wooden_rc_track_25_deg_up_left_banked(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008ACC88 */ -static void wooden_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3941,7 +3941,7 @@ static void wooden_rc_track_25_deg_up_right_banked(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC878 */ -static void wooden_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -3969,19 +3969,19 @@ static void wooden_rc_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008ACC98 */ -static void wooden_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_left_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_right_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACCA8 */ -static void wooden_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_right_banked(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_left_banked(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACE08 */ -static void wooden_rc_track_water_splash(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_water_splash(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4207,7 +4207,7 @@ static void wooden_rc_track_water_splash(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008AC958 */ -static void wooden_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4351,7 +4351,7 @@ static void wooden_rc_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x008AC968 */ -static void wooden_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4495,21 +4495,21 @@ static void wooden_rc_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x008AC978 */ -static void wooden_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC988 */ -static void wooden_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008AC998 */ -static void wooden_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4653,7 +4653,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(uint8 rideIndex, uint8 trac } /** rct2: 0x008AC9A8 */ -static void wooden_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4797,21 +4797,21 @@ static void wooden_rc_track_right_eighth_bank_to_diag(uint8 rideIndex, uint8 tra } /** rct2: 0x008AC9B8 */ -static void wooden_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_right_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC9C8 */ -static void wooden_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_eighth_bank_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_left_eighth_bank_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008AC888 */ -static void wooden_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -4942,7 +4942,7 @@ static void wooden_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008AC8B8 */ -static void wooden_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5073,7 +5073,7 @@ static void wooden_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008AC8E8 */ -static void wooden_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5144,7 +5144,7 @@ static void wooden_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008AC898 */ -static void wooden_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5275,7 +5275,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC8C8 */ -static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5346,7 +5346,7 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AC8D8 */ -static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5417,7 +5417,7 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008AC8A8 */ -static void wooden_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5548,7 +5548,7 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC918 */ -static void wooden_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5679,7 +5679,7 @@ static void wooden_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008AC948 */ -static void wooden_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5750,7 +5750,7 @@ static void wooden_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008AC8F8 */ -static void wooden_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5876,7 +5876,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trac } /** rct2: 0x008AC928 */ -static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -5947,7 +5947,7 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uin } /** rct2: 0x008AC938 */ -static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6018,7 +6018,7 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uin } /** rct2: 0x008AC908 */ -static void wooden_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6149,7 +6149,7 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trac } /** rct2: 0x008ACA18 */ -static void wooden_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6220,7 +6220,7 @@ static void wooden_rc_track_diag_flat_to_left_bank(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AC9F8 */ -static void wooden_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6291,7 +6291,7 @@ static void wooden_rc_track_diag_flat_to_right_bank(uint8 rideIndex, uint8 track } /** rct2: 0x008ACA08 */ -static void wooden_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6362,7 +6362,7 @@ static void wooden_rc_track_diag_left_bank_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008ACA28 */ -static void wooden_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6433,7 +6433,7 @@ static void wooden_rc_track_diag_right_bank_to_flat(uint8 rideIndex, uint8 track } /** rct2: 0x008ACA58 */ -static void wooden_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6504,7 +6504,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008ACA68 */ -static void wooden_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6575,7 +6575,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008ACA38 */ -static void wooden_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6646,7 +6646,7 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(uint8 rideIndex, uint8 t } /** rct2: 0x008ACA48 */ -static void wooden_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6717,7 +6717,7 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(uint8 rideIndex, uint8 } /** rct2: 0x008ACA78 */ -static void wooden_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6783,7 +6783,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(uint8 rideIndex, uint8 } /** rct2: 0x008ACA88 */ -static void wooden_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6849,7 +6849,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(uint8 rideIndex, uint } /** rct2: 0x008ACA98 */ -static void wooden_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6920,7 +6920,7 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(uint8 rideIndex, uint8 } /** rct2: 0x008ACAA8 */ -static void wooden_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -6991,7 +6991,7 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(uint8 rideIndex, uint } /** rct2: 0x008AC9D8 */ -static void wooden_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7062,7 +7062,7 @@ static void wooden_rc_track_diag_left_bank(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008AC9E8 */ -static void wooden_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7133,7 +7133,7 @@ static void wooden_rc_track_diag_right_bank(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008ACB38 */ -static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7220,7 +7220,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(uint8 rid } /** rct2: 0x008ACB48 */ -static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7307,7 +7307,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(uint8 r } /** rct2: 0x008ACB58 */ -static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7394,7 +7394,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(uint8 r } /** rct2: 0x008ACB68 */ -static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7481,7 +7481,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(uint8 } /** rct2: 0x008ACDF8 */ -static void wooden_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_paint( _wooden_rc_block_brakes_image_ids[direction][0], @@ -7493,7 +7493,7 @@ static void wooden_rc_track_block_brakes(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x008ACCB8 */ -static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7580,7 +7580,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(uint8 rideIndex } /** rct2: 0x008ACCC8 */ -static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7667,21 +7667,21 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(uint8 rideInde } /** rct2: 0x008ACCD8 */ -static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ACCE8 */ -static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ACC38 */ -static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -7859,7 +7859,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(uint8 rideIndex } /** rct2: 0x008ACC48 */ -static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -8037,21 +8037,21 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(uint8 rideInde } /** rct2: 0x008ACC58 */ -static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ACC68 */ -static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ACCF8 */ -static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8085,7 +8085,7 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ACD08 */ -static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8119,7 +8119,7 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ACD18 */ -static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8153,7 +8153,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ACD28 */ -static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8187,31 +8187,31 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(uint8 rideIndex, } /** rct2: 0x008ACD38 */ -static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACD48 */ -static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACD58 */ -static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACD68 */ -static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACD78 */ -static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8249,7 +8249,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(uint8 ride } /** rct2: 0x008ACD88 */ -static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8287,7 +8287,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(uint8 ri } /** rct2: 0x008ACD98 */ -static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8325,7 +8325,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(uint8 ride } /** rct2: 0x008ACDA8 */ -static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8363,31 +8363,31 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(uint8 ri } /** rct2: 0x008ACDB8 */ -static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACDC8 */ -static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACDD8 */ -static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACDE8 */ -static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACBB8 */ -static void wooden_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8425,7 +8425,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(uint8 rideIndex, uint8 } /** rct2: 0x008ACBC8 */ -static void wooden_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8463,7 +8463,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008ACBD8 */ -static void wooden_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8501,7 +8501,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 } /** rct2: 0x008ACBE8 */ -static void wooden_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -8539,30 +8539,30 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x008ACBF8 */ -static void wooden_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_left_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_right_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACC08 */ -static void wooden_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_flat_to_right_banked_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_left_banked_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACC18 */ -static void wooden_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_left_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_flat_to_right_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACC28 */ -static void wooden_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_rc_track_right_banked_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_rc_track_flat_to_left_banked_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_wooden_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_wooden_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/coaster/wooden_wild_mouse.c b/src/openrct2/ride/coaster/wooden_wild_mouse.c index e073d2724d..65713096c5 100644 --- a/src/openrct2/ride/coaster/wooden_wild_mouse.c +++ b/src/openrct2/ride/coaster/wooden_wild_mouse.c @@ -128,7 +128,7 @@ enum { }; /** rct2: 0x008A5464 */ -static void wooden_wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, @@ -146,7 +146,7 @@ static void wooden_wild_mouse_track_flat(uint8 rideIndex, uint8 trackSequence, u paint_util_set_general_support_height(height + 32, 0x20); } -static void wooden_wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -165,7 +165,7 @@ static void wooden_wild_mouse_track_station(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008A5474 */ -static void wooden_wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -199,7 +199,7 @@ static void wooden_wild_mouse_track_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A5484 */ -static void wooden_wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -237,7 +237,7 @@ static void wooden_wild_mouse_track_60_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008A5494 */ -static void wooden_wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -271,7 +271,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A54A4 */ -static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -312,7 +312,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint paint_util_set_general_support_height(height + 72, 0x20); } -static void wooden_wild_mouse_track_60_deg_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_60_deg_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -354,7 +354,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x008A54C4 */ -static void wooden_wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -388,42 +388,42 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A54D4 */ -static void wooden_wild_mouse_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A54E4 */ -static void wooden_wild_mouse_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A54F4 */ -static void wooden_wild_mouse_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5504 */ -static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_60_deg_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5514 */ -static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5524 */ -static void wooden_wild_mouse_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void wooden_wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -459,7 +459,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 2: blockedSegments = SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4; break; @@ -469,13 +469,13 @@ static void wooden_wild_mouse_track_right_quarter_turn_3(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 32, 0x20); } -static void wooden_wild_mouse_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_wild_mouse_track_right_quarter_turn_3(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void wooden_wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4] = { SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_SW_NE, @@ -507,13 +507,13 @@ static void wooden_wild_mouse_track_left_quarter_turn_1(uint8 rideIndex, uint8 t } /** rct2: 0x008A55D4 */ -static void wooden_wild_mouse_track_right_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_right_quarter_turn_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_left_quarter_turn_1(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A55E4 */ -static void wooden_wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -555,7 +555,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(uint8 rideIndex, uint8 tra } /** rct2: 0x008A55F4 */ -static void wooden_wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -597,18 +597,18 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x008A5604 */ -static void wooden_wild_mouse_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_flat_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_60_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5614 */ -static void wooden_wild_mouse_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void wooden_wild_mouse_track_60_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { wooden_wild_mouse_track_flat_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/gentle/car_ride.c b/src/openrct2/ride/gentle/car_ride.c index b745ec6089..bd21ba2a88 100644 --- a/src/openrct2/ride/gentle/car_ride.c +++ b/src/openrct2/ride/gentle/car_ride.c @@ -162,7 +162,7 @@ static const uint32 car_ride_track_pieces_quarter_turn_3_tiles[4][3] = { }; /** rct2: 0x006F72C8 */ -static void paint_car_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK]; @@ -184,7 +184,7 @@ static void paint_car_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x006F72D8 */ -static void paint_car_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; @@ -215,7 +215,7 @@ static void paint_car_ride_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x006F72E8 */ -static void paint_car_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; @@ -246,7 +246,7 @@ static void paint_car_ride_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x006F72F8 */ -static void paint_car_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK]; @@ -277,25 +277,25 @@ static void paint_car_ride_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x006F7308 */ -static void paint_car_ride_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7318 */ -static void paint_car_ride_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7328 */ -static void paint_car_ride_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7338, 0x006F7348, 0x006F7358 */ -static void paint_car_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -335,7 +335,7 @@ static void paint_car_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x006F7378 */ -static void paint_car_ride_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], car_ride_track_pieces_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_0); @@ -348,7 +348,7 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles(uint8 rideIndex, uin } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -360,14 +360,14 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles(uint8 rideIndex, uin } /** rct2: 0x006F7368 */ -static void paint_car_ride_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_car_ride_track_right_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x006F7388 */ -static void paint_car_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_left_quarter_turn_1_tile[direction] | gTrackColours[SCHEME_TRACK]; @@ -387,13 +387,13 @@ static void paint_car_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 } /** rct2: 0x006F7398 */ -static void paint_car_ride_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x006F73A8 */ -static void paint_car_ride_track_spinning_tunnel(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_spinning_tunnel(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_flat[direction] | gTrackColours[SCHEME_TRACK]; @@ -418,7 +418,7 @@ static void paint_car_ride_track_spinning_tunnel(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x006F73B8 */ -static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -464,7 +464,7 @@ static void paint_car_ride_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x006F73C8 */ -static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -510,7 +510,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x006F73D8 */ -static void paint_car_ride_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -556,25 +556,25 @@ static void paint_car_ride_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 t } /** rct2: 0x006F73E8 */ -static void paint_car_ride_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_60_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F73F8 */ -static void paint_car_ride_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7408 */ -static void paint_car_ride_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_car_ride_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7418 */ -static void paint_car_ride_track_log_bumps(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_car_ride_track_log_bumps(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = car_ride_track_pieces_log_bumps[direction] | gTrackColours[SCHEME_TRACK]; @@ -598,7 +598,7 @@ static void paint_car_ride_track_log_bumps(uint8 rideIndex, uint8 trackSequence, /** * rct2: 0x006F7000 */ -TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/gentle/circus_show.c b/src/openrct2/ride/gentle/circus_show.c index 424d2ec04b..a0d87c3845 100644 --- a/src/openrct2/ride/gentle/circus_show.c +++ b/src/openrct2/ride/gentle/circus_show.c @@ -51,11 +51,11 @@ static void paint_circus_show_tent(uint8 rideIndex, uint8 direction, sint8 al, s /** * rct2: 0x0076FAD4 */ -static void paint_circus_show(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_circus_show(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -74,7 +74,7 @@ static void paint_circus_show(uint8 rideIndex, uint8 trackSequence, uint8 direct case 8: paint_circus_show_tent(rideIndex, direction, -32, 0, height); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: // top @@ -102,7 +102,7 @@ static void paint_circus_show(uint8 rideIndex, uint8 trackSequence, uint8 direct /** * rct2: 0x0076F8D4 */ -TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/gentle/crooked_house.c b/src/openrct2/ride/gentle/crooked_house.c index 1b7035c99b..2e8dcf0d18 100644 --- a/src/openrct2/ride/gentle/crooked_house.c +++ b/src/openrct2/ride/gentle/crooked_house.c @@ -43,7 +43,7 @@ rct_crooked_house_bound_box crooked_house_data[] = { * @param (ebx) image_id * @param (edx) height */ -static void sub_88ABA4(uint8 direction, uint8 x_offset, uint8 y_offset, uint32 segment, int height) { +static void sub_88ABA4(uint8 direction, uint8 x_offset, uint8 y_offset, uint32 segment, sint32 height) { rct_map_element *original_map_element = g_currently_drawn_item; rct_ride *ride = get_ride(original_map_element->properties.track.ride_index); @@ -65,11 +65,11 @@ static void sub_88ABA4(uint8 direction, uint8 x_offset, uint8 y_offset, uint32 s sub_98197C(image_id, x_offset, y_offset, boundBox.length_x, boundBox.length_y, 127, height + 3, boundBox.offset_x, boundBox.offset_y, height + 3, get_current_rotation()); } -static void paint_crooked_house(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_crooked_house(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -87,7 +87,7 @@ static void paint_crooked_house(uint8 rideIndex, uint8 trackSequence, uint8 dire //case 8: sub_88ABA4(rideIndex, 224, 0, 3, height); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: // top @@ -112,7 +112,7 @@ static void paint_crooked_house(uint8 rideIndex, uint8 trackSequence, uint8 dire paint_util_set_general_support_height(height + 128, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_crooked_house(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_crooked_house(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; } diff --git a/src/openrct2/ride/gentle/dodgems.c b/src/openrct2/ride/gentle/dodgems.c index db929f5921..e15767469f 100644 --- a/src/openrct2/ride/gentle/dodgems.c +++ b/src/openrct2/ride/gentle/dodgems.c @@ -37,7 +37,7 @@ const uint32 dodgems_fence_sprites[] = { SPR_DODGEMS_FENCE_TOP_LEFT }; -static void paint_dodgems_roof(int height, int offset) +static void paint_dodgems_roof(sint32 height, sint32 offset) { uint32 image_id = (SPR_DODGEMS_ROOF_FRAME + offset) | gTrackColours[SCHEME_TRACK]; sub_98196C(image_id, 0, 0, 32, 32, 2, height, get_current_rotation()); @@ -46,11 +46,11 @@ static void paint_dodgems_roof(int height, int offset) paint_attach_to_previous_ps(image_id, 0, 0); } -static void paint_dodgems(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_dodgems(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 relativeTrackSequence = track_map_4x4[direction][trackSequence]; - int edges = edges_4x4[relativeTrackSequence]; + sint32 edges = edges_4x4[relativeTrackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -92,7 +92,7 @@ static void paint_dodgems(uint8 rideIndex, uint8 trackSequence, uint8 direction, /** * rct2: */ -TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_4_X_4) { return NULL; } diff --git a/src/openrct2/ride/gentle/ferris_wheel.c b/src/openrct2/ride/gentle/ferris_wheel.c index 60339e2c3e..1e04c46aef 100644 --- a/src/openrct2/ride/gentle/ferris_wheel.c +++ b/src/openrct2/ride/gentle/ferris_wheel.c @@ -100,7 +100,7 @@ static void paint_ferris_wheel_structure(uint8 rideIndex, uint8 direction, sint8 if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL) { vehicle = GET_VEHICLE(ride->vehicles[0]); - for (int i = 0; i < 32; i += 2) { + for (sint32 i = 0; i < 32; i += 2) { if (vehicle->peep[i] == SPRITE_INDEX_NULL) { continue; } @@ -110,7 +110,7 @@ static void paint_ferris_wheel_structure(uint8 rideIndex, uint8 direction, sint8 continue; } - int frameNum = (vehicle->vehicle_sprite_type + i * 4) % 128; + sint32 frameNum = (vehicle->vehicle_sprite_type + i * 4) % 128; imageColourFlags = vehicle->peep_tshirt_colours[i] << 19 | vehicle->peep_tshirt_colours[i + 1] << 24 | 0xA0000000; imageId = (baseImageId + 32 + direction * 128 + frameNum) | imageColourFlags; sub_98199C(imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x, boundBox.offset_y, height, get_current_rotation()); @@ -128,11 +128,11 @@ static void paint_ferris_wheel_structure(uint8 rideIndex, uint8 direction, sint8 /** * rct2: 0x008A8EC4 */ -static void paint_ferris_wheel(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ferris_wheel(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence]; - int edges; + sint32 edges; if (direction & 1) { edges = edges_1x4_nw_se[relativeTrackSequence]; } else { @@ -181,7 +181,7 @@ static void paint_ferris_wheel(uint8 rideIndex, uint8 trackSequence, uint8 direc /** * rct2: 0x008A8CC8 */ -TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_1_X_4_C) { return NULL; diff --git a/src/openrct2/ride/gentle/flying_saucers.c b/src/openrct2/ride/gentle/flying_saucers.c index 40ab4fc1f5..2bc51a7317 100644 --- a/src/openrct2/ride/gentle/flying_saucers.c +++ b/src/openrct2/ride/gentle/flying_saucers.c @@ -39,11 +39,11 @@ static const uint32 flying_saucers_fence_sprites[] = { /** * rct2: 0x008873D8 */ -static void paint_flying_saucers(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_flying_saucers(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 relativeTrackSequence = track_map_4x4[direction][trackSequence]; - int edges = edges_4x4[relativeTrackSequence]; + sint32 edges = edges_4x4[relativeTrackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -61,7 +61,7 @@ static void paint_flying_saucers(uint8 rideIndex, uint8 trackSequence, uint8 dir /** * rct2: 0x00887208 */ -TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_4_X_4) { return NULL; diff --git a/src/openrct2/ride/gentle/ghost_train.c b/src/openrct2/ride/gentle/ghost_train.c index 1d37459a6c..42f4a23f9c 100644 --- a/src/openrct2/ride/gentle/ghost_train.c +++ b/src/openrct2/ride/gentle/ghost_train.c @@ -147,7 +147,7 @@ static const uint32 ghost_train_track_pieces_brakes[4] = { }; /** rct2: 0x00770BEC */ -static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -174,7 +174,7 @@ static void paint_ghost_train_track_flat(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x00770BFC */ -static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -217,7 +217,7 @@ static void paint_ghost_train_track_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x00770C0C */ -static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -258,7 +258,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 48, 0x20); } -static void paint_ghost_train_track_25_deg_up_to_flat_shared(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_25_deg_up_to_flat_shared(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -285,7 +285,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat_shared(uint8 rideIndex, ui } /** rct2: 0x00770C1C */ -static void paint_ghost_train_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_ghost_train_track_25_deg_up_to_flat_shared(rideIndex, trackSequence, direction, height, mapElement); @@ -298,13 +298,13 @@ static void paint_ghost_train_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tra } /** rct2: 0x00770C2C */ -static void paint_ghost_train_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_ghost_train_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00770C3C */ -static void paint_ghost_train_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_ghost_train_track_25_deg_up_to_flat_shared(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); @@ -317,13 +317,13 @@ static void paint_ghost_train_track_flat_to_25_deg_down(uint8 rideIndex, uint8 t } /** rct2: 0x00770C4C */ -static void paint_ghost_train_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_ghost_train_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00770C5C, 0x00770C6C, 0x00770C7C */ -static void paint_ghost_train_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -363,7 +363,7 @@ static void paint_ghost_train_station(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x00770C9C */ -static void paint_ghost_train_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], ghost_train_track_pieces_quarter_turn_3_tiles, NULL, defaultRightQuarterTurn3TilesBoundLengths, defaultRightQuarterTurn3TilesBoundOffsets, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_0); @@ -375,7 +375,7 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles(uint8 rideIndex, break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -387,14 +387,14 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles(uint8 rideIndex, } /** rct2: 0x00770CAC */ -static void paint_ghost_train_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_ghost_train_track_right_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x00770CAC */ -static void paint_ghost_train_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(3, height, 0, direction, gTrackColours[SCHEME_TRACK], ghost_train_track_pieces_quarter_turn_1_tile, get_current_rotation()); track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0); @@ -405,13 +405,13 @@ static void paint_ghost_train_track_left_quarter_turn_1_tile(uint8 rideIndex, ui } /** rct2: 0x00770CBC */ -static void paint_ghost_train_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_ghost_train_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x00770CCC */ -static void paint_ghost_train_track_spinning_tunnel(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_spinning_tunnel(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = ghost_train_track_pieces_spinning_tunnel_track[direction] | gTrackColours[SCHEME_TRACK]; @@ -436,7 +436,7 @@ static void paint_ghost_train_track_spinning_tunnel(uint8 rideIndex, uint8 track } /** rct2: 0x00770CDC */ -static void paint_ghost_train_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_ghost_train_track_brakes(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -465,7 +465,7 @@ static void paint_ghost_train_track_brakes(uint8 rideIndex, uint8 trackSequence, /** * rct2: 0x00770924 */ -TRACK_PAINT_FUNCTION get_track_paint_function_ghost_train(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_ghost_train(sint32 trackType, sint32 direction) { switch(trackType) { case TRACK_ELEM_FLAT: return paint_ghost_train_track_flat; diff --git a/src/openrct2/ride/gentle/haunted_house.c b/src/openrct2/ride/gentle/haunted_house.c index 16b5c0430e..49982618d4 100644 --- a/src/openrct2/ride/gentle/haunted_house.c +++ b/src/openrct2/ride/gentle/haunted_house.c @@ -84,11 +84,11 @@ static void paint_haunted_house_structure(uint8 rideIndex, uint8 direction, sint /** * rct2: 0x0076E9B0 */ -static void paint_haunted_house(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_haunted_house(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -104,7 +104,7 @@ static void paint_haunted_house(uint8 rideIndex, uint8 trackSequence, uint8 dire case 7: paint_haunted_house_structure(rideIndex, direction, -32, -32, 2, height + 3); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: // top @@ -132,7 +132,7 @@ static void paint_haunted_house(uint8 rideIndex, uint8 trackSequence, uint8 dire /** * rct2: 0x0076E7B0 */ -TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/gentle/maze.c b/src/openrct2/ride/gentle/maze.c index 3e6dd680b9..20803cfb90 100644 --- a/src/openrct2/ride/gentle/maze.c +++ b/src/openrct2/ride/gentle/maze.c @@ -49,20 +49,20 @@ enum { /** * rct: 0x004ACF4A */ -static void maze_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) { +static void maze_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint16 maze_entry = mapElement->properties.track.maze_entry; maze_entry = rol16(maze_entry, direction * 4); uint32 rotation = get_current_rotation(); // draw ground - int image_id = SPR_TERRAIN_DIRT | gTrackColours[SCHEME_MISC]; + sint32 image_id = SPR_TERRAIN_DIRT | gTrackColours[SCHEME_MISC]; sub_98196C(image_id, 0, 0, 32, 32, 0, height, rotation); wooden_a_supports_paint_setup((rotation & 1) ? 0 : 1, 0, height, gTrackColours[SCHEME_3], NULL); paint_util_set_segment_support_height(SEGMENTS_ALL & ~SEGMENT_C4, 0xFFFF, 0); - int base_image_id = 0; + sint32 base_image_id = 0; switch (get_ride(rideIndex)->track_colour_supports[0]) { case 0: base_image_id = SPR_MAZE_BASE_BRICK; break; case 1: base_image_id = SPR_MAZE_BASE_HEDGE; break; @@ -177,7 +177,7 @@ static void maze_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 directi /** * rct2: 0x008A81E8 */ -TRACK_PAINT_FUNCTION get_track_paint_function_maze(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_maze(sint32 trackType, sint32 direction) { if (trackType != TRACK_ELEM_MAZE) { return NULL; } diff --git a/src/openrct2/ride/gentle/merry_go_round.c b/src/openrct2/ride/gentle/merry_go_round.c index 52734fa038..e8fa488643 100644 --- a/src/openrct2/ride/gentle/merry_go_round.c +++ b/src/openrct2/ride/gentle/merry_go_round.c @@ -78,7 +78,7 @@ static void paint_merry_go_round_structure(uint8 rideIndex, uint8 direction, sin && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) { - for (int peep = 0; peep <= 14; peep += 2) { + for (sint32 peep = 0; peep <= 14; peep += 2) { if (vehicle->num_peeps <= peep) { break; } @@ -103,11 +103,11 @@ static void paint_merry_go_round_structure(uint8 rideIndex, uint8 direction, sin /** * rct2: 0x00761B0C */ -static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -126,7 +126,7 @@ static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 dir case 8: paint_merry_go_round_structure(rideIndex, direction, -32, 0, height); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: // top @@ -154,7 +154,7 @@ static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 dir /** * rct2: 0x0076190C */ -TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/gentle/mini_golf.c b/src/openrct2/ride/gentle/mini_golf.c index 1e949a8b84..85d097e713 100644 --- a/src/openrct2/ride/gentle/mini_golf.c +++ b/src/openrct2/ride/gentle/mini_golf.c @@ -461,7 +461,7 @@ static bool mini_golf_paint_util_should_draw_fence(rct_map_element * mapElement) } /** rct2: 0x0087F10C */ -static void paint_mini_golf_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -498,7 +498,7 @@ static void paint_mini_golf_track_flat(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x0087F11C */ -static void paint_mini_golf_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -533,7 +533,7 @@ static void paint_mini_golf_track_25_deg_up(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x0087F12C */ -static void paint_mini_golf_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -568,7 +568,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x0087F13C */ -static void paint_mini_golf_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -603,25 +603,25 @@ static void paint_mini_golf_track_25_deg_up_to_flat(uint8 rideIndex, uint8 track } /** rct2: 0x0087F14C */ -static void paint_mini_golf_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_golf_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0087F15C */ -static void paint_mini_golf_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_golf_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0087F16C */ -static void paint_mini_golf_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_golf_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0087F17C, 0x0087F18C, 0x0087F19C */ -static void paint_mini_golf_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; rct_ride * ride = get_ride(rideIndex); @@ -676,7 +676,7 @@ static void paint_mini_golf_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x0087F1AC */ -static void paint_mini_golf_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -743,12 +743,12 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(uint8 rideIndex, uint } /** rct2: 0x0087F1BC */ -static void paint_mini_golf_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_golf_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } -static void paint_mini_golf_hole_ab(uint8 trackSequence, uint8 direction, int height, const uint32 sprites[4][2][2]) +static void paint_mini_golf_hole_ab(uint8 trackSequence, uint8 direction, sint32 height, const uint32 sprites[4][2][2]) { uint32 imageId; @@ -782,19 +782,19 @@ static void paint_mini_golf_hole_ab(uint8 trackSequence, uint8 direction, int he } /** rct2: 0x0087F1CC */ -static void paint_mini_golf_hole_a(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_hole_a(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_golf_hole_ab(trackSequence, direction, height, mini_golf_track_sprites_hole_a); } /** rct2: 0x0087F1DC */ -static void paint_mini_golf_hole_b(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_hole_b(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_golf_hole_ab(trackSequence, direction, height, mini_golf_track_sprites_hole_b); } /** rct2: 0x0087F1EC */ -static void paint_mini_golf_hole_c(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_hole_c(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -841,11 +841,11 @@ static void paint_mini_golf_hole_c(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x0087F1FC */ -static void paint_mini_golf_hole_d(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_hole_d(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; - int supportType = (direction & 1); + sint32 supportType = (direction & 1); if (trackSequence == 2) supportType = 1 - supportType; bool drewSupports = wooden_a_supports_paint_setup(supportType, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -907,11 +907,11 @@ static void paint_mini_golf_hole_d(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x0087F1FC */ -static void paint_mini_golf_hole_e(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_golf_hole_e(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; - int supportType = (direction & 1); + sint32 supportType = (direction & 1); if (trackSequence == 2) supportType = 1 - supportType; bool drewSupports = wooden_a_supports_paint_setup(supportType, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -975,7 +975,7 @@ static void paint_mini_golf_hole_e(uint8 rideIndex, uint8 trackSequence, uint8 d /** * rct2: 0x0087EDC4 */ -TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: return paint_mini_golf_track_flat; @@ -1022,7 +1022,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(int trackType, int direc /** * rct2: 0x006D42F0 */ -void vehicle_visual_mini_golf_player(int x, int imageDirection, int y, int z, rct_vehicle *vehicle) +void vehicle_visual_mini_golf_player(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle) { if (vehicle->num_peeps == 0) { return; @@ -1051,7 +1051,7 @@ void vehicle_visual_mini_golf_player(int x, int imageDirection, int y, int z, rc /** * rct2: 0x006D43C6 */ -void vehicle_visual_mini_golf_ball(int x, int imageDirection, int y, int z, rct_vehicle *vehicle) +void vehicle_visual_mini_golf_ball(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle) { if (vehicle->mini_golf_current_animation != 1) { return; diff --git a/src/openrct2/ride/gentle/mini_helicopters.c b/src/openrct2/ride/gentle/mini_helicopters.c index 2a341eca13..7048e0a036 100644 --- a/src/openrct2/ride/gentle/mini_helicopters.c +++ b/src/openrct2/ride/gentle/mini_helicopters.c @@ -24,7 +24,7 @@ #include "../../world/map.h" /** rct2: 0x */ -static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -57,7 +57,7 @@ static void paint_mini_helicopters_track_station(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x0081F348 */ -static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; uint32 imageId; @@ -81,7 +81,7 @@ static void paint_mini_helicopters_track_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x0081F368 */ -static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; uint32 imageId; @@ -118,7 +118,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x0081F358 */ -static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; uint32 imageId; @@ -155,7 +155,7 @@ static void paint_mini_helicopters_track_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x0081F378 */ -static void paint_mini_helicopters_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; uint32 imageId; @@ -192,25 +192,25 @@ static void paint_mini_helicopters_track_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x */ -static void paint_mini_helicopters_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_helicopters_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0081F388 */ -static void paint_mini_helicopters_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_helicopters_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0081F3A8 */ -static void paint_mini_helicopters_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_helicopters_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0081F3E8 */ -static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation()); track_paint_util_left_quarter_turn_3_tiles_tunnel(height, TUNNEL_0, direction, trackSequence); @@ -235,14 +235,14 @@ static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(uint8 rideInd static const uint8 mini_helicopters_right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0}; /** rct2: 0x0081F3F8 */ -static void paint_mini_helicopters_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mini_helicopters_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_mini_helicopters_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x0081F408 */ -static void paint_mini_helicopters_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(1, height, 0, direction, gTrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile, get_current_rotation()); track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height, 0, TUNNEL_0, 0, TUNNEL_0); @@ -252,7 +252,7 @@ static void paint_mini_helicopters_track_left_quarter_turn_1_tile(uint8 rideInde } /** rct2: 0x0081F418 */ -static void paint_mini_helicopters_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_mini_helicopters_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_mini_helicopters_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } @@ -260,7 +260,7 @@ static void paint_mini_helicopters_track_right_quarter_turn_1_tile(uint8 rideInd /** * rct2: 0x0081F268 */ -TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/gentle/monorail_cycles.c b/src/openrct2/ride/gentle/monorail_cycles.c index 4031d23076..ee29a93aa2 100644 --- a/src/openrct2/ride/gentle/monorail_cycles.c +++ b/src/openrct2/ride/gentle/monorail_cycles.c @@ -184,7 +184,7 @@ static paint_struct * paint_monorail_cycles_util_7c( } /** rct2: 0x0088AD48 */ -static void paint_monorail_cycles_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = monorail_cycles_track_pieces_flat[(direction & 1)] | gTrackColours[SCHEME_TRACK]; paint_monorail_cycles_util_7c((bool) (direction & 1), imageId, 0, 0, 32, 20, 3, height, 0, 6, height, get_current_rotation()); @@ -202,7 +202,7 @@ static void paint_monorail_cycles_track_flat(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x0088ADD8 */ -static void paint_monorail_cycles_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -235,7 +235,7 @@ static void paint_monorail_cycles_station(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0088AD88 */ -static void paint_monorail_cycles_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], monorail_cycles_track_pieces_flat_quarter_turn_3_tiles, get_current_rotation()); track_paint_util_left_quarter_turn_3_tiles_tunnel(height, TUNNEL_0, direction, trackSequence); @@ -260,7 +260,7 @@ static void paint_monorail_cycles_track_left_quarter_turn_3_tiles(uint8 rideInde static const uint8 monorail_cycles_right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0}; /** rct2: 0x0088AD98 */ -static void paint_monorail_cycles_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = monorail_cycles_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_monorail_cycles_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); @@ -281,12 +281,12 @@ static const sint8 monorail_cycles_track_right_quarter_turn_5_tiles_support_spec }; /** rct2: 0x0088ADB8 */ -static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint(1, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], monorail_cycles_track_pieces_flat_quarter_turn_5_tiles, NULL, defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesBoundOffsets, get_current_rotation()); - int supportHeight = height + monorail_cycles_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; - int supportSpecial = monorail_cycles_track_right_quarter_turn_5_tiles_support_special[direction][trackSequence]; + sint32 supportHeight = height + monorail_cycles_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence]; + sint32 supportSpecial = monorail_cycles_track_right_quarter_turn_5_tiles_support_special[direction][trackSequence]; switch (trackSequence) { case 0: metal_a_supports_paint_setup((direction & 1) ? 5 : 4, 4, supportSpecial, supportHeight, gTrackColours[SCHEME_SUPPORTS]); @@ -336,14 +336,14 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(uint8 rideInd } /** rct2: 0x0088ADA8 */ -static void paint_monorail_cycles_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_monorail_cycles_track_right_quarter_turn_5_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x0088ADC8 */ -static void paint_monorail_cycles_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -389,7 +389,7 @@ static void paint_monorail_cycles_track_s_bend_left(uint8 rideIndex, uint8 track } /** rct2: 0x*/ -static void paint_monorail_cycles_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_cycles_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -437,7 +437,7 @@ static void paint_monorail_cycles_track_s_bend_right(uint8 rideIndex, uint8 trac /** * rct2: 0x0088ac88 */ -TRACK_PAINT_FUNCTION get_track_paint_function_monorail_cycles(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_monorail_cycles(sint32 trackType, sint32 direction) { switch(trackType) { case TRACK_ELEM_FLAT: return paint_monorail_cycles_track_flat; diff --git a/src/openrct2/ride/gentle/observation_tower.c b/src/openrct2/ride/gentle/observation_tower.c index 843927eb4e..c8e87ef9e7 100644 --- a/src/openrct2/ride/gentle/observation_tower.c +++ b/src/openrct2/ride/gentle/observation_tower.c @@ -34,10 +34,10 @@ enum * * rct2: 0x006D6258 */ -void vehicle_visual_observation_tower(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_observation_tower(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { - int image_id; - int baseImage_id = (vehicle->restraints_position / 64); + sint32 image_id; + sint32 baseImage_id = (vehicle->restraints_position / 64); if (vehicle->restraints_position >= 64) { if ((imageDirection / 8) && (imageDirection / 8) != 3) { baseImage_id *= 2; @@ -69,11 +69,11 @@ void vehicle_visual_observation_tower(int x, int imageDirection, int y, int z, r } /** rct2: 0x0070DD6C */ -static void paint_observation_tower_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_observation_tower_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -105,7 +105,7 @@ static void paint_observation_tower_base(uint8 rideIndex, uint8 trackSequence, u return; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; @@ -123,7 +123,7 @@ static void paint_observation_tower_base(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x0070DD7C */ -static void paint_observation_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_observation_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence == 1) { return; @@ -147,7 +147,7 @@ static void paint_observation_tower_section(uint8 rideIndex, uint8 trackSequence /** * rct2: 0x0070DC5C */ -TRACK_PAINT_FUNCTION get_track_paint_function_observation_tower(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_observation_tower(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_TOWER_BASE: diff --git a/src/openrct2/ride/gentle/space_rings.c b/src/openrct2/ride/gentle/space_rings.c index e042f2f9bb..7b3dfe238d 100644 --- a/src/openrct2/ride/gentle/space_rings.c +++ b/src/openrct2/ride/gentle/space_rings.c @@ -37,7 +37,7 @@ static const uint32 space_rings_fence_sprites[] = { }; /** rct2: 0x00768A3B */ -static void paint_space_rings_structure(rct_ride * ride, uint8 direction, uint32 segment, int height) +static void paint_space_rings_structure(rct_ride * ride, uint8 direction, uint32 segment, sint32 height) { rct_map_element * savedMapElement = g_currently_drawn_item; @@ -47,7 +47,7 @@ static void paint_space_rings_structure(rct_ride * ride, uint8 direction, uint3 rct_ride_entry * ride_type = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; - int frameNum = direction; + sint32 frameNum = direction; uint32 baseImageId = ride_type->vehicles[0].base_image_id; @@ -84,11 +84,11 @@ static void paint_space_rings_structure(rct_ride * ride, uint8 direction, uint3 } /** rct2: 0x00767C40 */ -static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -121,7 +121,7 @@ static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direct case 8: paint_space_rings_structure(ride, direction, 3, height + 3); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 0: cornerSegments = 0; break; case 1: cornerSegments = SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; @@ -141,7 +141,7 @@ static void paint_space_rings(uint8 rideIndex, uint8 trackSequence, uint8 direct /** * rct2: 0x0x00767A40 */ -TRACK_PAINT_FUNCTION get_track_paint_function_space_rings(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_space_rings(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/gentle/spiral_slide.c b/src/openrct2/ride/gentle/spiral_slide.c index efe2240185..317c04c8c1 100644 --- a/src/openrct2/ride/gentle/spiral_slide.c +++ b/src/openrct2/ride/gentle/spiral_slide.c @@ -51,7 +51,7 @@ enum { SPIRAL_SLIDE_PEEP = 20568, // 46 sprites per direction }; -static void spiral_slide_paint_tile_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { +static void spiral_slide_paint_tile_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id = 0; if (direction == 0) image_id = SPIRAL_SLIDE_RIGHT_R0 | gTrackColours[SCHEME_TRACK]; @@ -63,7 +63,7 @@ static void spiral_slide_paint_tile_right(uint8 rideIndex, uint8 trackSequence, } -static void spiral_slide_paint_tile_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { +static void spiral_slide_paint_tile_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id = 0; if (direction == 0) image_id = SPIRAL_SLIDE_LEFT_R0 | gTrackColours[SCHEME_TRACK]; @@ -74,7 +74,7 @@ static void spiral_slide_paint_tile_left(uint8 rideIndex, uint8 trackSequence, u sub_98197C(image_id, 16, 16, 16, 16, 108, height, 0, 16, height + 3, get_current_rotation()); } -static void spiral_slide_paint_tile_front(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { +static void spiral_slide_paint_tile_front(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 image_id = 0; rct_ride *ride = get_ride(rideIndex); @@ -114,7 +114,7 @@ static void spiral_slide_paint_tile_front(uint8 rideIndex, uint8 trackSequence, if (slide_progress < 46) { - int offset = SPIRAL_SLIDE_PEEP + 46 * direction; + sint32 offset = SPIRAL_SLIDE_PEEP + 46 * direction; rct_xyz8 boundingBox = { .z = 108 }; @@ -161,10 +161,10 @@ static const uint32 spiral_slide_fence_sprites[] = { /** * rct: 0x007485C8 */ -static void paint_spiral_slide(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) { +static void paint_spiral_slide(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { trackSequence = track_map_2x2[direction][trackSequence]; - int edges = edges_2x2[trackSequence]; + sint32 edges = edges_2x2[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -189,7 +189,7 @@ static void paint_spiral_slide(uint8 rideIndex, uint8 trackSequence, uint8 direc /** * rct2: 0x0074840C */ -TRACK_PAINT_FUNCTION get_track_paint_function_spiral_slide(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_spiral_slide(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_2_X_2) { return NULL; } diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 4bceeb4c47..945f2948f2 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -125,7 +125,7 @@ uint8 gTypeToRideEntryIndexMap[TYPE_TO_RIDE_ENTRY_SLOTS]; #pragma endregion -static const int RideInspectionInterval[] = { +static const sint32 RideInspectionInterval[] = { 10, 20, 30, 45, 60, 120, 0, 0 }; @@ -139,11 +139,11 @@ rct_ride_measurement gRideMeasurements[MAX_RIDE_MEASUREMENTS]; uint16 gRideCount; bool gGotoStartPlacementMode = false; -int gRideRemoveTrackPieceCallbackX; -int gRideRemoveTrackPieceCallbackY; -int gRideRemoveTrackPieceCallbackZ; -int gRideRemoveTrackPieceCallbackDirection; -int gRideRemoveTrackPieceCallbackType; +sint32 gRideRemoveTrackPieceCallbackX; +sint32 gRideRemoveTrackPieceCallbackY; +sint32 gRideRemoveTrackPieceCallbackZ; +sint32 gRideRemoveTrackPieceCallbackDirection; +sint32 gRideRemoveTrackPieceCallbackType; money16 gTotalRideValue; uint32 gSamePriceThroughoutParkA; @@ -198,29 +198,29 @@ uint8 gRideEntranceExitPlaceDirection; uint8 gLastEntranceStyle; // Static function declarations -rct_peep *find_closest_mechanic(int x, int y, int forInspection); -static void ride_breakdown_status_update(int rideIndex); -static void ride_breakdown_update(int rideIndex); -static void ride_call_closest_mechanic(int rideIndex); -static void ride_call_mechanic(int rideIndex, rct_peep *mechanic, int forInspection); +rct_peep *find_closest_mechanic(sint32 x, sint32 y, sint32 forInspection); +static void ride_breakdown_status_update(sint32 rideIndex); +static void ride_breakdown_update(sint32 rideIndex); +static void ride_call_closest_mechanic(sint32 rideIndex); +static void ride_call_mechanic(sint32 rideIndex, rct_peep *mechanic, sint32 forInspection); static void ride_chairlift_update(rct_ride *ride); -static void ride_entrance_exit_connected(rct_ride* ride, int ride_idx); -static int ride_get_new_breakdown_problem(rct_ride *ride); +static void ride_entrance_exit_connected(rct_ride* ride, sint32 ride_idx); +static sint32 ride_get_new_breakdown_problem(rct_ride *ride); static void ride_inspection_update(rct_ride *ride); -static void ride_mechanic_status_update(int rideIndex, int mechanicStatus); -static void ride_music_update(int rideIndex); -static void ride_shop_connected(rct_ride* ride, int ride_idx); +static void ride_mechanic_status_update(sint32 rideIndex, sint32 mechanicStatus); +static void ride_music_update(sint32 rideIndex); +static void ride_shop_connected(rct_ride* ride, insint32t ride_idx); static void ride_spiral_slide_update(rct_ride *ride); -static void ride_update(int rideIndex); -static void ride_update_vehicle_colours(int rideIndex); +static void ride_update(sint32 rideIndex); +static void ride_update_vehicle_colours(sint32 rideIndex); static void ride_set_vehicle_colours_to_random_preset(rct_ride *ride, uint8 preset_index); -static void maze_entrance_hedge_removal(int x, int y, rct_map_element *mapElement); +static void maze_entrance_hedge_removal(sint32 x, sint32 y, rct_map_element *mapElement); void loc_6DDF9C(rct_ride *ride, rct_map_element *mapElement); -static void maze_entrance_hedge_replacement(int x, int y, rct_map_element *mapElement); -bool sub_6CA2DF(int *trackType, int *trackDirection, int *rideIndex, int *edxRS16, int *x, int *y, int *z, int *properties); -money32 sub_6CA162(int rideIndex, int trackType, int trackDirection, int edxRS16, int x, int y, int z); +static void maze_entrance_hedge_replacement(sint32 x, sint32 y, rct_map_element *mapElement); +bool sub_6CA2DF(sint32 *trackType, sint32 *trackDirection, sint32 *rideIndex, sint32 *edxRS16, sint32 *x, sint32 *y, sint32 *z, sint32 *properties); +money32 sub_6CA162(sint32 rideIndex, sint32 trackType, sint32 trackDirection, sint32 edxRS16, sint32 x, sint32 y, sint32 z); -rct_ride *get_ride(int index) +rct_ride *get_ride(sint32 index) { if (index < 0 || index >= MAX_RIDES) { @@ -230,7 +230,7 @@ rct_ride *get_ride(int index) return &gRideList[index]; } -rct_ride_entry *get_ride_entry(int index) +rct_ride_entry *get_ride_entry(sint32 index) { if (index < 0 || index >= object_entry_group_counts[OBJECT_TYPE_RIDE]) { @@ -240,7 +240,7 @@ rct_ride_entry *get_ride_entry(int index) return gRideEntries[index]; } -void get_ride_entry_name(char *name, int index) +void get_ride_entry_name(char *name, sint32 index) { if (index < 0 || index >= object_entry_group_counts[OBJECT_TYPE_RIDE]) { @@ -253,7 +253,7 @@ void get_ride_entry_name(char *name, int index) name[8] = '\0'; } -rct_ride_measurement *get_ride_measurement(int index) +rct_ride_measurement *get_ride_measurement(sint32 index) { return &gRideMeasurements[index]; } @@ -321,10 +321,10 @@ uint8 *get_ride_entry_indices_for_ride_type(uint8 rideType) return entryIndexList; } -int ride_get_count() +sint32 ride_get_count() { rct_ride *ride; - int i, count = 0; + sint32 i, count = 0; FOR_ALL_RIDES(i, ride) count++; @@ -332,18 +332,18 @@ int ride_get_count() return count; } -int ride_get_total_queue_length(rct_ride *ride) +sint32 ride_get_total_queue_length(rct_ride *ride) { - int i, queueLength = 0; + sint32 i, queueLength = 0; for (i = 0; i < 4; i++) if (ride->entrances[i] != 0xFFFF) queueLength += ride->queue_length[i]; return queueLength; } -int ride_get_max_queue_time(rct_ride *ride) +sint32 ride_get_max_queue_time(rct_ride *ride) { - int i, queueTime = 0; + sint32 i, queueTime = 0; for (i = 0; i < 4; i++) if (ride->entrances[i] != 0xFFFF) queueTime = max(queueTime, ride->queue_time[i]); @@ -356,7 +356,7 @@ int ride_get_max_queue_time(rct_ride *ride) */ void ride_update_favourited_stat() { - int i; + sint32 i; rct_ride *ride; uint16 spriteIndex; rct_peep* peep; @@ -379,22 +379,22 @@ void ride_update_favourited_stat() window_invalidate_by_class(WC_RIDE_LIST); } -money32 get_shop_item_cost(int shopItem) +money32 get_shop_item_cost(sint32 shopItem) { return ShopItemStats[shopItem].cost; } -money16 get_shop_base_value(int shopItem) +money16 get_shop_base_value(sint32 shopItem) { return ShopItemStats[shopItem].base_value; } -money16 get_shop_cold_value(int shopItem) +money16 get_shop_cold_value(sint32 shopItem) { return ShopItemStats[shopItem].cold_value; } -money16 get_shop_hot_value(int shopItem) +money16 get_shop_hot_value(sint32 shopItem) { return ShopItemStats[shopItem].hot_value; } @@ -413,7 +413,7 @@ static money32 ride_calculate_income_per_hour(rct_ride *ride) money32 customersPerHour = ride_customers_per_hour(ride); money32 priceMinusCost = ride_get_price(ride); - int currentShopItem = entry->shop_item; + sint32 currentShopItem = entry->shop_item; if (currentShopItem != SHOP_ITEM_NONE) { priceMinusCost -= get_shop_item_cost(currentShopItem); } @@ -441,7 +441,7 @@ static money32 ride_calculate_income_per_hour(rct_ride *ride) * dl ride index * esi result map element */ -bool ride_try_get_origin_element(int rideIndex, rct_xy_element *output) +bool ride_try_get_origin_element(sint32 rideIndex, rct_xy_element *output) { rct_map_element *resultMapElement = NULL; @@ -489,7 +489,7 @@ bool ride_try_get_origin_element(int rideIndex, rct_xy_element *output) * Use track_block_get_next if you are unsure if you are * on the first element of a track block */ -bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 rideIndex, uint8 direction_start, rct_xy_element *output, int *z, int *direction) +bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 rideIndex, uint8 direction_start, rct_xy_element *output, sint32 *z, sint32 *direction) { rct_ride* ride = get_ride(rideIndex); @@ -550,7 +550,7 @@ bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 ri * * rct2: 0x006C60C2 */ -bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, int *z, int *direction) +bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32 *z, sint32 *direction) { uint8 rideIndex = input->element->properties.track.ride_index; rct_ride* ride = get_ride(rideIndex); @@ -561,9 +561,9 @@ bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, int *z, const rct_track_coordinates* trackCoordinate = get_track_coord_from_ride(ride, input->element->properties.track.type); - int x = input->x; - int y = input->y; - int OriginZ = input->element->base_height * 8; + sint32 x = input->x; + sint32 y = input->y; + sint32 OriginZ = input->element->base_height * 8; uint8 rotation = input->element->type & MAP_ELEMENT_DIRECTION_MASK; switch (rotation){ @@ -710,7 +710,7 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride * higher two bytes of ecx and edx where as outTrackBeginEnd.end_x and * outTrackBeginEnd.end_y will be in the lower two bytes (cx and dx). */ -bool track_block_get_previous(int x, int y, rct_map_element *mapElement, track_begin_end *outTrackBeginEnd) +bool track_block_get_previous(sint32 x, sint32 y, rct_map_element *mapElement, track_begin_end *outTrackBeginEnd) { uint8 rideIndex = mapElement->properties.track.ride_index; rct_ride* ride = get_ride(rideIndex); @@ -721,7 +721,7 @@ bool track_block_get_previous(int x, int y, rct_map_element *mapElement, track_b const rct_track_coordinates* trackCoordinate = get_track_coord_from_ride(ride, mapElement->properties.track.type); - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; uint8 rotation = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; switch (rotation){ @@ -761,12 +761,12 @@ bool track_block_get_previous(int x, int y, rct_map_element *mapElement, track_b * bx result y * esi input / output map element */ -int ride_find_track_gap(rct_xy_element *input, rct_xy_element *output) +sint32 ride_find_track_gap(rct_xy_element *input, rct_xy_element *output) { rct_window *w; rct_ride *ride; track_circuit_iterator it, slowIt; - int rideIndex; + sint32 rideIndex; assert(map_element_get_type(input->element) == MAP_ELEMENT_TYPE_TRACK); rideIndex = input->element->properties.track.ride_index; @@ -813,7 +813,7 @@ int ride_find_track_gap(rct_xy_element *input, rct_xy_element *output) * * rct2: 0x006AF561 */ -void ride_get_status(int rideIndex, rct_string_id *formatSecondary, int *argument) +void ride_get_status(sint32 rideIndex, rct_string_id *formatSecondary, sint32 *argument) { rct_ride *ride = get_ride(rideIndex); @@ -866,23 +866,23 @@ void ride_get_status(int rideIndex, rct_string_id *formatSecondary, int *argumen } } -int ride_get_total_length(rct_ride *ride) +sint32 ride_get_total_length(rct_ride *ride) { - int i, totalLength = 0; + sint32 i, totalLength = 0; for (i = 0; i < ride->num_stations; i++) totalLength += ride->length[i]; return totalLength; } -int ride_get_total_time(rct_ride *ride) +sint32 ride_get_total_time(rct_ride *ride) { - int i, totalTime = 0; + sint32 i, totalTime = 0; for (i = 0; i < ride->num_stations; i++) totalTime += ride->time[i]; return totalTime; } -int ride_can_have_multiple_circuits(rct_ride *ride) +sint32 ride_can_have_multiple_circuits(rct_ride *ride) { if (!(RideData4[ride->type].flags & RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS)) return 0; @@ -911,12 +911,12 @@ int ride_can_have_multiple_circuits(rct_ride *ride) */ void ride_init_all() { - for (int i = 0; i < MAX_RIDES; i++) { + for (sint32 i = 0; i < MAX_RIDES; i++) { rct_ride *ride = get_ride(i); ride->type = RIDE_TYPE_NULL; } - for (int i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { + for (sint32 i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { rct_ride_measurement *ride_measurement = get_ride_measurement(i); ride_measurement->ride_index = 255; } @@ -928,7 +928,7 @@ void ride_init_all() */ void reset_all_ride_build_dates() { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) @@ -939,7 +939,7 @@ void reset_all_ride_build_dates() #pragma region Construction -static int ride_check_if_construction_allowed(rct_ride *ride) +static sint32 ride_check_if_construction_allowed(rct_ride *ride) { rct_ride_entry *rideType = get_ride_entry_by_ride(ride); if (rideType == NULL) { @@ -963,7 +963,7 @@ static int ride_check_if_construction_allowed(rct_ride *ride) return 1; } -static rct_window *ride_create_or_find_construction_window(int rideIndex) +static rct_window *ride_create_or_find_construction_window(sint32 rideIndex) { rct_window *w; @@ -980,9 +980,9 @@ static rct_window *ride_create_or_find_construction_window(int rideIndex) return w; } -static int ride_create_ride(ride_list_item listItem) +static sint32 ride_create_ride(ride_list_item listItem) { - int eax, ebx, ecx, edx, esi, edi, ebp; + sint32 eax, ebx, ecx, edx, esi, edi, ebp; edx = listItem.ride_type_and_entry; eax = 0; ecx = 0; @@ -1011,7 +1011,7 @@ void ride_construct_new(ride_list_item listItem) * * rct2: 0x006B4857 */ -void ride_construct(int rideIndex) +void ride_construct(sint32 rideIndex) { rct_xy_element trackElement; @@ -1075,7 +1075,7 @@ static void ride_remove_vehicles(rct_ride *ride) * * rct2: 0x006DD4AC */ -void ride_clear_for_construction(int rideIndex) +void ride_clear_for_construction(sint32 rideIndex) { rct_ride *ride; rct_window *w; @@ -1099,13 +1099,13 @@ void ride_clear_for_construction(int rideIndex) * * rct2: 0x006664DF */ -static void ride_remove_peeps(int rideIndex) +static void ride_remove_peeps(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); // Find first station - int stationIndex = -1; - for (int i = 0; i < 4; i++) { + sint32 stationIndex = -1; + for (sint32 i = 0; i < 4; i++) { if (ride->station_starts[i] != 0xFFFF) { stationIndex = i; break; @@ -1113,10 +1113,10 @@ static void ride_remove_peeps(int rideIndex) } // Get exit position and direction - int exitX = 0; - int exitY = 0; - int exitZ = 0; - int exitDirection = 255; + sint32 exitX = 0; + sint32 exitY = 0; + sint32 exitZ = 0; + sint32 exitDirection = 255; if (stationIndex != -1) { uint16 xy = ride->exits[stationIndex]; if (xy != 0xFFFF) { @@ -1157,9 +1157,9 @@ static void ride_remove_peeps(int rideIndex) invalidate_sprite_2((rct_sprite*)peep); if (exitDirection == 255) { - int x = peep->next_x + 16; - int y = peep->next_y + 16; - int z = peep->next_z * 8; + sint32 x = peep->next_x + 16; + sint32 y = peep->next_y + 16; + sint32 z = peep->next_z * 8; if (peep->next_var_29 & 4) z += 8; z++; @@ -1195,7 +1195,7 @@ static void ride_remove_peeps(int rideIndex) * di : output_element * bp : flags */ -int sub_6C683D(int* x, int* y, int* z, int direction, int type, uint16 extra_params, rct_map_element** output_element, uint16 flags) +sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_map_element** output_element, uint16 flags) { rct_map_element *mapElement = map_get_first_element_at(*x / 32, *y / 32); rct_map_element *successMapElement = NULL; @@ -1225,7 +1225,7 @@ int sub_6C683D(int* x, int* y, int* z, int direction, int type, uint16 extra_par // Possibly z should be & 0xF8 const rct_preview_track *trackBlock = get_track_def_from_ride_index(mapElement->properties.track.ride_index, type); - int sequence = mapElement->properties.track.sequence & 0x0F; + sint32 sequence = mapElement->properties.track.sequence & 0x0F; uint8 mapDirection = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; switch (mapDirection){ @@ -1248,10 +1248,10 @@ int sub_6C683D(int* x, int* y, int* z, int direction, int type, uint16 extra_par } *z -= trackBlock[sequence].z; - int start_x = *x, start_y = *y, start_z = *z; + sint32 start_x = *x, start_y = *y, start_z = *z; *z += trackBlock[0].z; - for (int i = 0; trackBlock[i].index != 0xFF; ++i){ - int cur_x = start_x, cur_y = start_y, cur_z = start_z; + for (sint32 i = 0; trackBlock[i].index != 0xFF; ++i){ + sint32 cur_x = start_x, cur_y = start_y, cur_z = start_z; switch (mapDirection){ case MAP_ELEMENT_DIRECTION_WEST: cur_x += trackBlock[i].x; @@ -1363,7 +1363,7 @@ void ride_remove_provisional_entrance_or_exit() void ride_restore_provisional_track_piece() { if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_TRACK) { - int x, y, z, direction, type, rideIndex, edxRS16; + sint32 x, y, z, direction, type, rideIndex, edxRS16; if (sub_6CA2DF(&type, &direction, &rideIndex, &edxRS16, &x, &y, &z, NULL)) { sub_6C96C0(); } else { @@ -1379,7 +1379,7 @@ void ride_remove_provisional_track_piece() return; } rct_ride *ride; - int rideIndex, x, y, z, direction; + sint32 rideIndex, x, y, z, direction; rideIndex = _currentRideIndex; @@ -1434,7 +1434,7 @@ void sub_6C96C0() void sub_6C9627() { - int x, y, z; + sint32 x, y, z; switch (_rideConstructionState) { case RIDE_CONSTRUCTION_STATE_SELECTED: @@ -1506,7 +1506,7 @@ static void ride_construction_reset_current_piece() */ void ride_construction_set_default_next_piece() { - int x, y, z, direction, rideIndex, trackType, curve, bank, slope; + sint32 x, y, z, direction, rideIndex, trackType, curve, bank, slope; rct_ride *ride; track_begin_end trackBeginEnd; rct_xy_element xyElement; @@ -1642,11 +1642,11 @@ void ride_select_next_section() { if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) { sub_6C9627(); - int x = _currentTrackBeginX; - int y = _currentTrackBeginY; - int z = _currentTrackBeginZ; - int direction = _currentTrackPieceDirection; - int type = _currentTrackPieceType; + sint32 x = _currentTrackBeginX; + sint32 y = _currentTrackBeginY; + sint32 z = _currentTrackBeginZ; + sint32 direction = _currentTrackPieceDirection; + sint32 type = _currentTrackPieceType; rct_map_element *mapElement; if (sub_6C683D(&x, &y, &z, direction & 3, type, 0, &mapElement, 0)) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_0; @@ -1698,11 +1698,11 @@ void ride_select_previous_section() { if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) { sub_6C9627(); - int x = _currentTrackBeginX; - int y = _currentTrackBeginY; - int z = _currentTrackBeginZ; - int direction = _currentTrackPieceDirection; - int type = _currentTrackPieceType; + sint32 x = _currentTrackBeginX; + sint32 y = _currentTrackBeginY; + sint32 z = _currentTrackBeginZ; + sint32 direction = _currentTrackPieceDirection; + sint32 type = _currentTrackPieceType; rct_map_element *mapElement; if (sub_6C683D(&x, &y, &z, direction & 3, type, 0, &mapElement, 0)) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_0; @@ -1742,9 +1742,9 @@ void ride_select_previous_section() * * rct2: 0x006CC2CA */ -static int ride_modify_entrance_or_exit(rct_map_element *mapElement, int x, int y) +static sint32 ride_modify_entrance_or_exit(rct_map_element *mapElement, sint32 x, sint32 y) { - int rideIndex, entranceType; + sint32 rideIndex, entranceType; rct_window *constructionWindow; rideIndex = mapElement->properties.entrance.ride_index; @@ -1753,7 +1753,7 @@ static int ride_modify_entrance_or_exit(rct_map_element *mapElement, int x, int if (entranceType != ENTRANCE_TYPE_RIDE_ENTRANCE && entranceType != ENTRANCE_TYPE_RIDE_EXIT) return 0; - int bl = (mapElement->properties.entrance.index & 0x70) >> 4; + sint32 bl = (mapElement->properties.entrance.index & 0x70) >> 4; // Get or create construction window for ride constructionWindow = window_find_by_class(WC_RIDE_CONSTRUCTION); @@ -1800,7 +1800,7 @@ static int ride_modify_entrance_or_exit(rct_map_element *mapElement, int x, int * * rct2: 0x006CC287 */ -static int ride_modify_maze(rct_map_element *mapElement, int x, int y) +static sint32 ride_modify_maze(rct_map_element *mapElement, sint32 x, sint32 y) { _currentRideIndex = mapElement->properties.track.ride_index; _rideConstructionState = RIDE_CONSTRUCTION_STATE_MAZE_BUILD; @@ -1817,9 +1817,9 @@ static int ride_modify_maze(rct_map_element *mapElement, int x, int y) * * rct2: 0x006CC056 */ -int ride_modify(rct_xy_element *input) +sint32 ride_modify(rct_xy_element *input) { - int rideIndex, x, y, z, direction, type; + sint32 rideIndex, x, y, z, direction, type; rct_xy_element mapElement, endOfTrackElement; rct_ride *ride; rct_ride_entry *rideType; @@ -1919,7 +1919,7 @@ int ride_modify(rct_xy_element *input) * * rct2: 0x006CC3FB */ -int sub_6CC3FB(int rideIndex) +sint32 sub_6CC3FB(sint32 rideIndex) { rct_ride *ride; rct_window *w; @@ -1972,7 +1972,7 @@ int sub_6CC3FB(int rideIndex) void ride_update_all() { rct_ride *ride; - int i; + sint32 i; // Remove all rides if scenario editor if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) { @@ -1995,7 +1995,7 @@ void ride_update_all() * * rct2: 0x006ABE73 */ -static void ride_update(int rideIndex) +static void ride_update(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -2006,7 +2006,7 @@ static void ride_update(int rideIndex) // Update stations if (ride->type != RIDE_TYPE_MAZE) - for (int i = 0; i < 4; i++) + for (sint32 i = 0; i < 4; i++) ride_update_station(ride, i); // Update financial statistics @@ -2046,7 +2046,7 @@ static void ride_update(int rideIndex) ride_inspection_update(ride); if (ride->status == RIDE_STATUS_TESTING && gConfigGeneral.no_test_crashes) { - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[i]); if (vehicle->status == VEHICLE_STATUS_CRASHED || vehicle->status == VEHICLE_STATUS_CRASHING) { @@ -2065,7 +2065,7 @@ static void ride_update(int rideIndex) */ static void ride_chairlift_update(rct_ride *ride) { - int x, y, z; + sint32 x, y, z; if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) return; @@ -2172,15 +2172,15 @@ static void ride_spiral_slide_update(rct_ride *ride) const uint8 current_rotation = get_current_rotation(); // Invalidate something related to station start - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (ride->station_starts[i] == 0xFFFF) continue; - int x = ride->station_starts[i] & 0xFF; - int y = ride->station_starts[i] >> 8; + sint32 x = ride->station_starts[i] & 0xFF; + sint32 y = ride->station_starts[i] >> 8; rct_map_element *mapElement = ride_get_station_start_track_element(ride, i); - int rotation = map_element_get_direction(mapElement); + sint32 rotation = map_element_get_direction(mapElement); x *= 32; y *= 32; x += ride_spiral_slide_main_tile_offset[rotation][current_rotation].x; @@ -2211,7 +2211,7 @@ static uint8 _breakdownProblemProbabilities[] = { */ static void ride_inspection_update(rct_ride *ride) { - int i; + sint32 i; if (gCurrentTicks & 2047) return; @@ -2222,7 +2222,7 @@ static void ride_inspection_update(rct_ride *ride) if (ride->last_inspection == 0) ride->last_inspection--; - int inspectionIntervalMinutes = RideInspectionInterval[ride->inspection_interval]; + sint32 inspectionIntervalMinutes = RideInspectionInterval[ride->inspection_interval]; if (inspectionIntervalMinutes == 0) return; @@ -2247,8 +2247,8 @@ static void ride_inspection_update(rct_ride *ride) } } -static int get_age_penalty(rct_ride *ride) { - int years; +static sint32 get_age_penalty(rct_ride *ride) { + sint32 years; years = date_get_year(gDateMonthsElapsed - ride->build_date); switch (years) { case 0: @@ -2273,7 +2273,7 @@ static int get_age_penalty(rct_ride *ride) { * * rct2: 0x006AC622 */ -static void ride_breakdown_update(int rideIndex) +static void ride_breakdown_update(sint32 rideIndex) { if (gCurrentTicks & 255) return; @@ -2285,7 +2285,7 @@ static void ride_breakdown_update(int rideIndex) ride->downtime_history[0]++; if (!(gCurrentTicks & 8191)) { - int totalDowntime = + sint32 totalDowntime = ride->downtime_history[0] + ride->downtime_history[1] + ride->downtime_history[2] + @@ -2308,7 +2308,7 @@ static void ride_breakdown_update(int rideIndex) return; // Calculate breakdown probability? - int unreliabilityAccumulator = ride->unreliability_factor + get_age_penalty(ride); + sint32 unreliabilityAccumulator = ride->unreliability_factor + get_age_penalty(ride); ride->reliability = max(0, ride->reliability - unreliabilityAccumulator); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE; @@ -2318,9 +2318,9 @@ static void ride_breakdown_update(int rideIndex) // // a 0.8% chance, less the breakdown factor which accumulates as the game // continues. - if ((ride->reliability == 0 || (int)(scenario_rand() & 0x2FFFFF) <= 1 + RIDE_INITIAL_RELIABILITY - ride->reliability) + if ((ride->reliability == 0 || (sint32)(scenario_rand() & 0x2FFFFF) <= 1 + RIDE_INITIAL_RELIABILITY - ride->reliability) && !gCheatsDisableAllBreakdowns) { - int breakdownReason = ride_get_new_breakdown_problem(ride); + sint32 breakdownReason = ride_get_new_breakdown_problem(ride); if (breakdownReason != -1) ride_prepare_breakdown(rideIndex, breakdownReason); } @@ -2330,9 +2330,9 @@ static void ride_breakdown_update(int rideIndex) * * rct2: 0x006B7294 */ -static int ride_get_new_breakdown_problem(rct_ride *ride) +static sint32 ride_get_new_breakdown_problem(rct_ride *ride) { - int availableBreakdownProblems, monthsOld, totalProbability, randomProbability, problemBits, breakdownProblem; + sint32 availableBreakdownProblems, monthsOld, totalProbability, randomProbability, problemBits, breakdownProblem; rct_ride_entry *entry; // Brake failure is more likely when its raining @@ -2391,9 +2391,9 @@ static int ride_get_new_breakdown_problem(rct_ride *ride) * * rct2: 0x006B7348 */ -void ride_prepare_breakdown(int rideIndex, int breakdownReason) +void ride_prepare_breakdown(sint32 rideIndex, sint32 breakdownReason) { - int i; + sint32 i; rct_ride *ride; rct_vehicle *vehicle; @@ -2467,7 +2467,7 @@ void ride_prepare_breakdown(int rideIndex, int breakdownReason) * * rct2: 0x006B74FA */ -void ride_breakdown_add_news_item(int rideIndex) +void ride_breakdown_add_news_item(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -2482,7 +2482,7 @@ void ride_breakdown_add_news_item(int rideIndex) * * rct2: 0x006B75C8 */ -static void ride_breakdown_status_update(int rideIndex) +static void ride_breakdown_status_update(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -2515,9 +2515,9 @@ static void ride_breakdown_status_update(int rideIndex) * * rct2: 0x006B762F */ -static void ride_mechanic_status_update(int rideIndex, int mechanicStatus) +static void ride_mechanic_status_update(sint32 rideIndex, sint32 mechanicStatus) { - int breakdownReason; + sint32 breakdownReason; rct_ride *ride; rct_peep *mechanic; @@ -2580,7 +2580,7 @@ static void ride_mechanic_status_update(int rideIndex, int mechanicStatus) * * rct2: 0x006B796C */ -static void ride_call_mechanic(int rideIndex, rct_peep *mechanic, int forInspection) +static void ride_call_mechanic(sint32 rideIndex, rct_peep *mechanic, sint32 forInspection) { rct_ride *ride; @@ -2600,11 +2600,11 @@ static void ride_call_mechanic(int rideIndex, rct_peep *mechanic, int forInspect * * rct2: 0x006B76AB */ -static void ride_call_closest_mechanic(int rideIndex) +static void ride_call_closest_mechanic(sint32 rideIndex) { rct_ride *ride; rct_peep *mechanic; - int forInspection; + sint32 forInspection; ride = get_ride(rideIndex); forInspection = (ride->lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN)) == 0; @@ -2614,9 +2614,9 @@ static void ride_call_closest_mechanic(int rideIndex) ride_call_mechanic(rideIndex, mechanic, forInspection); } -rct_peep *ride_find_closest_mechanic(rct_ride *ride, int forInspection) +rct_peep *ride_find_closest_mechanic(rct_ride *ride, sint32 forInspection) { - int x, y, z, stationIndex, direction; + sint32 x, y, z, stationIndex, direction; uint16 xy; rct_map_element *mapElement; @@ -2653,9 +2653,9 @@ rct_peep *ride_find_closest_mechanic(rct_ride *ride, int forInspection) * rct2: 0x006B774B (forInspection = 0) * rct2: 0x006B78C3 (forInspection = 1) */ -rct_peep *find_closest_mechanic(int x, int y, int forInspection) +rct_peep *find_closest_mechanic(sint32 x, sint32 y, sint32 forInspection) { - unsigned int closestDistance, distance; + uint32 closestDistance, distance; uint16 spriteIndex; rct_peep *peep, *closestMechanic = NULL; @@ -2761,7 +2761,7 @@ uint8 *ride_music_style_tuneids[] = { * * rct2: 0x006ABE85 */ -static void ride_music_update(int rideIndex) +static void ride_music_update(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -2817,11 +2817,11 @@ static void ride_music_update(int rideIndex) return; } - int x = (ride->station_starts[0] & 0xFF) * 32 + 16; - int y = (ride->station_starts[0] >> 8) * 32 + 16; - int z = ride->station_heights[0] * 8; + sint32 x = (ride->station_starts[0] & 0xFF) * 32 + 16; + sint32 y = (ride->station_starts[0] >> 8) * 32 + 16; + sint32 z = ride->station_heights[0] * 8; - int sampleRate = 22050; + sint32 sampleRate = 22050; // Alter sample rate for a power cut effect if (ride->lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN)) { @@ -2863,7 +2863,7 @@ static void ride_measurement_update(rct_ride_measurement *measurement) uint16 spriteIndex; rct_ride *ride; rct_vehicle *vehicle; - int velocity, altitude, verticalG, lateralG; + sint32 velocity, altitude, verticalG, lateralG; ride = get_ride(measurement->ride_index); spriteIndex = ride->vehicles[measurement->vehicle_index]; @@ -2940,7 +2940,7 @@ void ride_measurements_update() return; // For each ride measurement - for (int i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { + for (sint32 i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { rct_ride_measurement *measurement = get_ride_measurement(i); if (measurement->ride_index == 255) continue; @@ -2953,7 +2953,7 @@ void ride_measurements_update() ride_measurement_update(measurement); } else { // For each vehicle - for (int j = 0; j < ride->num_vehicles; j++) { + for (sint32 j = 0; j < ride->num_vehicles; j++) { uint16 spriteIndex = ride->vehicles[j]; if (spriteIndex == SPRITE_INDEX_NULL) continue; @@ -2973,9 +2973,9 @@ void ride_measurements_update() } } -static rct_ride_measurement *ride_get_existing_measurement(int rideIndex) +static rct_ride_measurement *ride_get_existing_measurement(sint32 rideIndex) { - for (int i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { + for (sint32 i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { rct_ride_measurement *measurement = get_ride_measurement(i); if (measurement->ride_index == rideIndex) return measurement; @@ -2984,9 +2984,9 @@ static rct_ride_measurement *ride_get_existing_measurement(int rideIndex) return NULL; } -static int ride_get_free_measurement() +static sint32 ride_get_free_measurement() { - for (int i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { + for (sint32 i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { rct_ride_measurement *measurement = get_ride_measurement(i); if (measurement->ride_index == 255) return i; @@ -2999,7 +2999,7 @@ static int ride_get_free_measurement() * * rct2: 0x006B66D9 */ -rct_ride_measurement *ride_get_measurement(int rideIndex, rct_string_id *message) +rct_ride_measurement *ride_get_measurement(sint32 rideIndex, rct_string_id *message) { rct_ride *ride = get_ride(rideIndex); @@ -3013,10 +3013,10 @@ rct_ride_measurement *ride_get_measurement(int rideIndex, rct_string_id *message rct_ride_measurement *measurement = ride_get_existing_measurement(rideIndex); if (measurement == NULL) { // Find a free measurement - int i = ride_get_free_measurement(); + sint32 i = ride_get_free_measurement(); if (i == -1) { // Use last recently used measurement for some other ride - int lruIndex = 0; + sint32 lruIndex = 0; uint32 lruTicks = 0xFFFFFFFF; for (i = 0; i < MAX_RIDE_MEASUREMENTS; i++) { measurement = get_ride_measurement(i); @@ -3059,7 +3059,7 @@ rct_ride_measurement *ride_get_measurement(int rideIndex, rct_string_id *message #pragma region Colour functions -track_colour ride_get_track_colour(rct_ride *ride, int colourScheme) +track_colour ride_get_track_colour(rct_ride *ride, sint32 colourScheme) { track_colour result; result.main = ride->track_colour_main[colourScheme]; @@ -3068,7 +3068,7 @@ track_colour ride_get_track_colour(rct_ride *ride, int colourScheme) return result; } -vehicle_colour ride_get_vehicle_colour(rct_ride *ride, int vehicleIndex) +vehicle_colour ride_get_vehicle_colour(rct_ride *ride, sint32 vehicleIndex) { vehicle_colour result; @@ -3085,7 +3085,7 @@ vehicle_colour ride_get_vehicle_colour(rct_ride *ride, int vehicleIndex) static bool ride_does_vehicle_colour_exist(uint8 ride_sub_type, vehicle_colour *vehicleColour) { - int i; + sint32 i; rct_ride *ride2; FOR_ALL_RIDES(i, ride2) { if (ride2->subtype != ride_sub_type) continue; @@ -3095,7 +3095,7 @@ static bool ride_does_vehicle_colour_exist(uint8 ride_sub_type, vehicle_colour * return true; } -static int ride_get_unused_preset_vehicle_colour(uint8 ride_type, uint8 ride_sub_type) +static sint32 ride_get_unused_preset_vehicle_colour(uint8 ride_type, uint8 ride_sub_type) { if (ride_sub_type >= 128) { @@ -3110,9 +3110,9 @@ static int ride_get_unused_preset_vehicle_colour(uint8 ride_type, uint8 ride_sub if (presetList->count == 255) return 255; - for (int attempt = 0; attempt < 200; attempt++) { + for (sint32 attempt = 0; attempt < 200; attempt++) { uint8 numColourConfigurations = presetList->count; - int randomConfigIndex = util_rand() % numColourConfigurations; + sint32 randomConfigIndex = util_rand() % numColourConfigurations; vehicle_colour *preset = &presetList->list[randomConfigIndex]; if (ride_does_vehicle_colour_exist(ride_sub_type, preset)) { @@ -3141,7 +3141,7 @@ static void ride_set_vehicle_colours_to_random_preset(rct_ride *ride, uint8 pres ride->vehicle_colours_extended[0] = preset->additional_2; } else { ride->colour_scheme_type = RIDE_COLOUR_SCHEME_DIFFERENT_PER_TRAIN; - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { vehicle_colour *preset = &presetList->list[i]; ride->vehicle_colours[i].body_colour = preset->main; ride->vehicle_colours[i].trim_colour = preset->additional_1; @@ -3161,7 +3161,7 @@ static void ride_set_vehicle_colours_to_random_preset(rct_ride *ride, uint8 pres void ride_check_all_reachable() { rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride->connected_message_throttle != 0) @@ -3181,9 +3181,9 @@ void ride_check_all_reachable() * rct2: 0x006B7C59 * @return 1 if the coordinate is reachable or has no entrance, 0 otherwise */ -static int ride_entrance_exit_is_reachable(uint16 coordinate, rct_ride* ride, int index) +static sint32 ride_entrance_exit_is_reachable(uint16 coordinate, rct_ride* ride, sint32 index) { - int x, y, z; + sint32 x, y, z; rct_map_element *mapElement; x = coordinate & 0xFF; @@ -3212,9 +3212,9 @@ static int ride_entrance_exit_is_reachable(uint16 coordinate, rct_ride* ride, in return map_coord_is_connected(x, y, z, face_direction); } -static void ride_entrance_exit_connected(rct_ride* ride, int ride_idx) +static void ride_entrance_exit_connected(rct_ride* ride, sint32 ride_idx) { - for (int i = 0; i < 4; ++i) { + for (sint32 i = 0; i < 4; ++i) { uint16 station_start = ride->station_starts[i], entrance = ride->entrances[i], exit = ride->exits[i]; @@ -3244,9 +3244,9 @@ static void ride_entrance_exit_connected(rct_ride* ride, int ride_idx) } } -static void ride_shop_connected(rct_ride* ride, int ride_idx) +static void ride_shop_connected(rct_ride* ride, sint32 ride_idx) { - int x, y, count; + sint32 x, y, count; rct_map_element *mapElement; uint16 coordinate = ride->station_starts[0]; @@ -3293,8 +3293,8 @@ static void ride_shop_connected(rct_ride* ride, int ride_idx) // Flip direction north<->south, east<->west uint8 face_direction = count ^ 2; - int y2 = y - TileDirectionDelta[face_direction].y; - int x2 = x - TileDirectionDelta[face_direction].x; + sint32 y2 = y - TileDirectionDelta[face_direction].y; + sint32 x2 = x - TileDirectionDelta[face_direction].x; if (map_coord_is_connected(x2 / 32, y2 / 32, mapElement->base_height, face_direction)) return; @@ -3316,7 +3316,7 @@ static void ride_shop_connected(rct_ride* ride, int ride_idx) static void ride_track_set_map_tooltip(rct_map_element *mapElement) { - int rideIndex; + sint32 rideIndex; rct_ride *ride; rideIndex = mapElement->properties.track.ride_index; @@ -3327,7 +3327,7 @@ static void ride_track_set_map_tooltip(rct_map_element *mapElement) set_map_tooltip_format_arg(4, uint32, ride->name_arguments); rct_string_id formatSecondary; - int arg1; + sint32 arg1; ride_get_status(rideIndex, &formatSecondary, &arg1); set_map_tooltip_format_arg(8, rct_string_id, formatSecondary); set_map_tooltip_format_arg(10, uint32, arg1); @@ -3335,7 +3335,7 @@ static void ride_track_set_map_tooltip(rct_map_element *mapElement) static void ride_station_set_map_tooltip(rct_map_element *mapElement) { - int i, rideIndex, stationIndex; + sint32 i, rideIndex, stationIndex; rct_ride *ride; rideIndex = mapElement->properties.track.ride_index; @@ -3354,7 +3354,7 @@ static void ride_station_set_map_tooltip(rct_map_element *mapElement) set_map_tooltip_format_arg(12, uint16, stationIndex + 1); rct_string_id formatSecondary; - int arg1; + sint32 arg1; ride_get_status(rideIndex, &formatSecondary, &arg1); set_map_tooltip_format_arg(14, rct_string_id, formatSecondary); set_map_tooltip_format_arg(16, uint32, arg1); @@ -3362,7 +3362,7 @@ static void ride_station_set_map_tooltip(rct_map_element *mapElement) static void ride_entrance_set_map_tooltip(rct_map_element *mapElement) { - int i, rideIndex, stationIndex; + sint32 i, rideIndex, stationIndex; rct_ride *ride; rideIndex = mapElement->properties.track.ride_index; @@ -3376,7 +3376,7 @@ static void ride_entrance_set_map_tooltip(rct_map_element *mapElement) if (mapElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_ENTRANCE) { // Get the queue length - int queueLength = 0; + sint32 queueLength = 0; if (ride->entrances[stationIndex] != 0xFFFF) queueLength = ride->queue_length[stationIndex]; @@ -3437,7 +3437,7 @@ void ride_set_map_tooltip(rct_map_element *mapElement) * @param tuneId (bh) * @returns new position (ebp) */ -int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint16 sampleRate, uint32 position, uint8 *tuneId) +sint32 ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint16 sampleRate, uint32 position, uint8 *tuneId) { if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gGameSoundsOff && g_music_tracking_viewport != (rct_viewport*)-1) { rct_xy16 rotatedCoords = { 0, 0 }; @@ -3473,26 +3473,26 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint view_y2 < rotatedCoords.y) { goto label58; } - int x2 = viewport->x + ((rotatedCoords.x - viewport->view_x) >> viewport->zoom); + sint32 x2 = viewport->x + ((rotatedCoords.x - viewport->view_x) >> viewport->zoom); x2 *= 0x10000; uint16 screenwidth = gScreenWidth; if (screenwidth < 64) { screenwidth = 64; } - int pan_x = ((x2 / screenwidth) - 0x8000) >> 4; + sint32 pan_x = ((x2 / screenwidth) - 0x8000) >> 4; - int y2 = viewport->y + ((rotatedCoords.y - viewport->view_y) >> viewport->zoom); + sint32 y2 = viewport->y + ((rotatedCoords.y - viewport->view_y) >> viewport->zoom); y2 *= 0x10000; uint16 screenheight = gScreenHeight; if (screenheight < 64) { screenheight = 64; } - int pan_y = ((y2 / screenheight) - 0x8000) >> 4; + sint32 pan_y = ((y2 / screenheight) - 0x8000) >> 4; uint8 vol1 = -1; uint8 vol2 = -1; - int panx2 = pan_x; - int pany2 = pan_y; + sint32 panx2 = pan_x; + sint32 pany2 = pan_y; if (pany2 < 0) { pany2 = -pany2; } @@ -3530,7 +3530,7 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint } else { vol1 = vol1 - (gVolumeAdjustZoom * 3); } - int v32 = -(((uint8)(-vol1 - 1) * (uint8)(-vol1 - 1)) / 16) - 700; + sint32 v32 = -(((uint8)(-vol1 - 1) * (uint8)(-vol1 - 1)) / 16) - 700; if (vol1 && v32 >= -4000) { if (pan_x > 10000) { pan_x = 10000; @@ -3539,7 +3539,7 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint pan_x = -10000; } rct_ride_music* ride_music = &gRideMusicList[0]; - int channel = 0; + sint32 channel = 0; uint32 a1; while (ride_music->ride_id != rideIndex || ride_music->tune_id != *tuneId) { ride_music++; @@ -3550,7 +3550,7 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint goto label51; } } - int playing = Mixer_Channel_IsPlaying(gRideMusicList[channel].sound_channel); + sint32 playing = Mixer_Channel_IsPlaying(gRideMusicList[channel].sound_channel); if (!playing) { *tuneId = 0xFF; return 0; @@ -3648,13 +3648,13 @@ rct_ride_music_info* gRideMusicInfoList[NUM_DEFAULT_MUSIC_TRACKS] = { void ride_music_update_final() { rct_ride_music_params* edi = NULL; - int ebx = 0; + sint32 ebx = 0; if (!(gScreenFlags & 2)) { // TODO Allow circus music (CSS24) to play if ride music is disabled (that should be sound) if (!gGameSoundsOff && gConfigSound.ride_music_enabled && !(gScreenFlags & 1)) { while (1) { - int v8 = 0; - int v9 = 1; + sint32 v8 = 0; + sint32 v9 = 1; rct_ride_music_params* ride_music_params = &gRideMusicParamsList[0]; while (ride_music_params < gRideMusicParamsListEnd) { if (ride_music_params->ride_id != (uint8)-1) { @@ -3674,13 +3674,13 @@ void ride_music_update_final() // stop currently playing music that is not in music params list or not playing? rct_ride_music* ride_music = &gRideMusicList[0]; - int channel = 0; + sint32 channel = 0; do { if (ride_music->ride_id != (uint8)-1) { rct_ride_music_params* ride_music_params = &gRideMusicParamsList[0]; while (ride_music_params < gRideMusicParamsListEnd) { if (ride_music_params->ride_id == ride_music->ride_id && ride_music_params->tune_id == ride_music->tune_id) { - int isplaying = Mixer_Channel_IsPlaying(gRideMusicList[channel].sound_channel); + sint32 isplaying = Mixer_Channel_IsPlaying(gRideMusicList[channel].sound_channel); if (isplaying) { goto label32; } @@ -3699,7 +3699,7 @@ void ride_music_update_final() for (rct_ride_music_params* ride_music_params = &gRideMusicParamsList[0]; ride_music_params < gRideMusicParamsListEnd; ride_music_params++) { if (ride_music_params->ride_id != (uint8)-1) { rct_ride_music* ride_music_2 = &gRideMusicList[0]; - int channel2 = 0; + sint32 channel2 = 0; while (ride_music_params->ride_id != ride_music_2->ride_id || ride_music_params->tune_id != ride_music_2->tune_id) { if (ride_music_2->ride_id == (uint8)-1) { ebx = channel2; @@ -3719,7 +3719,7 @@ void ride_music_update_final() Mixer_Channel_Volume(ride_music_3->sound_channel, DStoMixerVolume(ride_music_3->volume)); Mixer_Channel_Pan(ride_music_3->sound_channel, DStoMixerPan(ride_music_3->pan)); Mixer_Channel_Rate(ride_music_3->sound_channel, DStoMixerRate(ride_music_3->frequency)); - int offset = ride_music_params->offset - 10000; + sint32 offset = ride_music_params->offset - 10000; if (offset < 0) { offset = 0; } @@ -3773,17 +3773,17 @@ static bool ride_is_mode_valid(rct_ride *ride, uint8 mode) return false; } -static bool ride_is_valid_lift_hill_speed(rct_ride *ride, int speed) +static bool ride_is_valid_lift_hill_speed(rct_ride *ride, sint32 speed) { - int minSpeed = gCheatsFastLiftHill ? 0 : RideLiftData[ride->type].minimum_speed; - int maxSpeed = gCheatsFastLiftHill ? 255 : RideLiftData[ride->type].maximum_speed; + sint32 minSpeed = gCheatsFastLiftHill ? 0 : RideLiftData[ride->type].minimum_speed; + sint32 maxSpeed = gCheatsFastLiftHill ? 255 : RideLiftData[ride->type].maximum_speed; return speed >= minSpeed && speed <= maxSpeed; } -static bool ride_is_valid_num_circuits(rct_ride *ride, int numCircuits) +static bool ride_is_valid_num_circuits(rct_ride *ride, sint32 numCircuits) { - int minNumCircuits = 1; - int maxNumCircuits = gCheatsFastLiftHill ? 255 : 20; + sint32 minNumCircuits = 1; + sint32 maxNumCircuits = gCheatsFastLiftHill ? 255 : 20; return numCircuits >= minNumCircuits && numCircuits <= maxNumCircuits; } @@ -3964,7 +3964,7 @@ static money32 ride_set_setting(uint8 rideIndex, uint8 setting, uint8 value, uin * * rct2: 0x006B5559 */ -void game_command_set_ride_setting(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_ride_setting(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint8 rideIndex = *edx & 0xFF; uint8 setting = (*edx >> 8) & 0xFF; @@ -3977,7 +3977,7 @@ void game_command_set_ride_setting(int *eax, int *ebx, int *ecx, int *edx, int * * * rct2: 0x006B4CC1 */ -static int ride_mode_check_valid_station_numbers(rct_ride *ride) +static sint32 ride_mode_check_valid_station_numbers(rct_ride *ride) { uint8 no_stations = 0; for (uint8 station_index = 0; station_index < 4; ++station_index){ @@ -4011,9 +4011,9 @@ static int ride_mode_check_valid_station_numbers(rct_ride *ride) * returns stationIndex of first station on success * -1 on failure. */ -static int ride_mode_check_station_present(rct_ride* ride){ - int stationIndex = -1; - for (int i = 0; i < 4; i++) { +static sint32 ride_mode_check_station_present(rct_ride* ride){ + sint32 stationIndex = -1; + for (sint32 i = 0; i < 4; i++) { if (ride->station_starts[i] != 0xFFFF) { stationIndex = i; break; @@ -4039,14 +4039,14 @@ static int ride_mode_check_station_present(rct_ride* ride){ * * rct2: 0x006B5872 */ -static int ride_check_for_entrance_exit(int rideIndex) +static sint32 ride_check_for_entrance_exit(sint32 rideIndex) { rct_ride* ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) return 1; - int i; + sint32 i; uint8 entrance = 0; uint8 exit = 0; for (i = 0; i < 4; i++) { @@ -4086,18 +4086,18 @@ static int ride_check_for_entrance_exit(int rideIndex) * * rct2: 0x006B5952 */ -static void sub_6B5952(int rideIndex) +static void sub_6B5952(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { uint16 xy = ride->entrances[i]; if (xy == 0xFFFF) continue; - int x = (xy & 0xFF) * 32; - int y = (xy >> 8) * 32; - int z = ride->station_heights[i]; + sint32 x = (xy & 0xFF) * 32; + sint32 y = (xy >> 8) * 32; + sint32 z = ride->station_heights[i]; rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { @@ -4106,7 +4106,7 @@ static void sub_6B5952(int rideIndex) if (mapElement->base_height != z) continue; - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; footpath_chain_ride_queue(rideIndex, i, x, y, mapElement, direction ^ 2); } while (!map_element_is_last_for_tile(mapElement++)); } @@ -4116,11 +4116,11 @@ static void sub_6B5952(int rideIndex) * * rct2: 0x006D3319 */ -static int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output) +static sint32 ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output) { rct_window *w; track_circuit_iterator it; - int rideIndex, type; + sint32 rideIndex, type; rideIndex = input->element->properties.track.ride_index; w = window_find_by_class(WC_RIDE_CONSTRUCTION); @@ -4167,7 +4167,7 @@ static int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output */ static bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_element *output) { - int rideIndex = input->element->properties.track.ride_index; + sint32 rideIndex = input->element->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (ride->type == RIDE_TYPE_MAZE) return true; @@ -4180,7 +4180,7 @@ static bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_e track_circuit_iterator it; track_circuit_iterator_begin(&it, *input); while (track_circuit_iterator_next(&it)) { - int trackType = it.current.element->properties.track.type; + sint32 trackType = it.current.element->properties.track.type; if (TrackFlags[trackType] & TRACK_ELEM_FLAG_4000) { *output = it.current; return true; @@ -4198,7 +4198,7 @@ static bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_e */ static bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_element *output) { - int rideIndex = input->element->properties.track.ride_index; + sint32 rideIndex = input->element->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (ride->type == RIDE_TYPE_MAZE) return true; @@ -4211,7 +4211,7 @@ static bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_eleme track_circuit_iterator it; track_circuit_iterator_begin(&it, *input); while (track_circuit_iterator_next(&it)) { - int trackType = output->element->properties.track.type; + sint32 trackType = output->element->properties.track.type; if (TrackFlags[trackType] & TRACK_ELEM_FLAG_8000) { *output = it.current; return true; @@ -4224,7 +4224,7 @@ static bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_eleme * * rct2: 0x006CB25D */ -static int ride_check_station_length(rct_xy_element *input, rct_xy_element *output) +static sint32 ride_check_station_length(rct_xy_element *input, rct_xy_element *output) { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); if (w != 0 && @@ -4243,7 +4243,7 @@ static int ride_check_station_length(rct_xy_element *input, rct_xy_element *outp output->element = trackBeginEnd.begin_element; } - int num_station_elements = 0; + sint32 num_station_elements = 0; rct_xy_element last_good_station = *output; do{ @@ -4277,7 +4277,7 @@ static bool ride_check_start_and_end_is_station(rct_xy_element *input, rct_xy_el { rct_window *w; rct_ride *ride; - int rideIndex, trackType; + sint32 rideIndex, trackType; rct_xy_element trackBack, trackFront; rideIndex = input->element->properties.track.ride_index; @@ -4317,21 +4317,21 @@ static bool ride_check_start_and_end_is_station(rct_xy_element *input, rct_xy_el */ static void ride_set_boat_hire_return_point(rct_ride *ride, rct_xy_element *startElement) { - int trackType = -1; - int returnX = startElement->x; - int returnY = startElement->y; - int startX = returnX; - int startY = returnY; + sint32 trackType = -1; + sint32 returnX = startElement->x; + sint32 returnY = startElement->y; + sint32 startX = returnX; + sint32 startY = returnY; rct_map_element *returnTrackElement = startElement->element; track_begin_end trackBeginEnd; while (track_block_get_previous(returnX, returnY, returnTrackElement, &trackBeginEnd)) { // If previous track is back to the starting x, y, then break loop (otherwise possible infinite loop) if (trackType != -1 && startX == trackBeginEnd.begin_x && startY == trackBeginEnd.begin_y) break; - int x = trackBeginEnd.begin_x; - int y = trackBeginEnd.begin_y; - int z = trackBeginEnd.begin_z; - int direction = trackBeginEnd.begin_direction; + sint32 x = trackBeginEnd.begin_x; + sint32 y = trackBeginEnd.begin_y; + sint32 z = trackBeginEnd.begin_z; + sint32 direction = trackBeginEnd.begin_direction; trackType = trackBeginEnd.begin_element->properties.track.type; sub_6C683D(&x, &y, &z, direction, trackType, 0, &returnTrackElement, 0); returnX = x; @@ -4339,7 +4339,7 @@ static void ride_set_boat_hire_return_point(rct_ride *ride, rct_xy_element *star }; trackType = returnTrackElement->properties.track.type; - int elementReturnDirection = TrackCoordinates[trackType].rotation_begin; + sint32 elementReturnDirection = TrackCoordinates[trackType].rotation_begin; ride->boat_hire_return_direction = (returnTrackElement->type + elementReturnDirection) & 3; ride->boat_hire_return_position = (returnX >> 5) | ((returnY >> 5) << 8); } @@ -4354,7 +4354,7 @@ static void ride_set_maze_entrance_exit_points(rct_ride *ride) // Create a list of all the entrance and exit positions uint16 *position = positions; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (ride->entrances[i] != 0xFFFF) { *position++ = ride->entrances[i]; } @@ -4366,9 +4366,9 @@ static void ride_set_maze_entrance_exit_points(rct_ride *ride) // Enumerate entrance and exit positions for (position = positions; *position != 0xFFFF; position++) { - int x = (*position & 0xFF) << 5; - int y = (*position >> 8) << 5; - int z = ride->station_heights[0]; + sint32 x = (*position & 0xFF) << 5; + sint32 y = (*position >> 8) << 5; + sint32 z = ride->station_heights[0]; rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -4394,7 +4394,7 @@ static void ride_set_block_points(rct_xy_element *startElement) { rct_xy_element currentElement = *startElement; do { - int trackType = currentElement.element->properties.track.type; + sint32 trackType = currentElement.element->properties.track.type; switch (trackType) { case TRACK_ELEM_END_STATION: case TRACK_ELEM_CABLE_LIFT_HILL: @@ -4413,7 +4413,7 @@ static void ride_set_block_points(rct_xy_element *startElement) * * rct2: 0x006B4D26 */ -static void ride_set_start_finish_points(int rideIndex, rct_xy_element *startElement) +static void ride_set_start_finish_points(sint32 rideIndex, rct_xy_element *startElement) { rct_ride *ride = get_ride(rideIndex); @@ -4435,10 +4435,10 @@ static void ride_set_start_finish_points(int rideIndex, rct_xy_element *startEle * * rct2: 0x0069ED9E */ -static int sub_69ED9E() +static sint32 sub_69ED9E() { - int miscSpriteCount = gSpriteListCount[SPRITE_LIST_MISC]; - int remainingSpriteCount = gSpriteListCount[SPRITE_LIST_NULL]; + sint32 miscSpriteCount = gSpriteListCount[SPRITE_LIST_MISC]; + sint32 remainingSpriteCount = gSpriteListCount[SPRITE_LIST_NULL]; return max(0, miscSpriteCount + remainingSpriteCount - 300); } @@ -4466,14 +4466,14 @@ const rct_xy16 word_9A2A60[] = { * rct2: 0x006DD90D */ static rct_vehicle *vehicle_create_car( - int rideIndex, - int vehicleEntryIndex, - int carIndex, - int vehicleIndex, - int x, - int y, - int z, - int *remainingDistance, + sint32 rideIndex, + sint32 vehicleEntryIndex, + sint32 carIndex, + sint32 vehicleIndex, + sint32 x, + sint32 y, + sint32 z, + sint32 *remainingDistance, rct_map_element *mapElement ) { registers regs = { 0 }; @@ -4525,14 +4525,14 @@ static rct_vehicle *vehicle_create_car( vehicle->bank_rotation = 0; vehicle->target_seat_rotation = 4; vehicle->seat_rotation = 4; - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { vehicle->peep[i] = SPRITE_INDEX_NULL; } if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_15) { // loc_6DDCA4: vehicle->var_CD = 0; - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; x += word_9A3AB4[direction].x; y += word_9A3AB4[direction].y; z = mapElement->base_height * 8; @@ -4590,7 +4590,7 @@ static rct_vehicle *vehicle_create_car( vehicle->track_x = x; vehicle->track_y = y; - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; vehicle->sprite_direction = direction << 3; if (ride->type == RIDE_TYPE_SPACE_RINGS) { @@ -4643,12 +4643,12 @@ static rct_vehicle *vehicle_create_car( * * rct2: 0x006DD84C */ -static train_ref vehicle_create_train(int rideIndex, int x, int y, int z, int vehicleIndex, int *remainingDistance, rct_map_element *mapElement) +static train_ref vehicle_create_train(sint32 rideIndex, sint32 x, sint32 y, sint32 z, sint32 vehicleIndex, sint32 *remainingDistance, rct_map_element *mapElement) { rct_ride *ride = get_ride(rideIndex); train_ref train = { NULL, NULL }; - for (int carIndex = 0; carIndex < ride->num_cars_per_train; carIndex++) { + for (sint32 carIndex = 0; carIndex < ride->num_cars_per_train; carIndex++) { const uint8 vehicle = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, carIndex); rct_vehicle *car = vehicle_create_car(rideIndex, vehicle, carIndex, vehicleIndex, x, y, z, remainingDistance, mapElement); if (carIndex == 0) { @@ -4664,13 +4664,13 @@ static train_ref vehicle_create_train(int rideIndex, int x, int y, int z, int ve return train; } -static void vehicle_create_trains(int rideIndex, int x, int y, int z, rct_map_element *mapElement) +static void vehicle_create_trains(sint32 rideIndex, sint32 x, sint32 y, sint32 z, rct_map_element *mapElement) { rct_ride *ride = get_ride(rideIndex); train_ref firstTrain = { 0 }, lastTrain = { 0 }; - int remainingDistance = 0; + sint32 remainingDistance = 0; - for (int vehicleIndex = 0; vehicleIndex < ride->num_vehicles; vehicleIndex++) { + for (sint32 vehicleIndex = 0; vehicleIndex < ride->num_vehicles; vehicleIndex++) { if (ride_is_block_sectioned(ride)) { remainingDistance = 0; } @@ -4686,7 +4686,7 @@ static void vehicle_create_trains(int rideIndex, int x, int y, int z, rct_map_el // Add train to ride vehicle list move_sprite_to_list((rct_sprite*)train.head, SPRITE_LIST_TRAIN * 2); - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { if (ride->vehicles[i] == SPRITE_INDEX_NULL) { ride->vehicles[i] = train.head->sprite_index; break; @@ -4719,16 +4719,16 @@ static void vehicle_unset_var_48_b1(rct_vehicle *head) static void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element *outXYElement) { rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[0]); - int firstX = vehicle->track_x; - int firstY = vehicle->track_y; - int firstZ = vehicle->track_z; + sint32 firstX = vehicle->track_x; + sint32 firstY = vehicle->track_y; + sint32 firstZ = vehicle->track_z; rct_map_element *firstElement = map_get_track_element_at(firstX, firstY, firstZ / 8); assert(firstElement != NULL); - int x = firstX; - int y = firstY; - int z = firstZ; + sint32 x = firstX; + sint32 y = firstY; + sint32 z = firstZ; rct_map_element *trackElement = firstElement; track_begin_end trackBeginEnd; while (track_block_get_previous(x, y, trackElement, &trackBeginEnd)) { @@ -4739,7 +4739,7 @@ static void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element break; } - int trackType = trackElement->properties.track.type; + sint32 trackType = trackElement->properties.track.type; switch (trackType) { case TRACK_ELEM_25_DEG_UP_TO_FLAT: case TRACK_ELEM_60_DEG_UP_TO_FLAT: @@ -4787,7 +4787,7 @@ static void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element * * rct2: 0x006DD84C */ -static bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element *element, int isApplying) +static bool ride_create_vehicles(rct_ride *ride, sint32 rideIndex, rct_xy_element *element, sint32 isApplying) { ride_update_max_vehicles(rideIndex); if (ride->subtype == 0xFF) { @@ -4795,7 +4795,7 @@ static bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element * } // Check if there are enough free sprite slots for all the vehicles - int totalCars = ride->num_vehicles * ride->num_cars_per_train; + sint32 totalCars = ride->num_vehicles * ride->num_cars_per_train; if (totalCars > sub_69ED9E()) { gGameCommandErrorText = STR_UNABLE_TO_CREATE_ENOUGH_VEHICLES; return false; @@ -4806,10 +4806,10 @@ static bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element * } rct_map_element *mapElement = element->element; - int x = element->x; - int y = element->y; - int z = element->element->base_height; - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 x = element->x; + sint32 y = element->y; + sint32 z = element->element->base_height; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; // if (ride->mode == RIDE_MODE_STATION_TO_STATION) { @@ -4833,7 +4833,7 @@ static bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element * // Initialise station departs // 006DDDD0: ride->lifecycle_flags |= RIDE_LIFECYCLE_ON_TRACK; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { ride->station_depart[i] = (ride->station_depart[i] & 0x80) | 1; } @@ -4844,7 +4844,7 @@ static bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element * ride_create_vehicles_find_first_block(ride, &firstBlock); loc_6DDF9C(ride, firstBlock.element); } else { - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[i]); rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); @@ -4869,7 +4869,7 @@ void loc_6DDF9C(rct_ride *ride, rct_map_element *mapElement) { rct_vehicle *train, *car; - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { train = GET_VEHICLE(ride->vehicles[i]); if (i == 0) { vehicle_update_track_motion(train, NULL); @@ -4922,7 +4922,7 @@ void loc_6DDF9C(rct_ride *ride, rct_map_element *mapElement) static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying) { uint16 xy; - int stationIndex; + sint32 stationIndex; for (stationIndex = 0; stationIndex < 4; stationIndex++) { xy = ride->station_starts[stationIndex]; if (xy != 0xFFFF) break; @@ -4932,9 +4932,9 @@ static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying) } } - int x = (xy & 0xFF) * 32; - int y = (xy >> 8) * 32; - int z = ride->station_heights[stationIndex]; + sint32 x = (xy & 0xFF) * 32; + sint32 y = (xy >> 8) * 32; + sint32 z = ride->station_heights[stationIndex]; bool success = false; rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); @@ -4957,7 +4957,7 @@ static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying) STATE_FIND_STATION, STATE_REST_OF_TRACK }; - int state = STATE_FIND_CABLE_LIFT; + sint32 state = STATE_FIND_CABLE_LIFT; track_circuit_iterator it; track_circuit_iterator_begin(&it, (rct_xy_element){ @@ -4967,7 +4967,7 @@ static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying) }); while (track_circuit_iterator_previous(&it)) { mapElement = it.current.element; - int trackType = mapElement->properties.track.type; + sint32 trackType = mapElement->properties.track.type; uint16 flags = 16; switch (state) { @@ -5002,7 +5002,7 @@ static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying) } if (isApplying) { z = mapElement->base_height * 8; - int direction = mapElement->type & 3; + sint32 direction = mapElement->type & 3; trackType = mapElement->properties.track.type; x = it.current.x; y = it.current.y; @@ -5016,7 +5016,7 @@ static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying) * * rct2: 0x006DF4D4 */ -static bool ride_create_cable_lift(int rideIndex, bool isApplying) +static bool ride_create_cable_lift(sint32 rideIndex, bool isApplying) { rct_ride *ride = get_ride(rideIndex); @@ -5045,21 +5045,21 @@ static bool ride_create_cable_lift(int rideIndex, bool isApplying) return true; } - int x = ride->cable_lift_x; - int y = ride->cable_lift_y; - int z = ride->cable_lift_z; + sint32 x = ride->cable_lift_x; + sint32 y = ride->cable_lift_y; + sint32 z = ride->cable_lift_z; rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; break; } while (!map_element_is_last_for_tile(mapElement++)); - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; rct_vehicle *head = NULL; rct_vehicle *tail = NULL; uint32 ebx = 0; - for (int i = 0; i < 5; i++) { + for (sint32 i = 0; i < 5; i++) { uint32 edx = ror32(0x15478, 10); uint16 var_44 = edx & 0xFFFF; edx = rol32(edx, 10) >> 1; @@ -5090,7 +5090,7 @@ static bool ride_create_cable_lift(int rideIndex, bool isApplying) * * rct2: 0x006B51C0 */ -static void loc_6B51C0(int rideIndex) +static void loc_6B51C0(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -5102,7 +5102,7 @@ static void loc_6B51C0(int rideIndex) return; sint8 entranceOrExit = -1; - int i; + sint32 i; for (i = 0; i < 4; i++) { if (ride->station_starts[i] == 0xFFFF) continue; @@ -5122,15 +5122,15 @@ static void loc_6B51C0(int rideIndex) return; if (ride->type != RIDE_TYPE_MAZE) { - int x = (ride->station_starts[i] & 0xFF) * 32; - int y = (ride->station_starts[i] >> 8) * 32; - int z = ride->station_heights[i] * 8; + sint32 x = (ride->station_starts[i] & 0xFF) * 32; + sint32 y = (ride->station_starts[i] >> 8) * 32; + sint32 z = ride->station_heights[i] * 8; window_scroll_to_location(w, x, y, z); rct_xy_element trackElement; ride_try_get_origin_element(rideIndex, &trackElement); ride_find_track_gap(&trackElement, &trackElement); - int ok = ride_modify(&trackElement); + sint32 ok = ride_modify(&trackElement); if (ok == 0) { return; } @@ -5160,7 +5160,7 @@ static void ride_scroll_to_track_error(rct_xy_element *trackElement) * * rct2: 0x006B4F6B */ -static rct_map_element *loc_6B4F6B(int rideIndex, int x, int y) +static rct_map_element *loc_6B4F6B(sint32 rideIndex, sint32 x, sint32 y) { rct_ride * ride = get_ride(rideIndex); rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); @@ -5183,9 +5183,9 @@ static rct_map_element *loc_6B4F6B(int rideIndex, int x, int y) return NULL; } -static int ride_is_valid_for_test(int rideIndex, int goingToBeOpen, int isApplying) +static sint32 ride_is_valid_for_test(sint32 rideIndex, sint32 goingToBeOpen, sint32 isApplying) { - int stationIndex; + sint32 stationIndex; rct_ride *ride; rct_xy_element trackElement, problematicTrackElement; @@ -5312,9 +5312,9 @@ static int ride_is_valid_for_test(int rideIndex, int goingToBeOpen, int isApplyi * * rct2: 0x006B4EEA */ -static int ride_is_valid_for_open(int rideIndex, int goingToBeOpen, int isApplying) +static sint32 ride_is_valid_for_open(sint32 rideIndex, sint32 goingToBeOpen, sint32 isApplying) { - int stationIndex; + sint32 stationIndex; rct_ride *ride; rct_xy_element trackElement, problematicTrackElement; @@ -5440,7 +5440,7 @@ static int ride_is_valid_for_open(int rideIndex, int goingToBeOpen, int isApplyi return 1; } -void ride_set_status(int rideIndex, int status) +void ride_set_status(sint32 rideIndex, sint32 status) { game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, rideIndex | (status << 8), GAME_COMMAND_SET_RIDE_STATUS, 0, 0); } @@ -5449,9 +5449,9 @@ void ride_set_status(int rideIndex, int status) * * rct2: 0x006B4EA6 */ -void game_command_set_ride_status(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_ride_status(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { - int rideIndex, targetStatus; + sint32 rideIndex, targetStatus; rct_ride *ride; rideIndex = *edx & 0xFF; @@ -5541,11 +5541,11 @@ void game_command_set_ride_status(int *eax, int *ebx, int *ecx, int *edx, int *e } } -void ride_set_name(int rideIndex, const char *name) +void ride_set_name(sint32 rideIndex, const char *name) { typedef union name_union { char as_char[4]; - int as_int; + sint32 as_int; } name_union; name_union name_buffer[9]; @@ -5560,23 +5560,23 @@ void ride_set_name(int rideIndex, const char *name) * * rct2: 0x006B578B */ -void game_command_set_ride_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_ride_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { char oldName[128]; static char newName[128]; - int rideIndex = (*ebx >> 8) & 0xFF; + sint32 rideIndex = (*ebx >> 8) & 0xFF; if (rideIndex >= MAX_RIDES) { log_warning("Invalid game command for ride %u", rideIndex); *ebx = MONEY32_UNDEFINED; return; } - int nameChunkIndex = *eax & 0xFFFF; + sint32 nameChunkIndex = *eax & 0xFFFF; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_RUNNING_COSTS; //if (*ebx & GAME_COMMAND_FLAG_APPLY) { // this check seems to be useless and causes problems in multiplayer - int nameChunkOffset = nameChunkIndex - 1; + sint32 nameChunkOffset = nameChunkIndex - 1; if (nameChunkOffset < 0) nameChunkOffset = 2; nameChunkOffset *= 12; @@ -5647,7 +5647,7 @@ void game_command_set_ride_name(int *eax, int *ebx, int *ecx, int *edx, int *esi * * rct2: 0x006CB7FB */ -int ride_get_refund_price(int ride_id) +sint32 ride_get_refund_price(sint32 ride_id) { uint8 oldpaused = gGamePaused; gGamePaused = 0; @@ -5663,8 +5663,8 @@ int ride_get_refund_price(int ride_id) if (it.element->properties.track.ride_index != ride_id) continue; - int x = it.x * 32, y = it.y * 32; - int z = it.element->base_height * 8; + sint32 x = it.x * 32, y = it.y * 32; + sint32 z = it.element->base_height * 8; uint8 rotation = it.element->type & MAP_ELEMENT_DIRECTION_MASK; uint8 type = it.element->properties.track.type; @@ -5733,7 +5733,7 @@ int ride_get_refund_price(int ride_id) * * rct2: 0x00696707 */ -static void ride_stop_peeps_queuing(int rideIndex) +static void ride_stop_peeps_queuing(sint32 rideIndex) { uint16 spriteIndex; rct_peep *peep; @@ -5753,9 +5753,9 @@ static void ride_stop_peeps_queuing(int rideIndex) } } -static int ride_get_empty_slot() +static sint32 ride_get_empty_slot() { - for (int i = 0; i < MAX_RIDES; i++) { + for (sint32 i = 0; i < MAX_RIDES; i++) { rct_ride *ride = get_ride(i); if (ride->type == RIDE_TYPE_NULL) { return i; @@ -5764,12 +5764,12 @@ static int ride_get_empty_slot() return -1; } -static int ride_get_default_mode(rct_ride *ride) +static sint32 ride_get_default_mode(rct_ride *ride) { const rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); const uint8 *availableModes = RideAvailableModes; - for (int i = 0; i < ride->type; i++) { + for (sint32 i = 0; i < ride->type; i++) { while (*(availableModes++) != 255) {} } if (rideEntry->flags & RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES) { @@ -5781,7 +5781,7 @@ static int ride_get_default_mode(rct_ride *ride) static bool ride_with_colour_config_exists(uint8 ride_type, const track_colour *colours) { rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride->type != ride_type) continue; @@ -5798,7 +5798,7 @@ static bool ride_name_exists(char *name) { char buffer[256]; rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { format_string(buffer, 256, ride->name, &ride->name_arguments); @@ -5814,7 +5814,7 @@ static bool ride_name_exists(char *name) * * Based on rct2: 0x006B4776 */ -static int ride_get_random_colour_preset_index(uint8 ride_type) +static sint32 ride_get_random_colour_preset_index(uint8 ride_type) { if (ride_type >= 128) { @@ -5824,8 +5824,8 @@ static int ride_get_random_colour_preset_index(uint8 ride_type) const track_colour_preset_list *colourPresets = &RideColourPresets[ride_type]; // 200 attempts to find a colour preset that hasn't already been used in the park for this ride type - for (int i = 0; i < 200; i++) { - int listIndex = util_rand() % colourPresets->count; + for (sint32 i = 0; i < 200; i++) { + sint32 listIndex = util_rand() % colourPresets->count; const track_colour *colours = &colourPresets->list[listIndex]; if (!ride_with_colour_config_exists(ride_type, colours)) { @@ -5845,7 +5845,7 @@ static void ride_set_colour_preset(rct_ride *ride, uint8 index) { colourPresets = &RideColourPresets[ride->type]; colours = &colourPresets->list[index]; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { ride->track_colour_main[i] = colours->main; ride->track_colour_additional[i] = colours->additional; ride->track_colour_supports[i] = colours->supports; @@ -5856,7 +5856,7 @@ static void ride_set_colour_preset(rct_ride *ride, uint8 index) { static money32 ride_get_common_price(rct_ride *forRide) { rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride->type == forRide->type && ride != forRide) { @@ -5867,11 +5867,11 @@ static money32 ride_get_common_price(rct_ride *forRide) return MONEY32_UNDEFINED; } -static money32 shop_item_get_common_price(rct_ride *forRide, int shopItem) +static money32 shop_item_get_common_price(rct_ride *forRide, sint32 shopItem) { rct_ride_entry *rideEntry; rct_ride *ride; - int i; + sint32 i; FOR_ALL_RIDES(i, ride) { if (ride != forRide) { @@ -5894,7 +5894,7 @@ static money32 shop_item_get_common_price(rct_ride *forRide, int shopItem) return MONEY32_UNDEFINED; } -bool shop_item_is_photo(int shopItem) +bool shop_item_is_photo(sint32 shopItem) { return ( shopItem == SHOP_ITEM_PHOTO || shopItem == SHOP_ITEM_PHOTO2 || @@ -5902,7 +5902,7 @@ bool shop_item_is_photo(int shopItem) ); } -bool shop_item_has_common_price(int shopItem) +bool shop_item_has_common_price(sint32 shopItem) { if (shopItem < 32) { return gSamePriceThroughoutParkA & (1u << shopItem); @@ -5911,15 +5911,15 @@ bool shop_item_has_common_price(int shopItem) } } -money32 ride_create_command(int type, int subType, int flags, uint8 *outRideIndex, uint8 *outRideColour) +money32 ride_create_command(sint32 type, sint32 subType, sint32 flags, uint8 *outRideIndex, uint8 *outRideColour) { - int eax = 0; - int ebx = flags; - int ecx = 0; - int edx = type | (subType << 8); - int esi = 0; - int edi = 0; - int ebp = 0; + sint32 eax = 0; + sint32 ebx = flags; + sint32 ecx = 0; + sint32 edx = type | (subType << 8); + sint32 esi = 0; + sint32 edi = 0; + sint32 ebp = 0; money32 cost = game_do_command_p(GAME_COMMAND_CREATE_RIDE, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp); *outRideIndex = edi & 0xFF; *outRideColour = eax; @@ -5930,12 +5930,12 @@ money32 ride_create_command(int type, int subType, int flags, uint8 *outRideInde * * rct2: 0x006B3F0F */ -static money32 ride_create(int type, int subType, int flags, int *outRideIndex, int *outRideColour) +static money32 ride_create(sint32 type, sint32 subType, sint32 flags, sint32 *outRideIndex, sint32 *outRideColour) { char rideNameBuffer[256]; rct_ride *ride; rct_ride_entry *rideEntry; - int rideIndex, rideEntryIndex; + sint32 rideIndex, rideEntryIndex; if (type >= RIDE_TYPE_COUNT) { @@ -6028,7 +6028,7 @@ foundRideEntry: ride->name_arguments_number = 0; rct_string_id rideNameStringId = 0; - for (int i = 0; i < 100; i++) { + for (sint32 i = 0; i < 100; i++) { ride->name_arguments_number++; format_string(rideNameBuffer, 256, ride->name, &ride->name_arguments); @@ -6043,7 +6043,7 @@ foundRideEntry: } } - for (int i = 0; i < 4; i++) { + for (size_t i = 0; i < 4; i++) { ride->station_starts[i] = 0xFFFF; ride->entrances[i] = 0xFFFF; ride->exits[i] = 0xFFFF; @@ -6051,7 +6051,7 @@ foundRideEntry: ride->queue_time[i] = 0; } - for (int i = 0; i < 32; i++) { + for (size_t i = 0; i < 32; i++) { ride->vehicles[i] = SPRITE_INDEX_NULL; } @@ -6190,14 +6190,14 @@ foundRideEntry: * * rct2: 0x006B3F0F */ -void game_command_create_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_create_ride(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = ride_create(*edx & 0xFF, (*edx >> 8) & 0xFF, *ebx, edi, eax); } -void game_command_callback_ride_construct_new(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_ride_construct_new(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { - int rideIndex = edi; + sint32 rideIndex = edi; if (rideIndex != -1) ride_construct(rideIndex); } @@ -6210,9 +6210,9 @@ void game_command_callback_ride_construct_new(int eax, int ebx, int ecx, int edx * Only uses part that deals with construction state */ -void game_command_callback_ride_construct_placed_back(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_ride_construct_placed_back(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { - int trackDirection, x, y, z; + sint32 trackDirection, x, y, z; track_begin_end trackBeginEnd; trackDirection = _currentTrackPieceDirection ^ 2; @@ -6243,9 +6243,9 @@ void game_command_callback_ride_construct_placed_back(int eax, int ebx, int ecx, sub_6C84CE(); } -void game_command_callback_ride_construct_placed_front(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_ride_construct_placed_front(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { - int trackDirection, x, y, z; + sint32 trackDirection, x, y, z; trackDirection = _currentTrackPieceDirection; x = _currentTrackBeginX; @@ -6285,9 +6285,9 @@ void game_command_callback_ride_construct_placed_front(int eax, int ebx, int ecx * Only uses part that deals with construction state */ -void game_command_callback_ride_remove_track_piece(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_ride_remove_track_piece(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { - int x, y, z, direction, type; + sint32 x, y, z, direction, type; x = gRideRemoveTrackPieceCallbackX; y = gRideRemoveTrackPieceCallbackY; @@ -6302,7 +6302,7 @@ void game_command_callback_ride_remove_track_piece(int eax, int ebx, int ecx, in * * rct2: 0x006B49D9 */ -void game_command_demolish_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_demolish_ride(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint8 ride_id = *(uint8*)edx; if (ride_id >= MAX_RIDES) @@ -6322,7 +6322,7 @@ void game_command_demolish_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi *ebx = MONEY32_UNDEFINED; return; } - int x = 0, y = 0, z = 0; + sint32 x = 0, y = 0, z = 0; if(ride->overall_view != (uint16)-1){ x = ((ride->overall_view & 0xFF) * 32) + 16; y = ((ride->overall_view >> 8) * 32) + 16; @@ -6359,7 +6359,7 @@ void game_command_demolish_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi sub_6CB945(ride_id); news_item_disable_news(NEWS_ITEM_RIDE, ride_id); - for(int i = 0; i < MAX_BANNERS; i++){ + for(sint32 i = 0; i < MAX_BANNERS; i++){ rct_banner *banner = &gBanners[i]; if(banner->type != BANNER_NULL && banner->flags & BANNER_FLAG_2 && banner->colour == ride_id){ banner->flags &= 0xFB; @@ -6414,7 +6414,7 @@ void game_command_demolish_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi if(peep->favourite_ride == ride_id){ peep->favourite_ride = MAX_RIDES; } - for (int i = 0; i < PEEP_MAX_THOUGHTS; i++) { + for (sint32 i = 0; i < PEEP_MAX_THOUGHTS; i++) { if(peep->thoughts[i].item == ride_id){ // Clear top thought, push others up memmove(&peep->thoughts[i], &peep->thoughts[i + 1], sizeof(rct_peep_thought)*(PEEP_MAX_THOUGHTS - i - 1)); @@ -6444,7 +6444,7 @@ void game_command_demolish_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi * * rct2: 0x006B2FC5 */ -void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_ride_appearance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { bool apply = (*ebx & GAME_COMMAND_FLAG_APPLY); @@ -6457,7 +6457,7 @@ void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, in } uint8 type = *ebx >> 8; uint8 value = *edx >> 8; - int index = *edi; + sint32 index = *edi; if (index < 0) { log_warning("Invalid game command, index %d out of bounds", index); @@ -6543,7 +6543,7 @@ void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, in if (apply) { ride->colour_scheme_type &= ~(RIDE_COLOUR_SCHEME_DIFFERENT_PER_TRAIN | RIDE_COLOUR_SCHEME_DIFFERENT_PER_CAR); ride->colour_scheme_type |= value; - for (int i = 1; i < countof(ride->vehicle_colours); i++) { + for (sint32 i = 1; i < countof(ride->vehicle_colours); i++) { ride->vehicle_colours[i] = ride->vehicle_colours[0]; ride->vehicle_colours_extended[i] = ride->vehicle_colours_extended[0]; } @@ -6577,7 +6577,7 @@ void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, in * * rct2: 0x006B53E9 */ -void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_ride_price(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint32 flags = *ebx; uint8 ride_number = (*edx & 0xFF); @@ -6689,7 +6689,7 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es } } -bool ride_type_has_flag(int rideType, int flag) +bool ride_type_has_flag(sint32 rideType, sint32 flag) { return (RideProperties[rideType].flags & flag) != 0; } @@ -6799,7 +6799,7 @@ void increment_turn_count_4_plus_elements(rct_ride* ride, uint8 type){ *turn_count |= value; } -int get_turn_count_1_element(rct_ride* ride, uint8 type) { +sint32 get_turn_count_1_element(rct_ride* ride, uint8 type) { uint16* turn_count; switch (type){ case 0: @@ -6818,7 +6818,7 @@ int get_turn_count_1_element(rct_ride* ride, uint8 type) { return (*turn_count) & TURN_MASK_1_ELEMENT; } -int get_turn_count_2_elements(rct_ride* ride, uint8 type) { +sint32 get_turn_count_2_elements(rct_ride* ride, uint8 type) { uint16* turn_count; switch (type){ case 0: @@ -6837,7 +6837,7 @@ int get_turn_count_2_elements(rct_ride* ride, uint8 type) { return ((*turn_count) & TURN_MASK_2_ELEMENTS) >> 5; } -int get_turn_count_3_elements(rct_ride* ride, uint8 type) { +sint32 get_turn_count_3_elements(rct_ride* ride, uint8 type) { uint16* turn_count; switch (type){ case 0: @@ -6856,7 +6856,7 @@ int get_turn_count_3_elements(rct_ride* ride, uint8 type) { return ((*turn_count) & TURN_MASK_3_ELEMENTS) >> 8; } -int get_turn_count_4_plus_elements(rct_ride* ride, uint8 type) { +sint32 get_turn_count_4_plus_elements(rct_ride* ride, uint8 type) { uint16* turn_count; switch (type){ case 0: @@ -6916,7 +6916,7 @@ bool ride_is_block_sectioned(rct_ride *ride) ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED; } -bool ride_has_any_track_elements(int rideIndex) +bool ride_has_any_track_elements(sint32 rideIndex) { map_element_iterator it; @@ -6956,7 +6956,7 @@ void ride_all_has_any_track_elements(bool *rideIndexArray) * * rct2: 0x006847BA */ -void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int num_images){ +void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, sint32 num_images){ uint8 bitmap[200][200] = { 0 }; rct_drawpixelinfo dpi = { @@ -6969,12 +6969,12 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int .zoom_level = 0 }; - for (int i = 0; i < num_images; ++i){ + for (sint32 i = 0; i < num_images; ++i){ gfx_draw_sprite_software(&dpi, vehicle_type->base_image_id + i, 0, 0, 0); } - int al = -1; - for (int i = 99; i != 0; --i){ - for (int j = 0; j < 200; j++){ + sint32 al = -1; + for (sint32 i = 99; i != 0; --i){ + for (sint32 j = 0; j < 200; j++){ if (bitmap[j][100 - i] != 0){ al = i; break; @@ -6984,7 +6984,7 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int if (al != -1) break; - for (int j = 0; j < 200; j++){ + for (sint32 j = 0; j < 200; j++){ if (bitmap[j][100 + i] != 0){ al = i; break; @@ -6996,10 +6996,10 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int } al++; - int bl = -1; + sint32 bl = -1; - for (int i = 99; i != 0; --i){ - for (int j = 0; j < 200; j++){ + for (sint32 i = 99; i != 0; --i){ + for (sint32 j = 0; j < 200; j++){ if (bitmap[100 - i][j] != 0){ bl = i; break; @@ -7011,10 +7011,10 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int } bl++; - int bh = -1; + sint32 bh = -1; - for (int i = 99; i != 0; --i){ - for (int j = 0; j < 200; j++){ + for (sint32 i = 99; i != 0; --i){ + for (sint32 j = 0; j < 200; j++){ if (bitmap[100 + i][j] != 0){ bh = i; break; @@ -7041,7 +7041,7 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int * * rct2: 0x006CA28C */ -money32 ride_get_entrance_or_exit_price(int rideIndex, int x, int y, int direction, int dh, int di) +money32 ride_get_entrance_or_exit_price(sint32 rideIndex, sint32 x, sint32 y, sint32 direction, sint32 dh, sint32 di) { sub_6C96C0(); money32 result = game_do_command( @@ -7063,9 +7063,9 @@ money32 ride_get_entrance_or_exit_price(int rideIndex, int x, int y, int directi return result; } -static int loc_6CD18E(short mapX, short mapY, short entranceMinX, short entranceMinY, short entranceMaxX, short entranceMaxY) +static sint32 loc_6CD18E(sint16 mapX, sint16 mapY, sint16 entranceMinX, sint16 entranceMinY, sint16 entranceMaxX, sint16 entranceMaxY) { - int direction = 0; + sint32 direction = 0; if (mapX == entranceMinX) { if (mapY > entranceMinY && mapY < entranceMaxY) { return direction; @@ -7096,11 +7096,11 @@ static int loc_6CD18E(short mapX, short mapY, short entranceMinX, short entrance * * rct2: 0x006CCF70 */ -void ride_get_entrance_or_exit_position_from_screen_position(int screenX, int screenY, int *outX, int *outY, int *outDirection) +void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sint32 screenY, sint32 *outX, sint32 *outY, sint32 *outDirection) { - short mapX, mapY; - short entranceMinX, entranceMinY, entranceMaxX, entranceMaxY, word_F4418C, word_F4418E; - int interactionType, direction, stationHeight, stationDirection; + sint16 mapX, mapY; + sint16 entranceMinX, entranceMinY, entranceMaxX, entranceMaxY, word_F4418C, word_F4418E; + sint32 interactionType, direction, stationHeight, stationDirection; rct_map_element *mapElement; rct_viewport *viewport; rct_ride *ride; @@ -7155,7 +7155,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(int screenX, int sc direction = mapX < 0 ? 0 : 2; } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { mapX = _unkF44188.x + TileDirectionDelta[direction].x; mapY = _unkF44188.y + TileDirectionDelta[direction].y; if (mapX >= 0 && mapY >= 0 && mapX < (256 * 32) && mapY < (256 * 32)) { @@ -7175,7 +7175,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(int screenX, int sc if (map_get_station(mapElement) != gRideEntranceExitPlaceStationIndex) continue; - int eax = (direction + 2 - mapElement->type) & MAP_ELEMENT_DIRECTION_MASK; + sint32 eax = (direction + 2 - mapElement->type) & MAP_ELEMENT_DIRECTION_MASK; if (FlatRideTrackSequenceProperties[mapElement->properties.track.type][mapElement->properties.track.sequence & 0x0F] & (1 << eax)) { gRideEntranceExitPlaceDirection = direction ^ 2; *outDirection = direction ^ 2; @@ -7265,7 +7265,7 @@ bool ride_select_backwards_from_front() bool ride_select_forwards_from_back() { - int x, y, z, direction; + sint32 x, y, z, direction; sub_6C9627(); @@ -7290,7 +7290,7 @@ bool ride_select_forwards_from_back() } } -money32 ride_remove_track_piece(int x, int y, int z, int direction, int type, uint8 flags) +money32 ride_remove_track_piece(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type, uint8 flags) { gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_REMOVE_THIS; if (network_get_mode() == NETWORK_MODE_CLIENT) @@ -7309,7 +7309,7 @@ bool ride_are_all_possible_entrances_and_exits_built(rct_ride *ride) if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) return true; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (ride->station_starts[i] == 0xFFFF) continue; if (ride->entrances[i] == 0xFFFF) { gGameCommandErrorText = STR_ENTRANCE_NOT_YET_BUILT; @@ -7327,7 +7327,7 @@ bool ride_are_all_possible_entrances_and_exits_built(rct_ride *ride) * * rct2: 0x006B59C6 */ -void invalidate_test_results(int rideIndex) +void invalidate_test_results(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); @@ -7336,7 +7336,7 @@ void invalidate_test_results(int rideIndex) ride->lifecycle_flags &= ~RIDE_LIFECYCLE_TESTED; ride->lifecycle_flags &= ~RIDE_LIFECYCLE_TEST_IN_PROGRESS; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) { - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { uint16 spriteIndex = ride->vehicles[i]; if (spriteIndex != SPRITE_INDEX_NULL) { rct_vehicle *vehicle = GET_VEHICLE(spriteIndex); @@ -7354,7 +7354,7 @@ void invalidate_test_results(int rideIndex) * @param rideIndex (dl) * @param reliabilityIncreaseFactor (ax) */ -void ride_fix_breakdown(int rideIndex, int reliabilityIncreaseFactor) +void ride_fix_breakdown(sint32 rideIndex, sint32 reliabilityIncreaseFactor) { rct_ride *ride = get_ride(rideIndex); @@ -7364,7 +7364,7 @@ void ride_fix_breakdown(int rideIndex, int reliabilityIncreaseFactor) ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST | RIDE_INVALIDATE_RIDE_MAINTENANCE; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) { - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { uint16 spriteIndex = ride->vehicles[i]; while (spriteIndex != SPRITE_INDEX_NULL) { rct_vehicle *vehicle = GET_VEHICLE(spriteIndex); @@ -7384,15 +7384,15 @@ void ride_fix_breakdown(int rideIndex, int reliabilityIncreaseFactor) * * rct2: 0x006DE102 */ -static void ride_update_vehicle_colours(int rideIndex) +static void ride_update_vehicle_colours(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); if (ride->type == RIDE_TYPE_SPACE_RINGS || ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_16)) { gfx_invalidate_screen(); } - for (int i = 0; i < 32; i++) { - int carIndex = 0; + for (sint32 i = 0; i < 32; i++) { + sint32 carIndex = 0; uint16 spriteIndex = ride->vehicles[i]; rct_vehicle_colour colours = { 0 }; uint8 coloursExtended = 0; @@ -7428,11 +7428,11 @@ static void ride_update_vehicle_colours(int rideIndex) * rct2: 0x006DE4CD * trainLayout: Originally fixed to 0x00F64E38. This no longer postfixes with 255. */ -void ride_entry_get_train_layout(int rideEntryIndex, int numCarsPerTrain, uint8 *trainLayout) +void ride_entry_get_train_layout(sint32 rideEntryIndex, sint32 numCarsPerTrain, uint8 *trainLayout) { rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); - for (int i = 0; i < numCarsPerTrain; i++) { + for (sint32 i = 0; i < numCarsPerTrain; i++) { uint8 vehicleType = rideEntry->default_vehicle; if (i == 0 && rideEntry->front_vehicle != 255) { vehicleType = rideEntry->front_vehicle; @@ -7447,7 +7447,7 @@ void ride_entry_get_train_layout(int rideEntryIndex, int numCarsPerTrain, uint8 } } -uint8 ride_entry_get_vehicle_at_position(int rideEntryIndex,int numCarsPerTrain,int position) +uint8 ride_entry_get_vehicle_at_position(sint32 rideEntryIndex,sint32 numCarsPerTrain,sint32 position) { rct_ride_entry *rideEntry = get_ride_entry(rideEntryIndex); if (position == 0 && rideEntry->front_vehicle != 255) { @@ -7478,7 +7478,7 @@ uint64 ride_entry_get_supported_track_pieces(rct_ride_entry* rideEntry) }; //Only check default vehicle; it's assumed the others will have correct sprites if this one does (I've yet to find an exception, at least) - for (int j = 0; j < 55; j++) { + for (sint32 j = 0; j < 55; j++) { if ((rideEntry->vehicles[rideEntry->default_vehicle].sprite_flags & trackPieceRequiredSprites[j]) != trackPieceRequiredSprites[j]) supportedPieces &= ~(1ULL << j); } @@ -7486,29 +7486,29 @@ uint64 ride_entry_get_supported_track_pieces(rct_ride_entry* rideEntry) return supportedPieces; } -static int ride_get_smallest_station_length(rct_ride *ride) +static sint32 ride_get_smallest_station_length(rct_ride *ride) { uint32 result = -1; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (ride->station_starts[i] != 0xFFFF) { result = min(result, (uint32)(ride->station_length[i])); } } - return (int)result; + return (sint32)result; } /** * * rct2: 0x006CB3AA */ -static int ride_get_track_length(rct_ride *ride) +static sint32 ride_get_track_length(rct_ride *ride) { rct_window *w; rct_map_element *mapElement; track_circuit_iterator it; - int x, y, z, trackType, rideIndex, result; + sint32 x, y, z, trackType, rideIndex, result; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { uint16 xy = ride->station_starts[i]; if (xy == 0xFFFF) continue; @@ -7555,7 +7555,7 @@ foundTrack: * * rct2: 0x006DD57D */ -void ride_update_max_vehicles(int rideIndex) +void ride_update_max_vehicles(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); if (ride->subtype == 0xFF) @@ -7564,25 +7564,25 @@ void ride_update_max_vehicles(int rideIndex) rct_ride_entry *rideEntry = get_ride_entry(ride->subtype); rct_ride_entry_vehicle *vehicleEntry; uint8 numCarsPerTrain, numVehicles; - int maxNumTrains; + sint32 maxNumTrains; if (rideEntry->cars_per_flat_ride == 0xFF) { - int trainLength; + sint32 trainLength; ride->num_cars_per_train = max(rideEntry->min_cars_in_train, ride->num_cars_per_train); ride->min_max_cars_per_train = rideEntry->max_cars_in_train | (rideEntry->min_cars_in_train << 4); // Calculate maximum train length based on smallest station length - int stationLength = ride_get_smallest_station_length(ride); + sint32 stationLength = ride_get_smallest_station_length(ride); if (stationLength == -1) return; stationLength = (stationLength * 0x44180) - 0x16B2A; - int maxFriction = RideData5[ride->type].max_friction << 8; - int maxCarsPerTrain = 1; - for (int numCars = rideEntry->max_cars_in_train; numCars > 0; numCars--) { + sint32 maxFriction = RideData5[ride->type].max_friction << 8; + sint32 maxCarsPerTrain = 1; + for (sint32 numCars = rideEntry->max_cars_in_train; numCars > 0; numCars--) { trainLength = 0; - int totalFriction = 0; - for (int i = 0; i < numCars; i++) { + sint32 totalFriction = 0; + for (sint32 i = 0; i < numCars; i++) { vehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, numCars, i)]; trainLength += vehicleEntry->spacing; totalFriction += vehicleEntry->car_friction; @@ -7593,7 +7593,7 @@ void ride_update_max_vehicles(int rideIndex) break; } } - int newCarsPerTrain = max(ride->proposed_num_cars_per_train, rideEntry->min_cars_in_train); + sint32 newCarsPerTrain = max(ride->proposed_num_cars_per_train, rideEntry->min_cars_in_train); maxCarsPerTrain = max(maxCarsPerTrain, rideEntry->min_cars_in_train); if (!gCheatsDisableTrainLengthLimit) { newCarsPerTrain = min(maxCarsPerTrain, newCarsPerTrain); @@ -7615,12 +7615,12 @@ void ride_update_max_vehicles(int rideIndex) default: // Calculate maximum number of trains trainLength = 0; - for (int i = 0; i < newCarsPerTrain; i++) { + for (sint32 i = 0; i < newCarsPerTrain; i++) { vehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, newCarsPerTrain, i)]; trainLength += vehicleEntry->spacing; } - int totalLength = trainLength / 2; + sint32 totalLength = trainLength / 2; if (newCarsPerTrain != 1) totalLength /= 2; @@ -7637,22 +7637,22 @@ void ride_update_max_vehicles(int rideIndex) maxNumTrains = min(maxNumTrains, 31); } else { vehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, newCarsPerTrain, 0)]; - int speed = vehicleEntry->powered_max_speed; + sint32 speed = vehicleEntry->powered_max_speed; - int totalSpacing = 0; - for (int i = 0; i < newCarsPerTrain; i++) { + sint32 totalSpacing = 0; + for (sint32 i = 0; i < newCarsPerTrain; i++) { vehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, newCarsPerTrain, i)]; totalSpacing += vehicleEntry->spacing; } totalSpacing >>= 13; - int trackLength = ride_get_track_length(ride) / 4; + sint32 trackLength = ride_get_track_length(ride) / 4; if (speed > 10) trackLength = (trackLength * 3) / 4; if (speed > 25) trackLength = (trackLength * 3) / 4; if (speed > 40) trackLength = (trackLength * 3) / 4; maxNumTrains = 0; - int length = 0; + sint32 length = 0; do { maxNumTrains++; length += totalSpacing; @@ -7683,7 +7683,7 @@ void ride_update_max_vehicles(int rideIndex) } } -void ride_set_ride_entry(int rideIndex, int rideEntry) +void ride_set_ride_entry(sint32 rideIndex, sint32 rideEntry) { gGameCommandErrorTitle = STR_RIDE_SET_VEHICLE_TYPE_FAIL; game_do_command( @@ -7697,7 +7697,7 @@ void ride_set_ride_entry(int rideIndex, int rideEntry) ); } -void ride_set_num_vehicles(int rideIndex, int numVehicles) +void ride_set_num_vehicles(sint32 rideIndex, sint32 numVehicles) { gGameCommandErrorTitle = STR_RIDE_SET_VEHICLE_SET_NUM_TRAINS_FAIL; game_do_command( @@ -7711,7 +7711,7 @@ void ride_set_num_vehicles(int rideIndex, int numVehicles) ); } -void ride_set_num_cars_per_vehicle(int rideIndex, int numCarsPerVehicle) +void ride_set_num_cars_per_vehicle(sint32 rideIndex, sint32 numCarsPerVehicle) { gGameCommandErrorTitle = STR_RIDE_SET_VEHICLE_SET_NUM_CARS_PER_TRAIN_FAIL; game_do_command( @@ -7728,7 +7728,7 @@ void ride_set_num_cars_per_vehicle(int rideIndex, int numCarsPerVehicle) static bool ride_is_vehicle_type_valid(rct_ride *ride, uint8 inputRideEntryIndex) { bool selectionShouldBeExpanded; - int rideTypeIterator, rideTypeIteratorMax; + sint32 rideTypeIterator, rideTypeIteratorMax; if (gCheatsShowVehiclesFromOtherTrackTypes && !(ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) || ride->type == RIDE_TYPE_MAZE || ride->type == RIDE_TYPE_MINI_GOLF) @@ -7881,7 +7881,7 @@ static money32 ride_set_vehicles(uint8 rideIndex, uint8 setting, uint8 value, ui * * rct2: 0x006B52D4 */ -void game_command_set_ride_vehicles(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_ride_vehicles(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint8 rideIndex = *edx & 0xFF; uint8 setting = (*ebx >> 8) & 0xFF; @@ -7895,7 +7895,7 @@ void game_command_set_ride_vehicles(int *eax, int *ebx, int *ecx, int *edx, int * * rct2: 0x006CB945 */ -void sub_6CB945(int rideIndex) +void sub_6CB945(sint32 rideIndex) { rct_ride* ride = get_ride(rideIndex); if (ride->type != RIDE_TYPE_MAZE) { @@ -8079,13 +8079,13 @@ void sub_6CB945(int rideIndex) * Removes the hedge walls for an entrance placement. * rct2: 0x00666CBE */ -static void maze_entrance_hedge_removal(int x, int y, rct_map_element *mapElement) +static void maze_entrance_hedge_removal(sint32 x, sint32 y, rct_map_element *mapElement) { - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; x += TileDirectionDelta[direction].x; y += TileDirectionDelta[direction].y; - int z = mapElement->base_height; - int rideIndex = mapElement->properties.track.ride_index; + sint32 z = mapElement->base_height; + sint32 rideIndex = mapElement->properties.track.ride_index; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -8116,13 +8116,13 @@ static void maze_entrance_hedge_removal(int x, int y, rct_map_element *mapElemen * Replaces the outer hedge walls for an entrance placement removal. * rct2: 0x00666D6F */ -static void maze_entrance_hedge_replacement(int x, int y, rct_map_element *mapElement) +static void maze_entrance_hedge_replacement(sint32 x, sint32 y, rct_map_element *mapElement) { - int direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = mapElement->type & MAP_ELEMENT_DIRECTION_MASK; x += TileDirectionDelta[direction].x; y += TileDirectionDelta[direction].y; - int z = mapElement->base_height; - int rideIndex = mapElement->properties.track.ride_index; + sint32 z = mapElement->base_height; + sint32 rideIndex = mapElement->properties.track.ride_index; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -8332,7 +8332,7 @@ static money32 place_ride_entrance_or_exit(sint16 x, sint16 y, sint16 z, uint8 d * * rct2: 0x006660A8 */ -void game_command_place_ride_entrance_or_exit(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp){ +void game_command_place_ride_entrance_or_exit(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp){ *ebx = place_ride_entrance_or_exit( *eax & 0xFFFF, *ecx & 0xFFFF, @@ -8434,7 +8434,7 @@ static money32 remove_ride_entrance_or_exit(sint16 x, sint16 y, uint8 rideIndex, * * rct2: 0x0066640B */ -void game_command_remove_ride_entrance_or_exit(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp){ +void game_command_remove_ride_entrance_or_exit(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp){ *ebx = remove_ride_entrance_or_exit( *eax & 0xFFFF, *ecx & 0xFFFF, @@ -8444,7 +8444,7 @@ void game_command_remove_ride_entrance_or_exit(int *eax, int *ebx, int *ecx, int ); } -void ride_set_to_default_inspection_interval(int rideIndex) +void ride_set_to_default_inspection_interval(sint32 rideIndex) { rct_ride *ride = get_ride(rideIndex); uint8 defaultInspectionInterval = gConfigGeneral.default_inspection_interval; @@ -8480,7 +8480,7 @@ void ride_crash(uint8 rideIndex, uint8 vehicleIndex) } } -bool shop_item_is_food_or_drink(int shopItem) +bool shop_item_is_food_or_drink(sint32 shopItem) { switch (shopItem) { case SHOP_ITEM_DRINK: @@ -8517,7 +8517,7 @@ bool shop_item_is_food_or_drink(int shopItem) } } -bool shop_item_is_food(int shopItem) +bool shop_item_is_food(sint32 shopItem) { switch (shopItem) { case SHOP_ITEM_BURGER: @@ -8546,7 +8546,7 @@ bool shop_item_is_food(int shopItem) } } -bool shop_item_is_drink(int shopItem) +bool shop_item_is_drink(sint32 shopItem) { switch (shopItem) { case SHOP_ITEM_DRINK: @@ -8563,7 +8563,7 @@ bool shop_item_is_drink(int shopItem) } } -bool shop_item_is_souvenir(int shopItem) +bool shop_item_is_souvenir(sint32 shopItem) { switch (shopItem) { case SHOP_ITEM_BALLOON: @@ -8585,7 +8585,7 @@ bool shop_item_is_souvenir(int shopItem) void ride_reset_all_names() { - int i; + sint32 i; rct_ride *ride; char rideNameBuffer[256]; @@ -8620,7 +8620,7 @@ const uint8* ride_seek_available_modes(rct_ride *ride) if (!gCheatsShowAllOperatingModes) { availableModes = RideAvailableModes; - for (int i = 0; i < ride->type; i++) { + for (sint32 i = 0; i < ride->type; i++) { while (*(availableModes++) != 255) { } } } @@ -8712,7 +8712,7 @@ money16 ride_get_price(rct_ride * ride) * Return the map_element of an adjacent station at x,y,z(+-2). * Returns NULL if no suitable map_element is found. */ -rct_map_element *get_station_platform(int x, int y, int z, int z_tolerance) { +rct_map_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tolerance) { bool foundMapElement = false; rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement != NULL) { @@ -8743,13 +8743,13 @@ rct_map_element *get_station_platform(int x, int y, int z, int z_tolerance) { /** * Check for an adjacent station to x,y,z in direction. */ -static bool check_for_adjacent_station(int x, int y, int z, uint8 direction) { +static bool check_for_adjacent_station(sint32 x, sint32 y, sint32 z, uint8 direction) { bool found = false; - int adjX = x + TileDirectionDelta[direction].x; - int adjY = y + TileDirectionDelta[direction].y; + sint32 adjX = x + TileDirectionDelta[direction].x; + sint32 adjY = y + TileDirectionDelta[direction].y; rct_map_element *stationElement = get_station_platform(adjX, adjY, z, 2); if (stationElement != NULL) { - int rideIndex = stationElement->properties.track.ride_index; + sint32 rideIndex = stationElement->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS) { found = true; @@ -8767,7 +8767,7 @@ bool ride_has_adjacent_station(rct_ride *ride) /* Loop through all of the ride stations, checking for an * adjacent station on either side. */ - for (int stationNum = 0; stationNum <= 3; stationNum++) { + for (sint32 stationNum = 0; stationNum <= 3; stationNum++) { if (ride->station_starts[stationNum] != 0xFFFF) { /* Get the map element for the station start. */ uint16 stationX = (ride->station_starts[stationNum] & 0xFF) * 32; @@ -8779,7 +8779,7 @@ bool ride_has_adjacent_station(rct_ride *ride) continue; } /* Check the first side of the station */ - int direction = (stationElement->type + 1) & 3; + sint32 direction = (stationElement->type + 1) & 3; found = check_for_adjacent_station(stationX, stationY, stationZ, direction); if (found) break; /* Check the other side of the station */ diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h index d16431333b..ea19750a9a 100644 --- a/src/openrct2/ride/ride.h +++ b/src/openrct2/ride/ride.h @@ -355,14 +355,14 @@ typedef struct rct_ride_measurement { assert_struct_size(rct_ride_measurement, 0x4b0c); typedef struct track_begin_end { - int begin_x; - int begin_y; - int begin_z; - int begin_direction; + sint32 begin_x; + sint32 begin_y; + sint32 begin_z; + sint32 begin_direction; rct_map_element *begin_element; - int end_x; - int end_y; - int end_direction; + sint32 end_x; + sint32 end_y; + sint32 end_direction; rct_map_element *end_element; } track_begin_end; #ifdef PLATFORM_32BIT @@ -925,10 +925,10 @@ extern const rct_ride_properties RideProperties[RIDE_TYPE_COUNT]; #define TURN_MASK_4_PLUS_ELEMENTS 0xF800 /** Helper macros until rides are stored in this module. */ -rct_ride *get_ride(int index); -rct_ride_entry *get_ride_entry(int index); -void get_ride_entry_name(char *name, int index); -rct_ride_measurement *get_ride_measurement(int index); +rct_ride *get_ride(sint32 index); +rct_ride_entry *get_ride_entry(sint32 index); +void get_ride_entry_name(char *name, sint32 index); +rct_ride_measurement *get_ride_measurement(sint32 index); /** * Helper macro loop for enumerating through all the non null rides. @@ -999,17 +999,17 @@ extern uint8 gRideEntranceExitPlacePreviousRideConstructionState; extern uint8 gRideEntranceExitPlaceDirection; extern bool gGotoStartPlacementMode; -extern int gRideRemoveTrackPieceCallbackX; -extern int gRideRemoveTrackPieceCallbackY; -extern int gRideRemoveTrackPieceCallbackZ; -extern int gRideRemoveTrackPieceCallbackDirection; -extern int gRideRemoveTrackPieceCallbackType; +extern sint32 gRideRemoveTrackPieceCallbackX; +extern sint32 gRideRemoveTrackPieceCallbackY; +extern sint32 gRideRemoveTrackPieceCallbackZ; +extern sint32 gRideRemoveTrackPieceCallbackDirection; +extern sint32 gRideRemoveTrackPieceCallbackType; extern uint8 gLastEntranceStyle; -int ride_get_count(); -int ride_get_total_queue_length(rct_ride *ride); -int ride_get_max_queue_time(rct_ride *ride); +sint32 ride_get_count(); +sint32 ride_get_total_queue_length(rct_ride *ride); +sint32 ride_get_max_queue_time(rct_ride *ride); void ride_init_all(); void reset_all_ride_build_dates(); void ride_update_favourited_stat(); @@ -1017,64 +1017,64 @@ void ride_update_all(); void ride_check_all_reachable(); void ride_update_satisfaction(rct_ride* ride, uint8 happiness); void ride_update_popularity(rct_ride* ride, uint8 pop_amount); -money32 get_shop_item_cost(int shopItem); -money16 get_shop_base_value(int shopItem); -money16 get_shop_hot_value(int shopItem); -money16 get_shop_cold_value(int shopItem); -bool ride_try_get_origin_element(int rideIndex, rct_xy_element *output); -int ride_find_track_gap(rct_xy_element *input, rct_xy_element *output); +money32 get_shop_item_cost(sint32 shopItem); +money16 get_shop_base_value(sint32 shopItem); +money16 get_shop_hot_value(sint32 shopItem); +money16 get_shop_cold_value(sint32 shopItem); +bool ride_try_get_origin_element(sint32 rideIndex, rct_xy_element *output); +sint32 ride_find_track_gap(rct_xy_element *input, rct_xy_element *output); void ride_construct_new(ride_list_item listItem); -void ride_construct(int rideIndex); -int ride_modify(rct_xy_element *input); -void ride_get_status(int rideIndex, rct_string_id *formatSecondary, int *argument); +void ride_construct(sint32 rideIndex); +sint32 ride_modify(rct_xy_element *input); +void ride_get_status(sint32 rideIndex, rct_string_id *formatSecondary, sint32 *argument); rct_peep *ride_get_assigned_mechanic(rct_ride *ride); -int ride_get_total_length(rct_ride *ride); -int ride_get_total_time(rct_ride *ride); -int ride_can_have_multiple_circuits(rct_ride *ride); -track_colour ride_get_track_colour(rct_ride *ride, int colourScheme); -vehicle_colour ride_get_vehicle_colour(rct_ride *ride, int vehicleIndex); +sint32 ride_get_total_length(rct_ride *ride); +sint32 ride_get_total_time(rct_ride *ride); +sint32 ride_can_have_multiple_circuits(rct_ride *ride); +track_colour ride_get_track_colour(rct_ride *ride, sint32 colourScheme); +vehicle_colour ride_get_vehicle_colour(rct_ride *ride, sint32 vehicleIndex); rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride); uint8 *get_ride_entry_indices_for_ride_type(uint8 rideType); void reset_type_to_ride_entry_index_map(); void ride_measurement_clear(rct_ride *ride); void ride_measurements_update(); -rct_ride_measurement *ride_get_measurement(int rideIndex, rct_string_id *message); -void ride_breakdown_add_news_item(int rideIndex); -rct_peep *ride_find_closest_mechanic(rct_ride *ride, int forInspection); -int sub_6CC3FB(int rideIndex); +rct_ride_measurement *ride_get_measurement(sint32 rideIndex, rct_string_id *message); +void ride_breakdown_add_news_item(sint32 rideIndex); +rct_peep *ride_find_closest_mechanic(rct_ride *ride, sint32 forInspection); +sint32 sub_6CC3FB(sint32 rideIndex); void sub_6C9627(); -int sub_6C683D(int* x, int* y, int* z, int direction, int type, uint16 extra_params, rct_map_element** output_element, uint16 flags); +sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_map_element** output_element, uint16 flags); void ride_set_map_tooltip(rct_map_element *mapElement); -int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint16 sampleRate, uint32 position, uint8 *tuneId); +sint32 ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint16 sampleRate, uint32 position, uint8 *tuneId); void ride_music_update_final(); -void ride_prepare_breakdown(int rideIndex, int breakdownReason); -rct_map_element *ride_get_station_start_track_element(rct_ride *ride, int stationIndex); -rct_map_element *ride_get_station_exit_element(rct_ride *ride, int x, int y, int z); -void ride_set_status(int rideIndex, int status); -void game_command_set_ride_status(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void ride_set_name(int rideIndex, const char *name); -void game_command_set_ride_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_ride_setting(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -int ride_get_refund_price(int ride_id); -bool shop_item_is_photo(int shopItem); -bool shop_item_has_common_price(int shopItem); -void game_command_create_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_callback_ride_construct_new(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -void game_command_callback_ride_construct_placed_front(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -void game_command_callback_ride_construct_placed_back(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -void game_command_callback_ride_remove_track_piece(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); -void game_command_demolish_ride(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -money32 ride_create_command(int type, int subType, int flags, uint8 *outRideIndex, uint8 *outRideColour); +void ride_prepare_breakdown(sint32 rideIndex, sint32 breakdownReason); +rct_map_element *ride_get_station_start_track_element(rct_ride *ride, sint32 stationIndex); +rct_map_element *ride_get_station_exit_element(rct_ride *ride, sint32 x, sint32 y, sint32 z); +void ride_set_status(sint32 rideIndex, sint32 status); +void game_command_set_ride_status(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void ride_set_name(sint32 rideIndex, const char *name); +void game_command_set_ride_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_ride_setting(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +sint32 ride_get_refund_price(sint32 ride_id); +bool shop_item_is_photo(sint32 shopItem); +bool shop_item_has_common_price(sint32 shopItem); +void game_command_create_ride(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_callback_ride_construct_new(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +void game_command_callback_ride_construct_placed_front(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +void game_command_callback_ride_construct_placed_back(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +void game_command_callback_ride_remove_track_piece(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); +void game_command_demolish_ride(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_ride_appearance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_ride_price(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +money32 ride_create_command(sint32 type, sint32 subType, sint32 flags, uint8 *outRideIndex, uint8 *outRideColour); -void ride_clear_for_construction(int rideIndex); +void ride_clear_for_construction(sint32 rideIndex); void ride_restore_provisional_entrance_or_exit(); void ride_remove_provisional_entrance_or_exit(); void ride_restore_provisional_track_piece(); void ride_remove_provisional_track_piece(); -void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int num_images); -void invalidate_test_results(int rideIndex); +void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, sint32 num_images); +void invalidate_test_results(sint32 rideIndex); void ride_select_next_section(); void ride_select_previous_section(); @@ -1083,10 +1083,10 @@ void increment_turn_count_1_element(rct_ride* ride, uint8 type); void increment_turn_count_2_elements(rct_ride* ride, uint8 type); void increment_turn_count_3_elements(rct_ride* ride, uint8 type); void increment_turn_count_4_plus_elements(rct_ride* ride, uint8 type); -int get_turn_count_1_element(rct_ride* ride, uint8 type); -int get_turn_count_2_elements(rct_ride* ride, uint8 type); -int get_turn_count_3_elements(rct_ride* ride, uint8 type); -int get_turn_count_4_plus_elements(rct_ride* ride, uint8 type); +sint32 get_turn_count_1_element(rct_ride* ride, uint8 type); +sint32 get_turn_count_2_elements(rct_ride* ride, uint8 type); +sint32 get_turn_count_3_elements(rct_ride* ride, uint8 type); +sint32 get_turn_count_4_plus_elements(rct_ride* ride, uint8 type); uint8 ride_get_helix_sections(rct_ride *ride); bool ride_has_spinning_tunnel(rct_ride *ride); @@ -1096,62 +1096,62 @@ bool ride_has_log_reverser(rct_ride *ride); bool ride_has_waterfall(rct_ride *ride); bool ride_has_whirlpool(rct_ride *ride); -bool ride_type_has_flag(int rideType, int flag); +bool ride_type_has_flag(sint32 rideType, sint32 flag); bool ride_is_powered_launched(rct_ride *ride); bool ride_is_block_sectioned(rct_ride *ride); -bool ride_has_any_track_elements(int rideIndex); +bool ride_has_any_track_elements(sint32 rideIndex); void ride_all_has_any_track_elements(bool *rideIndexArray); void ride_construction_set_default_next_piece(); -bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, int *z, int *direction); -bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 rideIndex, uint8 direction_start, rct_xy_element *output, int *z, int *direction); +bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32 *z, sint32 *direction); +bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 rideIndex, uint8 direction_start, rct_xy_element *output, sint32 *z, sint32 *direction); -bool track_block_get_previous(int x, int y, rct_map_element *mapElement, track_begin_end *outTrackBeginEnd); +bool track_block_get_previous(sint32 x, sint32 y, rct_map_element *mapElement, track_begin_end *outTrackBeginEnd); bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint8 direction, track_begin_end *outTrackBeginEnd); void sub_6C84CE(); void sub_6C96C0(); -money32 ride_get_entrance_or_exit_price(int rideIndex, int x, int y, int direction, int dh, int di); -void ride_get_entrance_or_exit_position_from_screen_position(int x, int y, int *outX, int *outY, int *outDirection); +money32 ride_get_entrance_or_exit_price(sint32 rideIndex, sint32 x, sint32 y, sint32 direction, sint32 dh, sint32 di); +void ride_get_entrance_or_exit_position_from_screen_position(sint32 x, sint32 y, sint32 *outX, sint32 *outY, sint32 *outDirection); bool ride_select_backwards_from_front(); bool ride_select_forwards_from_back(); -money32 ride_remove_track_piece(int x, int y, int z, int direction, int type, uint8 flags); +money32 ride_remove_track_piece(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type, uint8 flags); bool ride_are_all_possible_entrances_and_exits_built(rct_ride *ride); -void ride_fix_breakdown(int rideIndex, int reliabilityIncreaseFactor); +void ride_fix_breakdown(sint32 rideIndex, sint32 reliabilityIncreaseFactor); -void ride_entry_get_train_layout(int rideEntryIndex, int numCarsPerTrain, uint8 *trainLayout); -uint8 ride_entry_get_vehicle_at_position(int rideEntryIndex, int numCarsPerTrain, int position); -void ride_update_max_vehicles(int rideIndex); +void ride_entry_get_train_layout(sint32 rideEntryIndex, sint32 numCarsPerTrain, uint8 *trainLayout); +uint8 ride_entry_get_vehicle_at_position(sint32 rideEntryIndex, sint32 numCarsPerTrain, sint32 position); +void ride_update_max_vehicles(sint32 rideIndex); uint64 ride_entry_get_supported_track_pieces(rct_ride_entry* rideEntry); -void ride_set_ride_entry(int rideIndex, int rideEntry); -void ride_set_num_vehicles(int rideIndex, int numVehicles); -void ride_set_num_cars_per_vehicle(int rideIndex, int numCarsPerVehicle); -void game_command_set_ride_vehicles(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +void ride_set_ride_entry(sint32 rideIndex, sint32 rideEntry); +void ride_set_num_vehicles(sint32 rideIndex, sint32 numVehicles); +void ride_set_num_cars_per_vehicle(sint32 rideIndex, sint32 numCarsPerVehicle); +void game_command_set_ride_vehicles(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); -void game_command_place_ride_entrance_or_exit(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_remove_ride_entrance_or_exit(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +void game_command_place_ride_entrance_or_exit(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_remove_ride_entrance_or_exit(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); -void ride_set_to_default_inspection_interval(int rideIndex); +void ride_set_to_default_inspection_interval(sint32 rideIndex); -void sub_6CB945(int rideIndex); +void sub_6CB945(sint32 rideIndex); void ride_crash(uint8 rideIndex, uint8 vehicleIndex); void sub_6C94D8(); -bool shop_item_is_food_or_drink(int shopItem); -bool shop_item_is_food(int shopItem); -bool shop_item_is_drink(int shopItem); -bool shop_item_is_souvenir(int shopItem); +bool shop_item_is_food_or_drink(sint32 shopItem); +bool shop_item_is_food(sint32 shopItem); +bool shop_item_is_drink(sint32 shopItem); +bool shop_item_is_souvenir(sint32 shopItem); void ride_reset_all_names(); const uint8* ride_seek_available_modes(rct_ride *ride); void window_ride_measurements_design_cancel(); -void window_ride_construction_mouseup_demolish_next_piece(int x, int y, int z, int direction, int type); +void window_ride_construction_mouseup_demolish_next_piece(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type); uint32 ride_customers_per_hour(const rct_ride *ride); uint32 ride_customers_in_last_5_minutes(const rct_ride *ride); @@ -1160,12 +1160,12 @@ rct_vehicle * ride_get_broken_vehicle(rct_ride *ride); void window_ride_construction_do_station_check(); void window_ride_construction_do_entrance_exit_check(); -void game_command_callback_place_ride_entrance_or_exit(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); +void game_command_callback_place_ride_entrance_or_exit(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); void ride_delete(uint8 rideIndex); money16 ride_get_price(rct_ride * ride); -rct_map_element *get_station_platform(int x, int y, int z, int z_tolerance); +rct_map_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tolerance); bool ride_has_adjacent_station(rct_ride *ride); bool ride_has_ratings(const rct_ride * ride); diff --git a/src/openrct2/ride/ride_data.c b/src/openrct2/ride/ride_data.c index 7b925b05d6..9c166fd525 100644 --- a/src/openrct2/ride/ride_data.c +++ b/src/openrct2/ride/ride_data.c @@ -1732,7 +1732,7 @@ const rct_ride_lift_data RideLiftData[] = { }; /** rct2: 0x0097D7CB */ -const int RidePhotoItems[] = { +const sint32 RidePhotoItems[] = { SHOP_ITEM_PHOTO, // RIDE_TYPE_SPIRAL_ROLLER_COASTER SHOP_ITEM_PHOTO, // RIDE_TYPE_STAND_UP_ROLLER_COASTER SHOP_ITEM_PHOTO2, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER diff --git a/src/openrct2/ride/ride_data.h b/src/openrct2/ride/ride_data.h index 70a3873984..d1489f21d3 100644 --- a/src/openrct2/ride/ride_data.h +++ b/src/openrct2/ride/ride_data.h @@ -153,7 +153,7 @@ extern const rct_ride_entrance_definition RideEntranceDefinitions[RIDE_ENTRANCE_ extern const rct_ride_lift_data RideLiftData[RIDE_TYPE_COUNT]; extern const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT]; -extern const int RidePhotoItems[RIDE_TYPE_COUNT]; +extern const sint32 RidePhotoItems[RIDE_TYPE_COUNT]; extern const ride_cost RideTrackCosts[RIDE_TYPE_COUNT]; extern const rct_ride_data_5 RideData5[RIDE_TYPE_COUNT]; diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index 46dedd9630..7c04da8392 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -116,7 +116,7 @@ void ride_ratings_update_all() */ static void ride_ratings_update_state_0() { - int currentRide = gRideRatingsCalcData.current_ride; + sint32 currentRide = gRideRatingsCalcData.current_ride; currentRide++; if (currentRide == 255) { @@ -137,7 +137,7 @@ static void ride_ratings_update_state_0() static void ride_ratings_update_state_1() { gRideRatingsCalcData.proximity_total = 0; - for (int i = 0; i < PROXIMITY_COUNT; i++) { + for (sint32 i = 0; i < PROXIMITY_COUNT; i++) { gRideRatingsCalcData.proximity_scores[i] = 0; } gRideRatingsCalcData.num_brakes = 0; @@ -159,10 +159,10 @@ static void ride_ratings_update_state_2() return; } - int x = gRideRatingsCalcData.proximity_x / 32; - int y = gRideRatingsCalcData.proximity_y / 32; - int z = gRideRatingsCalcData.proximity_z / 8; - int trackType = gRideRatingsCalcData.proximity_track_type; + sint32 x = gRideRatingsCalcData.proximity_x / 32; + sint32 y = gRideRatingsCalcData.proximity_y / 32; + sint32 z = gRideRatingsCalcData.proximity_z / 8; + sint32 trackType = gRideRatingsCalcData.proximity_track_type; rct_map_element *mapElement = map_get_first_element_at(x, y); do { @@ -173,7 +173,7 @@ static void ride_ratings_update_state_2() if (trackType == 255 || ((mapElement->properties.track.sequence & 0x0F) == 0 && trackType == mapElement->properties.track.type)) { if (trackType == TRACK_ELEM_END_STATION) { - int entranceIndex = map_get_station(mapElement); + sint32 entranceIndex = map_get_station(mapElement); gRideRatingsCalcData.station_flags &= ~RIDE_RATING_STATION_FLAG_NO_ENTRANCE; if (ride->entrances[entranceIndex] == 0xFFFF) { gRideRatingsCalcData.station_flags |= RIDE_RATING_STATION_FLAG_NO_ENTRANCE; @@ -253,10 +253,10 @@ static void ride_ratings_update_state_5() return; } - int x = gRideRatingsCalcData.proximity_x / 32; - int y = gRideRatingsCalcData.proximity_y / 32; - int z = gRideRatingsCalcData.proximity_z / 8; - int trackType = gRideRatingsCalcData.proximity_track_type; + sint32 x = gRideRatingsCalcData.proximity_x / 32; + sint32 y = gRideRatingsCalcData.proximity_y / 32; + sint32 z = gRideRatingsCalcData.proximity_z / 8; + sint32 trackType = gRideRatingsCalcData.proximity_track_type; rct_map_element *mapElement = map_get_first_element_at(x, y); do { @@ -311,16 +311,16 @@ static void ride_ratings_begin_proximity_loop() return; } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (ride->station_starts[i] != 0xFFFF) { gRideRatingsCalcData.station_flags &= ~RIDE_RATING_STATION_FLAG_NO_ENTRANCE; if (ride->entrances[i] == 0xFFFF) { gRideRatingsCalcData.station_flags |= RIDE_RATING_STATION_FLAG_NO_ENTRANCE; } - int x = (ride->station_starts[i] & 0xFF) * 32; - int y = (ride->station_starts[i] >> 8) * 32; - int z = ride->station_heights[i] * 8; + sint32 x = (ride->station_starts[i] & 0xFF) * 32; + sint32 y = (ride->station_starts[i] >> 8) * 32; + sint32 z = ride->station_heights[i] * 8; gRideRatingsCalcData.proximity_x = x; gRideRatingsCalcData.proximity_y = y; @@ -336,7 +336,7 @@ static void ride_ratings_begin_proximity_loop() gRideRatingsCalcData.state = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; } -static void proximity_score_increment(int type) +static void proximity_score_increment(sint32 type) { gRideRatingsCalcData.proximity_scores[type]++; } @@ -345,10 +345,10 @@ static void proximity_score_increment(int type) * * rct2: 0x006B6207 */ -static void ride_ratings_score_close_proximity_in_direction(rct_map_element *inputMapElement, int direction) +static void ride_ratings_score_close_proximity_in_direction(rct_map_element *inputMapElement, sint32 direction) { - int x = gRideRatingsCalcData.proximity_x + TileDirectionDelta[direction].x; - int y = gRideRatingsCalcData.proximity_y + TileDirectionDelta[direction].y; + sint32 x = gRideRatingsCalcData.proximity_x + TileDirectionDelta[direction].x; + sint32 y = gRideRatingsCalcData.proximity_y + TileDirectionDelta[direction].y; if (x < 0 || y < 0 || x >= (32 * 256) || y >= (32 * 256)) return; @@ -363,13 +363,13 @@ static void ride_ratings_score_close_proximity_in_direction(rct_map_element *inp } break; case MAP_ELEMENT_TYPE_PATH: - if (abs((int)inputMapElement->base_height - (int)mapElement->base_height) <= 2) { + if (abs((sint32)inputMapElement->base_height - (sint32)mapElement->base_height) <= 2) { proximity_score_increment(PROXIMITY_PATH_SIDE_CLOSE); } break; case MAP_ELEMENT_TYPE_TRACK: if (inputMapElement->properties.track.ride_index != mapElement->properties.track.ride_index) { - if (abs((int)inputMapElement->base_height - (int)mapElement->base_height) <= 2) { + if (abs((sint32)inputMapElement->base_height - (sint32)mapElement->base_height) <= 2) { proximity_score_increment(PROXIMITY_FOREIGN_TRACK_SIDE_CLOSE); } } @@ -389,14 +389,14 @@ static void ride_ratings_score_close_proximity_in_direction(rct_map_element *inp } -static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inputMapElement, int x, int y) +static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inputMapElement, sint32 x, sint32 y) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { switch (map_element_get_type(mapElement)) { case MAP_ELEMENT_TYPE_PATH: { - int zDiff = (int)mapElement->base_height - (int)inputMapElement->base_height; + sint32 zDiff = (sint32)mapElement->base_height - (sint32)inputMapElement->base_height; if (zDiff >= 0 && zDiff <= 16) { proximity_score_increment(PROXIMITY_PATH_TROUGH_VERTICAL_LOOP); @@ -405,10 +405,10 @@ static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inp case MAP_ELEMENT_TYPE_TRACK: { - int unk = (mapElement->type ^ inputMapElement->type) & 1; + sint32 unk = (mapElement->type ^ inputMapElement->type) & 1; if (unk != 0) { - int zDiff = (int)mapElement->base_height - (int)inputMapElement->base_height; + sint32 zDiff = (sint32)mapElement->base_height - (sint32)inputMapElement->base_height; if (zDiff >= 0 && zDiff <= 16) { proximity_score_increment(PROXIMITY_TRACK_THROUGH_VERTICAL_LOOP); @@ -432,13 +432,13 @@ static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inp */ static void ride_ratings_score_close_proximity_loops(rct_map_element *inputMapElement) { - int trackType = inputMapElement->properties.track.type; + sint32 trackType = inputMapElement->properties.track.type; if (trackType == TRACK_ELEM_LEFT_VERTICAL_LOOP || trackType == TRACK_ELEM_RIGHT_VERTICAL_LOOP) { - int x = gRideRatingsCalcData.proximity_x; - int y = gRideRatingsCalcData.proximity_y; + sint32 x = gRideRatingsCalcData.proximity_x; + sint32 y = gRideRatingsCalcData.proximity_y; ride_ratings_score_close_proximity_loops_helper(inputMapElement, x, y); - int direction = inputMapElement->type & MAP_ELEMENT_DIRECTION_MASK; + sint32 direction = inputMapElement->type & MAP_ELEMENT_DIRECTION_MASK; x = gRideRatingsCalcData.proximity_x + TileDirectionDelta[direction].x; y = gRideRatingsCalcData.proximity_y + TileDirectionDelta[direction].y; ride_ratings_score_close_proximity_loops_helper(inputMapElement, x, y); @@ -456,8 +456,8 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) } gRideRatingsCalcData.proximity_total++; - int x = gRideRatingsCalcData.proximity_x; - int y = gRideRatingsCalcData.proximity_y; + sint32 x = gRideRatingsCalcData.proximity_x; + sint32 y = gRideRatingsCalcData.proximity_y; rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { switch (map_element_get_type(mapElement)) { @@ -466,9 +466,9 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) if (mapElement->base_height * 8 == gRideRatingsCalcData.proximity_z) { proximity_score_increment(PROXIMITY_SURFACE_TOUCH); } - int waterHeight = (mapElement->properties.surface.terrain & 0x1F); + sint32 waterHeight = (mapElement->properties.surface.terrain & 0x1F); if (waterHeight != 0) { - int z = waterHeight * 16; + sint32 z = waterHeight * 16; if (z <= gRideRatingsCalcData.proximity_z) { proximity_score_increment(PROXIMITY_WATER_OVER); if (z == gRideRatingsCalcData.proximity_z) { @@ -507,9 +507,9 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) break; case MAP_ELEMENT_TYPE_TRACK: { - int trackType = mapElement->properties.track.type; + sint32 trackType = mapElement->properties.track.type; if (trackType == TRACK_ELEM_LEFT_VERTICAL_LOOP || trackType == TRACK_ELEM_RIGHT_VERTICAL_LOOP) { - int sequence = mapElement->properties.track.sequence & 0x0F; + sint32 sequence = mapElement->properties.track.sequence & 0x0F; if (sequence == 3 || sequence == 6) { if (mapElement->base_height - inputMapElement->clearance_height <= 10) { proximity_score_increment(PROXIMITY_THROUGH_VERTICAL_LOOP); @@ -614,12 +614,12 @@ static void ride_ratings_calculate_value(rct_ride *ride) return; } - int value = + sint32 value = (((ride->excitement * RideRatings[ride->type].excitement) * 32) >> 15) + (((ride->intensity * RideRatings[ride->type].intensity) * 32) >> 15) + (((ride->nausea * RideRatings[ride->type].nausea) * 32) >> 15); - int monthsOld = gDateMonthsElapsed - ride->build_date; + sint32 monthsOld = gDateMonthsElapsed - ride->build_date; // New ride reward if (monthsOld <= 12) { @@ -639,9 +639,9 @@ static void ride_ratings_calculate_value(rct_ride *ride) } // Other ride of same type penalty - int otherRidesOfSameType = 0; + sint32 otherRidesOfSameType = 0; rct_ride *ride2; - int i; + sint32 i; FOR_ALL_RIDES(i, ride2) { if (ride2->type == ride->type) otherRidesOfSameType++; @@ -785,7 +785,7 @@ static void ride_ratings_apply_adjustments(rct_ride *ride, rating_tuple *ratings static void ride_ratings_apply_intensity_penalty(rating_tuple *ratings) { static const ride_rating intensityBounds[] = { 1000, 1100, 1200, 1320, 1450 }; - int i; + sint32 i; ride_rating excitement = ratings->excitement; for (i = 0; i < countof(intensityBounds); i++) @@ -864,21 +864,21 @@ static uint32 ride_ratings_get_proximity_score() * Seems to calculate how much of the track is sheltered in eighths. * rct2: 0x0065E72D */ -static int sub_65E72D(rct_ride *ride) +static sint32 sub_65E72D(rct_ride *ride) { - int totalLength = ride_get_total_length(ride); - int shelteredLength = ride->sheltered_length; - int lengthEighth = totalLength / 8; - int lengthCounter = lengthEighth; - int numShelteredEighths = 0; - for (int i = 0; i < 7; i++) { + sint32 totalLength = ride_get_total_length(ride); + sint32 shelteredLength = ride->sheltered_length; + sint32 lengthEighth = totalLength / 8; + sint32 lengthCounter = lengthEighth; + sint32 numShelteredEighths = 0; + for (sint32 i = 0; i < 7; i++) { if (shelteredLength >= lengthCounter) { lengthCounter += lengthEighth; numShelteredEighths++; } } - int dh = numShelteredEighths; + sint32 dh = numShelteredEighths; rct_ride_entry *rideType = get_ride_entry(ride->subtype); if (rideType->flags & RIDE_ENTRY_FLAG_COVERED_RIDE) numShelteredEighths = 7; @@ -888,9 +888,9 @@ static int sub_65E72D(rct_ride *ride) static rating_tuple get_flat_turns_rating(rct_ride* ride) { - int no_3_plus_turns = get_turn_count_3_elements(ride, 0); - int no_2_turns = get_turn_count_2_elements(ride, 0); - int no_1_turns = get_turn_count_1_element(ride, 0); + sint32 no_3_plus_turns = get_turn_count_3_elements(ride, 0); + sint32 no_2_turns = get_turn_count_2_elements(ride, 0); + sint32 no_1_turns = get_turn_count_1_element(ride, 0); rating_tuple rating; rating.excitement = (no_3_plus_turns * 0x28000) >> 16; @@ -914,9 +914,9 @@ static rating_tuple get_flat_turns_rating(rct_ride* ride) */ static rating_tuple get_banked_turns_rating(rct_ride* ride) { - int no_3_plus_turns = get_turn_count_3_elements(ride, 1); - int no_2_turns = get_turn_count_2_elements(ride, 1); - int no_1_turns = get_turn_count_1_element(ride, 1); + sint32 no_3_plus_turns = get_turn_count_3_elements(ride, 1); + sint32 no_2_turns = get_turn_count_2_elements(ride, 1); + sint32 no_1_turns = get_turn_count_1_element(ride, 1); rating_tuple rating; rating.excitement = (no_3_plus_turns * 0x3C000) >> 16; @@ -941,10 +941,10 @@ static rating_tuple get_banked_turns_rating(rct_ride* ride) static rating_tuple get_sloped_turns_rating(rct_ride* ride) { rating_tuple rating; - int no_4_plus_turns = get_turn_count_4_plus_elements(ride, 2); - int no_3_turns = get_turn_count_3_elements(ride, 2); - int no_2_turns = get_turn_count_2_elements(ride, 2); - int no_1_turns = get_turn_count_1_element(ride, 2); + sint32 no_4_plus_turns = get_turn_count_4_plus_elements(ride, 2); + sint32 no_3_turns = get_turn_count_3_elements(ride, 2); + sint32 no_2_turns = get_turn_count_2_elements(ride, 2); + sint32 no_1_turns = get_turn_count_1_element(ride, 2); rating.excitement = (min(no_4_plus_turns, 4) * 0x78000) >> 16; rating.excitement += (min(no_3_turns, 6) * 273066) >> 16; @@ -971,7 +971,7 @@ static rating_tuple get_inversions_ratings(uint8 inversions) { } static rating_tuple get_special_track_elements_rating(uint8 type, rct_ride *ride) { - int excitement = 0, intensity = 0, nausea = 0; + sint32 excitement = 0, intensity = 0, nausea = 0; if (type == RIDE_TYPE_GHOST_TRAIN) { if (ride_has_spinning_tunnel(ride)) { excitement += 40; @@ -1002,7 +1002,7 @@ static rating_tuple get_special_track_elements_rating(uint8 type, rct_ride *ride } } uint8 helix_sections = ride_get_helix_sections(ride); - int al = min(helix_sections, 9); + sint32 al = min(helix_sections, 9); excitement += (al * 254862) >> 16; al = min(helix_sections, 11); @@ -1022,7 +1022,7 @@ static rating_tuple get_special_track_elements_rating(uint8 type, rct_ride *ride */ static rating_tuple ride_ratings_get_turns_ratings(rct_ride *ride) { - int excitement = 0, intensity = 0, nausea = 0; + sint32 excitement = 0, intensity = 0, nausea = 0; rating_tuple special_track_element_rating = get_special_track_elements_rating(ride->type, ride); excitement += special_track_element_rating.excitement; @@ -1059,15 +1059,15 @@ static rating_tuple ride_ratings_get_turns_ratings(rct_ride *ride) */ static rating_tuple ride_ratings_get_sheltered_ratings(rct_ride *ride) { - int sheltered_length_shifted = (ride->sheltered_length) >> 16; + sint32 sheltered_length_shifted = (ride->sheltered_length) >> 16; uint32 eax = min(sheltered_length_shifted, 1000); - int excitement = (eax * 9175) >> 16; + sint32 excitement = (eax * 9175) >> 16; eax = min(sheltered_length_shifted, 2000); - int intensity = (eax * 0x2666) >> 16; + sint32 intensity = (eax * 0x2666) >> 16; eax = min(sheltered_length_shifted, 1000); - int nausea = (eax * 0x4000) >> 16; + sint32 nausea = (eax * 0x4000) >> 16; /*eax = (ride->var_11C * 30340) >> 16;*/ /*nausea += eax;*/ @@ -1147,7 +1147,7 @@ static rating_tuple ride_ratings_get_drop_ratings(rct_ride *ride) }; // Apply number of drops factor - int drops = ride->drops & 0x3F; + sint32 drops = ride->drops & 0x3F; result.excitement += (min(9, drops) * 728177) >> 16; result.intensity += (drops * 928426) >> 16; result.nausea += (drops * 655360) >> 16; @@ -1164,9 +1164,9 @@ static rating_tuple ride_ratings_get_drop_ratings(rct_ride *ride) * Calculates a score based on the surrounding scenery. * rct2: 0x0065E557 */ -static int ride_ratings_get_scenery_score(rct_ride *ride) +static sint32 ride_ratings_get_scenery_score(rct_ride *ride) { - int i; + sint32 i; uint16 stationXY; for (i = 0; i < 4; i++) { stationXY = ride->station_starts[i]; @@ -1179,25 +1179,25 @@ static int ride_ratings_get_scenery_score(rct_ride *ride) if (ride->type == RIDE_TYPE_MAZE) stationXY = ride->entrances[0]; - int x = stationXY & 0xFF; - int y = stationXY >> 8; - int z = map_element_height(x * 32, y * 32) & 0xFFFF; + sint32 x = stationXY & 0xFF; + sint32 y = stationXY >> 8; + sint32 z = map_element_height(x * 32, y * 32) & 0xFFFF; // Check if station is underground, returns a fixed mediocre score since you can't have scenery underground if (z > ride->station_heights[i] * 8) return 40; // Count surrounding scenery items - int numSceneryItems = 0; - for (int yy = max(y - 5, 0); yy <= min(y + 5, 255); yy++) { - for (int xx = max(x - 5, 0); xx <= min(x + 5, 255); xx++) { + sint32 numSceneryItems = 0; + for (sint32 yy = max(y - 5, 0); yy <= min(y + 5, 255); yy++) { + for (sint32 xx = max(x - 5, 0); xx <= min(x + 5, 255); xx++) { // Count scenery items on this tile rct_map_element *mapElement = map_get_first_element_at(xx, yy); do { if (mapElement->flags & (1 << 4)) continue; - int type = map_element_get_type(mapElement); + sint32 type = map_element_get_type(mapElement); if (type == MAP_ELEMENT_TYPE_SCENERY || type == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) numSceneryItems++; } while (!map_element_is_last_for_tile(mapElement++)); @@ -1209,19 +1209,19 @@ static int ride_ratings_get_scenery_score(rct_ride *ride) #pragma region Ride rating calculation helpers -static void ride_ratings_set(rating_tuple *ratings, int excitement, int intensity, int nausea) +static void ride_ratings_set(rating_tuple *ratings, sint32 excitement, sint32 intensity, sint32 nausea) { ratings->excitement = excitement; ratings->intensity = intensity; ratings->nausea = nausea; } -static void ride_ratings_apply_length(rating_tuple *ratings, rct_ride *ride, int maxLength, int excitementMultiplier) +static void ride_ratings_apply_length(rating_tuple *ratings, rct_ride *ride, sint32 maxLength, sint32 excitementMultiplier) { ratings->excitement += (min(ride_get_total_length(ride) >> 16, maxLength) * excitementMultiplier) >> 16; } -static void ride_ratings_apply_synchronisation(rating_tuple *ratings, rct_ride *ride, int excitement, int intensity) +static void ride_ratings_apply_synchronisation(rating_tuple *ratings, rct_ride *ride, sint32 excitement, sint32 intensity) { if ((ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS) && ride_has_adjacent_station(ride)) { @@ -1230,30 +1230,30 @@ static void ride_ratings_apply_synchronisation(rating_tuple *ratings, rct_ride * } } -static void ride_ratings_apply_train_length(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier) +static void ride_ratings_apply_train_length(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier) { ratings->excitement += ((ride->num_cars_per_train - 1) * excitementMultiplier) >> 16; } -static void ride_ratings_apply_max_speed(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_max_speed(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier, sint32 nauseaMultiplier) { ratings->excitement += ((ride->max_speed >> 16) * excitementMultiplier) >> 16; ratings->intensity += ((ride->max_speed >> 16) * intensityMultiplier) >> 16; ratings->nausea += ((ride->max_speed >> 16) * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_average_speed(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier) +static void ride_ratings_apply_average_speed(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier) { ratings->excitement += ((ride->average_speed >> 16) * excitementMultiplier) >> 16; ratings->intensity += ((ride->average_speed >> 16) * intensityMultiplier) >> 16; } -static void ride_ratings_apply_duration(rating_tuple *ratings, rct_ride *ride, int maxDuration, int excitementMultiplier) +static void ride_ratings_apply_duration(rating_tuple *ratings, rct_ride *ride, sint32 maxDuration, sint32 excitementMultiplier) { ratings->excitement += (min(ride_get_total_time(ride), maxDuration) * excitementMultiplier) >> 16; } -static void ride_ratings_apply_gforces(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_gforces(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier, sint32 nauseaMultiplier) { rating_tuple subRating = ride_ratings_get_gforce_ratings(ride); ratings->excitement += (subRating.excitement * excitementMultiplier) >> 16; @@ -1261,7 +1261,7 @@ static void ride_ratings_apply_gforces(rating_tuple *ratings, rct_ride *ride, in ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_turns(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_turns(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier, sint32 nauseaMultiplier) { rating_tuple subRating = ride_ratings_get_turns_ratings(ride); ratings->excitement += (subRating.excitement * excitementMultiplier) >> 16; @@ -1269,7 +1269,7 @@ static void ride_ratings_apply_turns(rating_tuple *ratings, rct_ride *ride, int ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_drops(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_drops(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier, sint32 nauseaMultiplier) { rating_tuple subRating = ride_ratings_get_drop_ratings(ride); ratings->excitement += (subRating.excitement * excitementMultiplier) >> 16; @@ -1277,7 +1277,7 @@ static void ride_ratings_apply_drops(rating_tuple *ratings, rct_ride *ride, int ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_sheltered_ratings(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_sheltered_ratings(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier, sint32 nauseaMultiplier) { rating_tuple subRating = ride_ratings_get_sheltered_ratings(ride); ratings->excitement += (subRating.excitement * excitementMultiplier) >> 16; @@ -1285,24 +1285,24 @@ static void ride_ratings_apply_sheltered_ratings(rating_tuple *ratings, rct_ride ratings->nausea += (subRating.nausea * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_operation_option(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier, int intensityMultiplier, int nauseaMultiplier) +static void ride_ratings_apply_operation_option(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier, sint32 intensityMultiplier, sint32 nauseaMultiplier) { ratings->excitement += (ride->operation_option * excitementMultiplier) >> 16; ratings->intensity += (ride->operation_option * intensityMultiplier) >> 16; ratings->nausea += (ride->operation_option * nauseaMultiplier) >> 16; } -static void ride_ratings_apply_proximity(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier) +static void ride_ratings_apply_proximity(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier) { ratings->excitement += (ride_ratings_get_proximity_score() * excitementMultiplier) >> 16; } -static void ride_ratings_apply_scenery(rating_tuple *ratings, rct_ride *ride, int excitementMultiplier) +static void ride_ratings_apply_scenery(rating_tuple *ratings, rct_ride *ride, sint32 excitementMultiplier) { ratings->excitement += (ride_ratings_get_scenery_score(ride) * excitementMultiplier) >> 16; } -static void ride_ratings_apply_highest_drop_height_penalty(rating_tuple *ratings, rct_ride *ride, int minHighestDropHeight, int excitementPenalty, int intensityPenalty, int nauseaPenalty) +static void ride_ratings_apply_highest_drop_height_penalty(rating_tuple *ratings, rct_ride *ride, sint32 minHighestDropHeight, sint32 excitementPenalty, sint32 intensityPenalty, sint32 nauseaPenalty) { if (ride->highest_drop_height < minHighestDropHeight) { ratings->excitement /= excitementPenalty; @@ -1311,7 +1311,7 @@ static void ride_ratings_apply_highest_drop_height_penalty(rating_tuple *ratings } } -static void ride_ratings_apply_max_speed_penalty(rating_tuple *ratings, rct_ride *ride, int minMaxSpeed, int excitementPenalty, int intensityPenalty, int nauseaPenalty) +static void ride_ratings_apply_max_speed_penalty(rating_tuple *ratings, rct_ride *ride, sint32 minMaxSpeed, sint32 excitementPenalty, sint32 intensityPenalty, sint32 nauseaPenalty) { if (ride->max_speed < minMaxSpeed) { ratings->excitement /= excitementPenalty; @@ -1320,7 +1320,7 @@ static void ride_ratings_apply_max_speed_penalty(rating_tuple *ratings, rct_ride } } -static void ride_ratings_apply_num_drops_penalty(rating_tuple *ratings, rct_ride *ride, int minNumDrops, int excitementPenalty, int intensityPenalty, int nauseaPenalty) +static void ride_ratings_apply_num_drops_penalty(rating_tuple *ratings, rct_ride *ride, sint32 minNumDrops, sint32 excitementPenalty, sint32 intensityPenalty, sint32 nauseaPenalty) { if ((ride->drops & 0x3F) < minNumDrops) { ratings->excitement /= excitementPenalty; @@ -1329,7 +1329,7 @@ static void ride_ratings_apply_num_drops_penalty(rating_tuple *ratings, rct_ride } } -static void ride_ratings_apply_max_negative_g_penalty(rating_tuple *ratings, rct_ride *ride, int maxMaxNegativeVerticalG, int excitementPenalty, int intensityPenalty, int nauseaPenalty) +static void ride_ratings_apply_max_negative_g_penalty(rating_tuple *ratings, rct_ride *ride, sint32 maxMaxNegativeVerticalG, sint32 excitementPenalty, sint32 intensityPenalty, sint32 nauseaPenalty) { if (ride->max_negative_vertical_g >= maxMaxNegativeVerticalG) { ratings->excitement /= excitementPenalty; @@ -1338,7 +1338,7 @@ static void ride_ratings_apply_max_negative_g_penalty(rating_tuple *ratings, rct } } -static void ride_ratings_apply_max_lateral_g_penalty(rating_tuple *ratings, rct_ride *ride, int minMaxLateralG, int excitementPenalty, int intensityPenalty, int nauseaPenalty) +static void ride_ratings_apply_max_lateral_g_penalty(rating_tuple *ratings, rct_ride *ride, sint32 minMaxLateralG, sint32 excitementPenalty, sint32 intensityPenalty, sint32 nauseaPenalty) { if (ride->max_lateral_g < minMaxLateralG) { ratings->excitement /= excitementPenalty; @@ -1362,7 +1362,7 @@ static void ride_ratings_apply_excessive_lateral_g_penalty(rating_tuple *ratings #endif } -static void ride_ratings_apply_first_length_penalty(rating_tuple *ratings, rct_ride *ride, int minFirstLength, int excitementPenalty, int intensityPenalty, int nauseaPenalty) +static void ride_ratings_apply_first_length_penalty(rating_tuple *ratings, rct_ride *ride, sint32 minFirstLength, sint32 excitementPenalty, sint32 intensityPenalty, sint32 nauseaPenalty) { if (ride->length[0] < minFirstLength) { ratings->excitement /= excitementPenalty; @@ -1612,7 +1612,7 @@ static void ride_ratings_calculate_miniature_railway(rct_ride *ride) ride->upkeep_cost = ride_compute_upkeep(ride); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - int edx = sub_65E72D(ride); + sint32 edx = sub_65E72D(ride); if (((edx >> 8) & 0xFF) >= 4) ride->excitement /= 4; @@ -1648,7 +1648,7 @@ static void ride_ratings_calculate_monorail(rct_ride *ride) ride->upkeep_cost = ride_compute_upkeep(ride); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - int edx = sub_65E72D(ride); + sint32 edx = sub_65E72D(ride); if (((edx >> 8) & 0xFF) >= 4) ride->excitement /= 4; @@ -1874,7 +1874,7 @@ static void ride_ratings_calculate_launched_freefall(rct_ride *ride) // Fix #3282: When the ride mode is in downward launch mode, the intensity and // nausea were fixed regardless of how high the ride is. The following // calculation is based on roto-drop which is a similar mechanic. - int lengthFactor = ((ride_get_total_length(ride) >> 16) * 209715) >> 16; + sint32 lengthFactor = ((ride_get_total_length(ride) >> 16) * 209715) >> 16; ratings.excitement += lengthFactor; ratings.intensity += lengthFactor * 2; ratings.nausea += lengthFactor * 2; @@ -1961,7 +1961,7 @@ static void ride_ratings_calculate_observation_tower(rct_ride *ride) ride->inversions &= 0x1F; ride->inversions |= 7 << 5; - int edx = sub_65E72D(ride); + sint32 edx = sub_65E72D(ride); if (((edx >> 8) & 0xFF) >= 5) ride->excitement /= 4; } @@ -2126,7 +2126,7 @@ static void ride_ratings_calculate_chairlift(rct_ride *ride) ride->upkeep_cost = ride_compute_upkeep(ride); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - int edx = sub_65E72D(ride); + sint32 edx = sub_65E72D(ride); if (((edx >> 8) & 0xFF) >= 4) ride->excitement /= 4; @@ -2190,7 +2190,7 @@ static void ride_ratings_calculate_maze(rct_ride *ride) rating_tuple ratings; ride_ratings_set(&ratings, RIDE_RATING(1,30), RIDE_RATING(0,50), RIDE_RATING(0,00)); - int size = min(ride->maze_tiles, 100); + sint32 size = min(ride->maze_tiles, 100); ratings.excitement += size; ratings.intensity += size * 2; @@ -2255,7 +2255,7 @@ static void ride_ratings_calculate_go_karts(rct_ride *ride) ratings.excitement += RIDE_RATING(1,40); ratings.intensity += RIDE_RATING(0,50); - int lapsFactor = (ride->num_laps - 1) * 30; + sint32 lapsFactor = (ride->num_laps - 1) * 30; ratings.excitement += lapsFactor; ratings.intensity += lapsFactor / 2; } @@ -2274,7 +2274,7 @@ static void ride_ratings_calculate_go_karts(rct_ride *ride) ride->upkeep_cost = ride_compute_upkeep(ride); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - int edx = sub_65E72D(ride); + sint32 edx = sub_65E72D(ride); ride->inversions &= 0x1F; ride->inversions |= edx << 5; @@ -2467,7 +2467,7 @@ static void ride_ratings_calculate_merry_go_round(rct_ride *ride) rating_tuple ratings; ride_ratings_set(&ratings, RIDE_RATING(0,60), RIDE_RATING(0,15), RIDE_RATING(0,30)); - int rotationsFactor = ride->rotations * 5; + sint32 rotationsFactor = ride->rotations * 5; ratings.excitement += rotationsFactor; ratings.intensity += rotationsFactor; ratings.nausea += rotationsFactor; @@ -2508,7 +2508,7 @@ static void ride_ratings_calculate_ferris_wheel(rct_ride *ride) rating_tuple ratings; ride_ratings_set(&ratings, RIDE_RATING(0,60), RIDE_RATING(0,25), RIDE_RATING(0,30)); - int rotationsFactor = ride->rotations * 25; + sint32 rotationsFactor = ride->rotations * 25; ratings.excitement += rotationsFactor; ratings.intensity += rotationsFactor; ratings.nausea += rotationsFactor; @@ -2696,7 +2696,7 @@ static void ride_ratings_calculate_reverse_freefall_coaster(rct_ride *ride) static void ride_ratings_calculate_lift(rct_ride *ride) { - int totalLength; + sint32 totalLength; if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED)) return; @@ -3056,7 +3056,7 @@ static void ride_ratings_calculate_suspended_monorail(rct_ride *ride) ride->upkeep_cost = ride_compute_upkeep(ride); ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME; - int edx = sub_65E72D(ride); + sint32 edx = sub_65E72D(ride); if (((edx >> 8) & 0xFF) >= 4) ride->excitement /= 4; @@ -3080,7 +3080,7 @@ static void ride_ratings_calculate_reverser_roller_coaster(rct_ride *ride) ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424); ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360); - int numReversers = min(gRideRatingsCalcData.num_reversers, 6); + sint32 numReversers = min(gRideRatingsCalcData.num_reversers, 6); ride_rating reverserRating = numReversers * RIDE_RATING(0,20); ratings.excitement += reverserRating; ratings.intensity += reverserRating; @@ -3529,7 +3529,7 @@ static void ride_ratings_calculate_roto_drop(rct_ride *ride) rating_tuple ratings; ride_ratings_set(&ratings, RIDE_RATING(2,80), RIDE_RATING(3,50), RIDE_RATING(3,50)); - int lengthFactor = ((ride_get_total_length(ride) >> 16) * 209715) >> 16; + sint32 lengthFactor = ((ride_get_total_length(ride) >> 16) * 209715) >> 16; ratings.excitement += lengthFactor; ratings.intensity += lengthFactor * 2; ratings.nausea += lengthFactor * 2; diff --git a/src/openrct2/ride/shops/facility.c b/src/openrct2/ride/shops/facility.c index 6d0346ef2c..e8fa0cacb5 100644 --- a/src/openrct2/ride/shops/facility.c +++ b/src/openrct2/ride/shops/facility.c @@ -29,7 +29,7 @@ * rct2: 0x00762F50 * rct2: 0x007630DE */ -static void facility_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void facility_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool hasSupports = wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_3], NULL); @@ -41,9 +41,9 @@ static void facility_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 dir imageId |= firstVehicleEntry->base_image_id; imageId += (direction + 2) & 3; - int rotation = get_current_rotation(); - int lengthX = (direction & 1) == 0 ? 28 : 2; - int lengthY = (direction & 1) == 0 ? 2 : 28; + sint32 rotation = get_current_rotation(); + sint32 lengthX = (direction & 1) == 0 ? 28 : 2; + sint32 lengthY = (direction & 1) == 0 ? 2 : 28; if (hasSupports) { uint32 foundationImageId = ((direction & 1) ? SPR_FLOOR_PLANKS_90_DEG : SPR_FLOOR_PLANKS) | gTrackColours[SCHEME_3]; sub_98197C(foundationImageId, 0, 0, lengthX, lengthY, 29, height, direction == 3 ? 28 : 2, direction == 0 ? 28 : 2, height, rotation); @@ -69,7 +69,7 @@ static void facility_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 dir } /* 0x00762D44 */ -TRACK_PAINT_FUNCTION get_track_paint_function_facility(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_facility(sint32 trackType, sint32 direction) { switch (trackType) { case FLAT_TRACK_ELEM_1_X_1_A: return facility_paint_setup; diff --git a/src/openrct2/ride/shops/shop.c b/src/openrct2/ride/shops/shop.c index 6036670aba..39845c7672 100644 --- a/src/openrct2/ride/shops/shop.c +++ b/src/openrct2/ride/shops/shop.c @@ -29,7 +29,7 @@ * rct2: 0x0076163F * rct2: 0x007617A5 */ -static void shop_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void shop_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool hasSupports = wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_3], NULL); @@ -58,7 +58,7 @@ static void shop_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 directi } /* 0x00761160 */ -TRACK_PAINT_FUNCTION get_track_paint_function_shop(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_shop(sint32 trackType, sint32 direction) { switch (trackType) { case FLAT_TRACK_ELEM_1_X_1_A: diff --git a/src/openrct2/ride/station.c b/src/openrct2/ride/station.c index b1e1a2e680..b6009b6fbc 100644 --- a/src/openrct2/ride/station.c +++ b/src/openrct2/ride/station.c @@ -19,18 +19,18 @@ #include "../world/sprite.h" #include "station.h" -static void ride_update_station_blocksection(rct_ride *ride, int stationIndex); -static void ride_update_station_bumpercar(rct_ride *ride, int stationIndex); -static void ride_update_station_normal(rct_ride *ride, int stationIndex); -static void ride_update_station_race(rct_ride *ride, int stationIndex); +static void ride_update_station_blocksection(rct_ride *ride, sint32 stationIndex); +static void ride_update_station_bumpercar(rct_ride *ride, sint32 stationIndex); +static void ride_update_station_normal(rct_ride *ride, sint32 stationIndex); +static void ride_update_station_race(rct_ride *ride, sint32 stationIndex); static void ride_race_init_vehicle_speeds(rct_ride *ride); -static void ride_invalidate_station_start(rct_ride *ride, int stationIndex, int dl); +static void ride_invalidate_station_start(rct_ride *ride, sint32 stationIndex, sint32 dl); /** * * rct2: 0x006ABFFB */ -void ride_update_station(rct_ride *ride, int stationIndex) +void ride_update_station(rct_ride *ride, sint32 stationIndex) { if (ride->station_starts[stationIndex] == 0xFFFF) return; @@ -56,7 +56,7 @@ void ride_update_station(rct_ride *ride, int stationIndex) * * rct2: 0x006AC0A1 */ -static void ride_update_station_blocksection(rct_ride *ride, int stationIndex) +static void ride_update_station_blocksection(rct_ride *ride, sint32 stationIndex) { rct_map_element *mapElement; @@ -81,7 +81,7 @@ static void ride_update_station_blocksection(rct_ride *ride, int stationIndex) * * rct2: 0x006AC12B */ -static void ride_update_station_bumpercar(rct_ride *ride, int stationIndex) +static void ride_update_station_bumpercar(rct_ride *ride, sint32 stationIndex) { // Change of station depart flag should really call invalidate_station_start // but since bumpercars do not have station lights there is no point. @@ -94,10 +94,10 @@ static void ride_update_station_bumpercar(rct_ride *ride, int stationIndex) } if (ride->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) { - int dx = ride->time_limit * 32; - int dl = dx & 0xFF; - int dh = (dx >> 8) & 0xFF; - for (int i = 0; i < ride->num_vehicles; i++) { + sint32 dx = ride->time_limit * 32; + sint32 dl = dx & 0xFF; + sint32 dh = (dx >> 8) & 0xFF; + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = &(get_sprite(ride->vehicles[i])->vehicle); if (vehicle->var_CE < dh || (vehicle->var_CE < dh && vehicle->sub_state > dl)) continue; @@ -112,7 +112,7 @@ static void ride_update_station_bumpercar(rct_ride *ride, int stationIndex) ride->station_depart[stationIndex] |= STATION_DEPART_FLAG; } else { // Check if all vehicles are ready to go - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = &(get_sprite(ride->vehicles[i])->vehicle); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART) { ride->station_depart[stationIndex] &= ~STATION_DEPART_FLAG; @@ -131,9 +131,9 @@ static void ride_update_station_bumpercar(rct_ride *ride, int stationIndex) * * rct2: 0x006AC02C */ -static void ride_update_station_normal(rct_ride *ride, int stationIndex) +static void ride_update_station_normal(rct_ride *ride, sint32 stationIndex) { - int time; + sint32 time; time = ride->station_depart[stationIndex] & STATION_DEPART_MASK; if ( @@ -163,7 +163,7 @@ static void ride_update_station_normal(rct_ride *ride, int stationIndex) * * rct2: 0x006AC1DF */ -static void ride_update_station_race(rct_ride *ride, int stationIndex) +static void ride_update_station_race(rct_ride *ride, sint32 stationIndex) { if ( ride->status == RIDE_STATUS_CLOSED || @@ -177,8 +177,8 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex) } if (ride->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) { - int numLaps = ride->num_laps; - for (int i = 0; i < ride->num_vehicles; i++) { + sint32 numLaps = ride->num_laps; + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = &(get_sprite(ride->vehicles[i])->vehicle); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART && vehicle->num_laps >= numLaps) { // Found a winner @@ -202,7 +202,7 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex) ride->station_depart[stationIndex] |= STATION_DEPART_FLAG; } else { // Check if all vehicles are ready to go - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = &(get_sprite(ride->vehicles[i])->vehicle); if (vehicle->status != VEHICLE_STATUS_WAITING_TO_DEPART && vehicle->status != VEHICLE_STATUS_DEPARTING) { if (ride->station_depart[stationIndex] & STATION_DEPART_FLAG){ @@ -232,7 +232,7 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex) */ static void ride_race_init_vehicle_speeds(rct_ride *ride) { - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *vehicle = &get_sprite(ride->vehicles[i])->vehicle; vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_6; @@ -268,9 +268,9 @@ static void ride_race_init_vehicle_speeds(rct_ride *ride) * * rct2: 0x006AC2C7 */ -static void ride_invalidate_station_start(rct_ride *ride, int stationIndex, int dl) +static void ride_invalidate_station_start(rct_ride *ride, sint32 stationIndex, sint32 dl) { - int x, y; + sint32 x, y; rct_map_element *mapElement; x = (ride->station_starts[stationIndex] & 0xFF) * 32; @@ -289,9 +289,9 @@ static void ride_invalidate_station_start(rct_ride *ride, int stationIndex, int map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } -rct_map_element *ride_get_station_start_track_element(rct_ride *ride, int stationIndex) +rct_map_element *ride_get_station_start_track_element(rct_ride *ride, sint32 stationIndex) { - int x, y, z; + sint32 x, y, z; rct_map_element *mapElement; x = ride->station_starts[stationIndex] & 0xFF; @@ -309,7 +309,7 @@ rct_map_element *ride_get_station_start_track_element(rct_ride *ride, int statio return NULL; } -rct_map_element *ride_get_station_exit_element(rct_ride *ride, int x, int y, int z) +rct_map_element *ride_get_station_exit_element(rct_ride *ride, sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement; diff --git a/src/openrct2/ride/station.h b/src/openrct2/ride/station.h index d3d52e9629..6200ac337e 100644 --- a/src/openrct2/ride/station.h +++ b/src/openrct2/ride/station.h @@ -23,6 +23,6 @@ #define MAX_STATIONS 4 -void ride_update_station(rct_ride *ride, int stationIndex); +void ride_update_station(rct_ride *ride, sint32 stationIndex); #endif diff --git a/src/openrct2/ride/thrill/3d_cinema.c b/src/openrct2/ride/thrill/3d_cinema.c index fefc58c685..236e5f6e05 100644 --- a/src/openrct2/ride/thrill/3d_cinema.c +++ b/src/openrct2/ride/thrill/3d_cinema.c @@ -52,11 +52,11 @@ static void paint_3d_cinema_structure(uint8 rideIndex, uint8 direction, sint8 xO /** * rct2: 0x0076574C */ -static void paint_3d_cinema(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_3d_cinema(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -76,7 +76,7 @@ static void paint_3d_cinema(uint8 rideIndex, uint8 trackSequence, uint8 directio case 8: paint_3d_cinema_structure(rideIndex, direction, -32, 0, height); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: // top @@ -102,7 +102,7 @@ static void paint_3d_cinema(uint8 rideIndex, uint8 trackSequence, uint8 directio } /* 0x0076554C */ -TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/thrill/enterprise.c b/src/openrct2/ride/thrill/enterprise.c index 12ea7c2f64..0bc2200e61 100644 --- a/src/openrct2/ride/thrill/enterprise.c +++ b/src/openrct2/ride/thrill/enterprise.c @@ -58,7 +58,7 @@ static void paint_enterprise_structure(rct_ride * ride, sint8 xOffset, sint8 yOf && imageOffset < 12 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) { - for (int i = 0; i < 15; i++) { + for (sint32 i = 0; i < 15; i++) { if (vehicle->num_peeps <= i) { break; } @@ -75,11 +75,11 @@ static void paint_enterprise_structure(rct_ride * ride, sint8 xOffset, sint8 yOf } /** rct2: 0x008A1584 */ -static void paint_enterprise(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_enterprise(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_4x4[direction][trackSequence]; - int edges = edges_4x4[trackSequence]; + sint32 edges = edges_4x4[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -106,7 +106,7 @@ static void paint_enterprise(uint8 rideIndex, uint8 trackSequence, uint8 directi case 13: paint_enterprise_structure(ride, -48, 16, height, mapElement); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 0: cornerSegments = SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC; break; case 3: cornerSegments = SEGMENT_CC | SEGMENT_BC | SEGMENT_D4; break; @@ -122,7 +122,7 @@ static void paint_enterprise(uint8 rideIndex, uint8 trackSequence, uint8 directi /** * rct2: 0x008A13B4 */ -TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_4_X_4) { return NULL; diff --git a/src/openrct2/ride/thrill/go_karts.c b/src/openrct2/ride/thrill/go_karts.c index bae2fc8c70..db0218ba93 100644 --- a/src/openrct2/ride/thrill/go_karts.c +++ b/src/openrct2/ride/thrill/go_karts.c @@ -131,7 +131,7 @@ static const uint32 go_karts_track_pieces_25_deg_up_to_flat[4][2] = { }; /** rct2: 0x0074A748 */ -static void paint_go_karts_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; if (direction == 0 || direction == 2) { @@ -159,7 +159,7 @@ static void paint_go_karts_track_flat(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x0074A758 */ -static void paint_go_karts_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; paint_struct * ps; @@ -204,7 +204,7 @@ static void paint_go_karts_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x0074A768 */ -static void paint_go_karts_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; paint_struct * ps; @@ -249,7 +249,7 @@ static void paint_go_karts_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x */ -static void paint_go_karts_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; paint_struct * ps; @@ -294,25 +294,25 @@ static void paint_go_karts_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x0074A788 */ -static void paint_go_karts_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_go_karts_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0074A798 */ -static void paint_go_karts_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_go_karts_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0074A7A8 */ -static void paint_go_karts_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_go_karts_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x */ -static void paint_go_karts_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; rct_ride * ride = get_ride(rideIndex); @@ -402,7 +402,7 @@ static void paint_go_karts_station(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x0074A7E8 */ -static void paint_go_karts_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -468,7 +468,7 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 } /** rct2: 0x0074A7F8 */ -static void paint_go_karts_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_go_karts_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_go_karts_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } @@ -476,7 +476,7 @@ static void paint_go_karts_track_right_quarter_turn_1_tile(uint8 rideIndex, uint /** * rct2: 0x0074A668 */ -TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/thrill/launched_freefall.c b/src/openrct2/ride/thrill/launched_freefall.c index 6e48b9716b..9d05dc9e5f 100644 --- a/src/openrct2/ride/thrill/launched_freefall.c +++ b/src/openrct2/ride/thrill/launched_freefall.c @@ -42,10 +42,10 @@ static const uint32 launched_freefall_fence_sprites[] = { * * rct2: 0x006D5FAB */ -void vehicle_visual_launched_freefall(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_launched_freefall(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { - int image_id; - int baseImage_id = vehicleEntry->base_image_id + ((vehicle->restraints_position / 64) * 2); + sint32 image_id; + sint32 baseImage_id = vehicleEntry->base_image_id + ((vehicle->restraints_position / 64) * 2); const uint8 rotation = get_current_rotation(); // Draw back: @@ -84,11 +84,11 @@ void vehicle_visual_launched_freefall(int x, int imageDirection, int y, int z, r } /** rct2: 0x006FD1F8 */ -static void paint_launched_freefall_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_launched_freefall_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -116,7 +116,7 @@ static void paint_launched_freefall_base(uint8 rideIndex, uint8 trackSequence, u height -= 64; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; @@ -134,7 +134,7 @@ static void paint_launched_freefall_base(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x006FD208 */ -static void paint_launched_freefall_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_launched_freefall_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence == 1) { return; @@ -158,7 +158,7 @@ static void paint_launched_freefall_tower_section(uint8 rideIndex, uint8 trackSe /** * rct2: 0x006FD0E8 */ -TRACK_PAINT_FUNCTION get_track_paint_function_launched_freefall(int trackType, int direction) { +TRACK_PAINT_FUNCTION get_track_paint_function_launched_freefall(sint32 trackType, sint32 direction) { switch(trackType) { case TRACK_ELEM_TOWER_BASE: return paint_launched_freefall_base; diff --git a/src/openrct2/ride/thrill/magic_carpet.c b/src/openrct2/ride/thrill/magic_carpet.c index 8d59c9303c..fd2c17bc0f 100644 --- a/src/openrct2/ride/thrill/magic_carpet.c +++ b/src/openrct2/ride/thrill/magic_carpet.c @@ -185,7 +185,7 @@ static void paint_magic_carpet_structure(rct_ride *ride, uint8 direction, sint8 } /** rct2: 0x00898514 */ -static void paint_magic_carpet(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_magic_carpet(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence]; @@ -222,7 +222,7 @@ static void paint_magic_carpet(uint8 rideIndex, uint8 trackSequence, uint8 direc * * rct2: 0x00898384 */ -TRACK_PAINT_FUNCTION get_track_paint_function_magic_carpet(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_magic_carpet(sint32 trackType, sint32 direction) { switch (trackType) { case FLAT_TRACK_ELEM_1_X_4_A: return paint_magic_carpet; diff --git a/src/openrct2/ride/thrill/motion_simulator.c b/src/openrct2/ride/thrill/motion_simulator.c index 86c7aede3e..1d74a8164a 100644 --- a/src/openrct2/ride/thrill/motion_simulator.c +++ b/src/openrct2/ride/thrill/motion_simulator.c @@ -35,7 +35,7 @@ enum { * * rct2: 0x0076522A */ -static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 direction, int height, rct_map_element* mapElement) +static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 direction, sint32 height, rct_map_element* mapElement) { rct_ride *ride = get_ride(mapElement->properties.track.ride_index); rct_ride_entry *rideEntry = get_ride_entry_by_ride(ride); @@ -124,11 +124,11 @@ static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 di } /** rct2: 0x008A85C4 */ -static void paint_motionsimulator(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_motionsimulator(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_2x2[direction][trackSequence]; - int edges = edges_2x2[trackSequence]; + sint32 edges = edges_2x2[trackSequence]; rct_ride *ride = get_ride(rideIndex); rct_xy16 position = { gPaintMapPosition.x, gPaintMapPosition.y }; @@ -150,7 +150,7 @@ static void paint_motionsimulator(uint8 rideIndex, uint8 trackSequence, uint8 di * * rct2: 0x00763520 */ -TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(sint32 trackType, sint32 direction) { switch (trackType) { case FLAT_TRACK_ELEM_2_X_2: return paint_motionsimulator; diff --git a/src/openrct2/ride/thrill/pirate_ship.c b/src/openrct2/ride/thrill/pirate_ship.c index 6712ea58e4..ebebc3ca00 100644 --- a/src/openrct2/ride/thrill/pirate_ship.c +++ b/src/openrct2/ride/thrill/pirate_ship.c @@ -121,14 +121,14 @@ static void paint_pirate_ship_structure(rct_ride * ride, uint8 direction, sint8 if (dpi->zoom_level <= 1 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) { - int peep = 0; - int offset = 1; + sint32 peep = 0; + sint32 offset = 1; while (peep < 16) { if (vehicle->num_peeps <= peep) { break; } - int frameNum = offset + (direction >> 1); + sint32 frameNum = offset + (direction >> 1); imageColourFlags = vehicle->peep_tshirt_colours[peep] << 19 | vehicle->peep_tshirt_colours[peep + 1] << 24 | 0xA0000000; imageId = (baseImageId + frameNum) | imageColourFlags; sub_98199C(imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y, height, get_current_rotation()); @@ -157,7 +157,7 @@ static void paint_pirate_ship_structure(rct_ride * ride, uint8 direction, sint8 } /** rct2: 0x008A85C4 */ -static void paint_pirate_ship(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_pirate_ship(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 relativeTrackSequence = track_map_1x5[direction][trackSequence]; rct_ride * ride = get_ride(rideIndex); @@ -260,7 +260,7 @@ static void paint_pirate_ship(uint8 rideIndex, uint8 trackSequence, uint8 direct /** * rct2: 0x008A83E0 */ -TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_1_X_5) { return NULL; diff --git a/src/openrct2/ride/thrill/roto_drop.c b/src/openrct2/ride/thrill/roto_drop.c index 79d1a5bdf2..881670817d 100644 --- a/src/openrct2/ride/thrill/roto_drop.c +++ b/src/openrct2/ride/thrill/roto_drop.c @@ -36,10 +36,10 @@ enum * * rct2: 0x006D5DA9 */ -void vehicle_visual_roto_drop(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_roto_drop(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { - int image_id; - int baseImage_id = (vehicleEntry->base_image_id + 4) + ((vehicle->var_C5 / 4) & 0x3); + sint32 image_id; + sint32 baseImage_id = (vehicleEntry->base_image_id + 4) + ((vehicle->var_C5 / 4) & 0x3); if (vehicle->restraints_position >= 64) { baseImage_id += 7; baseImage_id += (vehicle->restraints_position / 64); @@ -56,7 +56,7 @@ void vehicle_visual_roto_drop(int x, int imageDirection, int y, int z, rct_vehic uint8 riding_peep_sprites[64]; memset(riding_peep_sprites, 0xFF, sizeof(riding_peep_sprites)); - for (int i = 0; i < vehicle->num_peeps; i++) { + for (sint32 i = 0; i < vehicle->num_peeps; i++) { uint8 cl = (i & 3) * 16; cl += (i & 0xFC); cl += vehicle->var_C5 / 4; @@ -66,8 +66,8 @@ void vehicle_visual_roto_drop(int x, int imageDirection, int y, int z, rct_vehic } // Draw riding peep sprites in back to front order: - for (int j = 0; j <= 48; j++) { - int i = (j % 2) ? (48 - (j / 2)) : (j / 2); + for (sint32 j = 0; j <= 48; j++) { + sint32 i = (j % 2) ? (48 - (j / 2)) : (j / 2); if (riding_peep_sprites[i] != 0xFF) { baseImage_id = vehicleEntry->base_image_id + 20 + i; if (vehicle->restraints_position >= 64) { @@ -84,11 +84,11 @@ void vehicle_visual_roto_drop(int x, int imageDirection, int y, int z, rct_vehic } /** rct2: 0x00886194 */ -static void paint_roto_drop_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_roto_drop_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -121,7 +121,7 @@ static void paint_roto_drop_base(uint8 rideIndex, uint8 trackSequence, uint8 dir return; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 1: blockedSegments = SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; @@ -138,7 +138,7 @@ static void paint_roto_drop_base(uint8 rideIndex, uint8 trackSequence, uint8 dir } /** rct2: 0x008861A4 */ -static void paint_roto_drop_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_roto_drop_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence == 1) { return; @@ -162,7 +162,7 @@ static void paint_roto_drop_tower_section(uint8 rideIndex, uint8 trackSequence, /** * rct2: 0x00886074 */ -TRACK_PAINT_FUNCTION get_track_paint_function_roto_drop(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_roto_drop(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_TOWER_BASE: diff --git a/src/openrct2/ride/thrill/swinging_inverter_ship.c b/src/openrct2/ride/thrill/swinging_inverter_ship.c index bf2b0d57a2..ae02b2574d 100644 --- a/src/openrct2/ride/thrill/swinging_inverter_ship.c +++ b/src/openrct2/ride/thrill/swinging_inverter_ship.c @@ -117,7 +117,7 @@ static void paint_swinging_inverter_ship_structure(rct_ride * ride, uint8 direct } /** rct2: 0x00760260 */ -static void paint_swinging_inverter_ship(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_swinging_inverter_ship(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence]; @@ -172,7 +172,7 @@ static void paint_swinging_inverter_ship(uint8 rideIndex, uint8 trackSequence, u /** * rct2: 0x00760070 */ -TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_1_X_4_B) { return NULL; diff --git a/src/openrct2/ride/thrill/top_spin.c b/src/openrct2/ride/thrill/top_spin.c index b6bc1dc2bb..3aa0c7e480 100644 --- a/src/openrct2/ride/thrill/top_spin.c +++ b/src/openrct2/ride/thrill/top_spin.c @@ -48,7 +48,7 @@ static sint8 TopSpinSeatPositionOffset[] = { * * rct2: 0x0076750D */ -static void top_spin_paint_vehicle(sint8 al, sint8 cl, uint8 rideIndex, uint8 direction, int height, rct_map_element* mapElement) { +static void top_spin_paint_vehicle(sint8 al, sint8 cl, uint8 rideIndex, uint8 direction, sint32 height, rct_map_element* mapElement) { uint16 boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ; // As we will be drawing a vehicle we need to backup the mapElement that // is assigned to the drawings. @@ -256,10 +256,10 @@ static void top_spin_paint_vehicle(sint8 al, sint8 cl, uint8 rideIndex, uint8 di /** * rct2: 0x0076679C */ -static void paint_top_spin(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) { +static void paint_top_spin(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride *ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -278,7 +278,7 @@ static void paint_top_spin(uint8 rideIndex, uint8 trackSequence, uint8 direction case 8: top_spin_paint_vehicle(-32, 0, rideIndex, direction, height, mapElement); break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: // top @@ -305,7 +305,7 @@ static void paint_top_spin(uint8 rideIndex, uint8 trackSequence, uint8 direction /* 0x0076659C */ -TRACK_PAINT_FUNCTION get_track_paint_function_topspin(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_topspin(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/thrill/twist.c b/src/openrct2/ride/thrill/twist.c index f7494f9dcc..e029dc4c99 100644 --- a/src/openrct2/ride/thrill/twist.c +++ b/src/openrct2/ride/thrill/twist.c @@ -63,7 +63,7 @@ static void paint_twist_structure(rct_ride * ride, uint8 direction, sint8 xOffse && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != NULL) { - for (int i = 0; i < vehicle->num_peeps; i += 2) { + for (sint32 i = 0; i < vehicle->num_peeps; i += 2) { imageColourFlags = vehicle->peep_tshirt_colours[i] << 19 | vehicle->peep_tshirt_colours[i + 1] << 24 | 0xA0000000; uint32 peepFrameNum = (frameNum + i * 12) % 216; @@ -78,7 +78,7 @@ static void paint_twist_structure(rct_ride * ride, uint8 direction, sint8 xOffse /** rct2: 0x0076D858 */ -static void paint_twist(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_twist(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -129,7 +129,7 @@ static void paint_twist(uint8 rideIndex, uint8 trackSequence, uint8 direction, i break; } - int cornerSegments = 0; + sint32 cornerSegments = 0; switch (trackSequence) { case 1: cornerSegments = SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC; break; case 3: cornerSegments = SEGMENT_CC | SEGMENT_BC | SEGMENT_D4; break; @@ -145,7 +145,7 @@ static void paint_twist(uint8 rideIndex, uint8 trackSequence, uint8 direction, i /** * rct2: 0x0076D658 */ -TRACK_PAINT_FUNCTION get_track_paint_function_twist(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_twist(sint32 trackType, sint32 direction) { if (trackType != FLAT_TRACK_ELEM_3_X_3) { return NULL; diff --git a/src/openrct2/ride/track.c b/src/openrct2/ride/track.c index 7fed75ec37..7325774ebb 100644 --- a/src/openrct2/ride/track.c +++ b/src/openrct2/ride/track.c @@ -564,9 +564,9 @@ const rct_trackdefinition FlatRideTrackDefinitions[256] = { /** * Helper method to determine if a connects to b by its bank and angle, not location. */ -int track_is_connected_by_shape(rct_map_element *a, rct_map_element *b) +sint32 track_is_connected_by_shape(rct_map_element *a, rct_map_element *b) { - int trackType, aBank, aAngle, bBank, bAngle; + sint32 trackType, aBank, aAngle, bBank, bAngle; trackType = a->properties.track.type; aBank = TrackDefinitions[trackType].bank_end; @@ -581,25 +581,25 @@ int track_is_connected_by_shape(rct_map_element *a, rct_map_element *b) return aBank == bBank && aAngle == bAngle; } -const rct_preview_track *get_track_def_from_ride(rct_ride *ride, int trackType) +const rct_preview_track *get_track_def_from_ride(rct_ride *ride, sint32 trackType) { return ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? FlatRideTrackBlocks[trackType] : TrackBlocks[trackType]; } -const rct_track_coordinates *get_track_coord_from_ride(rct_ride *ride, int trackType){ +const rct_track_coordinates *get_track_coord_from_ride(rct_ride *ride, sint32 trackType){ return ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? &FlatTrackCoordinates[trackType] : &TrackCoordinates[trackType]; } -const rct_preview_track *get_track_def_from_ride_index(int rideIndex, int trackType) +const rct_preview_track *get_track_def_from_ride_index(sint32 rideIndex, sint32 trackType) { return get_track_def_from_ride(get_ride(rideIndex), trackType); } -static rct_map_element *find_station_element(int x, int y, int z, int direction, int rideIndex) +static rct_map_element *find_station_element(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -614,10 +614,10 @@ static rct_map_element *find_station_element(int x, int y, int z, int direction, return NULL; } -static void ride_remove_station(rct_ride *ride, int x, int y, int z) +static void ride_remove_station(rct_ride *ride, sint32 x, sint32 y, sint32 z) { uint16 xy = (x >> 5) | ((y >> 5) << 8); - for (int i = 0; i < MAX_STATIONS; i++) { + for (sint32 i = 0; i < MAX_STATIONS; i++) { if (ride->station_starts[i] == xy && ride->station_heights[i] == z) { ride->station_starts[i] = 0xFFFF; ride->num_stations--; @@ -630,13 +630,13 @@ static void ride_remove_station(rct_ride *ride, int x, int y, int z) * * rct2: 0x006C4D89 */ -static bool track_add_station_element(int x, int y, int z, int direction, int rideIndex, int flags) +static bool track_add_station_element(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex, sint32 flags) { - int stationX0 = x; - int stationY0 = y; - int stationX1 = x; - int stationY1 = y; - int stationLength = 1; + sint32 stationX0 = x; + sint32 stationY0 = y; + sint32 stationX1 = x; + sint32 stationY1 = y; + sint32 stationLength = 1; rct_ride *ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) { @@ -645,8 +645,8 @@ static bool track_add_station_element(int x, int y, int z, int direction, int ri return false; } if (flags & GAME_COMMAND_FLAG_APPLY) { - int stationIndex = -1; - for (int i = 0; i < MAX_STATIONS; i++) { + sint32 stationIndex = -1; + for (sint32 i = 0; i < MAX_STATIONS; i++) { if (ride->station_starts[i] == 0xFFFF) { stationIndex = i; break; @@ -728,10 +728,10 @@ static bool track_add_station_element(int x, int y, int z, int direction, int ri stationElement = find_station_element(x, y, z, direction, rideIndex); if (stationElement != NULL) { - int targetTrackType; + sint32 targetTrackType; if (x == stationX1 && y == stationY1) { - int stationIndex = -1; - for (int i = 0; i < MAX_STATIONS; i++) { + sint32 stationIndex = -1; + for (sint32 i = 0; i < MAX_STATIONS; i++) { if (ride->station_starts[i] == 0xFFFF) { stationIndex = i; break; @@ -772,16 +772,16 @@ static bool track_add_station_element(int x, int y, int z, int direction, int ri * * rct2: 0x006C494B */ -static bool track_remove_station_element(int x, int y, int z, int direction, int rideIndex, int flags) +static bool track_remove_station_element(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex, sint32 flags) { - int removeX = x; - int removeY = y; - int stationX0 = x; - int stationY0 = y; - int stationX1 = x; - int stationY1 = y; - int stationLength = 0; - int byte_F441D1 = -1; + sint32 removeX = x; + sint32 removeY = y; + sint32 stationX0 = x; + sint32 stationY0 = y; + sint32 stationX1 = x; + sint32 stationY1 = y; + sint32 stationLength = 0; + sint32 byte_F441D1 = -1; rct_ride *ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) { @@ -856,11 +856,11 @@ static bool track_remove_station_element(int x, int y, int z, int direction, int if (x != removeX || y != removeY) { stationElement = find_station_element(x, y, z, direction, rideIndex); if (stationElement != NULL) { - int targetTrackType; + sint32 targetTrackType; if (x == stationX1 && y == stationY1) { loc_6C4BF5:; - int stationIndex = -1; - for (int i = 0; i < MAX_STATIONS; i++) { + sint32 stationIndex = -1; + for (sint32 i = 0; i < MAX_STATIONS; i++) { if (ride->station_starts[i] == 0xFFFF) { stationIndex = i; break; @@ -913,7 +913,7 @@ static bool track_remove_station_element(int x, int y, int z, int direction, int return true; } -static money32 track_place(int rideIndex, int type, int originX, int originY, int originZ, int direction, int properties_1, int properties_2, int properties_3, int edx_flags, int flags) +static money32 track_place(sint32 rideIndex, sint32 type, sint32 originX, sint32 originY, sint32 originZ, sint32 direction, sint32 properties_1, sint32 properties_2, sint32 properties_3, sint32 edx_flags, sint32 flags) { rct_ride *ride = get_ride(rideIndex); if (ride == NULL) @@ -1039,11 +1039,11 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in // If that is not the case, then perform the remaining checks trackBlock = get_track_def_from_ride(ride, type); - for (int blockIndex = 0; trackBlock->index != 0xFF; trackBlock++, blockIndex++) { + for (sint32 blockIndex = 0; trackBlock->index != 0xFF; trackBlock++, blockIndex++) { sint32 offsetX = 0; sint32 offsetY = 0; - int bl = trackBlock->var_08; - int bh; + sint32 bl = trackBlock->var_08; + sint32 bh; switch (direction) { case 0: offsetX = trackBlock->x; @@ -1091,9 +1091,9 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in return MONEY32_UNDEFINED; } - int baseZ = (originZ + trackBlock->z) / 8; + sint32 baseZ = (originZ + trackBlock->z) / 8; - int clearanceZ = trackBlock->var_07; + sint32 clearanceZ = trackBlock->var_07; if (trackBlock->var_09 & (1 << 2) && RideData5[ride->type].clearance_height > 24) { clearanceZ += 24; } @@ -1126,7 +1126,7 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in // Remove walls in the directions this track intersects uint8 intersectingDirections = (*wallEdges)[blockIndex]; intersectingDirections ^= 0x0F; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (intersectingDirections & (1 << i)) { map_remove_intersecting_walls(x, y, baseZ, clearanceZ, i); } @@ -1203,7 +1203,7 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in } } - int entranceDirections; + sint32 entranceDirections; if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { entranceDirections = FlatRideTrackSequenceProperties[type][0]; } @@ -1221,10 +1221,10 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in if (entranceDirections != 0) { if (!(flags & GAME_COMMAND_FLAG_APPLY) && !(flags & GAME_COMMAND_FLAG_GHOST)) { uint8 _bl = entranceDirections; - for (int dl = bitscanforward(_bl); dl != -1; dl = bitscanforward(_bl)){ + for (sint32 dl = bitscanforward(_bl); dl != -1; dl = bitscanforward(_bl)){ _bl &= ~(1 << dl); - int temp_x = x, temp_y = y; - int temp_direction = (direction + dl) & 3; + sint32 temp_x = x, temp_y = y; + sint32 temp_direction = (direction + dl) & 3; temp_x += TileDirectionDelta[temp_direction].x; temp_y += TileDirectionDelta[temp_direction].y; temp_direction ^= (1 << 1); @@ -1236,9 +1236,9 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in //6c5648 12 push mapElement = map_get_surface_element_at(x / 32, y / 32); if (!gCheatsDisableSupportLimits){ - int ride_height = clearanceZ - mapElement->base_height; + sint32 ride_height = clearanceZ - mapElement->base_height; if (ride_height >= 0) { - int maxHeight = rideEntry->max_height; + sint32 maxHeight = rideEntry->max_height; if (maxHeight == 0) { maxHeight = RideData5[ride->type].max_height; } @@ -1250,7 +1250,7 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in } } - int _support_height = baseZ - mapElement->base_height; + sint32 _support_height = baseZ - mapElement->base_height; if (_support_height < 0) { _support_height = 10; } @@ -1415,7 +1415,7 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in * * rct2: 0x006C511D */ -void game_command_place_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_place_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = track_place( *edx & 0xFF, @@ -1585,7 +1585,7 @@ static money32 track_remove(uint8 type, uint8 sequence, sint16 originX, sint16 o return MONEY32_UNDEFINED; } - int entranceDirections; + sint32 entranceDirections; if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { entranceDirections = FlatRideTrackSequenceProperties[type][0]; } @@ -1702,7 +1702,7 @@ static money32 track_remove(uint8 type, uint8 sequence, sint16 originX, sint16 o * * rct2: 0x006C5B69 */ -void game_command_remove_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_remove_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = track_remove( *edx & 0xFF, @@ -1960,7 +1960,7 @@ static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, * * rct2: 0x006CD8CE */ -void game_command_set_maze_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_maze_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { uint16 x = (*eax & 0xFFFF); // AX uint8 flags = (*ebx & 0xFF); // BL @@ -1977,10 +1977,10 @@ void game_command_set_maze_track(int *eax, int *ebx, int *ecx, int *edx, int *es * * rct2: 0x006C5AE9 */ -void game_command_set_brakes_speed(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_brakes_speed(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { rct_map_element *mapElement; - int x, y, z, trackType, brakesSpeed; + sint32 x, y, z, trackType, brakesSpeed; x = (*eax & 0xFFFF); y = (*ecx & 0xFFFF); @@ -2110,7 +2110,7 @@ void track_get_back(rct_xy_element *input, rct_xy_element *output) void track_get_front(rct_xy_element *input, rct_xy_element *output) { rct_xy_element lastTrack, currentTrack; - int z, direction; + sint32 z, direction; bool result; lastTrack = *input; @@ -2169,14 +2169,14 @@ bool track_element_is_inverted(rct_map_element *trackElement) return trackElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED; } -int track_get_actual_bank(rct_map_element *mapElement, int bank) +sint32 track_get_actual_bank(rct_map_element *mapElement, sint32 bank) { rct_ride *ride = get_ride(mapElement->properties.track.ride_index); - int trackColour = mapElement->properties.track.colour; + sint32 trackColour = mapElement->properties.track.colour; return track_get_actual_bank_2(ride->type, trackColour, bank); } -int track_get_actual_bank_2(int rideType, int trackColour, int bank) +sint32 track_get_actual_bank_2(sint32 rideType, sint32 trackColour, sint32 bank) { if (RideData4[rideType].flags & RIDE_TYPE_FLAG4_3) { if (trackColour & 4) { @@ -2190,13 +2190,13 @@ int track_get_actual_bank_2(int rideType, int trackColour, int bank) return bank; } -int track_get_actual_bank_3(rct_vehicle *vehicle, rct_map_element *mapElement) +sint32 track_get_actual_bank_3(rct_vehicle *vehicle, rct_map_element *mapElement) { uint8 colourThingToXor = (vehicle->update_flags >> 9) & 0xFF; - int trackType = mapElement->properties.track.type; - int rideType = get_ride(mapElement->properties.track.ride_index)->type; - int trackColour = mapElement->properties.track.colour ^ colourThingToXor; - int bankStart = TrackDefinitions[trackType].bank_start; + sint32 trackType = mapElement->properties.track.type; + sint32 rideType = get_ride(mapElement->properties.track.ride_index)->type; + sint32 trackColour = mapElement->properties.track.colour ^ colourThingToXor; + sint32 bankStart = TrackDefinitions[trackType].bank_start; return track_get_actual_bank_2(rideType, trackColour, bankStart); } @@ -2212,7 +2212,7 @@ bool track_element_is_station(rct_map_element *trackElement) } } -bool track_element_is_covered(int trackElementType) +bool track_element_is_covered(sint32 trackElementType) { switch (trackElementType) { case TRACK_ELEM_FLAT_COVERED: diff --git a/src/openrct2/ride/track.h b/src/openrct2/ride/track.h index 5c37969aea..42835202b5 100644 --- a/src/openrct2/ride/track.h +++ b/src/openrct2/ride/track.h @@ -494,8 +494,8 @@ enum { typedef struct track_circuit_iterator { rct_xy_element last; rct_xy_element current; - int currentZ; - int currentDirection; + sint32 currentZ; + sint32 currentDirection; rct_map_element *first; bool firstIteration; bool looped; @@ -506,11 +506,11 @@ extern const rct_trackdefinition TrackDefinitions[256]; extern uint8 gTrackGroundFlags; -int track_is_connected_by_shape(rct_map_element *a, rct_map_element *b); +sint32 track_is_connected_by_shape(rct_map_element *a, rct_map_element *b); -const rct_preview_track *get_track_def_from_ride(rct_ride *ride, int trackType); -const rct_preview_track *get_track_def_from_ride_index(int rideIndex, int trackType); -const rct_track_coordinates *get_track_coord_from_ride(rct_ride *ride, int trackType); +const rct_preview_track *get_track_def_from_ride(rct_ride *ride, sint32 trackType); +const rct_preview_track *get_track_def_from_ride_index(sint32 rideIndex, sint32 trackType); +const rct_track_coordinates *get_track_coord_from_ride(rct_ride *ride, sint32 trackType); void track_circuit_iterator_begin(track_circuit_iterator *it, rct_xy_element first); bool track_circuit_iterator_previous(track_circuit_iterator *it); @@ -520,7 +520,7 @@ void track_get_back(rct_xy_element *input, rct_xy_element *output); void track_get_front(rct_xy_element *input, rct_xy_element *output); bool track_element_is_block_start(rct_map_element *trackElement); -bool track_element_is_covered(int trackElementType); +bool track_element_is_covered(sint32 trackElementType); bool track_element_is_station(rct_map_element *trackElement); bool track_element_is_lift_hill(rct_map_element *trackElement); bool track_element_is_cable_lift(rct_map_element *trackElement); @@ -528,13 +528,13 @@ void track_element_set_cable_lift(rct_map_element *trackElement); void track_element_clear_cable_lift(rct_map_element *trackElement); bool track_element_is_inverted(rct_map_element *trackElement); -int track_get_actual_bank(rct_map_element *mapElement, int bank); -int track_get_actual_bank_2(int rideType, int trackColour, int bank); -int track_get_actual_bank_3(rct_vehicle *vehicle, rct_map_element *mapElement); +sint32 track_get_actual_bank(rct_map_element *mapElement, sint32 bank); +sint32 track_get_actual_bank_2(sint32 rideType, sint32 trackColour, sint32 bank); +sint32 track_get_actual_bank_3(rct_vehicle *vehicle, rct_map_element *mapElement); -void game_command_place_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_remove_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_maze_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_brakes_speed(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +void game_command_place_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_remove_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_maze_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_brakes_speed(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); #endif diff --git a/src/openrct2/ride/track_design.c b/src/openrct2/ride/track_design.c index dc0abfcd65..71412d336c 100644 --- a/src/openrct2/ride/track_design.c +++ b/src/openrct2/ride/track_design.c @@ -188,7 +188,7 @@ static rct_track_td6 * track_design_open_from_td4(uint8 *src, size_t srcLength) td6->version_and_colour_scheme = td4->version_and_colour_scheme; // Vehicle colours - for (int i = 0; i < 12; i++) { + for (sint32 i = 0; i < 12; i++) { td6->vehicle_colours[i].body_colour = rct1_get_colour(td4->vehicle_colours[i].body_colour); td6->vehicle_colours[i].trim_colour = rct1_get_colour(td4->vehicle_colours[i].trim_colour); @@ -198,17 +198,17 @@ static rct_track_td6 * track_design_open_from_td4(uint8 *src, size_t srcLength) } } // Set remaining vehicles to same colour as first vehicle - for (int i = 12; i < 32; i++) { + for (sint32 i = 12; i < 32; i++) { td6->vehicle_colours[i] = td6->vehicle_colours[0]; } // Set additional colour to trim colour for all vehicles - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { td6->vehicle_additional_colour[i] = td6->vehicle_colours[i].trim_colour; } // Track colours if (version == 0) { - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { td6->track_spine_colour[i] = rct1_get_colour(td4->track_spine_colour_v0); td6->track_rail_colour[i] = rct1_get_colour(td4->track_rail_colour_v0); td6->track_support_colour[i] = rct1_get_colour(td4->track_support_colour_v0); @@ -225,7 +225,7 @@ static rct_track_td6 * track_design_open_from_td4(uint8 *src, size_t srcLength) } } } else { - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { td6->track_spine_colour[i] = rct1_get_colour(td4->track_spine_colour[i]); td6->track_rail_colour[i] = rct1_get_colour(td4->track_rail_colour[i]); td6->track_support_colour[i] = rct1_get_colour(td4->track_support_colour[i]); @@ -563,7 +563,7 @@ static void track_design_update_max_min_coordinates(sint16 x, sint16 y, sint16 z * * rct2: 0x006D0964 */ -static int track_design_place_scenery(rct_td6_scenery_element *scenery_start, uint8 rideIndex, int originX, int originY, int originZ) +static sint32 track_design_place_scenery(rct_td6_scenery_element *scenery_start, uint8 rideIndex, sint32 originX, sint32 originY, sint32 originZ) { for (uint8 mode = 0; mode <= 1; mode++) { if ((scenery_start->scenery_object.flags & 0xFF) != 0xFF) { @@ -648,7 +648,7 @@ static int track_design_place_scenery(rct_td6_scenery_element *scenery_start, ui entry_type = 0xFF; } } - int z; + sint32 z; switch (entry_type) { case OBJECT_TYPE_SMALL_SCENERY: //bl @@ -709,7 +709,7 @@ static int track_design_place_scenery(rct_td6_scenery_element *scenery_start, ui } if (_trackDesignPlaceOperation == PTD_OPERATION_GET_PLACE_Z) { - int z = scenery->z * 8 + _trackDesignPlaceZ; + sint32 z = scenery->z * 8 + _trackDesignPlaceZ; if (z < word_F44129) { word_F44129 = z; } @@ -913,7 +913,7 @@ static int track_design_place_scenery(rct_td6_scenery_element *scenery_start, ui return 1; } -static int track_design_place_maze(rct_track_td6 *td6, sint16 x, sint16 y, sint16 z, uint8 rideIndex) +static sint32 track_design_place_maze(rct_track_td6 *td6, sint16 x, sint16 y, sint16 z, uint8 rideIndex) { if (_trackDesignPlaceOperation == PTD_OPERATION_DRAW_OUTLINES) { gMapSelectionTiles->x = -1; @@ -1084,7 +1084,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint { const rct_track_coordinates *trackCoordinates = &TrackCoordinates[trackType]; const rct_preview_track *trackBlock = TrackBlocks[trackType]; - int tempZ = z - trackCoordinates->z_begin + trackBlock->z; + sint32 tempZ = z - trackCoordinates->z_begin + trackBlock->z; uint8 flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | @@ -1108,7 +1108,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint (((track->flags >> 4) & 0x03) << 24) | (tempZ & 0xFFFF); - int edx = _currentRideIndex | (trackType << 8); + sint32 edx = _currentRideIndex | (trackType << 8); if (track->flags & 0x80) edx |= 0x10000; if (track->flags & 0x40) edx |= 0x20000; @@ -1137,7 +1137,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint } case PTD_OPERATION_GET_PLACE_Z: { - int tempZ = z - TrackCoordinates[trackType].z_begin; + sint32 tempZ = z - TrackCoordinates[trackType].z_begin; for (const rct_preview_track *trackBlock = TrackBlocks[trackType]; trackBlock->index != 0xFF; trackBlock++) { rct_xy16 tile = { x, y }; map_offset_with_rotation(&tile.x, &tile.y, trackBlock->x, trackBlock->y, rotation); @@ -1150,7 +1150,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint return false; } - int height = mapElement->base_height * 8; + sint32 height = mapElement->base_height * 8; if (mapElement->properties.surface.slope & 0x0F) { height += 16; if (mapElement->properties.surface.slope & 0x10) { @@ -1162,7 +1162,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint if (water_height > 0 && water_height > height) { height = water_height; } - int heightDifference = tempZ + _trackDesignPlaceZ + trackBlock->z - height; + sint32 heightDifference = tempZ + _trackDesignPlaceZ + trackBlock->z - height; if (heightDifference < 0) { _trackDesignPlaceZ -= heightDifference; } @@ -1225,7 +1225,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_TRACK) continue; if (map_element->base_height != z) continue; - int di = (map_element->properties.track.sequence >> 4) & 0x07; + sint32 di = (map_element->properties.track.sequence >> 4) & 0x07; uint8 bl = 1; if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST) bl = 41; if (_trackDesignPlaceOperation == PTD_OPERATION_4) bl = 105; @@ -1283,7 +1283,7 @@ static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint * bl == 6, Clear white outlined track. * rct2: 0x006D01B3 */ -int sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, int x, int y, int z) +sint32 sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, sint32 x, sint32 y, sint32 z) { byte_F4414E = bl & 0x80; _trackDesignPlaceOperation = bl & 0x7F; @@ -1363,7 +1363,7 @@ static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 * ride->entrance_style = td6->entrance_style; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { ride->track_colour_main[i] = td6->track_spine_colour[i]; ride->track_colour_additional[i] = td6->track_rail_colour[i]; ride->track_colour_supports[i] = td6->track_support_colour[i]; @@ -1373,10 +1373,10 @@ static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 * uint8 backup_rotation = _currentTrackPieceDirection; uint32 backup_park_flags = gParkFlags; gParkFlags &= ~PARK_FLAGS_FORBID_HIGH_CONSTRUCTION; - int mapSize = gMapSize << 4; + sint32 mapSize = gMapSize << 4; _currentTrackPieceDirection = 0; - int z = sub_6D01B3(td6, PTD_OPERATION_GET_PLACE_Z, 0, mapSize, mapSize, 16); + sint32 z = sub_6D01B3(td6, PTD_OPERATION_GET_PLACE_Z, 0, mapSize, mapSize, 16); if (byte_F4414E & 4) { *flags |= 2; @@ -1384,7 +1384,7 @@ static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 * z += 16 - word_F44129; - int operation = PTD_OPERATION_GET_COST; + sint32 operation = PTD_OPERATION_GET_COST; if (byte_F4414E & BYTE_F4414E_SCENERY_UNAVAILABLE) { operation |= 0x80; *flags |= TRACK_DESIGN_FLAG_SCENERY_UNAVAILABLE; @@ -1506,13 +1506,13 @@ static money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uin ride->entrance_style = td6->entrance_style; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { ride->track_colour_main[i] = td6->track_spine_colour[i]; ride->track_colour_additional[i] = td6->track_rail_colour[i]; ride->track_colour_supports[i] = td6->track_support_colour[i]; } - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { ride->vehicle_colours[i].body_colour = td6->vehicle_colours[i].body_colour; ride->vehicle_colours[i].trim_colour = td6->vehicle_colours[i].trim_colour; ride->vehicle_colours_extended[i] = td6->vehicle_additional_colour[i]; @@ -1576,10 +1576,10 @@ static money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, money32 cost = 0; // Clearance checks if (!gCheatsDisableClearanceChecks) { - int fx = floor2(x, 32); - int fy = floor2(y, 32); - int fz0 = z >> 3; - int fz1 = fz0 + 4; + sint32 fx = floor2(x, 32); + sint32 fy = floor2(y, 32); + sint32 fz0 = z >> 3; + sint32 fz1 = fz0 + 4; if (!map_can_construct_with_clear_at(fx, fy, fz0, fz1, &map_place_non_scenery_clear_func, 15, flags, &cost)) { return MONEY32_UNDEFINED; @@ -1617,9 +1617,9 @@ static money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, } // Place track element - int fx = floor2(x, 32); - int fy = floor2(y, 32); - int fz = z >> 3; + sint32 fx = floor2(x, 32); + sint32 fy = floor2(y, 32); + sint32 fz = z >> 3; rct_map_element *mapElement = map_element_insert(fx >> 5, fy >> 5, fz, 15); mapElement->clearance_height = fz + 4; mapElement->type = MAP_ELEMENT_TYPE_TRACK; @@ -1647,7 +1647,7 @@ static money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, * * rct2: 0x006D13FE */ -void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_place_track_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { sint16 x = *eax & 0xFFFF; sint16 y = *ecx & 0xFFFF; @@ -1662,7 +1662,7 @@ void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int * * rct2: 0x006CDEE4 */ -void game_command_place_maze_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_place_maze_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = place_maze_design( *ebx & 0xFF, @@ -1709,13 +1709,13 @@ void track_design_draw_preview(rct_track_td6 *td6, uint8 *pixels) centre.y = (gTrackPreviewMin.y + gTrackPreviewMax.y) / 2 + 16; centre.z = (gTrackPreviewMin.z + gTrackPreviewMax.z) / 2; - int width = gTrackPreviewMax.x - gTrackPreviewMin.x; - int height = gTrackPreviewMax.y - gTrackPreviewMin.y; + sint32 width = gTrackPreviewMax.x - gTrackPreviewMin.x; + sint32 height = gTrackPreviewMax.y - gTrackPreviewMin.y; if (width < height) { width = height; } - int zoom_level = 1; + sint32 zoom_level = 1; if (width > 1120) { zoom_level = 2; } @@ -1746,7 +1746,7 @@ void track_design_draw_preview(rct_track_td6 *td6, uint8 *pixels) dpi.bits = pixels; rct_xy32 offset = { width / 2, height / 2 }; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { gCurrentRotation = i; rct_xy32 pos2d = translate_3d_to_2d_with_z(i, centre); @@ -1834,7 +1834,7 @@ static void track_design_preview_clear_map() gMapSizeMinus2 = (264 * 32) - 2; gMapSize = 256; - for (int i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { + for (sint32 i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { rct_map_element* map_element = &gMapElements[i]; map_element->type = MAP_ELEMENT_TYPE_SURFACE; map_element->flags = MAP_ELEMENT_FLAG_LAST_TILE; diff --git a/src/openrct2/ride/track_design.h b/src/openrct2/ride/track_design.h index 53776fe804..1760c61528 100644 --- a/src/openrct2/ride/track_design.h +++ b/src/openrct2/ride/track_design.h @@ -198,10 +198,10 @@ void track_design_dispose(rct_track_td6 *td6); void track_design_mirror(rct_track_td6 *td6); -int sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, int x, int y, int z); +sint32 sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, sint32 x, sint32 y, sint32 z); -void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_place_maze_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void game_command_place_track_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_place_maze_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); /////////////////////////////////////////////////////////////////////////////// // Track design preview @@ -214,8 +214,8 @@ void track_design_draw_preview(rct_track_td6 *td6, uint8 *pixels); void track_design_save_init(); void track_design_save_reset_scenery(); bool track_design_save_contains_map_element(rct_map_element *mapElement); -void track_design_save_select_nearby_scenery(int rideIndex); -void track_design_save_toggle_map_element(int interactionType, int x, int y, rct_map_element *mapElement); +void track_design_save_select_nearby_scenery(sint32 rideIndex); +void track_design_save_toggle_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement); bool track_design_save(uint8 rideIndex); bool track_design_save_to_file(const utf8 *path); diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 9ef60c3202..d69317b550 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -48,10 +48,10 @@ static rct_td6_scenery_element _trackSavedMapElementsDesc[TRACK_MAX_SAVED_MAP_EL static rct_track_td6 *_trackDesign; static uint8 _trackSaveDirection; -static bool track_design_save_should_select_scenery_around(int rideIndex, rct_map_element *mapElement); -static void track_design_save_select_nearby_scenery_for_tile(int rideIndex, int cx, int cy); -static bool track_design_save_add_map_element(int interactionType, int x, int y, rct_map_element *mapElement); -static void track_design_save_remove_map_element(int interactionType, int x, int y, rct_map_element *mapElement); +static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct_map_element *mapElement); +static void track_design_save_select_nearby_scenery_for_tile(sint32 rideIndex, sint32 cx, sint32 cy); +static bool track_design_save_add_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement); +static void track_design_save_remove_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement); static bool track_design_save_copy_scenery_to_td6(rct_track_td6 *td6); static rct_track_td6 *track_design_save_to_td6(uint8 rideIndex); static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td6); @@ -75,7 +75,7 @@ void track_design_save_init() * * rct2: 0x006D2B07 */ -void track_design_save_toggle_map_element(int interactionType, int x, int y, rct_map_element *mapElement) +void track_design_save_toggle_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement) { if (track_design_save_contains_map_element(mapElement)) { track_design_save_remove_map_element(interactionType, x, y, mapElement); @@ -93,12 +93,12 @@ void track_design_save_toggle_map_element(int interactionType, int x, int y, rct * * rct2: 0x006D303D */ -void track_design_save_select_nearby_scenery(int rideIndex) +void track_design_save_select_nearby_scenery(sint32 rideIndex) { rct_map_element *mapElement; - for (int y = 0; y < 256; y++) { - for (int x = 0; x < 256; x++) { + for (sint32 y = 0; y < 256; y++) { + for (sint32 x = 0; x < 256; x++) { mapElement = map_get_first_element_at(x, y); do { if (track_design_save_should_select_scenery_around(rideIndex, mapElement)) { @@ -121,7 +121,7 @@ void track_design_save_reset_scenery() gfx_invalidate_screen(); } -static void track_design_save_callback(int result, const utf8 * path) +static void track_design_save_callback(sint32 result, const utf8 * path) { free(_trackDesign->track_elements); free(_trackDesign->entrance_elements); @@ -191,9 +191,9 @@ bool track_design_save_contains_map_element(rct_map_element *mapElement) return false; } -static int map_element_get_total_element_count(rct_map_element *mapElement) +static sint32 map_element_get_total_element_count(rct_map_element *mapElement) { - int elementCount; + sint32 elementCount; rct_scenery_entry *sceneryEntry; rct_large_scenery_tile *tile; @@ -243,7 +243,7 @@ static bool track_design_save_can_add_map_element(rct_map_element *mapElement) * * rct2: 0x006D2F4C */ -static void track_design_save_push_map_element(int x, int y, rct_map_element *mapElement) +static void track_design_save_push_map_element(sint32 x, sint32 y, rct_map_element *mapElement) { if (_trackSavedMapElementsCount < TRACK_MAX_SAVED_MAP_ELEMENTS) { _trackSavedMapElements[_trackSavedMapElementsCount++] = mapElement; @@ -260,7 +260,7 @@ static void track_design_save_push_map_element(int x, int y, rct_map_element *ma * * rct2: 0x006D2FA7 */ -static void track_design_save_push_map_element_desc(rct_object_entry *entry, int x, int y, int z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) +static void track_design_save_push_map_element_desc(rct_object_entry *entry, sint32 x, sint32 y, sint32 z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) { rct_td6_scenery_element *item = &_trackSavedMapElementsDesc[_trackSavedMapElementsDescCount++]; item->scenery_object = *entry; @@ -272,9 +272,9 @@ static void track_design_save_push_map_element_desc(rct_object_entry *entry, int item->secondary_colour = secondaryColour; } -static void track_design_save_add_scenery(int x, int y, rct_map_element *mapElement) +static void track_design_save_add_scenery(sint32 x, sint32 y, rct_map_element *mapElement) { - int entryType = mapElement->properties.scenery.type; + sint32 entryType = mapElement->properties.scenery.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].entries[entryType]; uint8 flags = 0; @@ -288,13 +288,13 @@ static void track_design_save_add_scenery(int x, int y, rct_map_element *mapElem track_design_save_push_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_add_large_scenery(int x, int y, rct_map_element *mapElement) +static void track_design_save_add_large_scenery(sint32 x, sint32 y, rct_map_element *mapElement) { rct_large_scenery_tile *sceneryTiles, *tile; - int x0, y0, z0, z; - int direction, sequence; + sint32 x0, y0, z0, z; + sint32 direction, sequence; - int entryType = mapElement->properties.scenerymultiple.type & 0x3FF; + sint32 entryType = mapElement->properties.scenerymultiple.type & 0x3FF; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_LARGE_SCENERY].entries[entryType]; sceneryTiles = get_large_scenery_entry(entryType)->large_scenery.tiles; @@ -330,9 +330,9 @@ static void track_design_save_add_large_scenery(int x, int y, rct_map_element *m } } -static void track_design_save_add_wall(int x, int y, rct_map_element *mapElement) +static void track_design_save_add_wall(sint32 x, sint32 y, rct_map_element *mapElement) { - int entryType = mapElement->properties.fence.type; + sint32 entryType = mapElement->properties.fence.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_WALLS].entries[entryType]; uint8 flags = 0; @@ -346,9 +346,9 @@ static void track_design_save_add_wall(int x, int y, rct_map_element *mapElement track_design_save_push_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_add_footpath(int x, int y, rct_map_element *mapElement) +static void track_design_save_add_footpath(sint32 x, sint32 y, rct_map_element *mapElement) { - int entryType = mapElement->properties.path.type >> 4; + sint32 entryType = mapElement->properties.path.type >> 4; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_PATHS].entries[entryType]; uint8 flags = 0; @@ -365,7 +365,7 @@ static void track_design_save_add_footpath(int x, int y, rct_map_element *mapEle * * rct2: 0x006D2B3C */ -static bool track_design_save_add_map_element(int interactionType, int x, int y, rct_map_element *mapElement) +static bool track_design_save_add_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement) { if (!track_design_save_can_add_map_element(mapElement)) { return false; @@ -393,7 +393,7 @@ static bool track_design_save_add_map_element(int interactionType, int x, int y, * * rct2: 0x006D2F78 */ -static void track_design_save_pop_map_element(int x, int y, rct_map_element *mapElement) +static void track_design_save_pop_map_element(sint32 x, sint32 y, rct_map_element *mapElement) { map_invalidate_tile_full(x, y); @@ -428,7 +428,7 @@ static void track_design_save_pop_map_element(int x, int y, rct_map_element *map * * rct2: 0x006D2FDD */ -static void track_design_save_pop_map_element_desc(rct_object_entry *entry, int x, int y, int z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) +static void track_design_save_pop_map_element_desc(rct_object_entry *entry, sint32 x, sint32 y, sint32 z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) { size_t removeIndex = SIZE_MAX; for (size_t i = 0; i < _trackSavedMapElementsDescCount; i++) { @@ -455,9 +455,9 @@ static void track_design_save_pop_map_element_desc(rct_object_entry *entry, int } } -static void track_design_save_remove_scenery(int x, int y, rct_map_element *mapElement) +static void track_design_save_remove_scenery(sint32 x, sint32 y, rct_map_element *mapElement) { - int entryType = mapElement->properties.scenery.type; + sint32 entryType = mapElement->properties.scenery.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].entries[entryType]; uint8 flags = 0; @@ -471,13 +471,13 @@ static void track_design_save_remove_scenery(int x, int y, rct_map_element *mapE track_design_save_pop_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_remove_large_scenery(int x, int y, rct_map_element *mapElement) +static void track_design_save_remove_large_scenery(sint32 x, sint32 y, rct_map_element *mapElement) { rct_large_scenery_tile *sceneryTiles, *tile; - int x0, y0, z0, z; - int direction, sequence; + sint32 x0, y0, z0, z; + sint32 direction, sequence; - int entryType = mapElement->properties.scenerymultiple.type & 0x3FF; + sint32 entryType = mapElement->properties.scenerymultiple.type & 0x3FF; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_LARGE_SCENERY].entries[entryType]; sceneryTiles = get_large_scenery_entry(entryType)->large_scenery.tiles; @@ -513,9 +513,9 @@ static void track_design_save_remove_large_scenery(int x, int y, rct_map_element } } -static void track_design_save_remove_wall(int x, int y, rct_map_element *mapElement) +static void track_design_save_remove_wall(sint32 x, sint32 y, rct_map_element *mapElement) { - int entryType = mapElement->properties.fence.type; + sint32 entryType = mapElement->properties.fence.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_WALLS].entries[entryType]; uint8 flags = 0; @@ -529,9 +529,9 @@ static void track_design_save_remove_wall(int x, int y, rct_map_element *mapElem track_design_save_pop_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_remove_footpath(int x, int y, rct_map_element *mapElement) +static void track_design_save_remove_footpath(sint32 x, sint32 y, rct_map_element *mapElement) { - int entryType = mapElement->properties.path.type >> 4; + sint32 entryType = mapElement->properties.path.type >> 4; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_PATHS].entries[entryType]; uint8 flags = 0; @@ -548,7 +548,7 @@ static void track_design_save_remove_footpath(int x, int y, rct_map_element *map * * rct2: 0x006D2B3C */ -static void track_design_save_remove_map_element(int interactionType, int x, int y, rct_map_element *mapElement) +static void track_design_save_remove_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement) { switch (interactionType) { case VIEWPORT_INTERACTION_ITEM_SCENERY: @@ -566,7 +566,7 @@ static void track_design_save_remove_map_element(int interactionType, int x, int } } -static bool track_design_save_should_select_scenery_around(int rideIndex, rct_map_element *mapElement) +static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct_map_element *mapElement) { switch (map_element_get_type(mapElement)) { case MAP_ELEMENT_TYPE_PATH: @@ -589,15 +589,15 @@ static bool track_design_save_should_select_scenery_around(int rideIndex, rct_ma return false; } -static void track_design_save_select_nearby_scenery_for_tile(int rideIndex, int cx, int cy) +static void track_design_save_select_nearby_scenery_for_tile(sint32 rideIndex, sint32 cx, sint32 cy) { rct_map_element *mapElement; - for (int y = cy - 1; y <= cy + 1; y++) { - for (int x = cx - 1; x <= cx + 1; x++) { + for (sint32 y = cy - 1; y <= cy + 1; y++) { + for (sint32 x = cx - 1; x <= cx + 1; x++) { mapElement = map_get_first_element_at(x, y); do { - int interactionType = VIEWPORT_INTERACTION_ITEM_NONE; + sint32 interactionType = VIEWPORT_INTERACTION_ITEM_NONE; switch (map_element_get_type(mapElement)) { case MAP_ELEMENT_TYPE_PATH: if (!(mapElement->type & 1)) @@ -695,7 +695,7 @@ static bool track_design_save_copy_scenery_to_td6(rct_track_td6 *td6) scenery->x = (sint8)x; scenery->y = (sint8)y; - int z = scenery->z * 8 - gTrackPreviewOrigin.z; + sint32 z = scenery->z * 8 - gTrackPreviewOrigin.z; z /= 8; if (z > 127 || z < -126) { window_error_open(STR_CANT_SAVE_TRACK_DESIGN, STR_TRACK_TOO_LARGE_OR_TOO_MUCH_SCENERY); @@ -729,12 +729,12 @@ static rct_track_td6 *track_design_save_to_td6(uint8 rideIndex) (ride->colour_scheme_type & 3) | (1 << 3); // Version .TD6 - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { td6->vehicle_colours[i] = ride->vehicle_colours[i]; td6->vehicle_additional_colour[i] = ride->vehicle_colours_extended[i]; } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { td6->track_spine_colour[i] = ride->track_colour_main[i]; td6->track_rail_colour[i] = ride->track_colour_additional[i]; td6->track_support_colour[i] = ride->track_colour_supports[i]; @@ -949,7 +949,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track return false; } - int z = 0; + sint32 z = 0; // Find the start of the track. // It has to do this as a backwards loop incase this is an incomplete track. if (track_block_get_previous(trackElement.x, trackElement.y, trackElement.element, &trackBeginEnd)) { @@ -1094,8 +1094,8 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track rct_td6_entrance_element *entrance = td6->entrance_elements; // First entrances, second exits - for (int i = 0; i < 2; i++) { - for (int station_index = 0; station_index < 4; station_index++) { + for (sint32 i = 0; i < 2; i++) { + for (sint32 station_index = 0; station_index < 4; station_index++) { z = ride->station_heights[station_index]; uint16 location; diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index 3e478f81b0..d157556aad 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -229,7 +229,7 @@ bool track_paint_util_has_fence(enum edge_t edge, rct_xy16 position, rct_map_ele ((position.x / 32) + offset.x) | (((position.y / 32) + offset.y) * (1 << 8)); - int entranceId = map_get_station(mapElement); + sint32 entranceId = map_get_station(mapElement); return (ride->entrances[entranceId] != entranceLoc && ride->exits[entranceId] != entranceLoc); } @@ -285,14 +285,14 @@ bool track_paint_util_should_paint_supports(rct_xy16 position) return false; } -void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, int fenceOffsetA, int fenceOffsetB); +void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB); void track_paint_util_draw_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement) { track_paint_util_draw_station_impl(rideIndex, trackSequence, direction, height, height, mapElement, 5, 7); } -void track_paint_util_draw_station_2(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement, int fenceOffsetA, int fenceOffsetB) +void track_paint_util_draw_station_2(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB) { track_paint_util_draw_station_impl(rideIndex, trackSequence, direction, height, height, mapElement, fenceOffsetA, fenceOffsetB); } @@ -302,7 +302,7 @@ void track_paint_util_draw_station_3(uint8 rideIndex, uint8 trackSequence, uint8 track_paint_util_draw_station_impl(rideIndex, trackSequence, direction, height, coverHeight, mapElement, 5, 7); } -void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, int fenceOffsetA, int fenceOffsetB) +void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; rct_ride * ride = get_ride(rideIndex); @@ -436,7 +436,7 @@ void track_paint_util_draw_station_impl(uint8 rideIndex, uint8 trackSequence, ui } } -void track_paint_util_draw_station_inverted(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, uint8 stationVariant) +void track_paint_util_draw_station_inverted(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 stationVariant) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; rct_ride * ride = get_ride(rideIndex); @@ -589,7 +589,7 @@ bool track_paint_util_draw_station_covers_2(enum edge_t edge, bool hasFence, con uint32 imageId; uint32 baseImageId = entranceStyle->base_image_id; - int imageOffset = 0; + sint32 imageOffset = 0; rct_xyz16 offset, bounds = { 0, 0, 0 }, boundsOffset = { 0, 0, 0 }; offset = (rct_xyz16) {0, 0, height}; @@ -645,7 +645,7 @@ bool track_paint_util_draw_station_covers_2(enum edge_t edge, bool hasFence, con return true; } -void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, int height, int zOffset, rct_map_element * mapElement) +void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; @@ -682,7 +682,7 @@ void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, int } } -void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definition * entranceStyle, rct_xy16 position, uint8 direction, int height, rct_map_element * mapElement, uint8 rotation) +void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definition * entranceStyle, rct_xy16 position, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 rotation) { bool hasFence; uint32 imageId; @@ -784,9 +784,9 @@ const rct_xyz16 defaultRightHelixUpSmallQuarterBoundOffsets[4][3][2] = { static const sint8 right_helix_up_small_quarter_tiles_sprite_map[] = {0, -1, 1, 2}; -void track_paint_util_right_helix_up_small_quarter_tiles_paint(const sint8 thickness[2], sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3][2], const rct_xy16 offsets[4][3][2], const rct_xy16 boundsLengths[4][3][2], const rct_xyz16 boundsOffsets[4][3][2], uint8 rotation) +void track_paint_util_right_helix_up_small_quarter_tiles_paint(const sint8 thickness[2], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3][2], const rct_xy16 offsets[4][3][2], const rct_xy16 boundsLengths[4][3][2], const rct_xyz16 boundsOffsets[4][3][2], uint8 rotation) { - int index = right_helix_up_small_quarter_tiles_sprite_map[trackSequence]; + sint32 index = right_helix_up_small_quarter_tiles_sprite_map[trackSequence]; if (index < 0) { return; } @@ -872,9 +872,9 @@ const rct_xy16 defaultRightHelixUpLargeQuarterBoundLengths[4][5][2] = { }; static const sint8 right_helix_up_large_quarter_sprite_map[] = {0, -1, 1, 2, -1, 3, 4}; -void track_paint_util_right_helix_up_large_quarter_tiles_paint(const sint8 thickness[2], sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5][2], const rct_xy16 offsets[4][5][2], const rct_xy16 boundsLengths[4][5][2], const rct_xyz16 boundsOffsets[4][5][2], uint8 rotation) +void track_paint_util_right_helix_up_large_quarter_tiles_paint(const sint8 thickness[2], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5][2], const rct_xy16 offsets[4][5][2], const rct_xy16 boundsLengths[4][5][2], const rct_xyz16 boundsOffsets[4][5][2], uint8 rotation) { - int index = right_helix_up_large_quarter_sprite_map[trackSequence]; + sint32 index = right_helix_up_large_quarter_sprite_map[trackSequence]; if (index < 0) { return; } @@ -1035,9 +1035,9 @@ const sint8 defaultEighthToDiagThickness[4][4] = { const uint8 mapLeftEighthTurnToOrthogonal[] = { 4, 2, 3, 1, 0 }; static const sint8 eighth_to_diag_sprite_map[] = {0, 1, 2, -1, 3}; -void track_paint_util_eighth_to_diag_tiles_paint(const sint8 thickness[4][4], sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][4], const rct_xy16 offsets[4][4], const rct_xy16 boundsLengths[4][4], const rct_xyz16 boundsOffsets[4][4], uint8 rotation) +void track_paint_util_eighth_to_diag_tiles_paint(const sint8 thickness[4][4], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][4], const rct_xy16 offsets[4][4], const rct_xy16 boundsLengths[4][4], const rct_xyz16 boundsOffsets[4][4], uint8 rotation) { - int index = eighth_to_diag_sprite_map[trackSequence]; + sint32 index = eighth_to_diag_sprite_map[trackSequence]; if (index < 0) { return; } @@ -1071,9 +1071,9 @@ static const sint8 diag_sprite_map[4][4] = { {0, -1, -1, -1}, }; -void track_paint_util_diag_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4], const rct_xy16 offsets[4], const rct_xy16 boundsLengths[4], const rct_xyz16 boundsOffsets[4], uint8 rotation) +void track_paint_util_diag_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4], const rct_xy16 offsets[4], const rct_xy16 boundsLengths[4], const rct_xyz16 boundsOffsets[4], uint8 rotation) { - int index = diag_sprite_map[direction][trackSequence]; + sint32 index = diag_sprite_map[direction][trackSequence]; if (index < 0) { return; } @@ -1182,9 +1182,9 @@ const rct_xy16 defaultRightQuarterTurn5TilesBoundLengths[4][5] = { }; static const sint8 right_quarter_turn_5_tiles_sprite_map[] = {0, -1, 1, 2, -1, 3, 4}; -void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xyz16 boundsOffsets[4][5], uint8 rotation) +void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xyz16 boundsOffsets[4][5], uint8 rotation) { - int index = right_quarter_turn_5_tiles_sprite_map[trackSequence]; + sint32 index = right_quarter_turn_5_tiles_sprite_map[trackSequence]; if (index < 0) { return; } @@ -1197,7 +1197,7 @@ void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 h sub_98197C(imageId, (sint8) offset.x, (sint8) offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x, boundsOffset.y, height + boundsOffset.z, rotation); } -void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) +void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) { sint8 sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -1214,7 +1214,7 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int dire rotation); } -void track_paint_util_right_quarter_turn_5_tiles_paint_3(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) +void track_paint_util_right_quarter_turn_5_tiles_paint_3(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) { sint8 sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -1332,9 +1332,9 @@ const rct_xy16 defaultRightQuarterTurn3TilesBoundLengths[4][3] = { }; static const sint8 right_quarter_turn_3_tiles_sprite_map[] = {0, -1, 1, 2}; -void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], const rct_xy16 offsets[4][3], const rct_xy16 boundsLengths[4][3], const rct_xyz16 boundsOffsets[4][3], uint8 rotation) +void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], const rct_xy16 offsets[4][3], const rct_xy16 boundsLengths[4][3], const rct_xyz16 boundsOffsets[4][3], uint8 rotation) { - int index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; + sint32 index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; if (index < 0) { return; } @@ -1347,12 +1347,12 @@ void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 h sub_98197C(imageId, (sint8) offset.x, (sint8) offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x, boundsOffset.y, height + boundsOffset.z, rotation); } -void track_paint_util_right_quarter_turn_3_tiles_paint_2(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation) +void track_paint_util_right_quarter_turn_3_tiles_paint_2(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation) { track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(thickness, height, direction, trackSequence, colourFlags, sprites, rotation, 0); } -void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset) +void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset) { sint8 sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -1396,7 +1396,7 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(sint } } -void track_paint_util_right_quarter_turn_3_tiles_paint_3(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]) +void track_paint_util_right_quarter_turn_3_tiles_paint_3(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]) { sint8 sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -1406,7 +1406,7 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_3(sint16 height, int dire sub_98197C(spriteBB->sprite_id | colourFlags, (sint8)spriteBB->offset.x, (sint8)spriteBB->offset.y, spriteBB->bb_size.x, spriteBB->bb_size.y, (sint8)spriteBB->bb_size.z, spriteBB->offset.z + height, spriteBB->bb_offset.x, spriteBB->bb_offset.y, height + spriteBB->bb_offset.z, rotation); } -void track_paint_util_right_quarter_turn_3_tiles_paint_4(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]) +void track_paint_util_right_quarter_turn_3_tiles_paint_4(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]) { sint8 sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -1476,12 +1476,12 @@ void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(sint16 heigh } static const sint8 left_quarter_turn_3_tiles_sprite_map[] = {2, -1, 1, 0}; -void track_paint_util_left_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation) +void track_paint_util_left_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation) { track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(thickness, height, direction, trackSequence, colourFlags, sprites, rotation, 0); } -void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset) +void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset) { sint8 sprite = left_quarter_turn_3_tiles_sprite_map[trackSequence]; if (sprite < 0) { @@ -1525,7 +1525,7 @@ void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(sint8 t } } -// void track_paint_util_left_quarter_turn_3_tiles_paint_2(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) +// void track_paint_util_left_quarter_turn_3_tiles_paint_2(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]) // { // sint8 sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence]; // if (sprite < 0) { @@ -1564,7 +1564,7 @@ void track_paint_util_left_quarter_turn_3_tiles_tunnel(sint16 height, uint8 tunn } -void track_paint_util_left_quarter_turn_1_tile_paint(sint8 thickness, sint16 height, sint16 boundBoxZOffset, int direction, uint32 colourFlags, const uint32 * sprites, uint8 rotation) +void track_paint_util_left_quarter_turn_1_tile_paint(sint8 thickness, sint16 height, sint16 boundBoxZOffset, sint32 direction, uint32 colourFlags, const uint32 * sprites, uint8 rotation) { uint32 imageId = sprites[direction] | colourFlags; @@ -1601,7 +1601,7 @@ void track_paint_util_left_quarter_turn_1_tile_tunnel(uint8 direction, uint16 ba void track_paint_util_spinning_tunnel_paint(sint8 thickness, sint16 height, uint8 direction, uint8 rotation) { - int frame = gScenarioTicks >> 2 & 3; + sint32 frame = gScenarioTicks >> 2 & 3; uint32 colourFlags = gTrackColours[SCHEME_SUPPORTS]; uint32 colourFlags2 = gTrackColours[SCHEME_TRACK]; @@ -1737,9 +1737,9 @@ void track_paint_util_left_corkscrew_up_supports(uint8 direction, uint16 height) * * rct2: 0x006C4794 */ -void track_paint(uint8 direction, int height, rct_map_element *mapElement) +void track_paint(uint8 direction, sint32 height, rct_map_element *mapElement) { - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (ride->type == RIDE_TYPE_NULL) { log_error("Attempted to paint invalid ride: %d", rideIndex); @@ -1756,9 +1756,9 @@ void track_paint(uint8 direction, int height, rct_map_element *mapElement) rct_drawpixelinfo *dpi = unk_140E9A8; if (!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex) { - int trackType = mapElement->properties.track.type; - int trackSequence = mapElement->properties.track.sequence & 0x0F; - int trackColourScheme = mapElement->properties.track.colour & 3; + sint32 trackType = mapElement->properties.track.type; + sint32 trackSequence = mapElement->properties.track.sequence & 0x0F; + sint32 trackColourScheme = mapElement->properties.track.colour & 3; if ((gCurrentViewportFlags & VIEWPORT_FLAG_TRACK_HEIGHTS) && dpi->zoom_level == 0) { gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_NONE; @@ -1811,10 +1811,10 @@ void track_paint(uint8 direction, int height, rct_map_element *mapElement) RCT2_CALLPROC_X( 0x006C4934, ride->type, - (int)trackDirectionList, + (sint32)trackDirectionList, direction, height, - (int)mapElement, + (sint32)mapElement, rideIndex * sizeof(rct_ride), trackSequence ); diff --git a/src/openrct2/ride/track_paint.h b/src/openrct2/ride/track_paint.h index b9607d77cb..bfa13de34f 100644 --- a/src/openrct2/ride/track_paint.h +++ b/src/openrct2/ride/track_paint.h @@ -272,40 +272,40 @@ void track_paint_util_paint_floor(uint8 edges, uint32 colourFlags, uint16 height void track_paint_util_paint_fences(uint8 edges, rct_xy16 position, rct_map_element * mapElement, rct_ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation); bool track_paint_util_draw_station_covers(enum edge_t edge, bool hasFence, const rct_ride_entrance_definition * entranceStyle, uint8 direction, uint16 height); bool track_paint_util_draw_station_covers_2(enum edge_t edge, bool hasFence, const rct_ride_entrance_definition * entranceStyle, uint8 direction, uint16 height, uint8 stationVariant); -void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, int height, int zOffset, rct_map_element * mapElement); +void track_paint_util_draw_station_platform(rct_ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_map_element * mapElement); void track_paint_util_draw_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement); -void track_paint_util_draw_station_2(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement, int fenceOffsetA, int fenceOffsetB); +void track_paint_util_draw_station_2(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB); void track_paint_util_draw_station_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement); -void track_paint_util_draw_station_inverted(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement, uint8 stationVariant); +void track_paint_util_draw_station_inverted(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 stationVariant); bool track_paint_util_should_paint_supports(rct_xy16 position); -void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definition * entranceStyle, rct_xy16 position, uint8 direction, int height, rct_map_element * mapElement, uint8 rotation); +void track_paint_util_draw_pier(rct_ride * ride, const rct_ride_entrance_definition * entranceStyle, rct_xy16 position, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 rotation); void track_paint_util_draw_station_metal_supports(uint8 direction, uint16 height, uint32 colour); void track_paint_util_draw_station_metal_supports_2(uint8 direction, uint16 height, uint32 colour, uint8 type); -void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xyz16 boundsOffsets[4][5], uint8 rotation); -void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]); -void track_paint_util_right_quarter_turn_5_tiles_paint_3(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]); +void track_paint_util_right_quarter_turn_5_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5], const rct_xy16 offsets[4][5], const rct_xy16 boundsLengths[4][5], const rct_xyz16 boundsOffsets[4][5], uint8 rotation); +void track_paint_util_right_quarter_turn_5_tiles_paint_2(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]); +void track_paint_util_right_quarter_turn_5_tiles_paint_3(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[][5]); void track_paint_util_right_quarter_turn_5_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType); void track_paint_util_right_quarter_turn_5_tiles_wooden_supports(sint16 height, uint8 direction, uint8 trackSequence); void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3); void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType0, uint8 tunnelType3); -void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], const rct_xy16 offsets[4][3], const rct_xy16 boundsLengths[4][3], const rct_xyz16 boundsOffsets[4][3], uint8 rotation); -void track_paint_util_right_quarter_turn_3_tiles_paint_2(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation); -void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset); -void track_paint_util_right_quarter_turn_3_tiles_paint_3(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]); -void track_paint_util_right_quarter_turn_3_tiles_paint_4(sint16 height, int direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]); +void track_paint_util_right_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], const rct_xy16 offsets[4][3], const rct_xy16 boundsLengths[4][3], const rct_xyz16 boundsOffsets[4][3], uint8 rotation); +void track_paint_util_right_quarter_turn_3_tiles_paint_2(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation); +void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset); +void track_paint_util_right_quarter_turn_3_tiles_paint_3(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]); +void track_paint_util_right_quarter_turn_3_tiles_paint_4(sint16 height, sint32 direction, uint8 rotation, uint8 trackSequence, uint32 colourFlags, const sprite_bb sprites[4][3]); void track_paint_util_right_quarter_turn_3_tiles_tunnel(sint16 height, uint8 direction, uint8 trackSequence, uint8 tunnelType); -void track_paint_util_left_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation); -void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset); +void track_paint_util_left_quarter_turn_3_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation); +void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3], uint8 rotation, sint32 heightOffset); void track_paint_util_left_quarter_turn_3_tiles_tunnel(sint16 height, uint8 tunnelType, uint8 direction, uint8 trackSequence); -void track_paint_util_left_quarter_turn_1_tile_paint(sint8 thickness, sint16 height, sint16 boundBoxZOffset, int direction, uint32 colourFlags, const uint32 * sprites, uint8 rotation); +void track_paint_util_left_quarter_turn_1_tile_paint(sint8 thickness, sint16 height, sint16 boundBoxZOffset, sint32 direction, uint32 colourFlags, const uint32 * sprites, uint8 rotation); void track_paint_util_spinning_tunnel_paint(sint8 thickness, sint16 height, uint8 direction, uint8 rotation); void track_paint_util_onride_photo_small_paint(uint8 direction, sint32 height, rct_map_element *mapElement); void track_paint_util_onride_photo_paint(uint8 direction, sint32 height, rct_map_element *mapElement); -void track_paint_util_right_helix_up_small_quarter_tiles_paint(const sint8 thickness[2], sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3][2], const rct_xy16 offsets[4][3][2], const rct_xy16 boundsLengths[4][3][2], const rct_xyz16 boundsOffsets[4][3][2], uint8 rotation); -void track_paint_util_right_helix_up_large_quarter_tiles_paint(const sint8 thickness[2], sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5][2], const rct_xy16 offsets[4][5][2], const rct_xy16 boundsLengths[4][5][2], const rct_xyz16 boundsOffsets[4][5][2], uint8 rotation); -void track_paint_util_eighth_to_diag_tiles_paint(const sint8 thickness[4][4], sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][4], const rct_xy16 offsets[4][4], const rct_xy16 boundsLengths[4][4], const rct_xyz16 boundsOffsets[4][4], uint8 rotation); -void track_paint_util_diag_tiles_paint(sint8 thickness, sint16 height, int direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4], const rct_xy16 offsets[4], const rct_xy16 boundsLengths[4], const rct_xyz16 boundsOffsets[4], uint8 rotation); +void track_paint_util_right_helix_up_small_quarter_tiles_paint(const sint8 thickness[2], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3][2], const rct_xy16 offsets[4][3][2], const rct_xy16 boundsLengths[4][3][2], const rct_xyz16 boundsOffsets[4][3][2], uint8 rotation); +void track_paint_util_right_helix_up_large_quarter_tiles_paint(const sint8 thickness[2], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5][2], const rct_xy16 offsets[4][5][2], const rct_xy16 boundsLengths[4][5][2], const rct_xyz16 boundsOffsets[4][5][2], uint8 rotation); +void track_paint_util_eighth_to_diag_tiles_paint(const sint8 thickness[4][4], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][4], const rct_xy16 offsets[4][4], const rct_xy16 boundsLengths[4][4], const rct_xyz16 boundsOffsets[4][4], uint8 rotation); +void track_paint_util_diag_tiles_paint(sint8 thickness, sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4], const rct_xy16 offsets[4], const rct_xy16 boundsLengths[4], const rct_xyz16 boundsOffsets[4], uint8 rotation); void track_paint_util_left_quarter_turn_1_tile_tunnel(uint8 direction, uint16 baseHeight, sint8 startOffset, uint8 startTunnel, sint8 endOffset, uint8 endTunnel); void track_paint_util_right_quarter_turn_1_tile_tunnel(uint8 direction, uint16 baseHeight, sint8 startOffset, uint8 startTunnel, sint8 endOffset, uint8 endTunnel); @@ -314,81 +314,81 @@ void track_paint_util_right_vertical_loop_segments(uint8 direction, uint8 trackS void track_paint_util_left_corkscrew_up_supports(uint8 direction, uint16 height); -typedef void (*TRACK_PAINT_FUNCTION)(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement); -typedef TRACK_PAINT_FUNCTION (*TRACK_PAINT_FUNCTION_GETTER)(int trackType, int direction); +typedef void (*TRACK_PAINT_FUNCTION)(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement); +typedef TRACK_PAINT_FUNCTION (*TRACK_PAINT_FUNCTION_GETTER)(sint32 trackType, sint32 direction); -TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_suspended_swinging_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_inverted_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_monorail(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_launched_freefall(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_observation_tower(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_dinghy_slide(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_mine_train_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_chairlift(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_maze(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_spiral_slide(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_topspin(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_space_rings(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_reverse_freefall_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_lift(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_vertical_drop_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_shop(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_facility(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_twist(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_ghost_train(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_side_friction_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_wooden_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_wild_mouse(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_multi_dimension_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_flying_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_lay_down_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_suspended_monorail(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_reverser_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_heartline_twister_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_giga_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_roto_drop(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_crooked_house(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_monorail_cycles(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_compact_inverted_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_water_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_inverted_hairpin_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_magic_carpet(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_river_rafts(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_inverted_impulse_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_mini_rc(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_mine_ride(int trackType, int direction); -TRACK_PAINT_FUNCTION get_track_paint_function_lim_launched_rc(int trackType, int direction); +TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_suspended_swinging_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_inverted_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_monorail(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_launched_freefall(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_bobsleigh_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_observation_tower(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_looping_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_dinghy_slide(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_mine_train_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_chairlift(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_maze(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_spiral_slide(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_topspin(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_space_rings(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_reverse_freefall_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_lift(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_vertical_drop_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_shop(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_facility(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_twist(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_haunted_house(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_ghost_train(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_side_friction_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_wooden_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_wild_mouse(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_multi_dimension_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_flying_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_virginia_reel(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_lay_down_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_suspended_monorail(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_reverser_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_heartline_twister_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_mini_golf(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_giga_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_roto_drop(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_crooked_house(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_monorail_cycles(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_compact_inverted_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_water_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_air_powered_vertical_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_inverted_hairpin_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_magic_carpet(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_river_rafts(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_inverted_impulse_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_mini_rc(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_mine_ride(sint32 trackType, sint32 direction); +TRACK_PAINT_FUNCTION get_track_paint_function_lim_launched_rc(sint32 trackType, sint32 direction); #endif diff --git a/src/openrct2/ride/transport/chairlift.c b/src/openrct2/ride/transport/chairlift.c index ca4f01a3c9..cbafbf2620 100644 --- a/src/openrct2/ride/transport/chairlift.c +++ b/src/openrct2/ride/transport/chairlift.c @@ -82,11 +82,11 @@ const uint32 chairlift_bullwheel_frames[] = { SPR_CHAIRLIFT_BULLWHEEL_FRAME_4 }; -static void chairlift_paint_util_draw_supports(int segments, uint16 height) +static void chairlift_paint_util_draw_supports(sint32 segments, uint16 height) { bool success = false; - for (int s = 0; s < 9; s++) { + for (sint32 s = 0; s < 9; s++) { if (!(segments & segment_offsets[s])) { continue; } @@ -100,7 +100,7 @@ static void chairlift_paint_util_draw_supports(int segments, uint16 height) return; } - for (int s = 0; s < 9; s++) { + for (sint32 s = 0; s < 9; s++) { if (!(segments & segment_offsets[s])) { continue; } @@ -111,7 +111,7 @@ static void chairlift_paint_util_draw_supports(int segments, uint16 height) } } -static rct_map_element * chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(int x, int y, int z, int rideIndex) +static rct_map_element * chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(sint32 x, sint32 y, sint32 z, sint32 rideIndex) { rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement == NULL) { @@ -163,7 +163,7 @@ static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_map_el return nextTrack == NULL; } -static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; uint8 trackType = mapElement->properties.track.type; @@ -242,7 +242,7 @@ static void chairlift_paint_station_ne_sw(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -static void chairlift_paint_station_se_nw(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_station_se_nw(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const rct_xy16 pos = {gPaintMapPosition.x, gPaintMapPosition.y}; uint8 trackType = mapElement->properties.track.type; @@ -323,7 +323,7 @@ static void chairlift_paint_station_se_nw(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x00744068 */ -static void chairlift_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction % 2) { chairlift_paint_station_se_nw(rideIndex, trackSequence, direction, height, mapElement); @@ -332,7 +332,7 @@ static void chairlift_paint_station(uint8 rideIndex, uint8 trackSequence, uint8 } } -static void chairlift_paint_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; if (direction & 1) { @@ -350,7 +350,7 @@ static void chairlift_paint_flat(uint8 rideIndex, uint8 trackSequence, uint8 dir } /** rct2: 0x00743FD8 */ -static void chairlift_paint_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -385,7 +385,7 @@ static void chairlift_paint_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x00743FD8 */ -static void chairlift_paint_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -437,7 +437,7 @@ static void chairlift_paint_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x00743FF8 */ -static void chairlift_paint_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -490,25 +490,25 @@ static void chairlift_paint_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x00744008 */ -static void chairlift_paint_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { chairlift_paint_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00744018 */ -static void chairlift_paint_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { chairlift_paint_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00744028 */ -static void chairlift_paint_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { chairlift_paint_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00744038 */ -static void chairlift_paint_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -572,13 +572,13 @@ static void chairlift_paint_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trac } /** rct2: 0x00744048 */ -static void chairlift_paint_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void chairlift_paint_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { chairlift_paint_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /* 0x008AAA0C */ -TRACK_PAINT_FUNCTION get_track_paint_function_chairlift(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_chairlift(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_BEGIN_STATION: diff --git a/src/openrct2/ride/transport/lift.c b/src/openrct2/ride/transport/lift.c index 88ee911c6c..77e1c04d86 100644 --- a/src/openrct2/ride/transport/lift.c +++ b/src/openrct2/ride/transport/lift.c @@ -42,7 +42,7 @@ static const uint32 lift_cage_sprites[][2] = { {SPR_LIFT_CAGE_NW_BACK, SPR_LIFT_CAGE_NW_FRONT}, }; -static void paint_lift_cage(sint8 index, uint32 colourFlags, int height, uint8 rotation) +static void paint_lift_cage(sint8 index, uint32 colourFlags, sint32 height, uint8 rotation) { uint32 imageId; @@ -54,7 +54,7 @@ static void paint_lift_cage(sint8 index, uint32 colourFlags, int height, uint8 r } /** rct2: 0x0076C6CC */ -static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -77,7 +77,7 @@ static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 directio return; } - int edges = edges_3x3[trackSequence]; + sint32 edges = edges_3x3[trackSequence]; rct_ride * ride = get_ride(rideIndex); rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -86,7 +86,7 @@ static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 directio track_paint_util_paint_fences(edges, position, mapElement, ride, gTrackColours[SCHEME_TRACK], height, fenceSpritesMetalB, get_current_rotation()); - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 1: blockedSegments = SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_B4 | SEGMENT_CC | SEGMENT_BC; break; @@ -103,7 +103,7 @@ static void paint_lift_base(uint8 rideIndex, uint8 trackSequence, uint8 directio } /** rct2: 0x0076C6DC */ -static void paint_lift_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_lift_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (trackSequence == 1) { return; @@ -120,7 +120,7 @@ static void paint_lift_tower_section(uint8 rideIndex, uint8 trackSequence, uint8 /** * rct2: 0x0076C5BC */ -TRACK_PAINT_FUNCTION get_track_paint_function_lift(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_lift(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_TOWER_BASE: diff --git a/src/openrct2/ride/transport/miniature_railway.c b/src/openrct2/ride/transport/miniature_railway.c index 45d43dcd6b..742ca411a3 100644 --- a/src/openrct2/ride/transport/miniature_railway.c +++ b/src/openrct2/ride/transport/miniature_railway.c @@ -572,7 +572,7 @@ static const uint32 miniature_railway_track_pieces_diag_25_deg_up[4] = { }; /** rct2: 0x008AD0C0 */ -static void paint_miniature_railway_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isSupported = wooden_a_supports_paint_setup(direction & 1, 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); @@ -597,7 +597,7 @@ static void paint_miniature_railway_track_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x008AD170, 0x008AD180, 0x008AD190 */ -static void paint_miniature_railway_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -619,7 +619,7 @@ static void paint_miniature_railway_station(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x008AD0D0 */ -static void paint_miniature_railway_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = miniature_railway_track_pieces_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; @@ -640,7 +640,7 @@ static void paint_miniature_railway_track_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x008AD0E0 */ -static void paint_miniature_railway_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = miniature_railway_track_pieces_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; @@ -661,7 +661,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x008AD0F0 */ -static void paint_miniature_railway_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = miniature_railway_track_pieces_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK]; @@ -682,19 +682,19 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(uint8 rideIndex, uin } /** rct2: 0x008AD100 */ -static void paint_miniature_railway_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_miniature_railway_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD110 */ -static void paint_miniature_railway_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_miniature_railway_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD120 */ -static void paint_miniature_railway_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_miniature_railway_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -833,7 +833,7 @@ static const sint8 right_quarter_turn_5_supports_type[4][7] = { static const sint8 miniature_railway_right_quarter_turn_5_tiles_sprite_map[] = {0, -1, 1, 2, -1, 3, 4}; /** rct2: 0x008AD140 */ -static void paint_miniature_railway_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1){ @@ -845,7 +845,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(uint8 rideI else { track_paint_util_right_quarter_turn_5_tiles_paint(2, height, direction, trackSequence, gTrackColours[SCHEME_SUPPORTS], miniature_railway_right_quarter_turn_5_tiles_track_floor, NULL, miniature_railway_right_quarter_turn_5_tiles_bound_lengths, miniature_railway_right_quarter_turn_5_tiles_bound_offsets, get_current_rotation()); - int index = miniature_railway_right_quarter_turn_5_tiles_sprite_map[trackSequence]; + sint32 index = miniature_railway_right_quarter_turn_5_tiles_sprite_map[trackSequence]; uint32 imageId = miniature_railway_track_pieces_flat_quarter_turn_5_tiles[direction][index] | gTrackColours[SCHEME_TRACK]; rct_xy16 offset = miniature_railway_right_quarter_turn_5_tiles_offsets[direction][index]; rct_xy16 boundsLength = miniature_railway_right_quarter_turn_5_tiles_bound_lengths[direction][index]; @@ -870,7 +870,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(uint8 rideI paint_util_push_tunnel_right(height, TUNNEL_6); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC; break; @@ -887,7 +887,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(uint8 rideI } /** rct2: 0x008AD130 */ -static void paint_miniature_railway_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_miniature_railway_track_right_quarter_turn_5_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); @@ -916,7 +916,7 @@ static const uint32 miniature_railway_s_bend_left_tiles_track_floor[2][4] = { }; /** rct2: 0x8AD150 */ -static void paint_miniature_railway_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -962,7 +962,7 @@ static void paint_miniature_railway_track_s_bend_left(uint8 rideIndex, uint8 tra } } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4; break; @@ -997,7 +997,7 @@ static const uint32 miniature_railway_s_bend_right_tiles_track_floor[2][4] = { }; /** rct2: 0x008AD160 */ -static void paint_miniature_railway_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -1043,7 +1043,7 @@ static void paint_miniature_railway_track_s_bend_right(uint8 rideIndex, uint8 tr } } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC; break; @@ -1102,7 +1102,7 @@ const rct_xyz16 miniature_railway_right_quarter_turn_3_tile_bound_offsets[4][3] }; /** rct2: 0x008AD1B0 */ -static void paint_miniature_railway_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isSupported = false; if (trackSequence != 1 && trackSequence != 2) @@ -1118,7 +1118,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(uint8 rideI static const sint8 right_quarter_turn_3_tiles_sprite_map[] = {0, -1, 1, 2}; - int index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; + sint32 index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; uint32 imageId = miniature_railway_track_pieces_flat_quarter_turn_3_tiles[direction][index] | gTrackColours[SCHEME_TRACK]; rct_xy16 offset = defaultRightQuarterTurn3TilesOffsets[direction][index]; @@ -1129,7 +1129,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(uint8 rideI } track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_6); - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENTS_ALL; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -1141,7 +1141,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(uint8 rideI } /** rct2: 0x008AD1A0 */ -static void paint_miniature_railway_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) {trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_miniature_railway_track_right_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } @@ -1242,7 +1242,7 @@ static const rct_xy16 miniature_railway_track_floor_pieces_left_eight_to_diag_of }; /** rct2: 0x008AD1C0 */ -static void paint_miniature_railway_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 supportType[4][5] = { { 0, 0, 3, 5, 1 }, @@ -1392,7 +1392,7 @@ static const rct_xy16 miniature_railway_track_floor_pieces_right_eight_to_diag_o }; /** rct2: 0x008AD1D0 */ -static void paint_miniature_railway_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 supportType[4][5] = { { 0, 0, 2, 4, 1 }, @@ -1450,14 +1450,14 @@ static void paint_miniature_railway_track_right_eighth_to_diag(uint8 rideIndex, } /** rct2: 0x008AD1E0 */ -static void paint_miniature_railway_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; paint_miniature_railway_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD1F0 */ -static void paint_miniature_railway_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_miniature_railway_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; paint_miniature_railway_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); @@ -1502,7 +1502,7 @@ static const floor_desc floors[] = { }; /** rct2: 0x008AD200 */ -static void miniature_railway_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) { +static void miniature_railway_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { bool isSupported = false; sint16 supportType = monorail_diag_support_types[direction][trackSequence]; @@ -1550,7 +1550,7 @@ enum { WOOD_B = 1, }; -static bool wooden_supports_paint_setup(int woodType, int supportType, int special, int height, uint32 imageColourFlags, bool *underground) { +static bool wooden_supports_paint_setup(sint32 woodType, sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool *underground) { switch (woodType) { case WOOD_A: return wooden_a_supports_paint_setup(supportType, special, height, imageColourFlags, underground); @@ -1563,7 +1563,7 @@ static bool wooden_supports_paint_setup(int woodType, int supportType, int speci } /** rct2: 0x008AD230 */ -static void miniature_railway_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void miniature_railway_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { // TODO: The supports are inconsistent for different rotations @@ -1628,7 +1628,7 @@ static void miniature_railway_track_diag_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AD210 */ -static void miniature_railway_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void miniature_railway_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool hasSupports = false; @@ -1672,7 +1672,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint } /** rct2: 0x008AD220 */ -static void miniature_railway_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) { +static void miniature_railway_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { const sint8 supportOffsets[][4] = { {0, +8, +8, +8}, {0, -8, -8, 0}, @@ -1736,7 +1736,7 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint } /** rct2: 0x008AD260 */ -static void miniature_railway_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void miniature_railway_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const sint8 supportOffsets[][4] = { {0, +16, +16, 0}, @@ -1800,7 +1800,7 @@ static void miniature_railway_track_diag_25_deg_down(uint8 rideIndex, uint8 trac } /** rct2: 0x008AD240 */ -static void miniature_railway_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void miniature_railway_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const sint8 supportOffsets[][4] = { {0, +16, +16, 0}, @@ -1862,7 +1862,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(uint8 rideIndex, ui paint_util_set_general_support_height(height + 56, 0x20); } -static void miniature_railway_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void miniature_railway_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool hasSupports = false; uint32 floorImage = 0; @@ -1907,7 +1907,7 @@ static void miniature_railway_track_diag_25_deg_down_to_flat(uint8 rideIndex, ui /** * rct2: 0x008ACE48 */ -TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/transport/monorail.c b/src/openrct2/ride/transport/monorail.c index b2d5391e98..4b9eb0c6de 100644 --- a/src/openrct2/ride/transport/monorail.c +++ b/src/openrct2/ride/transport/monorail.c @@ -441,7 +441,7 @@ static const uint32 monorail_track_pieces_diag_25_deg_up[4] = { }; /** rct2: 0x008AE1AC */ -static void paint_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -468,7 +468,7 @@ static void paint_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x008AE25C, 0x008AE26C, 0x008AE27C */ -static void paint_monorail_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -508,7 +508,7 @@ static void paint_monorail_station(uint8 rideIndex, uint8 trackSequence, uint8 d } /** rct2: 0x008AE1BC */ -static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -536,7 +536,7 @@ static void paint_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008AE1CC */ -static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -564,7 +564,7 @@ static void paint_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AE1DC */ -static void paint_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; @@ -592,25 +592,25 @@ static void paint_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackS } /** rct2: 0x008AE1EC */ -static void paint_monorail_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_monorail_track_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AE1FC */ -static void paint_monorail_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_monorail_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AE20C */ -static void paint_monorail_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_monorail_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AE22C */ -static void paint_monorail_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], monorail_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets, defaultRightQuarterTurn5TilesBoundLengths, NULL, get_current_rotation()); @@ -637,7 +637,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(uint8 rideIndex, uin paint_util_push_tunnel_right(height, TUNNEL_6); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC; break; @@ -653,14 +653,14 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(uint8 rideIndex, uin } /** rct2: 0x008AE21C */ -static void paint_monorail_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_monorail_track_right_quarter_turn_5_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } /** rct2: 0x */ -static void paint_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -711,7 +711,7 @@ static void paint_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequenc } } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4; break; @@ -724,7 +724,7 @@ static void paint_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x008AE24C */ -static void paint_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (direction == 2 || direction == 3) { trackSequence = 3 - trackSequence; @@ -775,7 +775,7 @@ static void paint_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequen } } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC; break; @@ -788,7 +788,7 @@ static void paint_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequen } /** rct2: 0x008AE29C */ -static void paint_monorail_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint(3, height, direction, trackSequence, gTrackColours[SCHEME_TRACK], monorail_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets, defaultRightQuarterTurn3TilesBoundLengths, NULL, get_current_rotation()); track_paint_util_right_quarter_turn_3_tiles_tunnel(height, direction, trackSequence, TUNNEL_6); @@ -800,7 +800,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(uint8 rideIndex, uin break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -812,7 +812,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(uint8 rideIndex, uin } /** rct2: 0x008AE28C */ -static void paint_monorail_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) {trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_monorail_track_right_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } @@ -820,7 +820,7 @@ static void paint_monorail_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint static const sint8 paint_monorail_eighth_to_diag_index[] = {0, 1, 2, -1, 3}; /** rct2: 0x008AE31C */ -static void paint_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { sint8 index = paint_monorail_eighth_to_diag_index[trackSequence]; if (index >= 0) { @@ -849,7 +849,7 @@ static void paint_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trac paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4; break; @@ -863,7 +863,7 @@ static void paint_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trac } /** rct2: 0x008AE32C */ -static void paint_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { sint8 index = paint_monorail_eighth_to_diag_index[trackSequence]; if (index >= 0) { @@ -892,7 +892,7 @@ static void paint_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 tra paint_util_push_tunnel_right(height, TUNNEL_0); } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC; break; case 1: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC; break; @@ -906,7 +906,7 @@ static void paint_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 tra } /** rct2: 0x008AE33C */ -static void paint_monorail_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 map[] = {4, 2, 3, 1, 0}; trackSequence = map[trackSequence]; @@ -914,14 +914,14 @@ static void paint_monorail_track_left_eighth_to_orthogonal(uint8 rideIndex, uint } /** rct2: 0x008AE34C */ -static void paint_monorail_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { const uint8 map[] = {4, 2, 3, 1, 0}; trackSequence = map[trackSequence]; paint_monorail_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } -static void paint_monorail_util_diag_supports(uint8 direction, int height) +static void paint_monorail_util_diag_supports(uint8 direction, sint32 height) { switch (direction) { case 0: @@ -948,7 +948,7 @@ static const bool monorail_diag_image_segment[][4] = { static const uint8 monorail_diag_support_segment[] = {1, 0, 2, 3}; -static const int monorail_diag_blocked_segments[] = { +static const sint32 monorail_diag_blocked_segments[] = { SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4 | SEGMENT_BC, SEGMENT_C4 | SEGMENT_CC | SEGMENT_C8 | SEGMENT_B4, SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4, @@ -956,7 +956,7 @@ static const int monorail_diag_blocked_segments[] = { }; /** rct2: 0x008AE2AC */ -static void paint_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_flat[direction] | gTrackColours[SCHEME_TRACK]; @@ -967,13 +967,13 @@ static void paint_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSequence, metal_a_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 32, 0x20); } /** rct2: 0x008AE2DC */ -static void paint_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; @@ -984,13 +984,13 @@ static void paint_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequ metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AE2BC */ -static void paint_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_flat_to_25_deg_up[direction] | gTrackColours[SCHEME_TRACK]; @@ -1001,13 +1001,13 @@ static void paint_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 t metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } /** rct2: 0x008AE2CC */ -static void paint_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_25_deg_up_to_flat[direction] | gTrackColours[SCHEME_TRACK]; @@ -1018,13 +1018,13 @@ static void paint_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 t metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AE30C */ -static void paint_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_25_deg_up[(direction + 2) % 4] | gTrackColours[SCHEME_TRACK]; @@ -1035,13 +1035,13 @@ static void paint_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSe metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AE2EC */ -static void paint_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_25_deg_up_to_flat[(direction + 2) % 4] | gTrackColours[SCHEME_TRACK]; @@ -1052,13 +1052,13 @@ static void paint_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 56, 0x20); } /** rct2: 0x008AE2FC */ -static void paint_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { uint32 imageId = monorail_track_pieces_diag_flat_to_25_deg_up[(direction + 2) % 4] | gTrackColours[SCHEME_TRACK]; @@ -1069,7 +1069,7 @@ static void paint_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 metal_b_supports_paint_setup(METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height, gTrackColours[SCHEME_SUPPORTS]); } - int blockedSegments = monorail_diag_blocked_segments[trackSequence]; + sint32 blockedSegments = monorail_diag_blocked_segments[trackSequence]; paint_util_set_segment_support_height(paint_util_rotate_segments(blockedSegments, direction), 0xFFFF, 0); paint_util_set_general_support_height(height + 48, 0x20); } @@ -1077,7 +1077,7 @@ static void paint_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 /** * rct2: 0x008ADF34 */ -TRACK_PAINT_FUNCTION get_track_paint_function_monorail(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_monorail(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/transport/suspended_monorail.c b/src/openrct2/ride/transport/suspended_monorail.c index db79f61b3e..b0a1024514 100644 --- a/src/openrct2/ride/transport/suspended_monorail.c +++ b/src/openrct2/ride/transport/suspended_monorail.c @@ -27,7 +27,7 @@ #include "../track_paint.h" /** rct2: 0x008636F4 */ -static void suspended_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -50,7 +50,7 @@ static void suspended_monorail_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x008637A4, 0x008637B4, 0x008637C4 */ -static void suspended_monorail_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 25853, SPR_STATION_INVERTED_BAR_F_SW_NE }, @@ -70,7 +70,7 @@ static void suspended_monorail_track_station(uint8 rideIndex, uint8 trackSequenc } /** rct2: 0x00863704 */ -static void suspended_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -114,7 +114,7 @@ static void suspended_monorail_track_25_deg_up(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00863714 */ -static void suspended_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -158,7 +158,7 @@ static void suspended_monorail_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr } /** rct2: 0x00863724 */ -static void suspended_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (direction) { case 0: @@ -202,25 +202,25 @@ static void suspended_monorail_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr } /** rct2: 0x00863734 */ -static void suspended_monorail_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_monorail_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863744 */ -static void suspended_monorail_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_monorail_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863754 */ -static void suspended_monorail_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { suspended_monorail_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863764 */ -static void suspended_monorail_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -340,14 +340,14 @@ static void suspended_monorail_track_left_quarter_turn_5(uint8 rideIndex, uint8 } /** rct2: 0x00863774 */ -static void suspended_monorail_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_monorail_track_left_quarter_turn_5(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00863784 */ -static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -463,7 +463,7 @@ static void suspended_monorail_track_s_bend_left(uint8 rideIndex, uint8 trackSeq } /** rct2: 0x00863794 */ -static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -579,7 +579,7 @@ static void suspended_monorail_track_s_bend_right(uint8 rideIndex, uint8 trackSe } /** rct2: 0x008637D4 */ -static void suspended_monorail_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -660,14 +660,14 @@ static void suspended_monorail_track_left_quarter_turn_3(uint8 rideIndex, uint8 } /** rct2: 0x008637E4 */ -static void suspended_monorail_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_monorail_track_left_quarter_turn_3(rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00863864 */ -static void suspended_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -772,7 +772,7 @@ static void suspended_monorail_track_left_eighth_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x00863874 */ -static void suspended_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -877,21 +877,21 @@ static void suspended_monorail_track_right_eighth_to_diag(uint8 rideIndex, uint8 } /** rct2: 0x00863884 */ -static void suspended_monorail_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_left_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_monorail_track_right_eighth_to_diag(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863894 */ -static void suspended_monorail_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_right_eighth_to_orthogonal(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_monorail_track_left_eighth_to_diag(rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); } /** rct2: 0x008637F4 */ -static void suspended_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -950,7 +950,7 @@ static void suspended_monorail_track_diag_flat(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00863824 */ -static void suspended_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1009,7 +1009,7 @@ static void suspended_monorail_track_diag_25_deg_up(uint8 rideIndex, uint8 track } /** rct2: 0x00863804 */ -static void suspended_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1068,7 +1068,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(uint8 rideIndex, uin } /** rct2: 0x00863814 */ -static void suspended_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1127,7 +1127,7 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(uint8 rideIndex, uin } /** rct2: 0x00863854 */ -static void suspended_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1186,7 +1186,7 @@ static void suspended_monorail_track_diag_25_deg_down(uint8 rideIndex, uint8 tra } /** rct2: 0x00863834 */ -static void suspended_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1242,7 +1242,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(uint8 rideIndex, u } /** rct2: 0x00863844 */ -static void suspended_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void suspended_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { switch (trackSequence) { case 0: @@ -1300,7 +1300,7 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(uint8 rideIndex, u } } -TRACK_PAINT_FUNCTION get_track_paint_function_suspended_monorail(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_suspended_monorail(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/vehicle.c b/src/openrct2/ride/vehicle.c index b3778d0dfd..68e3750354 100644 --- a/src/openrct2/ride/vehicle.c +++ b/src/openrct2/ride/vehicle.c @@ -59,18 +59,18 @@ static void vehicle_update_crash(rct_vehicle *vehicle); static void vehicle_update_travelling_boat(rct_vehicle* vehicle); static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle); static void sub_6DA280(rct_vehicle *vehicle); -static bool vehicle_is_boat_on_water(rct_vehicle *vehicle, int x, int y); +static bool vehicle_is_boat_on_water(rct_vehicle *vehicle, sint32 x, sint32 y); static void vehicle_update_arriving(rct_vehicle* vehicle); static void vehicle_update_unloading_passengers(rct_vehicle* vehicle); static void vehicle_update_waiting_for_cable_lift(rct_vehicle *vehicle); static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle); static void vehicle_update_crash_setup(rct_vehicle* vehicle); static void vehicle_update_collision_setup(rct_vehicle* vehicle); -static int vehicle_update_motion_bumper_car(rct_vehicle* vehicle); +static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle); static void sub_6D63D4(rct_vehicle *vehicle); static bool vehicle_update_motion_collision_detection(rct_vehicle *vehicle, sint16 x, sint16 y, sint16 z, uint16 *otherVehicleIndex); static void vehicle_update_sound(rct_vehicle *vehicle); -static int vehicle_update_scream_sound(rct_vehicle *vehicle); +static sint32 vehicle_update_scream_sound(rct_vehicle *vehicle); static void vehicle_kill_all_passengers(rct_vehicle* vehicle); static bool vehicle_can_depart_synchronised(rct_vehicle *vehicle); @@ -533,12 +533,12 @@ static const sint32 Unk9A39C4[] = { 1946281152, }; -static bool vehicle_move_info_valid(int cd, int typeAndDirection, int offset) +static bool vehicle_move_info_valid(sint32 cd, sint32 typeAndDirection, sint32 offset) { if (cd >= countof(gTrackVehicleInfo)) { return false; } - int size = 0; + sint32 size = 0; switch (cd) { case 0: size = 1024; break; case 1: size = 692; break; @@ -567,7 +567,7 @@ static bool vehicle_move_info_valid(int cd, int typeAndDirection, int offset) return true; } -const rct_vehicle_info *vehicle_get_move_info(int cd, int typeAndDirection, int offset) +const rct_vehicle_info *vehicle_get_move_info(sint32 cd, sint32 typeAndDirection, sint32 offset) { if (!vehicle_move_info_valid(cd, typeAndDirection, offset)) { static const rct_vehicle_info zero = { 0 }; @@ -576,7 +576,7 @@ const rct_vehicle_info *vehicle_get_move_info(int cd, int typeAndDirection, int return &gTrackVehicleInfo[cd][typeAndDirection]->info[offset]; } -uint16 vehicle_get_move_info_size(int cd, int typeAndDirection) +uint16 vehicle_get_move_info_size(sint32 cd, sint32 typeAndDirection) { if (!vehicle_move_info_valid(cd, typeAndDirection, 0)) { return 0; @@ -688,7 +688,7 @@ static void vehicle_update_sound_params(rct_vehicle* vehicle) *(j + 1) = *j; } i->var_A = v9; - int pan_x = (vehicle->sprite_left / 2) + (vehicle->sprite_right / 2) - g_music_tracking_viewport->view_x; + sint32 pan_x = (vehicle->sprite_left / 2) + (vehicle->sprite_right / 2) - g_music_tracking_viewport->view_x; pan_x >>= g_music_tracking_viewport->zoom; pan_x += g_music_tracking_viewport->x; @@ -698,7 +698,7 @@ static void vehicle_update_sound_params(rct_vehicle* vehicle) } i->pan_x = ((((pan_x * 65536) / screenwidth) - 0x8000) >> 4); - int pan_y = (vehicle->sprite_top / 2) + (vehicle->sprite_bottom / 2) - g_music_tracking_viewport->view_y; + sint32 pan_y = (vehicle->sprite_top / 2) + (vehicle->sprite_bottom / 2) - g_music_tracking_viewport->view_y; pan_y >>= g_music_tracking_viewport->zoom; pan_y += g_music_tracking_viewport->y; @@ -745,9 +745,9 @@ static void vehicle_update_sound_params(rct_vehicle* vehicle) * * rct2: 0x006BC2F3 */ -int sub_6BC2F3(rct_vehicle* vehicle) +sint32 sub_6BC2F3(rct_vehicle* vehicle) { - int result = 0; + sint32 result = 0; rct_vehicle* vehicle_temp = vehicle; do { result += vehicle_temp->friction; @@ -805,7 +805,7 @@ void vehicle_sounds_update() for (uint16 i = gSpriteListHead[SPRITE_LIST_TRAIN]; i != SPRITE_INDEX_NULL; i = get_sprite(i)->vehicle.next) { vehicle_update_sound_params(&get_sprite(i)->vehicle); } - for(int i = 0; i < countof(gVehicleSoundList); i++){ + for(sint32 i = 0; i < countof(gVehicleSoundList); i++){ rct_vehicle_sound* vehicle_sound = &gVehicleSoundList[i]; if (vehicle_sound->id != (uint16)-1) { for (rct_vehicle_sound_params* vehicle_sound_params = &gVehicleSoundParamsList[0]; vehicle_sound_params != gVehicleSoundParamsListEnd; vehicle_sound_params++) { @@ -888,7 +888,7 @@ void vehicle_sounds_update() vehicle_sound++; if (vehicle_sound >= &gVehicleSoundList[countof(gVehicleSoundList)]) { vehicle_sound = &gVehicleSoundList[0]; - int i = 0; + sint32 i = 0; while (vehicle_sound->id != (uint16)-1) { vehicle_sound++; i++; @@ -905,7 +905,7 @@ void vehicle_sounds_update() } } - int tempvolume = vehicle_sound->volume; + sint32 tempvolume = vehicle_sound->volume; if (tempvolume != vehicle_sound_params->volume) { if (tempvolume < vehicle_sound_params->volume) { tempvolume += 4; @@ -922,7 +922,7 @@ void vehicle_sounds_update() // do sound1 stuff, track noise rct_sprite* sprite = get_sprite(vehicle_sound_params->id); - int volume = sprite->vehicle.sound1_volume; + sint32 volume = sprite->vehicle.sound1_volume; volume *= vol1; volume = volume / 8; volume -= 0x1FFF; @@ -950,7 +950,7 @@ void vehicle_sounds_update() frequency = (frequency / 2) + 4000; } uint8 looping = _soundParams[sprite->vehicle.sound1_id][0]; - int pan = vehicle_sound_params->pan_x; + sint32 pan = vehicle_sound_params->pan_x; vehicle_sound->sound1_channel = Mixer_Play_Effect(sprite->vehicle.sound1_id, looping ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE, DStoMixerVolume(volume), DStoMixerPan(pan), DStoMixerRate(frequency), 0); goto label87; } @@ -1005,7 +1005,7 @@ void vehicle_sounds_update() frequency = 25700; } uint8 looping = _soundParams[sprite->vehicle.sound2_id][0]; - int pan = vehicle_sound_params->pan_x; + sint32 pan = vehicle_sound_params->pan_x; vehicle_sound->sound2_channel = Mixer_Play_Effect(sprite->vehicle.sound2_id, looping ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE, DStoMixerVolume(volume), DStoMixerPan(pan), DStoMixerRate(frequency), 0); goto label114; } @@ -1065,9 +1065,9 @@ void vehicle_update_all() * rct2: 0x006D6956 * @returns 0 when all closed */ -static int vehicle_close_restraints(rct_vehicle* vehicle){ +static sint32 vehicle_close_restraints(rct_vehicle* vehicle){ rct_ride* ride = get_ride(vehicle->ride); - int ebp = 0; + sint32 ebp = 0; uint16 vehicle_id = vehicle->sprite_index; do { @@ -1117,8 +1117,8 @@ static int vehicle_close_restraints(rct_vehicle* vehicle){ * rct2: 0x006D6A2C * @returns 0 when all open */ -static int vehicle_open_restraints(rct_vehicle* vehicle){ - int ebp = 0; +static sint32 vehicle_open_restraints(rct_vehicle* vehicle){ + sint32 ebp = 0; uint16 vehicle_id = vehicle->sprite_index; do { @@ -1253,7 +1253,7 @@ static void vehicle_update_measurements(rct_vehicle *vehicle) } if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_G_FORCES)){ - int vertical_g, lateral_g; + sint32 vertical_g, lateral_g; vehicle_get_g_forces(vehicle, &vertical_g, &lateral_g); vertical_g += ride->previous_vertical_g; @@ -1539,7 +1539,7 @@ static void vehicle_update_measurements(rct_vehicle *vehicle) ride->sheltered_length += distance; } -static uint16 sub_6D7AC0(int currentSoundId, int currentVolume, int targetSoundId, int targetVolume) +static uint16 sub_6D7AC0(sint32 currentSoundId, sint32 currentVolume, sint32 targetSoundId, sint32 targetVolume) { if (currentSoundId != 255) { if (currentSoundId == targetSoundId) { @@ -1675,7 +1675,7 @@ static void vehicle_update(rct_vehicle *vehicle) */ static void vehicle_update_moving_to_end_of_station(rct_vehicle *vehicle){ rct_ride* ride = get_ride(vehicle->ride); - int eax, ebx; + sint32 eax, ebx; switch (ride->mode){ case RIDE_MODE_UPWARD_LAUNCH: @@ -1733,7 +1733,7 @@ static void vehicle_update_moving_to_end_of_station(rct_vehicle *vehicle){ vehicle->acceleration = 0; } - int station; + sint32 station; eax = vehicle_update_track_motion(vehicle, &station); if (eax & (1 << 1)){ @@ -1926,7 +1926,7 @@ static void vehicle_update_waiting_for_passengers(rct_vehicle* vehicle){ if (ride->depart_flags & RIDE_DEPART_LEAVE_WHEN_ANOTHER_ARRIVES){ - for (int i = 0; i < 32; ++i){ + for (sint32 i = 0; i < 32; ++i){ uint16 train_id = ride->vehicles[i]; if (train_id == SPRITE_INDEX_NULL) continue; @@ -2133,8 +2133,8 @@ static void vehicle_update_waiting_to_depart(rct_vehicle* vehicle) { if (ride->lifecycle_flags & RIDE_LIFECYCLE_CABLE_LIFT) { rct_xy_element track; - int z; - int direction; + sint32 z; + sint32 direction; if (track_block_get_next_from_zero( vehicle->track_x, @@ -2299,7 +2299,7 @@ static rct_synchronised_vehicle* _lastSynchronisedVehicle = NULL; * to synchronise to the vehicle synchronisation list. * rct2: 0x006DE1A4 */ -static bool try_add_synchronised_station(int x, int y, int z) +static bool try_add_synchronised_station(sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement = get_station_platform(x, y, z, 2); if (mapElement == NULL) { @@ -2308,7 +2308,7 @@ static bool try_add_synchronised_station(int x, int y, int z) return false; } - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (!(ride->depart_flags & RIDE_DEPART_SYNCHRONISE_WITH_ADJACENT_STATIONS)) { /* Ride is not set to synchronise with adjacent stations. */ @@ -2319,7 +2319,7 @@ static bool try_add_synchronised_station(int x, int y, int z) * to sync with adjacent stations, so it will return true. * Still to determine if a vehicle to sync can be identified. */ - int stationIndex = map_get_station(mapElement); + sint32 stationIndex = map_get_station(mapElement); rct_synchronised_vehicle *sv = _lastSynchronisedVehicle; sv->ride_id = rideIndex; @@ -2341,7 +2341,7 @@ static bool try_add_synchronised_station(int x, int y, int z) } // Look for a vehicle on this station waiting to depart. - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { uint16 spriteIndex = ride->vehicles[i]; if (spriteIndex == SPRITE_INDEX_NULL) continue; @@ -2375,11 +2375,11 @@ static bool try_add_synchronised_station(int x, int y, int z) static bool vehicle_can_depart_synchronised(rct_vehicle *vehicle) { rct_ride *ride = get_ride(vehicle->ride); - int station = vehicle->current_station; + sint32 station = vehicle->current_station; uint16 xy = ride->station_starts[station]; - int x = (xy & 0xFF) * 32; - int y = (xy >> 8) * 32; - int z = ride->station_heights[station]; + sint32 x = (xy & 0xFF) * 32; + sint32 y = (xy >> 8) * 32; + sint32 z = ride->station_heights[station]; rct_map_element *mapElement = map_get_track_element_at(x, y, z); if (mapElement == NULL) { @@ -2392,7 +2392,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle *vehicle) // Search for stations to sync in both directions from the current tile. // First search direction. - int direction = (mapElement->type + 1) & 3; + sint32 direction = (mapElement->type + 1) & 3; while (_lastSynchronisedVehicle < &_synchronisedVehicles[SYNCHRONISED_VEHICLE_COUNT - 1]) { x += TileDirectionDelta[direction].x; @@ -2442,7 +2442,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle *vehicle) /* Here all the of sync-ed stations are from the same ride */ ride = get_ride(rideId); - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehicle *v = GET_VEHICLE(ride->vehicles[i]); if (v->status != VEHICLE_STATUS_WAITING_TO_DEPART && v->velocity != 0) { // Here at least one vehicle on the ride is moving. @@ -2468,10 +2468,10 @@ static bool vehicle_can_depart_synchronised(rct_vehicle *vehicle) return false; } - int numTrainsAtStation = 0; - int numTravelingTrains = 0; - int currentStation = sv->station_id; - for (int i = 0; i < sv_ride->num_vehicles; i++) { + sint32 numTrainsAtStation = 0; + sint32 numTravelingTrains = 0; + sint32 currentStation = sv->station_id; + for (sint32 i = 0; i < sv_ride->num_vehicles; i++) { uint16 spriteIndex = sv_ride->vehicles[i]; if (spriteIndex != SPRITE_INDEX_NULL) { rct_vehicle *otherVehicle = GET_VEHICLE(spriteIndex); @@ -2489,7 +2489,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle *vehicle) } } - int totalTrains = numTrainsAtStation + numTravelingTrains; + sint32 totalTrains = numTrainsAtStation + numTravelingTrains; if (totalTrains != sv_ride->num_vehicles || numTravelingTrains >= sv_ride->num_vehicles / 2) { //if (numArrivingTrains > 0 || numTravelingTrains >= sv_ride->num_vehicles / 2) { /* Sync condition: If there are trains arriving at the @@ -2527,7 +2527,7 @@ void vehicle_peep_easteregg_here_we_are(rct_vehicle* vehicle) { uint16 spriteId = vehicle->sprite_index; do { vehicle = GET_VEHICLE(spriteId); - for (int i = 0; i < vehicle->num_peeps; ++i) { + for (sint32 i = 0; i < vehicle->num_peeps; ++i) { rct_peep* peep = GET_PEEP(vehicle->peep[i]); if (peep->peep_flags & PEEP_FLAGS_HERE_WE_ARE) { peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_HERE_WE_ARE, peep->current_ride); @@ -2546,7 +2546,7 @@ void vehicle_update_test_finish(rct_vehicle* vehicle) { vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_TESTING; ride->lifecycle_flags |= RIDE_LIFECYCLE_TESTED; - for (int i = ride->num_stations - 1; i >= 1; i--) { + for (sint32 i = ride->num_stations - 1; i >= 1; i--) { if (ride->time[i - 1] != 0) continue; @@ -3037,7 +3037,7 @@ static void vehicle_update_collision_setup(rct_vehicle* vehicle) { train->z ); - for (int i = 0; i < 10; i++) { + for (sint32 i = 0; i < 10; i++) { crashed_vehicle_particle_create( train->colours, train->x, @@ -3094,7 +3094,7 @@ static void vehicle_update_crash_setup(rct_vehicle* vehicle) { vehicle->status = VEHICLE_STATUS_CRASHING; vehicle_invalidate_window(vehicle); - int num_peeps = vehicle_get_total_num_peeps(vehicle); + sint32 num_peeps = vehicle_get_total_num_peeps(vehicle); if (num_peeps != 0) { audio_play_sound_at_location( SOUND_HAUNTED_HOUSE_SCREAM_2, @@ -3104,7 +3104,7 @@ static void vehicle_update_crash_setup(rct_vehicle* vehicle) { ); } - int edx = vehicle->velocity >> 10; + sint32 edx = vehicle->velocity >> 10; rct_vehicle* lastVehicle = vehicle; uint16 spriteId = vehicle->sprite_index; @@ -3113,10 +3113,10 @@ static void vehicle_update_crash_setup(rct_vehicle* vehicle) { lastVehicle = trainVehicle; trainVehicle->sub_state = 0; - int x = stru_9A3AC4[trainVehicle->sprite_direction / 2].x; - int y = stru_9A3AC4[trainVehicle->sprite_direction / 2].y; + sint32 x = stru_9A3AC4[trainVehicle->sprite_direction / 2].x; + sint32 y = stru_9A3AC4[trainVehicle->sprite_direction / 2].y; - int ecx = Unk9A37E4[trainVehicle->vehicle_sprite_type] >> 15; + sint32 ecx = Unk9A37E4[trainVehicle->vehicle_sprite_type] >> 15; x *= ecx; y *= ecx; x >>= 16; @@ -3679,7 +3679,7 @@ static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle) { if (vehicle->velocity <= 439800) { vehicle->acceleration = 4398; } - int flags = vehicle_update_track_motion(vehicle, NULL); + sint32 flags = vehicle_update_track_motion(vehicle, NULL); if (flags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_11) { vehicle->status = VEHICLE_STATUS_TRAVELLING; @@ -3722,7 +3722,7 @@ static void vehicle_update_travelling_boat(rct_vehicle* vehicle) vehicle_update_motion_boat_hire(vehicle); } -static void loc_6DA9F9(rct_vehicle *vehicle, int x, int y, int bx, int dx) +static void loc_6DA9F9(rct_vehicle *vehicle, sint32 x, sint32 y, sint32 bx, sint32 dx) { vehicle->remaining_distance = 0; if (!vehicle_update_motion_collision_detection(vehicle, x, y, vehicle->z, NULL)) { @@ -3776,9 +3776,9 @@ static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle) for (;;) { // loc_6DA7A5 vehicle->var_35++; - int x = (vehicle->boat_location.x * 32) + 16; - int y = (vehicle->boat_location.y * 32) + 16; - int z; + sint32 x = (vehicle->boat_location.x * 32) + 16; + sint32 y = (vehicle->boat_location.y * 32) + 16; + sint32 z; uint8 bl; x -= vehicle->x; @@ -3855,7 +3855,7 @@ static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle) } } - int edi = (vehicle->sprite_direction | (vehicle->var_35 & 1)) & 0x1F; + sint32 edi = (vehicle->sprite_direction | (vehicle->var_35 & 1)) & 0x1F; x = vehicle->x + Unk9A36C4[edi].x; y = vehicle->y + Unk9A36C4[edi].y; z = vehicle->z; @@ -3869,8 +3869,8 @@ static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle) break; } - int bx = floor2(x, 32); - int dx = floor2(y, 32); + sint32 bx = floor2(x, 32); + sint32 dx = floor2(y, 32); if (bx != vehicle->track_x || dx != vehicle->track_y) { if (vehicle_is_boat_on_water(vehicle, x, y)) { // loc_6DA939: @@ -3956,7 +3956,7 @@ static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle) // loc_6DAAC9: { - int edx = vehicle->velocity >> 8; + sint32 edx = vehicle->velocity >> 8; edx = (edx * edx); if (vehicle->velocity < 0) { edx = -edx; @@ -3964,13 +3964,13 @@ static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle) edx >>= 5; // Hack to fix people messing with boat hire - int friction = vehicle->friction == 0 ? 1 : vehicle->friction; + sint32 friction = vehicle->friction == 0 ? 1 : vehicle->friction; - int eax = ((vehicle->velocity >> 1) + edx) / friction; - int ecx = -eax; + sint32 eax = ((vehicle->velocity >> 1) + edx) / friction; + sint32 ecx = -eax; if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_3) { eax = vehicle->speed << 14; - int ebx = (vehicle->speed * friction) >> 2; + sint32 ebx = (vehicle->speed * friction) >> 2; if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_3) { eax = -eax; } @@ -4026,7 +4026,7 @@ static void sub_6DA280(rct_vehicle *vehicle) } static const sint8 rotations[] = { 0, 1, -1, 2 }; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (randDirection + rotations[i] == curDirection) { continue; } @@ -4052,13 +4052,13 @@ static void sub_6DA280(rct_vehicle *vehicle) * * rct2: 0x006DA22A */ -static bool vehicle_is_boat_on_water(rct_vehicle *vehicle, int x, int y) +static bool vehicle_is_boat_on_water(rct_vehicle *vehicle, sint32 x, sint32 y) { - int z = vehicle->track_z >> 3; + sint32 z = vehicle->track_z >> 3; rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) { - int waterZ = (mapElement->properties.surface.terrain & 0x1F) * 2; + sint32 waterZ = (mapElement->properties.surface.terrain & 0x1F) * 2; if (z != waterZ) { return true; } @@ -4468,7 +4468,7 @@ static void vehicle_update_top_spin_operating(rct_vehicle* vehicle) { */ static void vehicle_update_showing_film(rct_vehicle *vehicle) { - int currentTime, totalTime; + sint32 currentTime, totalTime; if (_vehicleBreakdown == 0) return; @@ -4495,7 +4495,7 @@ static void vehicle_update_doing_circus_show(rct_vehicle *vehicle) if (_vehicleBreakdown == 0) return; - int currentTime = vehicle->current_time + 1; + sint32 currentTime = vehicle->current_time + 1; if (currentTime <= 5000) { vehicle->current_time = currentTime; } else { @@ -4694,7 +4694,7 @@ static void vehicle_crash_on_water(rct_vehicle* vehicle) { crash_splash_create(vehicle->x + 11, vehicle->y + 8, vehicle->z); crash_splash_create(vehicle->x - 4, vehicle->y + 8, vehicle->z); - for (int i = 0; i < 10; ++i) + for (sint32 i = 0; i < 10; ++i) crashed_vehicle_particle_create(vehicle->colours, vehicle->x - 4, vehicle->y + 8, vehicle->z); vehicle->flags |= SPRITE_FLAGS_IS_CRASHED_VEHICLE_SPRITE; @@ -4749,7 +4749,7 @@ static void vehicle_update_crash(rct_vehicle *vehicle){ continue; } - int z = map_element_height(curVehicle->x, curVehicle->y); + sint32 z = map_element_height(curVehicle->x, curVehicle->y); sint16 waterHeight = (z >> 16) & 0xFFFF; z = (sint16)(z & 0xFFFF); sint16 zDiff; @@ -4815,7 +4815,7 @@ static void vehicle_update_sound(rct_vehicle *vehicle) rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; - int ecx = abs(vehicle->velocity) - 0x10000; + sint32 ecx = abs(vehicle->velocity) - 0x10000; if (ecx >= 0) { frictionId = vehicleEntry->friction_sound_id; ecx >>= 15; @@ -4886,8 +4886,8 @@ static void vehicle_update_sound(rct_vehicle *vehicle) vehicle->sound2_volume = (soundIdVolume >> 8) & 0xFF; { - int ebx = word_9A3684[vehicle->sprite_direction]; - int eax = ((vehicle->velocity >> 14) * ebx) >> 14; + sint32 ebx = word_9A3684[vehicle->sprite_direction]; + sint32 eax = ((vehicle->velocity >> 14) * ebx) >> 14; eax = clamp(-127, eax, 127); vehicle->var_BF = eax & 0xFF; @@ -4898,7 +4898,7 @@ static void vehicle_update_sound(rct_vehicle *vehicle) * * rct2: 0x006D796B */ -static int vehicle_update_scream_sound(rct_vehicle *vehicle) +static sint32 vehicle_update_scream_sound(rct_vehicle *vehicle) { uint32 r; uint16 spriteIndex; @@ -4909,7 +4909,7 @@ static int vehicle_update_scream_sound(rct_vehicle *vehicle) rct_ride_entry_vehicle* vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type]; - int totalNumPeeps = vehicle_get_total_num_peeps(vehicle); + sint32 totalNumPeeps = vehicle_get_total_num_peeps(vehicle); if (totalNumPeeps == 0) return 255; @@ -4952,7 +4952,7 @@ static int vehicle_update_scream_sound(rct_vehicle *vehicle) produceScream: if (vehicle->scream_sound_id == 255) { r = scenario_rand(); - if (totalNumPeeps >= (int)(r % 16)) { + if (totalNumPeeps >= (sint32)(r % 16)) { switch (vehicleEntry->sound_range) { case 0: vehicle->scream_sound_id = byte_9A3A14[r % 2]; @@ -4981,11 +4981,11 @@ produceScream: * dx: lateralG * esi: vehicle */ -void vehicle_get_g_forces(rct_vehicle *vehicle, int *verticalG, int *lateralG) +void vehicle_get_g_forces(rct_vehicle *vehicle, sint32 *verticalG, sint32 *lateralG) { - int gForceVert = (((sint64)0x280000) * Unk9A37E4[vehicle->vehicle_sprite_type]) >> 32; + sint32 gForceVert = (((sint64)0x280000) * Unk9A37E4[vehicle->vehicle_sprite_type]) >> 32; gForceVert = (((sint64)gForceVert) * Unk9A39C4[vehicle->bank_rotation]) >> 32; - int lateralFactor = 0, vertFactor = 0; + sint32 lateralFactor = 0, vertFactor = 0; // Note shr has meant some of the below functions cast a known negative number to // unsigned. Possibly an original bug but will be left implemented. @@ -5479,7 +5479,7 @@ void vehicle_get_g_forces(rct_vehicle *vehicle, int *verticalG, int *lateralG) break; } - int gForceLateral = 0; + sint32 gForceLateral = 0; if (vertFactor != 0) { gForceVert += abs(vehicle->velocity) * 98 / vertFactor; @@ -5501,7 +5501,7 @@ void vehicle_get_g_forces(rct_vehicle *vehicle, int *verticalG, int *lateralG) void vehicle_set_map_toolbar(rct_vehicle *vehicle) { rct_ride *ride; - int vehicleIndex; + sint32 vehicleIndex; ride = get_ride(vehicle->ride); @@ -5521,7 +5521,7 @@ void vehicle_set_map_toolbar(rct_vehicle *vehicle) set_map_tooltip_format_arg(12, uint16, vehicleIndex + 1); rct_string_id formatSecondary; - int arg1; + sint32 arg1; ride_get_status(vehicle->ride, &formatSecondary, &arg1); set_map_tooltip_format_arg(14, rct_string_id, formatSecondary); // TODO: odd cast @@ -5553,7 +5553,7 @@ rct_vehicle *vehicle_get_tail(rct_vehicle *vehicle) return vehicle; } -int vehicle_is_used_in_pairs(rct_vehicle *vehicle) +sint32 vehicle_is_used_in_pairs(rct_vehicle *vehicle) { return vehicle->num_seats & VEHICLE_SEAT_PAIR_FLAG; } @@ -5562,7 +5562,7 @@ int vehicle_is_used_in_pairs(rct_vehicle *vehicle) * * rct2: 0x006DA44E */ -static int vehicle_update_motion_bumper_car(rct_vehicle* vehicle) { +static sint32 vehicle_update_motion_bumper_car(rct_vehicle* vehicle) { _vehicleMotionTrackFlags = 0; rct_ride* ride = get_ride(vehicle->ride); @@ -5755,7 +5755,7 @@ bool vehicle_update_bumper_car_collision(rct_vehicle *vehicle, sint16 x, sint16 uint8 rideIndex = vehicle->ride; - for (int i = 0; i < countof(Unk9A37C4); i++) { + for (sint32 i = 0; i < countof(Unk9A37C4); i++) { location.x += Unk9A37C4[i].x; location.y += Unk9A37C4[i].y; @@ -5773,15 +5773,15 @@ bool vehicle_update_bumper_car_collision(rct_vehicle *vehicle, sint16 x, sint16 if (vehicle2->ride != rideIndex) continue; - int distX = abs(x - vehicle2->x); + sint32 distX = abs(x - vehicle2->x); if (distX > 32768) continue; - int distY = abs(y - vehicle2->y); + sint32 distY = abs(y - vehicle2->y); if (distY > 32768) continue; - int ecx = (vehicle->var_44 + vehicle2->var_44) / 2; + sint32 ecx = (vehicle->var_44 + vehicle2->var_44) / 2; ecx *= 30; ecx >>= 8; if (max(distX, distY) < ecx) { @@ -5802,11 +5802,11 @@ bool vehicle_update_bumper_car_collision(rct_vehicle *vehicle, sint16 x, sint16 static void vehicle_update_track_motion_up_stop_check(rct_vehicle *vehicle) { rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); - int verticalG, lateralG; + sint32 verticalG, lateralG; // No up stops (coaster types) if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_1) { - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; if (!track_element_is_covered(trackType)) { vehicle_get_g_forces(vehicle, &verticalG, &lateralG); lateralG = abs(lateralG); @@ -5826,7 +5826,7 @@ static void vehicle_update_track_motion_up_stop_check(rct_vehicle *vehicle) } } else if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_2) { // No up stops bobsleigh type - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; if (!track_element_is_covered(trackType)) { vehicle_get_g_forces(vehicle, &verticalG, &lateralG); @@ -5915,7 +5915,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle *vehicle) vehicle->acceleration = 0; } - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; rct_map_element *trackElement = map_get_track_element_at_of_type( vehicle->track_x, @@ -5985,14 +5985,14 @@ static void update_velocity(rct_vehicle *vehicle) static void vehicle_update_block_breaks_open_previous_section(rct_vehicle *vehicle, rct_map_element *mapElement) { - int x = vehicle->track_x; - int y = vehicle->track_y; - int z = vehicle->track_z; + sint32 x = vehicle->track_x; + sint32 y = vehicle->track_y; + sint32 z = vehicle->track_z; track_begin_end trackBeginEnd, slowTrackBeginEnd; rct_map_element slowMapElement = *mapElement; bool counter = true; - int slowX = x; - int slowY = y; + sint32 slowX = x; + sint32 slowY = y; do { if (!track_block_get_previous(x, y, mapElement, &trackBeginEnd)) { return; @@ -6035,7 +6035,7 @@ static void vehicle_update_block_breaks_open_previous_section(rct_vehicle *vehic mapElement->flags &= ~MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; map_invalidate_element(x, y, mapElement); - int trackType = mapElement->properties.track.type; + sint32 trackType = mapElement->properties.track.type; if (trackType == TRACK_ELEM_BLOCK_BRAKES || trackType == TRACK_ELEM_END_STATION) { rct_ride *ride = get_ride(vehicle->ride); if (ride_is_block_sectioned(ride)) { @@ -6044,9 +6044,9 @@ static void vehicle_update_block_breaks_open_previous_section(rct_vehicle *vehic } } -static int vehicle_get_swing_amount(rct_vehicle *vehicle) +static sint32 vehicle_get_swing_amount(rct_vehicle *vehicle) { - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; switch (trackType) { case TRACK_ELEM_LEFT_QUARTER_TURN_5_TILES: case TRACK_ELEM_BANKED_LEFT_QUARTER_TURN_5_TILES: @@ -6165,7 +6165,7 @@ static void vehicle_update_swinging_car(rct_vehicle *vehicle) { sint32 dword_F64E08 = _vehicleVelocityF64E08; vehicle->var_4E += (-vehicle->swinging_car_var_0) >> 6; - int swingAmount = vehicle_get_swing_amount(vehicle); + sint32 swingAmount = vehicle_get_swing_amount(vehicle); if (swingAmount < 0) { vehicle->var_4E -= dword_F64E08 >> (-swingAmount); } @@ -6187,7 +6187,7 @@ static void vehicle_update_swinging_car(rct_vehicle *vehicle) dx = 5370; cx = -5370; - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; switch (trackType) { case TRACK_ELEM_BANKED_LEFT_QUARTER_TURN_5_TILES: case TRACK_ELEM_LEFT_BANK: @@ -6568,10 +6568,10 @@ static void vehicle_update_spinning_car(rct_vehicle *vehicle) } rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle); - int spinningInertia = vehicleEntry->spinning_inertia; - int trackType = vehicle->track_type >> 2; + sint32 spinningInertia = vehicleEntry->spinning_inertia; + sint32 trackType = vehicle->track_type >> 2; sint32 dword_F64E08 = _vehicleVelocityF64E08; - int unk; + sint32 unk; switch (off_9A2E84[trackType]) { case loc_6D665A: spinningInertia += 6; @@ -6692,7 +6692,7 @@ static void sub_6D63D4(rct_vehicle *vehicle) (vehicle->status != VEHICLE_STATUS_MOVING_TO_END_OF_STATION && vehicle->status != VEHICLE_STATUS_ARRIVING) ) { - int index = vehicle->sprite_direction >> 1; + sint32 index = vehicle->sprite_direction >> 1; if (vehicle->vehicle_sprite_type == 2) { index += 16; } @@ -6800,9 +6800,9 @@ static void sub_6D63D4(rct_vehicle *vehicle) static void vehicle_play_scenery_door_open_sound(rct_vehicle *vehicle, rct_map_element *mapElement) { rct_scenery_entry *wallEntry = get_wall_entry(mapElement->properties.fence.type); - int doorSoundType = (wallEntry->wall.flags2 >> 1) & 3; + sint32 doorSoundType = (wallEntry->wall.flags2 >> 1) & 3; if (doorSoundType != 0) { - int soundId = DoorOpenSoundIds[doorSoundType - 1]; + sint32 soundId = DoorOpenSoundIds[doorSoundType - 1]; if (soundId != 255) { audio_play_sound_at_location(soundId, vehicle->x, vehicle->track_y, vehicle->track_z); } @@ -6816,9 +6816,9 @@ static void vehicle_play_scenery_door_open_sound(rct_vehicle *vehicle, rct_map_e static void vehicle_play_scenery_door_close_sound(rct_vehicle *vehicle, rct_map_element *mapElement) { rct_scenery_entry *wallEntry = get_wall_entry(mapElement->properties.fence.type); - int doorSoundType = (wallEntry->wall.flags2 >> 1) & 3; + sint32 doorSoundType = (wallEntry->wall.flags2 >> 1) & 3; if (doorSoundType != 0) { - int soundId = DoorCloseSoundIds[doorSoundType - 1]; + sint32 soundId = DoorCloseSoundIds[doorSoundType - 1]; if (soundId != 255) { audio_play_sound_at_location(soundId, vehicle->x, vehicle->track_y, vehicle->track_z); } @@ -6831,16 +6831,16 @@ static void vehicle_play_scenery_door_close_sound(rct_vehicle *vehicle, rct_map_ */ static void vehicle_update_scenery_door(rct_vehicle *vehicle) { - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; const rct_preview_track *trackBlock = TrackBlocks[trackType]; while ((trackBlock + 1)->index != 255) { trackBlock++; } const rct_track_coordinates *trackCoordinates = &TrackCoordinates[trackType]; - int x = floor2(vehicle->x, 32); - int y = floor2(vehicle->y, 32); - int z = (vehicle->track_z - trackBlock->z + trackCoordinates->z_end) >> 3; - int direction = (vehicle->track_direction + trackCoordinates->rotation_end) & 3; + sint32 x = floor2(vehicle->x, 32); + sint32 y = floor2(vehicle->y, 32); + sint32 z = (vehicle->track_z - trackBlock->z + trackCoordinates->z_end) >> 3; + sint32 direction = (vehicle->track_direction + trackCoordinates->rotation_end) & 3; rct_map_element *mapElement = map_get_fence_element_at(x, y, z, direction); if (mapElement == NULL) { @@ -6866,11 +6866,11 @@ static void vehicle_update_scenery_door(rct_vehicle *vehicle) static bool loc_6DB38B(rct_vehicle *vehicle, rct_map_element *mapElement) { // Get bank - int bankStart = track_get_actual_bank_3(vehicle, mapElement); + sint32 bankStart = track_get_actual_bank_3(vehicle, mapElement); // Get vangle - int trackType = mapElement->properties.track.type; - int vangleStart = TrackDefinitions[trackType].vangle_start; + sint32 trackType = mapElement->properties.track.type; + sint32 vangleStart = TrackDefinitions[trackType].vangle_start; if (vangleStart != _vehicleVAngleEndF64E36 || bankStart != _vehicleBankEndF64E37 @@ -6916,13 +6916,13 @@ static void vehicle_trigger_on_ride_photo(rct_vehicle *vehicle, rct_map_element */ static void sub_6DEDE8(rct_vehicle *vehicle) { - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; const rct_preview_track *trackBlock = TrackBlocks[trackType]; const rct_track_coordinates *trackCoordinates = &TrackCoordinates[trackType]; - int x = vehicle->track_x; - int y = vehicle->track_y; - int z = (vehicle->track_z - trackBlock->z + trackCoordinates->z_begin) >> 3; - int direction = (vehicle->track_direction + trackCoordinates->rotation_begin) & 3; + sint32 x = vehicle->track_x; + sint32 y = vehicle->track_y; + sint32 z = (vehicle->track_z - trackBlock->z + trackCoordinates->z_begin) >> 3; + sint32 direction = (vehicle->track_direction + trackCoordinates->rotation_begin) & 3; direction ^= 2; rct_map_element *mapElement = map_get_fence_element_at(x, y, z, direction); @@ -6963,7 +6963,7 @@ static void vehicle_update_play_water_splash_sound() static void vehicle_update_handle_water_splash(rct_vehicle *vehicle) { rct_ride_entry *rideEntry = get_ride_entry(vehicle->ride_subtype); - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; if (!(rideEntry->flags & RIDE_ENTRY_FLAG_8)) { if (rideEntry->flags & RIDE_ENTRY_FLAG_9) { @@ -7006,9 +7006,9 @@ static void sub_6DB807(rct_vehicle *vehicle) vehicle->track_type, vehicle->track_progress ); - int x = vehicle->track_x + moveInfo->x; - int y = vehicle->track_y + moveInfo->y; - int z = vehicle->z; + sint32 x = vehicle->track_x + moveInfo->x; + sint32 y = vehicle->track_y + moveInfo->y; + sint32 z = vehicle->z; sprite_move(x, y, z, (rct_sprite*)vehicle); } @@ -7067,7 +7067,7 @@ static bool vehicle_update_motion_collision_detection( bool mayCollide = false; uint16 collideId = SPRITE_INDEX_NULL; rct_vehicle* collideVehicle = NULL; - for (int i = 0; i < countof(Unk9A37C4); i++) { + for (sint32 i = 0; i < countof(Unk9A37C4); i++) { location.x += Unk9A37C4[i].x; location.y += Unk9A37C4[i].y; @@ -7215,7 +7215,7 @@ static void sub_6DBF3E(rct_vehicle *vehicle) return; } - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; if (!(TrackSequenceProperties[trackType][0] & TRACK_SEQUENCE_FLAG_ORIGIN)) { return; } @@ -7246,7 +7246,7 @@ static void sub_6DBF3E(rct_vehicle *vehicle) ) { if (vehicle->track_progress > 3 && !(vehicle->update_flags & VEHICLE_UPDATE_FLAG_3)) { rct_xy_element input, output; - int outputZ, outputDirection; + sint32 outputZ, outputDirection; input.x = vehicle->track_x; input.y = vehicle->track_y; @@ -7367,7 +7367,7 @@ loc_6DB32A: loc_6DB358: { rct_xy_element xyElement; - int z, direction; + sint32 z, direction; xyElement.x = vehicle->track_x; xyElement.y = vehicle->track_y; xyElement.element = mapElement; @@ -7394,7 +7394,7 @@ loc_6DB358: // Update VEHICLE_UPDATE_FLAG_11 flag vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_11; - int rideType = get_ride(mapElement->properties.track.ride_index)->type; + sint32 rideType = get_ride(mapElement->properties.track.ride_index)->type; if (RideData4[rideType].flags & RIDE_TYPE_FLAG4_3) { if (mapElement->properties.track.colour & 4) { vehicle->update_flags |= VEHICLE_UPDATE_FLAG_11; @@ -7471,7 +7471,7 @@ static bool vehicle_update_track_motion_forwards(rct_vehicle *vehicle, rct_ride_ loc_6DAEB9: regs.edi = vehicle->track_type; regs.cx = vehicle->track_type >> 2; - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; if (trackType == TRACK_ELEM_HEARTLINE_TRANSFER_UP || trackType == TRACK_ELEM_HEARTLINE_TRANSFER_DOWN) { if (vehicle->track_progress == 80) { vehicle->vehicle_type ^= 1; @@ -7696,7 +7696,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *veh ); bool nextTileBackwards = true; - int direction; + sint32 direction; //loc_6DBB08:; sint16 x = vehicle->track_x; sint16 y = vehicle->track_y; @@ -7734,10 +7734,10 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *veh return false; } - int trackColour = ((vehicle->update_flags >> 9) ^ mapElement->properties.track.colour) & 4; - int bank = TrackDefinitions[trackType].bank_end; + sint32 trackColour = ((vehicle->update_flags >> 9) ^ mapElement->properties.track.colour) & 4; + sint32 bank = TrackDefinitions[trackType].bank_end; bank = track_get_actual_bank_2(ride->type, trackColour, bank); - int vAngle = TrackDefinitions[trackType].vangle_end; + sint32 vAngle = TrackDefinitions[trackType].vangle_end; if (_vehicleVAngleEndF64E36 != vAngle || _vehicleBankEndF64E37 != bank ) { @@ -7761,7 +7761,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *veh //loc_6DBB4F:; rct_xy_element input; rct_xy_element output; - int outputZ; + sint32 outputZ; input.x = x; input.y = y; @@ -7971,7 +7971,7 @@ extern const uint8 mini_golf_peep_animation_lengths[]; * * */ -static int vehicle_update_track_motion_mini_golf(rct_vehicle *vehicle, int* outStation) { +static sint32 vehicle_update_track_motion_mini_golf(rct_vehicle *vehicle, sint32* outStation) { registers regs = { 0 }; rct_ride *ride = get_ride(vehicle->ride); @@ -8091,10 +8091,10 @@ loc_6DC476: trackType, 0 ); sint16 x, y, z; - int direction; + sint32 direction; { rct_xy_element input, output; - int outZ, outDirection; + sint32 outZ, outDirection; input.x = vehicle->track_x; input.y = vehicle->track_y; input.element = mapElement; @@ -8112,7 +8112,7 @@ loc_6DC476: goto loc_6DC9BC; } - int rideType = get_ride(mapElement->properties.track.ride_index)->type; + sint32 rideType = get_ride(mapElement->properties.track.ride_index)->type; vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_11; if (RideData4[rideType].flags & RIDE_TYPE_FLAG4_3) { if (mapElement->properties.track.colour & (1 << 2)) { @@ -8478,7 +8478,7 @@ loc_6DCE68: regs.al = vehicle->track_x >> 5; regs.ah = vehicle->track_y >> 5; regs.dl = vehicle->track_z >> 3; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if ((uint16)regs.ax != ride->station_starts[i]) { continue; } @@ -8607,7 +8607,7 @@ loc_6DD069: * * rct2: 0x006DAB4C */ -int vehicle_update_track_motion(rct_vehicle *vehicle, int *outStation) +sint32 vehicle_update_track_motion(rct_vehicle *vehicle, sint32 *outStation) { registers regs = { 0 }; @@ -8729,7 +8729,7 @@ int vehicle_update_track_motion(rct_vehicle *vehicle, int *outStation) //Not used regs.dx = 0; //ebx - int numVehicles = 0; + sint32 numVehicles = 0; for (;;) { numVehicles++; @@ -8924,10 +8924,10 @@ rct_ride_entry_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle) return &rideEntry->vehicles[vehicle->vehicle_type]; } -int vehicle_get_total_num_peeps(rct_vehicle *vehicle) +sint32 vehicle_get_total_num_peeps(rct_vehicle *vehicle) { uint16 spriteIndex; - int numPeeps = 0; + sint32 numPeeps = 0; for (;;) { numPeeps += vehicle->num_peeps; spriteIndex = vehicle->next_vehicle_on_train; @@ -8946,7 +8946,7 @@ int vehicle_get_total_num_peeps(rct_vehicle *vehicle) */ void vehicle_invalidate_window(rct_vehicle *vehicle) { - int viewVehicleIndex; + sint32 viewVehicleIndex; rct_ride *ride; rct_window *w; diff --git a/src/openrct2/ride/vehicle.h b/src/openrct2/ride/vehicle.h index 79ce9b2880..ef80c3f28b 100644 --- a/src/openrct2/ride/vehicle.h +++ b/src/openrct2/ride/vehicle.h @@ -367,22 +367,22 @@ enum { #define VEHICLE_SEAT_NUM_MASK 0x7F void vehicle_update_all(); -int sub_6BC2F3(rct_vehicle* vehicle); +sint32 sub_6BC2F3(rct_vehicle* vehicle); void vehicle_sounds_update(); -void vehicle_get_g_forces(rct_vehicle *vehicle, int *verticalG, int *lateralG); +void vehicle_get_g_forces(rct_vehicle *vehicle, sint32 *verticalG, sint32 *lateralG); void vehicle_set_map_toolbar(rct_vehicle *vehicle); -int vehicle_is_used_in_pairs(rct_vehicle *vehicle); -int vehicle_update_track_motion(rct_vehicle *vehicle, int *outStation); +sint32 vehicle_is_used_in_pairs(rct_vehicle *vehicle); +sint32 vehicle_update_track_motion(rct_vehicle *vehicle, sint32 *outStation); rct_ride_entry_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle); -int vehicle_get_total_num_peeps(rct_vehicle *vehicle); +sint32 vehicle_get_total_num_peeps(rct_vehicle *vehicle); void vehicle_invalidate_window(rct_vehicle *vehicle); void vehicle_update_test_finish(rct_vehicle* vehicle); void vehicle_test_reset(rct_vehicle* vehicle); void vehicle_peep_easteregg_here_we_are(rct_vehicle* vehicle); rct_vehicle *vehicle_get_head(rct_vehicle *vehicle); rct_vehicle *vehicle_get_tail(rct_vehicle *vehicle); -const rct_vehicle_info *vehicle_get_move_info(int cd, int typeAndDirection, int offset); -uint16 vehicle_get_move_info_size(int cd, int typeAndDirection); +const rct_vehicle_info *vehicle_get_move_info(sint32 cd, sint32 typeAndDirection, sint32 offset); +uint16 vehicle_get_move_info_size(sint32 cd, sint32 typeAndDirection); bool vehicle_update_bumper_car_collision(rct_vehicle *vehicle, sint16 x, sint16 y, uint16 *spriteId); extern rct_vehicle *gCurrentVehicle; diff --git a/src/openrct2/ride/vehicle_data.c b/src/openrct2/ride/vehicle_data.c index 6d1dcb8a8d..225aa40a79 100644 --- a/src/openrct2/ride/vehicle_data.c +++ b/src/openrct2/ride/vehicle_data.c @@ -797,7 +797,7 @@ const uint8 MotionSimulatorTimeToSpriteMap[] = { 0xFF, }; -const int MotionSimulatorTimeToSpriteMapCount = countof(MotionSimulatorTimeToSpriteMap); +const sint32 MotionSimulatorTimeToSpriteMapCount = countof(MotionSimulatorTimeToSpriteMap); /** rct2: 0x009A2930 */ const sint32 dword_9A2930[] = { diff --git a/src/openrct2/ride/vehicle_data.h b/src/openrct2/ride/vehicle_data.h index 47d33d2628..b22f1a3fb7 100644 --- a/src/openrct2/ride/vehicle_data.h +++ b/src/openrct2/ride/vehicle_data.h @@ -31,7 +31,7 @@ typedef struct top_spin_time_to_sprite_map { extern const top_spin_time_to_sprite_map * TopSpinTimeToSpriteMaps[]; extern const uint8 MotionSimulatorTimeToSpriteMap[]; -extern const int MotionSimulatorTimeToSpriteMapCount; +extern const sint32 MotionSimulatorTimeToSpriteMapCount; extern const sint32 dword_9A2930[]; extern const sint32 dword_9A2970[]; diff --git a/src/openrct2/ride/vehicle_paint.c b/src/openrct2/ride/vehicle_paint.c index 74f3b470a7..0948e44c72 100644 --- a/src/openrct2/ride/vehicle_paint.c +++ b/src/openrct2/ride/vehicle_paint.c @@ -890,10 +890,10 @@ const vehicle_boundbox VehicleBoundboxes[16][224] = { }; // 6D5214 -static void vehicle_sprite_paint(rct_vehicle *vehicle, int ebx, int ecx, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint(rct_vehicle *vehicle, sint32 ebx, sint32 ecx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { - int baseImage_id = ebx; + sint32 baseImage_id = ebx; vehicle_boundbox bb = VehicleBoundboxes[vehicleEntry->draw_order][ecx]; if (vehicleEntry->flags_a & 0x4000) { baseImage_id += (vehicle->var_BA / 8) & 31; @@ -902,7 +902,7 @@ static void vehicle_sprite_paint(rct_vehicle *vehicle, int ebx, int ecx, int z, baseImage_id += vehicle->var_C5; } uint32 rotation = get_current_rotation(); - int image_id = baseImage_id | (vehicle->colours.body_colour << 19) | (vehicle->colours.trim_colour << 24) | 0x80000000; + sint32 image_id = baseImage_id | (vehicle->colours.body_colour << 19) | (vehicle->colours.trim_colour << 24) | 0x80000000; paint_struct* ps = sub_98197C(image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, bb.offset_z + z, rotation); if (ps != NULL) { ps->tertiary_colour = vehicle->colours_extended; @@ -910,7 +910,7 @@ static void vehicle_sprite_paint(rct_vehicle *vehicle, int ebx, int ecx, int z, rct_drawpixelinfo* dpi = unk_140E9A8; if (dpi->zoom_level < 2 && vehicle->num_peeps > 0 && vehicleEntry->no_seating_rows > 0) { baseImage_id += vehicleEntry->no_vehicle_images; - for (int i = 0; i < 8; i++){ + for (sint32 i = 0; i < 8; i++){ if (vehicle->num_peeps > (i * 2) && vehicleEntry->no_seating_rows > i) { image_id = baseImage_id | (vehicle->peep_tshirt_colours[i * 2] << 19) | (vehicle->peep_tshirt_colours[(i * 2) + 1] << 24) | 0xA0000000; if (i == 0 && vehicleEntry->flags_b & 0x100) { @@ -925,15 +925,15 @@ static void vehicle_sprite_paint(rct_vehicle *vehicle, int ebx, int ecx, int z, } // 6D520E -static void vehicle_sprite_paint_6D520E(rct_vehicle *vehicle, int ebx, int ecx, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint_6D520E(rct_vehicle *vehicle, sint32 ebx, sint32 ecx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicle_sprite_paint(vehicle, ebx + vehicle->var_4A, ecx, z, vehicleEntry); } // 6D51EB -static void vehicle_sprite_paint_6D51EB(rct_vehicle *vehicle, int ebx, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint_6D51EB(rct_vehicle *vehicle, sint32 ebx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { - int ecx = ebx / 2; + sint32 ecx = ebx / 2; if (vehicleEntry->flags_a & 0x800) { ebx = ebx / 2; } @@ -945,7 +945,7 @@ static void vehicle_sprite_paint_6D51EB(rct_vehicle *vehicle, int ebx, int z, co } // 6D51DE -static void vehicle_sprite_paint_6D51DE(rct_vehicle *vehicle, int ebx, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_paint_6D51DE(rct_vehicle *vehicle, sint32 ebx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->restraints_position < 64) { vehicle_sprite_paint_6D51EB(vehicle, ebx, z, vehicleEntry); @@ -959,7 +959,7 @@ static void vehicle_sprite_paint_6D51DE(rct_vehicle *vehicle, int ebx, int z, co vehicle_sprite_paint_6D51EB(vehicle, ebx, z, vehicleEntry); return; } - int ecx = ebx / 2; + sint32 ecx = ebx / 2; ebx = ebx / 8; ebx += ((vehicle->restraints_position - 64) / 64) * 4; ebx *= vehicleEntry->var_16; @@ -968,17 +968,17 @@ static void vehicle_sprite_paint_6D51DE(rct_vehicle *vehicle, int ebx, int z, co } // 6D51DE -static void vehicle_sprite_0_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); } // 6D4EE7 -static void vehicle_sprite_0_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection / 4) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection / 4) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -986,11 +986,11 @@ static void vehicle_sprite_0_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F34 -static void vehicle_sprite_0_2(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_2(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = (imageDirection / 2) + 108; - int ebx = ((imageDirection + 16) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = (imageDirection / 2) + 108; + sint32 ebx = ((imageDirection + 16) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -998,11 +998,11 @@ static void vehicle_sprite_0_2(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F0C -static void vehicle_sprite_0_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1010,11 +1010,11 @@ static void vehicle_sprite_0_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F5C -static void vehicle_sprite_0_4(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_4(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = ((imageDirection / 2) ^ 8) + 108; - int ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = ((imageDirection / 2) ^ 8) + 108; + sint32 ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1022,14 +1022,14 @@ static void vehicle_sprite_0_4(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F84 -static void vehicle_sprite_0_5(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_5(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = (imageDirection / 8) + 124; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = (imageDirection / 8) + 124; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_2(vehicle, imageDirection, z, vehicleEntry); @@ -1037,14 +1037,14 @@ static void vehicle_sprite_0_5(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4FE4 -static void vehicle_sprite_0_6(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_6(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = (imageDirection / 8) + 128; - int ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = (imageDirection / 8) + 128; + sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_2(vehicle, imageDirection, z, vehicleEntry); @@ -1052,14 +1052,14 @@ static void vehicle_sprite_0_6(rct_vehicle *vehicle, int imageDirection, int z, } // 6D5055 -static void vehicle_sprite_0_7(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_7(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = (imageDirection / 8) + 132; - int ebx = (((imageDirection / 8) + 16) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = (imageDirection / 8) + 132; + sint32 ebx = (((imageDirection / 8) + 16) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_2(vehicle, imageDirection, z, vehicleEntry); @@ -1067,14 +1067,14 @@ static void vehicle_sprite_0_7(rct_vehicle *vehicle, int imageDirection, int z, } // 6D50C6 -static void vehicle_sprite_0_8(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_8(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = (imageDirection / 8) + 136; - int ebx = (((imageDirection / 8) + 24) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = (imageDirection / 8) + 136; + sint32 ebx = (((imageDirection / 8) + 24) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_2(vehicle, imageDirection, z, vehicleEntry); @@ -1082,14 +1082,14 @@ static void vehicle_sprite_0_8(rct_vehicle *vehicle, int imageDirection, int z, } // 6D5137 -static void vehicle_sprite_0_9(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_9(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = (imageDirection / 8) + 140; - int ebx = (((imageDirection / 8) + 32) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = (imageDirection / 8) + 140; + sint32 ebx = (((imageDirection / 8) + 32) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_2(vehicle, imageDirection, z, vehicleEntry); @@ -1097,14 +1097,14 @@ static void vehicle_sprite_0_9(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4FB1 -static void vehicle_sprite_0_10(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_10(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = ((imageDirection / 8) ^ 2) + 124; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = ((imageDirection / 8) ^ 2) + 124; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_4(vehicle, imageDirection, z, vehicleEntry); @@ -1112,14 +1112,14 @@ static void vehicle_sprite_0_10(rct_vehicle *vehicle, int imageDirection, int z, } // 6D501B -static void vehicle_sprite_0_11(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_11(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = ((imageDirection / 8) ^ 2) + 128; - int ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = ((imageDirection / 8) ^ 2) + 128; + sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_4(vehicle, imageDirection, z, vehicleEntry); @@ -1127,14 +1127,14 @@ static void vehicle_sprite_0_11(rct_vehicle *vehicle, int imageDirection, int z, } // 6D508C -static void vehicle_sprite_0_12(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_12(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = ((imageDirection / 8) ^ 2) + 132; - int ebx = (((imageDirection / 8) + 20) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = ((imageDirection / 8) ^ 2) + 132; + sint32 ebx = (((imageDirection / 8) + 20) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_4(vehicle, imageDirection, z, vehicleEntry); @@ -1142,14 +1142,14 @@ static void vehicle_sprite_0_12(rct_vehicle *vehicle, int imageDirection, int z, } // 6D50FD -static void vehicle_sprite_0_13(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_13(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = ((imageDirection / 8) ^ 2) + 136; - int ebx = (((imageDirection / 8) + 28) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = ((imageDirection / 8) ^ 2) + 136; + sint32 ebx = (((imageDirection / 8) + 28) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_4(vehicle, imageDirection, z, vehicleEntry); @@ -1157,14 +1157,14 @@ static void vehicle_sprite_0_13(rct_vehicle *vehicle, int imageDirection, int z, } // 6D516E -static void vehicle_sprite_0_14(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_14(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - int ecx = ((imageDirection / 8) ^ 2) + 140; - int ebx = (((imageDirection / 8) + 36) * vehicleEntry->var_16) + vehicleEntry->var_34; + sint32 ecx = ((imageDirection / 8) ^ 2) + 140; + sint32 ebx = (((imageDirection / 8) + 36) * vehicleEntry->var_16) + vehicleEntry->var_34; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0_2(vehicle, imageDirection, z, vehicleEntry); @@ -1172,12 +1172,12 @@ static void vehicle_sprite_0_14(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4EE4 -static void vehicle_sprite_0_16(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_16(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection / 4) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection / 4) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1185,12 +1185,12 @@ static void vehicle_sprite_0_16(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F31 -static void vehicle_sprite_0_17(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_17(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = (imageDirection / 2) + 108; - int ebx = ((imageDirection + 16) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = (imageDirection / 2) + 108; + sint32 ebx = ((imageDirection + 16) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1198,12 +1198,12 @@ static void vehicle_sprite_0_17(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F09 -static void vehicle_sprite_0_18(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_18(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1211,12 +1211,12 @@ static void vehicle_sprite_0_18(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4F59 -static void vehicle_sprite_0_19(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0_19(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - int ecx = ((imageDirection / 2) ^ 8) + 108; - int ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_30; + sint32 ecx = ((imageDirection / 2) ^ 8) + 108; + sint32 ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_30; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1224,7 +1224,7 @@ static void vehicle_sprite_0_19(rct_vehicle *vehicle, int imageDirection, int z, } // 6D51D7 -static void vehicle_sprite_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3DE4: switch (vehicle->bank_rotation) { @@ -1252,11 +1252,11 @@ static void vehicle_sprite_0(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D4614 -static void vehicle_sprite_1_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_20; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -1264,11 +1264,11 @@ static void vehicle_sprite_1_0(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4662 -static void vehicle_sprite_1_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_38; + sint32 ecx = imageDirection / 2; + sint32 ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_1_0(vehicle, imageDirection, z, vehicleEntry); @@ -1276,11 +1276,11 @@ static void vehicle_sprite_1_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D46DB -static void vehicle_sprite_1_2(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_2(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_48; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_1_1(vehicle, imageDirection, z, vehicleEntry); @@ -1288,11 +1288,11 @@ static void vehicle_sprite_1_2(rct_vehicle *vehicle, int imageDirection, int z, } // 6D467D -static void vehicle_sprite_1_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection + 32) * vehicleEntry->var_16) + vehicleEntry->var_38; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection + 32) * vehicleEntry->var_16) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_1_0(vehicle, imageDirection, z, vehicleEntry); @@ -1300,11 +1300,11 @@ static void vehicle_sprite_1_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D46FD -static void vehicle_sprite_1_4(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1_4(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_48; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_1_3(vehicle, imageDirection, z, vehicleEntry); @@ -1312,7 +1312,7 @@ static void vehicle_sprite_1_4(rct_vehicle *vehicle, int imageDirection, int z, } // 6D460D -static void vehicle_sprite_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3C04: switch (vehicle->bank_rotation) { @@ -1340,16 +1340,16 @@ static void vehicle_sprite_1(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D4791 -static void vehicle_sprite_2_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { if (vehicleEntry->flags_a & 0x4000) { - int ecx = (imageDirection / 2) + 16; - int ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_20; + sint32 ecx = (imageDirection / 2) + 16; + sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { - int ecx = (imageDirection / 2) + 16; - int ebx = ((imageDirection + 8) * vehicleEntry->var_16) + vehicleEntry->var_20; + sint32 ecx = (imageDirection / 2) + 16; + sint32 ebx = ((imageDirection + 8) * vehicleEntry->var_16) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } else { @@ -1358,11 +1358,11 @@ static void vehicle_sprite_2_0(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4833 -static void vehicle_sprite_2_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = (imageDirection / 2) + 16; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_40; + sint32 ecx = (imageDirection / 2) + 16; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_2_0(vehicle, imageDirection, z, vehicleEntry); @@ -1370,17 +1370,17 @@ static void vehicle_sprite_2_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D48D6 -static void vehicle_sprite_2_2(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_2(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { - int ecx = imageDirection / 2; + sint32 ecx = imageDirection / 2; if (vehicleEntry->draw_order < 5) { ecx += 108; - int ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { ecx += 16; - int ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } else { @@ -1389,11 +1389,11 @@ static void vehicle_sprite_2_2(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4858 -static void vehicle_sprite_2_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = (imageDirection / 2) + 16; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_40; + sint32 ecx = (imageDirection / 2) + 16; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_2_0(vehicle, imageDirection, z, vehicleEntry); @@ -1401,17 +1401,17 @@ static void vehicle_sprite_2_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4910 -static void vehicle_sprite_2_4(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2_4(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { - int ecx = imageDirection / 2; + sint32 ecx = imageDirection / 2; if (vehicleEntry->draw_order < 5) { ecx = (ecx ^ 8) + 108; - int ebx = ((imageDirection + 32) * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = ((imageDirection + 32) * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { ecx += 16; - int ebx = ((imageDirection + 32) * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = ((imageDirection + 32) * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } else { @@ -1420,7 +1420,7 @@ static void vehicle_sprite_2_4(rct_vehicle *vehicle, int imageDirection, int z, } // 6D476C -static void vehicle_sprite_2(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_2(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3CA4: switch (vehicle->bank_rotation) { @@ -1448,35 +1448,35 @@ static void vehicle_sprite_2(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D49DC -static void vehicle_sprite_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) { vehicle_sprite_2(vehicle, imageDirection, z, vehicleEntry); } else { - int ecx = (imageDirection / 4) + 32; - int ebx = ((imageDirection / 4) * vehicleEntry->var_16) + vehicleEntry->var_24; + sint32 ecx = (imageDirection / 4) + 32; + sint32 ebx = ((imageDirection / 4) * vehicleEntry->var_16) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } // 6D4A31 -static void vehicle_sprite_4(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_4(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) { vehicle_sprite_2(vehicle, imageDirection, z, vehicleEntry); } else { - int ecx = (imageDirection / 2) + 40; - int ebx = ((imageDirection + 16) * vehicleEntry->var_16) + vehicleEntry->var_24; + sint32 ecx = (imageDirection / 2) + 40; + sint32 ebx = ((imageDirection + 16) * vehicleEntry->var_16) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } // 6D463D -static void vehicle_sprite_5_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_20; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -1484,11 +1484,11 @@ static void vehicle_sprite_5_0(rct_vehicle *vehicle, int imageDirection, int z, } // 6D469B -static void vehicle_sprite_5_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection + 64) * vehicleEntry->var_16) + vehicleEntry->var_38; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection + 64) * vehicleEntry->var_16) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_5_0(vehicle, imageDirection, z, vehicleEntry); @@ -1496,11 +1496,11 @@ static void vehicle_sprite_5_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4722 -static void vehicle_sprite_5_2(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_2(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_48; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_5_1(vehicle, imageDirection, z, vehicleEntry); @@ -1508,11 +1508,11 @@ static void vehicle_sprite_5_2(rct_vehicle *vehicle, int imageDirection, int z, } // 6D46B9 -static void vehicle_sprite_5_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection + 96) * vehicleEntry->var_16) + vehicleEntry->var_38; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection + 96) * vehicleEntry->var_16) + vehicleEntry->var_38; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_5_0(vehicle, imageDirection, z, vehicleEntry); @@ -1520,11 +1520,11 @@ static void vehicle_sprite_5_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4747 -static void vehicle_sprite_5_4(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5_4(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_48; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_48; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_5_3(vehicle, imageDirection, z, vehicleEntry); @@ -1532,7 +1532,7 @@ static void vehicle_sprite_5_4(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4636 -static void vehicle_sprite_5(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_5(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3C54: switch (vehicle->bank_rotation) { @@ -1560,16 +1560,16 @@ static void vehicle_sprite_5(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D47E4 -static void vehicle_sprite_6_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { if (vehicleEntry->flags_a & 0x4000) { - int ecx = ((imageDirection / 2) ^ 8) + 16; - int ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_20; + sint32 ecx = ((imageDirection / 2) ^ 8) + 16; + sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { - int ecx = ((imageDirection / 2) ^ 8) + 16; - int ebx = ((imageDirection + 40) * vehicleEntry->var_16) + vehicleEntry->var_20; + sint32 ecx = ((imageDirection / 2) ^ 8) + 16; + sint32 ebx = ((imageDirection + 40) * vehicleEntry->var_16) + vehicleEntry->var_20; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } else { @@ -1578,11 +1578,11 @@ static void vehicle_sprite_6_0(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4880 -static void vehicle_sprite_6_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = ((imageDirection / 2) ^ 8) + 16; - int ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_40; + sint32 ecx = ((imageDirection / 2) ^ 8) + 16; + sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_6_0(vehicle, imageDirection, z, vehicleEntry); @@ -1590,17 +1590,17 @@ static void vehicle_sprite_6_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4953 -static void vehicle_sprite_6_2(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_2(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { - int ecx = imageDirection / 2; + sint32 ecx = imageDirection / 2; if (vehicleEntry->draw_order < 5) { ecx += 108; - int ebx = ((imageDirection + 64) * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = ((imageDirection + 64) * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { ecx = (ecx ^ 8) + 16; - int ebx = ((imageDirection + 64) * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = ((imageDirection + 64) * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } else { @@ -1609,11 +1609,11 @@ static void vehicle_sprite_6_2(rct_vehicle *vehicle, int imageDirection, int z, } // 6D48AB -static void vehicle_sprite_6_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = ((imageDirection / 2) ^ 8) + 16; - int ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_40; + sint32 ecx = ((imageDirection / 2) ^ 8) + 16; + sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_40; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_6_0(vehicle, imageDirection, z, vehicleEntry); @@ -1621,17 +1621,17 @@ static void vehicle_sprite_6_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4996 -static void vehicle_sprite_6_4(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6_4(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { - int ecx = imageDirection / 2; + sint32 ecx = imageDirection / 2; if (vehicleEntry->draw_order < 5) { ecx = (ecx ^ 8) + 108; - int ebx = ((imageDirection + 96) * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = ((imageDirection + 96) * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { ecx = (ecx ^ 8) + 16; - int ebx = ((imageDirection + 96) * vehicleEntry->var_16) + vehicleEntry->var_44; + sint32 ebx = ((imageDirection + 96) * vehicleEntry->var_16) + vehicleEntry->var_44; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } } else { @@ -1640,7 +1640,7 @@ static void vehicle_sprite_6_4(rct_vehicle *vehicle, int imageDirection, int z, } // 6D47DD -static void vehicle_sprite_6(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_6(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3CF4: switch (vehicle->bank_rotation) { @@ -1668,11 +1668,11 @@ static void vehicle_sprite_6(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D4A05 -static void vehicle_sprite_7(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_7(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { - int ecx = ((imageDirection / 4) ^ 4) + 32; - int ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_24; + sint32 ecx = ((imageDirection / 4) ^ 4) + 32; + sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_6(vehicle, imageDirection, z, vehicleEntry); @@ -1680,11 +1680,11 @@ static void vehicle_sprite_7(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D4A59 -static void vehicle_sprite_8(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_8(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { - int ecx = ((imageDirection / 2) ^ 8) + 40; - int ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_24; + sint32 ecx = ((imageDirection / 2) ^ 8) + 40; + sint32 ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_6(vehicle, imageDirection, z, vehicleEntry); @@ -1692,11 +1692,11 @@ static void vehicle_sprite_8(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D4A81 -static void vehicle_sprite_9(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_9(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 56; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 56; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1704,11 +1704,11 @@ static void vehicle_sprite_9(rct_vehicle *vehicle, int imageDirection, int z, co } // 6D4AE8 -static void vehicle_sprite_10(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_10(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 2) + 60; - int ebx = ((imageDirection + 8) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 2) + 60; + sint32 ebx = ((imageDirection + 8) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1716,11 +1716,11 @@ static void vehicle_sprite_10(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4B57 -static void vehicle_sprite_11(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_11(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 76; - int ebx = (((imageDirection / 8) + 72) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 76; + sint32 ebx = (((imageDirection / 8) + 72) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1728,11 +1728,11 @@ static void vehicle_sprite_11(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4BB7 -static void vehicle_sprite_12(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_12(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 80; - int ebx = (((imageDirection / 8) + 80) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 80; + sint32 ebx = (((imageDirection / 8) + 80) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1740,11 +1740,11 @@ static void vehicle_sprite_12(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4C17 -static void vehicle_sprite_13(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_13(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 84; - int ebx = (((imageDirection / 8) + 88) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 84; + sint32 ebx = (((imageDirection / 8) + 88) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1752,11 +1752,11 @@ static void vehicle_sprite_13(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4C77 -static void vehicle_sprite_14(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_14(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 88; - int ebx = (((imageDirection / 8) + 96) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 88; + sint32 ebx = (((imageDirection / 8) + 96) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1764,11 +1764,11 @@ static void vehicle_sprite_14(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4CD7 -static void vehicle_sprite_15(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_15(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 92; - int ebx = (((imageDirection / 8) + 104) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 92; + sint32 ebx = (((imageDirection / 8) + 104) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1776,11 +1776,11 @@ static void vehicle_sprite_15(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4D37 -static void vehicle_sprite_16(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_16(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = (imageDirection / 8) + 96; - int ebx = (((imageDirection / 8) + 112) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = (imageDirection / 8) + 96; + sint32 ebx = (((imageDirection / 8) + 112) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_4(vehicle, imageDirection, z, vehicleEntry); @@ -1788,7 +1788,7 @@ static void vehicle_sprite_16(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4AA3 -static void vehicle_sprite_17(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_17(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { if( (vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN_TO_60_DEG_DOWN && @@ -1797,8 +1797,8 @@ static void vehicle_sprite_17(rct_vehicle *vehicle, int imageDirection, int z, c } } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 56; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 8) ^ 2) + 56; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1806,7 +1806,7 @@ static void vehicle_sprite_17(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4B0D -static void vehicle_sprite_18(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_18(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { if( (vehicle->track_type >> 2) != TRACK_ELEM_90_DEG_DOWN && @@ -1816,8 +1816,8 @@ static void vehicle_sprite_18(rct_vehicle *vehicle, int imageDirection, int z, c } } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 2) ^ 8) + 60; - int ebx = ((imageDirection + 40) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 2) ^ 8) + 60; + sint32 ebx = ((imageDirection + 40) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1825,14 +1825,14 @@ static void vehicle_sprite_18(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4B80 -static void vehicle_sprite_19(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_19(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 76; - int ebx = (((imageDirection / 8) + 76) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 8) ^ 2) + 76; + sint32 ebx = (((imageDirection / 8) + 76) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1840,14 +1840,14 @@ static void vehicle_sprite_19(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4BE0 -static void vehicle_sprite_20(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_20(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 80; - int ebx = (((imageDirection / 8) + 84) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 8) ^ 2) + 80; + sint32 ebx = (((imageDirection / 8) + 84) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1855,14 +1855,14 @@ static void vehicle_sprite_20(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4C40 -static void vehicle_sprite_21(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_21(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 84; - int ebx = (((imageDirection / 8) + 92) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 8) ^ 2) + 84; + sint32 ebx = (((imageDirection / 8) + 92) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1870,14 +1870,14 @@ static void vehicle_sprite_21(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4CA0 -static void vehicle_sprite_22(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_22(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 88; - int ebx = (((imageDirection / 8) + 100) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 8) ^ 2) + 88; + sint32 ebx = (((imageDirection / 8) + 100) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1885,14 +1885,14 @@ static void vehicle_sprite_22(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4D00 -static void vehicle_sprite_23(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_23(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 92; - int ebx = (((imageDirection / 8) + 108) * vehicleEntry->var_16) + vehicleEntry->var_28; + sint32 ecx = ((imageDirection / 8) ^ 2) + 92; + sint32 ebx = (((imageDirection / 8) + 108) * vehicleEntry->var_16) + vehicleEntry->var_28; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_8(vehicle, imageDirection, z, vehicleEntry); @@ -1900,15 +1900,15 @@ static void vehicle_sprite_23(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D51A5 -static void vehicle_sprite_24(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_24(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) { vehicleEntry--; } if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_CORKSCREWS) { - int eax = ((vehicle->vehicle_sprite_type - 24) * 4); - int ecx = (imageDirection / 8) + eax + 144; - int ebx = (((imageDirection / 8) + eax) * vehicleEntry->var_16) + vehicleEntry->var_4C; + sint32 eax = ((vehicle->vehicle_sprite_type - 24) * 4); + sint32 ecx = (imageDirection / 8) + eax + 144; + sint32 ebx = (((imageDirection / 8) + eax) * vehicleEntry->var_16) + vehicleEntry->var_4C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry); @@ -1916,11 +1916,11 @@ static void vehicle_sprite_24(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4D67 -static void vehicle_sprite_50_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_2C; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -1928,11 +1928,11 @@ static void vehicle_sprite_50_0(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4DB5 -static void vehicle_sprite_50_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_3C; + sint32 ecx = imageDirection / 2; + sint32 ebx = ((imageDirection / 8) * vehicleEntry->var_16) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_50_0(vehicle, imageDirection, z, vehicleEntry); @@ -1940,11 +1940,11 @@ static void vehicle_sprite_50_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4DD3 -static void vehicle_sprite_50_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_3C; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_50_0(vehicle, imageDirection, z, vehicleEntry); @@ -1952,7 +1952,7 @@ static void vehicle_sprite_50_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4D60 -static void vehicle_sprite_50(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_50(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3D44: switch (vehicle->bank_rotation) { @@ -1980,11 +1980,11 @@ static void vehicle_sprite_50(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4E3A -static void vehicle_sprite_51(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_51(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - int ecx = (imageDirection / 8) + 100; - int ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_2C; + sint32 ecx = (imageDirection / 8) + 100; + sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -1992,11 +1992,11 @@ static void vehicle_sprite_51(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4E8F -static void vehicle_sprite_52(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_52(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - int ecx = (imageDirection / 8) + 104; - int ebx = (((imageDirection / 8) + 16) * vehicleEntry->var_16) + vehicleEntry->var_2C; + sint32 ecx = (imageDirection / 8) + 104; + sint32 ebx = (((imageDirection / 8) + 16) * vehicleEntry->var_16) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -2004,11 +2004,11 @@ static void vehicle_sprite_52(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4D90 -static void vehicle_sprite_53_0(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_2C; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 4) * vehicleEntry->var_16) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -2016,11 +2016,11 @@ static void vehicle_sprite_53_0(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4DF4 -static void vehicle_sprite_53_1(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53_1(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_3C; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_53_0(vehicle, imageDirection, z, vehicleEntry); @@ -2028,11 +2028,11 @@ static void vehicle_sprite_53_1(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4E15 -static void vehicle_sprite_53_3(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53_3(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { - int ecx = imageDirection / 2; - int ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_3C; + sint32 ecx = imageDirection / 2; + sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_3C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_53_0(vehicle, imageDirection, z, vehicleEntry); @@ -2040,7 +2040,7 @@ static void vehicle_sprite_53_3(rct_vehicle *vehicle, int imageDirection, int z, } // 6D4D89 -static void vehicle_sprite_53(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_53(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { // 0x009A3D94: switch (vehicle->bank_rotation) { @@ -2068,11 +2068,11 @@ static void vehicle_sprite_53(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4E63 -static void vehicle_sprite_54(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_54(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 100; - int ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_2C; + sint32 ecx = ((imageDirection / 8) ^ 2) + 100; + sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -2080,11 +2080,11 @@ static void vehicle_sprite_54(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4EB8 -static void vehicle_sprite_55(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_55(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - int ecx = ((imageDirection / 8) ^ 2) + 104; - int ebx = (((imageDirection / 8) + 20) * vehicleEntry->var_16) + vehicleEntry->var_2C; + sint32 ecx = ((imageDirection / 8) ^ 2) + 104; + sint32 ebx = (((imageDirection / 8) + 20) * vehicleEntry->var_16) + vehicleEntry->var_2C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_0(vehicle, imageDirection, z, vehicleEntry); @@ -2092,19 +2092,19 @@ static void vehicle_sprite_55(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D47DA -static void vehicle_sprite_56(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_56(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; vehicle_sprite_6(vehicle, imageDirection, z, vehicleEntry); } // 6D4A02 -static void vehicle_sprite_57(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_57(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { - int ecx = ((imageDirection / 4) ^ 4) + 32; - int ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_24; + sint32 ecx = ((imageDirection / 4) ^ 4) + 32; + sint32 ebx = (((imageDirection / 4) + 8) * vehicleEntry->var_16) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_6(vehicle, imageDirection, z, vehicleEntry); @@ -2112,12 +2112,12 @@ static void vehicle_sprite_57(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4A56 -static void vehicle_sprite_58(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_58(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { vehicleEntry--; if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { - int ecx = ((imageDirection / 2) ^ 8) + 40; - int ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_24; + sint32 ecx = ((imageDirection / 2) ^ 8) + 40; + sint32 ebx = ((imageDirection + 48) * vehicleEntry->var_16) + vehicleEntry->var_24; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_6(vehicle, imageDirection, z, vehicleEntry); @@ -2125,11 +2125,11 @@ static void vehicle_sprite_58(rct_vehicle *vehicle, int imageDirection, int z, c } // 6D4773 -static void vehicle_sprite_59(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_sprite_59(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_14) { - int ecx = (imageDirection / 2) + 16; - int ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_4C; + sint32 ecx = (imageDirection / 2) + 16; + sint32 ebx = (imageDirection * vehicleEntry->var_16) + vehicleEntry->var_4C; vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry); } else { vehicle_sprite_2(vehicle, imageDirection, z, vehicleEntry); @@ -2137,7 +2137,7 @@ static void vehicle_sprite_59(rct_vehicle *vehicle, int imageDirection, int z, c } // 0x009A3B14: -typedef void (*vehicle_sprite_func)(rct_vehicle *vehicle, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry); +typedef void (*vehicle_sprite_func)(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry); vehicle_sprite_func vehicle_sprite_funcs[] = { vehicle_sprite_0, vehicle_sprite_1, @@ -2205,7 +2205,7 @@ vehicle_sprite_func vehicle_sprite_funcs[] = { * * rct2: 0x006D5600 */ -static void vehicle_visual_splash1_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash1_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { if ((vehicle->track_type >> 2) != TRACK_ELEM_WATER_SPLASH) { return; @@ -2219,7 +2219,7 @@ static void vehicle_visual_splash1_effect(int z, rct_vehicle *vehicle, const rct if (vehicle_get_head(vehicle)->velocity <= 0x50000) { return; } - int image_id = 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(image_id, 0, 0, 0, 0, 0, z, 0, 0, z, get_current_rotation()); } @@ -2227,7 +2227,7 @@ static void vehicle_visual_splash1_effect(int z, rct_vehicle *vehicle, const rct * * rct2: 0x006D5696 */ -static void vehicle_visual_splash2_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash2_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->sprite_direction & 7) { return; @@ -2238,7 +2238,7 @@ static void vehicle_visual_splash2_effect(int z, rct_vehicle *vehicle, const rct if (vehicle->velocity <= 0x50000) { return; } - int image_id = 29046 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = 29046 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(image_id, 0, 0, 0, 0, 0, z, 0, 0, z, get_current_rotation()); } @@ -2246,7 +2246,7 @@ static void vehicle_visual_splash2_effect(int z, rct_vehicle *vehicle, const rct * * rct2: 0x006D57EE */ -static void vehicle_visual_splash3_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash3_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->sprite_direction & 7) { return; @@ -2257,7 +2257,7 @@ static void vehicle_visual_splash3_effect(int z, rct_vehicle *vehicle, const rct if (vehicle->velocity <= 0x50000) { return; } - int image_id = 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = 29014 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(image_id, 0, 0, 0, 0, 0, z, 0, 0, z, get_current_rotation()); } @@ -2265,7 +2265,7 @@ static void vehicle_visual_splash3_effect(int z, rct_vehicle *vehicle, const rct * * rct2: 0x006D5783 */ -static void vehicle_visual_splash4_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash4_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { rct_vehicle *vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); if (vehicle2->velocity <= 0x50000) { @@ -2277,7 +2277,7 @@ static void vehicle_visual_splash4_effect(int z, rct_vehicle *vehicle, const rct if (vehicle->vehicle_sprite_type != 0) { return; } - int image_id = 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(image_id, 0, 0, 1, 1, 0, z, 0, 0, z, get_current_rotation()); } @@ -2285,7 +2285,7 @@ static void vehicle_visual_splash4_effect(int z, rct_vehicle *vehicle, const rct * * rct2: 0x006D5701 */ -static void vehicle_visual_splash5_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +static void vehicle_visual_splash5_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { rct_vehicle *vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride); if (vehicle2->velocity <= 0x50000) { @@ -2300,11 +2300,11 @@ static void vehicle_visual_splash5_effect(int z, rct_vehicle *vehicle, const rct if (!track_element_is_covered(vehicle->track_type >> 2)) { return; } - int image_id = 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); + sint32 image_id = 29078 + ((((vehicle->sprite_direction / 8) + get_current_rotation()) & 3) * 8) + ((gCurrentTicks / 2) & 7); sub_98199C(image_id, 0, 0, 1, 1, 0, z, 0, 0, z, get_current_rotation()); } -void vehicle_visual_splash_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_splash_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { switch (vehicleEntry->effect_visual) { case 1: /* nullsub */ break; @@ -2321,7 +2321,7 @@ void vehicle_visual_splash_effect(int z, rct_vehicle *vehicle, const rct_ride_en * * rct2: 0x006D45F8 */ -void vehicle_visual_default(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_default(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { assert(vehicle->vehicle_sprite_type < countof(vehicle_sprite_funcs)); if (vehicle->vehicle_sprite_type < countof(vehicle_sprite_funcs)) { @@ -2333,14 +2333,14 @@ void vehicle_visual_default(int x, int imageDirection, int y, int z, rct_vehicle * * rct2: 0x006D4244 */ -void vehicle_paint(rct_vehicle *vehicle, int imageDirection) +void vehicle_paint(rct_vehicle *vehicle, sint32 imageDirection) { rct_ride_entry *rideEntry = 0; const rct_ride_entry_vehicle *vehicleEntry; - int x = vehicle->x; - int y = vehicle->y; - int z = vehicle->z; + sint32 x = vehicle->x; + sint32 y = vehicle->y; + sint32 z = vehicle->z; if (vehicle->flags & SPRITE_FLAGS_IS_CRASHED_VEHICLE_SPRITE) { uint32 ebx = 22965 + vehicle->var_C5; diff --git a/src/openrct2/ride/vehicle_paint.h b/src/openrct2/ride/vehicle_paint.h index 3f92d9138e..7f7fc9e2bd 100644 --- a/src/openrct2/ride/vehicle_paint.h +++ b/src/openrct2/ride/vehicle_paint.h @@ -30,19 +30,19 @@ typedef struct vehicle_boundbox { extern const vehicle_boundbox VehicleBoundboxes[16][224]; -void vehicle_paint(rct_vehicle *vehicle, int imageDirection); +void vehicle_paint(rct_vehicle *vehicle, sint32 imageDirection); -void vehicle_visual_default(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_roto_drop(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_observation_tower(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_river_rapids(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_reverser(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_splash_boats_or_water_coaster(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_launched_freefall(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_splash_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_virginia_reel(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_submarine(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); -void vehicle_visual_mini_golf_player(int x, int imageDirection, int y, int z, rct_vehicle *vehicle); -void vehicle_visual_mini_golf_ball(int x, int imageDirection, int y, int z, rct_vehicle *vehicle); +void vehicle_visual_default(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_roto_drop(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_observation_tower(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_river_rapids(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_reverser(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_splash_boats_or_water_coaster(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_launched_freefall(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_splash_effect(sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_virginia_reel(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_submarine(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry); +void vehicle_visual_mini_golf_player(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle); +void vehicle_visual_mini_golf_ball(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle); #endif diff --git a/src/openrct2/ride/water/boat_ride.c b/src/openrct2/ride/water/boat_ride.c index 70863b2908..d957738337 100644 --- a/src/openrct2/ride/water/boat_ride.c +++ b/src/openrct2/ride/water/boat_ride.c @@ -37,7 +37,7 @@ enum }; /** rct2: 0x008B0E40 */ -static void paint_boat_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_boat_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -60,7 +60,7 @@ static void paint_boat_ride_track_flat(uint8 rideIndex, uint8 trackSequence, uin } /** rct2: 0x008B0E50 */ -static void paint_boat_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_boat_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; rct_ride * ride = get_ride(rideIndex); @@ -79,7 +79,7 @@ static void paint_boat_ride_station(uint8 rideIndex, uint8 trackSequence, uint8 } /** rct2: 0x008B0E80 */ -static void paint_boat_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_boat_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; switch (direction) { @@ -118,7 +118,7 @@ static void paint_boat_ride_track_left_quarter_turn_1_tile(uint8 rideIndex, uint } /** rct2: 0x008B0E90 */ -static void paint_boat_ride_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_boat_ride_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_boat_ride_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } @@ -126,7 +126,7 @@ static void paint_boat_ride_track_right_quarter_turn_1_tile(uint8 rideIndex, uin /** * rct2: 0x008B0D60 */ -TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/water/dingy_slide.c b/src/openrct2/ride/water/dingy_slide.c index eb15700363..ed8cc40f41 100644 --- a/src/openrct2/ride/water/dingy_slide.c +++ b/src/openrct2/ride/water/dingy_slide.c @@ -355,7 +355,7 @@ enum { SPR_DINGHY_SLIDE_S_BEND_COVERED_FRONT_SE_SW_SE_SEQ_3 = 20051, }; -static void dinghy_slide_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -389,7 +389,7 @@ static void dinghy_slide_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -412,7 +412,7 @@ static void dinghy_slide_track_station(uint8 rideIndex, uint8 trackSequence, uin paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -450,7 +450,7 @@ static void dinghy_slide_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, u paint_util_set_general_support_height(height + 56, 0x20); } -static void dinghy_slide_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_SW_NE, SPR_DINGHY_SLIDE_60_DEG_FRONT_SW_NE }, @@ -479,7 +479,7 @@ static void dinghy_slide_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, u paint_util_set_general_support_height(height + 104, 0x20); } -static void dinghy_slide_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -517,7 +517,7 @@ static void dinghy_slide_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 48, 0x20); } -static void dinghy_slide_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_FRONT_SW_NE }, @@ -546,7 +546,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 72, 0x20); } -static void dinghy_slide_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_SW_NE, SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_FRONT_SW_NE }, @@ -575,7 +575,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 72, 0x20); } -static void dinghy_slide_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -613,32 +613,32 @@ static void dinghy_slide_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 40, 0x20); } -static void dinghy_slide_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_right_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -735,18 +735,18 @@ static void dinghy_slide_track_right_quarter_turn_5(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_left_quarter_turn_5(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_5(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void dinghy_slide_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -818,7 +818,7 @@ static void dinghy_slide_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -890,7 +890,7 @@ static void dinghy_slide_track_s_bend_right(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_right_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -948,7 +948,7 @@ static void dinghy_slide_track_right_quarter_turn_3(uint8 rideIndex, uint8 track break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -959,13 +959,13 @@ static void dinghy_slide_track_right_quarter_turn_3(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_left_quarter_turn_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_3(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void dinghy_slide_track_flat_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_flat_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_FLAT_COVERED_SW_NE, SPR_DINGHY_SLIDE_FLAT_COVERED_FRONT_SW_NE }, @@ -990,7 +990,7 @@ static void dinghy_slide_track_flat_covered(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_25_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_COVERED_FRONT_SW_NE }, @@ -1019,7 +1019,7 @@ static void dinghy_slide_track_25_deg_up_covered(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 56, 0x20); } -static void dinghy_slide_track_60_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_60_DEG_COVERED_FRONT_SW_NE }, @@ -1048,7 +1048,7 @@ static void dinghy_slide_track_60_deg_up_covered(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 104, 0x20); } -static void dinghy_slide_track_flat_to_25_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_flat_to_25_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_FLAT_TO_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_FLAT_TO_25_DEG_COVERED_FRONT_SW_NE }, @@ -1077,7 +1077,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 48, 0x20); } -static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_COVERED_FRONT_SW_NE }, @@ -1106,7 +1106,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(uint8 rideIndex, u paint_util_set_general_support_height(height + 72, 0x20); } -static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_COVERED_FRONT_SW_NE }, @@ -1135,7 +1135,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(uint8 rideIndex, u paint_util_set_general_support_height(height + 72, 0x20); } -static void dinghy_slide_track_25_deg_up_to_flat_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_up_to_flat_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_FLAT_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_FLAT_COVERED_FRONT_SW_NE }, @@ -1164,32 +1164,32 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 40, 0x20); } -static void dinghy_slide_track_25_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_25_deg_up_covered(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_60_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_60_deg_up_covered(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_flat_to_25_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_flat_to_25_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_25_deg_up_to_flat_covered(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_60_deg_up_to_25_deg_up_covered(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_25_deg_down_to_flat_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_25_deg_down_to_flat_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_flat_to_25_deg_up_covered(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void dinghy_slide_track_right_quarter_turn_5_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_right_quarter_turn_5_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -1286,13 +1286,13 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(uint8 rideIndex, uin paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_left_quarter_turn_5_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_left_quarter_turn_5_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_5_covered(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void dinghy_slide_track_s_bend_left_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_s_bend_left_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -1364,7 +1364,7 @@ static void dinghy_slide_track_s_bend_left_covered(uint8 rideIndex, uint8 trackS paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_s_bend_right_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_s_bend_right_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -1436,7 +1436,7 @@ static void dinghy_slide_track_s_bend_right_covered(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_right_quarter_turn_3_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_right_quarter_turn_3_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -1494,7 +1494,7 @@ static void dinghy_slide_track_right_quarter_turn_3_covered(uint8 rideIndex, uin break; } - int blockedSegments = 0; + sint32 blockedSegments = 0; switch (trackSequence) { case 0: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC; break; case 2: blockedSegments = SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_C0; break; @@ -1505,18 +1505,18 @@ static void dinghy_slide_track_right_quarter_turn_3_covered(uint8 rideIndex, uin paint_util_set_general_support_height(height + 32, 0x20); } -static void dinghy_slide_track_left_quarter_turn_3_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_left_quarter_turn_3_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_3_covered(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void dinghy_slide_track_60_deg_down_to_25_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void dinghy_slide_track_60_deg_down_to_25_deg_down_covered(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { dinghy_slide_track_25_deg_up_to_60_deg_up_covered(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -TRACK_PAINT_FUNCTION get_track_paint_function_dinghy_slide(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_dinghy_slide(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/water/log_flume.c b/src/openrct2/ride/water/log_flume.c index e439dfeb1e..111841e355 100644 --- a/src/openrct2/ride/water/log_flume.c +++ b/src/openrct2/ride/water/log_flume.c @@ -168,7 +168,7 @@ static const uint32 LogFlumeTrackFlatImageIds[4][2] = { SPR_LOG_FLUME_FLAT_SE_NW, SPR_LOG_FLUME_FLAT_FRONT_SE_NW }, }; -static void paint_log_flume_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = LogFlumeTrackFlatImageIds[direction][0] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = LogFlumeTrackFlatImageIds[direction][1] | gTrackColours[SCHEME_TRACK]; @@ -185,7 +185,7 @@ static void paint_log_flume_track_flat(uint8 rideIndex, uint8 trackSequence, uin paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_log_flume_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = LogFlumeTrackFlatImageIds[direction][0] | gTrackColours[SCHEME_TRACK]; sub_98197C_rotated(direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height + 3); @@ -214,7 +214,7 @@ static void paint_log_flume_track_station(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_log_flume_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -243,7 +243,7 @@ static void paint_log_flume_track_25_deg_up(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 56, 0x20); } -static void paint_log_flume_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -272,7 +272,7 @@ static void paint_log_flume_track_flat_to_25_deg_up(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 48, 0x20); } -static void paint_log_flume_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -301,7 +301,7 @@ static void paint_log_flume_track_25_deg_up_to_flat(uint8 rideIndex, uint8 track paint_util_set_general_support_height(height + 40, 0x20); } -static void paint_log_flume_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -330,7 +330,7 @@ static void paint_log_flume_track_25_deg_down(uint8 rideIndex, uint8 trackSequen paint_util_set_general_support_height(height + 56, 0x20); } -static void paint_log_flume_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -359,7 +359,7 @@ static void paint_log_flume_track_flat_to_25_deg_down(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 40, 0x20); } -static void paint_log_flume_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -388,7 +388,7 @@ static void paint_log_flume_track_25_deg_down_to_flat(uint8 rideIndex, uint8 tra paint_util_set_general_support_height(height + 48, 0x20); } -static void paint_log_flume_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -460,7 +460,7 @@ static void paint_log_flume_track_s_bend_left(uint8 rideIndex, uint8 trackSequen paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_log_flume_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -532,7 +532,7 @@ static void paint_log_flume_track_s_bend_right(uint8 rideIndex, uint8 trackSeque paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_log_flume_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { @@ -579,7 +579,7 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(uint8 rideIndex, uin paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_log_flume_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][3] = { @@ -626,7 +626,7 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(uint8 rideIndex, ui paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_log_flume_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId = SPR_STATION_BASE_D | 0x20000000; sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); @@ -652,7 +652,7 @@ static void paint_log_flume_track_on_ride_photo(uint8 rideIndex, uint8 trackSequ paint_util_set_general_support_height(height + 48, 0x20); } -static void paint_log_flume_track_reverser(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_log_flume_track_reverser(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][2] = { @@ -675,7 +675,7 @@ static void paint_log_flume_track_reverser(uint8 rideIndex, uint8 trackSequence, paint_util_set_general_support_height(height + 32, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/water/river_rafts.c b/src/openrct2/ride/water/river_rafts.c index 462ea677f4..0ba2f36128 100644 --- a/src/openrct2/ride/water/river_rafts.c +++ b/src/openrct2/ride/water/river_rafts.c @@ -291,7 +291,7 @@ static const sprite_bb RiverRaftsRightQuarterTurn5_Side[4][5] = { }; /** rct2: 0x0089B170 */ -static void paint_river_rafts_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rafts_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -322,7 +322,7 @@ static void paint_river_rafts_track_flat(uint8 rideIndex, uint8 trackSequence, u } /** rct2: 0x0089B1A0 */ -static void paint_river_rafts_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rafts_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_ride *ride = get_ride(rideIndex); @@ -351,7 +351,7 @@ static void paint_river_rafts_station(uint8 rideIndex, uint8 trackSequence, uint } /** rct2: 0x0089B1D0 */ -static void paint_river_rafts_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rafts_track_left_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint_2(height, direction, get_current_rotation(), trackSequence, gTrackColours[SCHEME_TRACK], RiverRaftsLeftQuarterTurn5_Top); track_paint_util_right_quarter_turn_5_tiles_paint_2(height, direction, get_current_rotation(), trackSequence, gTrackColours[SCHEME_TRACK], RiverRaftsLeftQuarterTurn5_Side); @@ -394,7 +394,7 @@ static void paint_river_rafts_track_left_quarter_turn_5_tiles(uint8 rideIndex, u } /** rct2: 0x0089B1D0 */ -static void paint_river_rafts_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rafts_track_right_quarter_turn_5_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint_2(height, direction, get_current_rotation(), trackSequence, gTrackColours[SCHEME_TRACK], RiverRaftsRightQuarterTurn5_Top); track_paint_util_right_quarter_turn_5_tiles_paint_2(height, direction, get_current_rotation(), trackSequence, gTrackColours[SCHEME_TRACK], RiverRaftsRightQuarterTurn5_Side); @@ -437,7 +437,7 @@ static void paint_river_rafts_track_right_quarter_turn_5_tiles(uint8 rideIndex, } /** rct2: 0x0089B180 */ -static void paint_river_rafts_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rafts_track_s_bend_left(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -475,7 +475,7 @@ static void paint_river_rafts_track_s_bend_left(uint8 rideIndex, uint8 trackSequ sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); - static const int supportTypes1[] = { 5, 2, 3, 4 }; + static const sint32 supportTypes1[] = { 5, 2, 3, 4 }; wooden_a_supports_paint_setup(supportTypes1[direction], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -485,7 +485,7 @@ static void paint_river_rafts_track_s_bend_left(uint8 rideIndex, uint8 trackSequ sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); - static const int supportTypes2[] = { 3, 4, 5, 2 }; + static const sint32 supportTypes2[] = { 3, 4, 5, 2 }; wooden_a_supports_paint_setup(supportTypes2[direction], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -512,7 +512,7 @@ static void paint_river_rafts_track_s_bend_left(uint8 rideIndex, uint8 trackSequ } /** rct2: 0x0089B190 */ -static void paint_river_rafts_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rafts_track_s_bend_right(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { static const uint32 imageIds[4][4][2] = { @@ -550,7 +550,7 @@ static void paint_river_rafts_track_s_bend_right(uint8 rideIndex, uint8 trackSeq sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); - static const int supportTypes1[] = { 4, 5, 2, 3 }; + static const sint32 supportTypes1[] = { 4, 5, 2, 3 }; wooden_a_supports_paint_setup(supportTypes1[direction], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF, 0); @@ -560,7 +560,7 @@ static void paint_river_rafts_track_s_bend_right(uint8 rideIndex, uint8 trackSeq sub_98197C_rotated(direction, imageId, 0, 0, 32, 26, 2, height, 0, bboy, height); sub_98197C_rotated(direction, frontImageId, 0, 0, 32, 26, 0, height, 0, bboy, height + 27); - static const int supportTypes2[] = { 2, 3, 4, 5 }; + static const sint32 supportTypes2[] = { 2, 3, 4, 5 }; wooden_a_supports_paint_setup(supportTypes2[direction], 0, height, gTrackColours[SCHEME_SUPPORTS], NULL); paint_util_set_segment_support_height(paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0); @@ -589,7 +589,7 @@ static void paint_river_rafts_track_s_bend_right(uint8 rideIndex, uint8 trackSeq /** * rct2: 0x0089B0C0 */ -TRACK_PAINT_FUNCTION get_track_paint_function_river_rafts(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_river_rafts(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: return paint_river_rafts_track_flat; diff --git a/src/openrct2/ride/water/river_rapids.c b/src/openrct2/ride/water/river_rapids.c index 20c2842c68..cd43bec882 100644 --- a/src/openrct2/ride/water/river_rapids.c +++ b/src/openrct2/ride/water/river_rapids.c @@ -189,13 +189,13 @@ static const uint32 river_rapids_track_pieces_25_deg_down_to_flat[][2] = { * * rct2: 0x006D5889 */ -void vehicle_visual_river_rapids(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_river_rapids(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { - int image_id; - int baseImage_id = imageDirection; + sint32 image_id; + sint32 baseImage_id = imageDirection; uint32 rotation = get_current_rotation(); - int ecx = ((vehicle->var_BA / 8) + (rotation * 8)) & 31; - int j = 0; + sint32 ecx = ((vehicle->var_BA / 8) + (rotation * 8)) & 31; + sint32 j = 0; if (vehicle->vehicle_sprite_type == 0) { baseImage_id = ecx & 7; } else { @@ -228,7 +228,7 @@ void vehicle_visual_river_rapids(int x, int imageDirection, int y, int z, rct_ve if (unk_140E9A8->zoom_level < 2 && vehicle->num_peeps > 0) { // Draw peeps: (this particular vehicle doesn't sort them back to front like others so the back ones sometimes clip, but thats how the original does it...) - int peeps = ((ecx / 8) + 0) & 3; + sint32 peeps = ((ecx / 8) + 0) & 3; image_id = (baseImage_id + ((peeps + 1) * 72)) | (vehicle->peep_tshirt_colours[0] << 19) | (vehicle->peep_tshirt_colours[1] << 24) | 0xA0000000; sub_98199C(image_id, 0, 0, bb->length_x, bb->length_y, bb->length_z, z, bb->offset_x, bb->offset_y, bb->offset_z + z, rotation); if (vehicle->num_peeps > 2) { @@ -253,7 +253,7 @@ void vehicle_visual_river_rapids(int x, int imageDirection, int y, int z, rct_ve #endif /** rct2: 0x00757650 */ -static void paint_river_rapids_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -284,7 +284,7 @@ static void paint_river_rapids_track_flat(uint8 rideIndex, uint8 trackSequence, } /** rct2: 0x007576C0 */ -static void paint_river_rapids_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_ride *ride = get_ride(rideIndex); @@ -293,7 +293,7 @@ static void paint_river_rapids_station(uint8 rideIndex, uint8 trackSequence, uin paint_util_set_general_support_height(height + 32, 0x20); } -static void paint_river_rapids_track_25_deg(uint8 direction, int height, const uint32 sprites[4][2]) +static void paint_river_rapids_track_25_deg(uint8 direction, sint32 height, const uint32 sprites[4][2]) { uint32 imageId; paint_struct * ps; @@ -350,7 +350,7 @@ static void paint_river_rapids_track_25_deg(uint8 direction, int height, const u paint_util_set_general_support_height(height + 56, 0x20); } -static void paint_river_rapids_track_25_deg_to_flat_a(uint8 direction, int height, const uint32 sprites[4][2]) +static void paint_river_rapids_track_25_deg_to_flat_a(uint8 direction, sint32 height, const uint32 sprites[4][2]) { uint32 imageId; paint_struct * ps; @@ -407,7 +407,7 @@ static void paint_river_rapids_track_25_deg_to_flat_a(uint8 direction, int heigh paint_util_set_general_support_height(height + 40, 0x20); } -static void paint_river_rapids_track_25_deg_to_flat_b(uint8 direction, int height, const uint32 sprites[4][2]) +static void paint_river_rapids_track_25_deg_to_flat_b(uint8 direction, sint32 height, const uint32 sprites[4][2]) { uint32 imageId; paint_struct * ps; @@ -465,43 +465,43 @@ static void paint_river_rapids_track_25_deg_to_flat_b(uint8 direction, int heigh } /** rct2: 0x00757660 */ -static void paint_river_rapids_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_25_deg(direction, height, river_rapids_track_pieces_25_deg_up); } /** rct2: 0x00757670 */ -static void paint_river_rapids_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_b(direction, height, river_rapids_track_pieces_flat_to_25_deg_up); } /** rct2: 0x00757680 */ -static void paint_river_rapids_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_a(direction, height, river_rapids_track_pieces_25_deg_up_to_flat); } /** rct2: 0x00757690 */ -static void paint_river_rapids_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_25_deg((direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down); } /** rct2: 0x007576A0 */ -static void paint_river_rapids_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_a((direction + 2) % 4, height, river_rapids_track_pieces_flat_to_25_deg_down); } /** rct2: 0x007576B0 */ -static void paint_river_rapids_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_b((direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down_to_flat); } /** rct2: 0x007576F0 */ -static void paint_river_rapids_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; switch (direction) { @@ -554,7 +554,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(uint8 rideIndex, u } /** rct2: 0x00757700 */ -static void paint_river_rapids_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -608,7 +608,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(uint8 rideIndex, } /** rct2: 0x00757710 */ -static void paint_river_rapids_track_waterfall(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_waterfall(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -659,7 +659,7 @@ static void paint_river_rapids_track_waterfall(uint8 rideIndex, uint8 trackSeque } /** rct2: 0x00757720 */ -static void paint_river_rapids_track_rapids(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_rapids(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -692,7 +692,7 @@ static void paint_river_rapids_track_rapids(uint8 rideIndex, uint8 trackSequence } /** rct2: 0x00757740 */ -static void paint_river_rapids_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { paint_river_rapids_track_flat(rideIndex, trackSequence, direction, height, mapElement); track_paint_util_onride_photo_paint(direction, height + 13, mapElement); @@ -700,7 +700,7 @@ static void paint_river_rapids_track_on_ride_photo(uint8 rideIndex, uint8 trackS } /** rct2: 0x */ -static void paint_river_rapids_track_whirlpool(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void paint_river_rapids_track_whirlpool(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { uint32 imageId; @@ -741,7 +741,7 @@ static void paint_river_rapids_track_whirlpool(uint8 rideIndex, uint8 trackSeque /** * rct2: 0x0075745C **/ -TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/ride/water/splash_boats.c b/src/openrct2/ride/water/splash_boats.c index d496eeedce..06c4715c6a 100644 --- a/src/openrct2/ride/water/splash_boats.c +++ b/src/openrct2/ride/water/splash_boats.c @@ -230,7 +230,7 @@ uint32 SplashBoats25DegDownToFlatFrontImageId[4] = SPR_SPLASH_BOATS_FLAT_TO_25_DEG_UP_FRONT_NW_SE, }; -static void paint_splash_boats_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats25DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -249,7 +249,7 @@ static void paint_splash_boats_track_25_deg_up(uint8 rideIndex, uint8 trackSeque paint_util_set_general_support_height(height + 56, 0x20); } -static void paint_splash_boats_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats60DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats60DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -268,7 +268,7 @@ static void paint_splash_boats_track_60_deg_up(uint8 rideIndex, uint8 trackSeque paint_util_set_general_support_height(height + 104, 0x20); } -static void paint_splash_boats_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoatsFlatTo25DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoatsFlatTo25DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -287,7 +287,7 @@ static void paint_splash_boats_track_flat_to_25_deg_up(uint8 rideIndex, uint8 tr paint_util_set_general_support_height(height + 48, 0x20); } -static void paint_splash_boats_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats25DegUpToFlatImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpToFlatFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -306,7 +306,7 @@ static void paint_splash_boats_track_25_deg_up_to_flat(uint8 rideIndex, uint8 tr paint_util_set_general_support_height(height + 40, 0x20); } -static void paint_splash_boats_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats25DegUpTo60DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpTo60DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -325,7 +325,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uin paint_util_set_general_support_height(height + 72, 0x20); } -static void paint_splash_boats_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats60DegUpTo25DegUpImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats60DegUpTo25DegUpFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -344,7 +344,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uin paint_util_set_general_support_height(height + 72, 0x20); } -static void paint_splash_boats_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats25DegDownImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegDownFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -364,12 +364,12 @@ static void paint_splash_boats_track_25_deg_down(uint8 rideIndex, uint8 trackSeq paint_util_set_general_support_height(height + 56, 0x20); } -static void paint_splash_boats_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { paint_splash_boats_track_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void paint_splash_boats_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoatsFlatTo25DegDownImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoatsFlatTo25DegDownFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -389,17 +389,17 @@ static void paint_splash_boats_track_flat_to_25_deg_down(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 40, 0x20); } -static void paint_splash_boats_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { paint_splash_boats_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void paint_splash_boats_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { paint_splash_boats_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void paint_splash_boats_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) +static void paint_splash_boats_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element *mapElement) { uint32 imageId = SplashBoats25DegDownToFlatImageId[direction] | gTrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegDownToFlatFrontImageId[direction] | gTrackColours[SCHEME_TRACK]; @@ -419,7 +419,7 @@ static void paint_splash_boats_track_25_deg_down_to_flat(uint8 rideIndex, uint8 paint_util_set_general_support_height(height + 48, 0x20); } -TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_25_DEG_UP: @@ -469,7 +469,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(int trackType, int di * * rct2: 0x006D4295 */ -void vehicle_visual_splash_boats_or_water_coaster(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_splash_boats_or_water_coaster(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { if (vehicle->is_child) { vehicle = GET_VEHICLE(vehicle->prev_vehicle_on_ride); diff --git a/src/openrct2/ride/water/submarine_ride.c b/src/openrct2/ride/water/submarine_ride.c index 3de0ba1fb4..753a327e5d 100644 --- a/src/openrct2/ride/water/submarine_ride.c +++ b/src/openrct2/ride/water/submarine_ride.c @@ -27,10 +27,10 @@ * * rct2: 0x006D44D5 */ -void vehicle_visual_submarine(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) +void vehicle_visual_submarine(sint32 x, sint32 imageDirection, sint32 y, sint32 z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry) { - int baseImage_id = imageDirection; - int image_id; + sint32 baseImage_id = imageDirection; + sint32 image_id; if (vehicle->restraints_position >= 64) { if ((vehicleEntry->sprite_flags & 0x2000) && !(imageDirection & 3)) { baseImage_id /= 8; @@ -68,12 +68,12 @@ void vehicle_visual_submarine(int x, int imageDirection, int y, int z, rct_vehic } #endif -static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; rct_ride * ride = get_ride(rideIndex); const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - int heightLower = height - 16; + sint32 heightLower = height - 16; uint32 imageId; if (direction & 1) { @@ -94,10 +94,10 @@ static void submarine_ride_paint_track_station(uint8 rideIndex, uint8 trackSeque paint_util_set_general_support_height(height + 32, 0x20); } -static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { rct_xy16 position = {gPaintMapPosition.x, gPaintMapPosition.y}; - int heightLower = height - 16; + sint32 heightLower = height - 16; uint32 imageId; if (direction & 1) { @@ -118,7 +118,7 @@ static void submarine_ride_paint_track_flat(uint8 rideIndex, uint8 trackSequence paint_util_set_general_support_height(height + 16, 0x20); } -static void submarine_ride_paint_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void submarine_ride_paint_track_left_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint(3, height - 16, direction, trackSequence, gTrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles, get_current_rotation()); track_paint_util_left_quarter_turn_3_tiles_tunnel(height - 16, TUNNEL_0, direction, trackSequence); @@ -141,13 +141,13 @@ static void submarine_ride_paint_track_left_quarter_turn_3_tiles(uint8 rideIndex } static const uint8 submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0}; -static void submarine_ride_paint_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void submarine_ride_paint_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; submarine_ride_paint_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } -static void submarine_ride_paint_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void submarine_ride_paint_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(1, height - 16, 0, direction, gTrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile, get_current_rotation()); track_paint_util_left_quarter_turn_1_tile_tunnel(direction, height - 16, 0, TUNNEL_0, 0, TUNNEL_0); @@ -156,7 +156,7 @@ static void submarine_ride_paint_track_left_quarter_turn_1_tile(uint8 rideIndex, paint_util_set_general_support_height(height + 16, 0x20); } -static void submarine_ride_paint_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void submarine_ride_paint_track_right_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { submarine_ride_paint_track_left_quarter_turn_1_tile(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } @@ -164,7 +164,7 @@ static void submarine_ride_paint_track_right_quarter_turn_1_tile(uint8 rideIndex /** * rct2: 0x008995D4 */ -TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_submarine_ride(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_BEGIN_STATION: diff --git a/src/openrct2/ride/water/water_coaster.c b/src/openrct2/ride/water/water_coaster.c index 3bd608df0e..cbb49b50fc 100644 --- a/src/openrct2/ride/water/water_coaster.c +++ b/src/openrct2/ride/water/water_coaster.c @@ -19,203 +19,203 @@ #include "../track.h" #include "../track_paint.h" -static void water_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void water_rc_track_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void water_rc_track_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void water_rc_track_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { water_rc_track_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void water_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void water_rc_track_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { water_rc_track_25_deg_up_to_flat(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void water_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void water_rc_track_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { water_rc_track_flat_to_25_deg_up(rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } -static void water_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element* mapElement) +static void water_rc_track_diag_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_flat_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_25_deg_up_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up_to_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_flat_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_25_deg_down_to_flat(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down_to_flat(rideIndex, trackSequence, direction, height, mapElement, isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_station(rideIndex, trackSequence, direction, height, mapElement, RIDE_TYPE_WATER_COASTER); } -static void water_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { water_rc_track_60_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } -static void water_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { water_rc_track_60_deg_up_to_25_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } -static void water_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { water_rc_track_25_deg_up_to_60_deg_up(rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } // 5 tile turns -static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static const uint8 water_rc_left_quarter_turn_5_tiles_to_right_turn_map[] = {6, 4, 5, 3, 1, 2, 0}; -static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { water_rc_track_right_quarter_turn_5_tiles_25_deg_up(rideIndex, water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 1) % 4, height, mapElement);} -static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { water_rc_track_left_quarter_turn_5_tiles_25_deg_up(rideIndex, water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 3) % 4, height, mapElement); } // 3 tile turns -static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static const uint8 water_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = {3, 1, 2, 0}; -static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; water_rc_track_right_quarter_turn_3_tiles_25_deg_down(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; water_rc_track_right_quarter_turn_3_tiles_25_deg_up(rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } -static void water_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_diag_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_25_deg_up_to_60_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_60_deg_up_to_25_deg_up(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_diag_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_25_deg_down_to_60_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -static void water_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement) +static void water_rc_track_diag_60_deg_down_to_25_deg_down(uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement) { junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } -TRACK_PAINT_FUNCTION get_track_paint_function_water_rc(int trackType, int direction) +TRACK_PAINT_FUNCTION get_track_paint_function_water_rc(sint32 trackType, sint32 direction) { switch (trackType) { case TRACK_ELEM_FLAT: diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index b9b9fcd772..e2f832777d 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -36,7 +36,7 @@ extern "C" #include "scenario.h" } -static int ScenarioCategoryCompare(int categoryA, int categoryB) +static sint32 ScenarioCategoryCompare(sint32 categoryA, sint32 categoryB) { if (categoryA == categoryB) return 0; if (categoryA == SCENARIO_CATEGORY_DLC) return -1; @@ -46,7 +46,7 @@ static int ScenarioCategoryCompare(int categoryA, int categoryB) return Math::Sign(categoryA - categoryB); } -static int scenario_index_entry_CompareByCategory(const scenario_index_entry &entryA, +static sint32 scenario_index_entry_CompareByCategory(const scenario_index_entry &entryA, const scenario_index_entry &entryB) { // Order by category @@ -69,7 +69,7 @@ static int scenario_index_entry_CompareByCategory(const scenario_index_entry &en } } -static int scenario_index_entry_CompareByIndex(const scenario_index_entry &entryA, +static sint32 scenario_index_entry_CompareByIndex(const scenario_index_entry &entryA, const scenario_index_entry &entryB) { // Order by source game diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c index eef9ecb883..219b0e7a5e 100644 --- a/src/openrct2/scenario/scenario.c +++ b/src/openrct2/scenario/scenario.c @@ -66,7 +66,7 @@ char gScenarioDetails[256]; char gScenarioCompletedBy[32]; char gScenarioSavePath[MAX_PATH]; char gScenarioExpansionPacks[3256]; -int gFirstTimeSave = 1; +sint32 gFirstTimeSave = 1; uint16 gSavedAge; uint32 gLastAutoSaveUpdate = 0; @@ -85,7 +85,7 @@ uint16 gScenarioParkRatingWarningDays; money32 gScenarioCompletedCompanyValue; money32 gScenarioCompanyValueRecord; -static int scenario_create_ducks(); +static sint32 scenario_create_ducks(); static void scenario_objective_check(); /** @@ -125,7 +125,7 @@ bool scenario_load_basic(const char *path, rct_s6_header *header, rct_s6_info *i return false; } -int scenario_load_and_play_from_path(const char *path) +sint32 scenario_load_and_play_from_path(const char *path) { window_close_construction_windows(); @@ -382,7 +382,7 @@ static void scenario_entrance_fee_too_high_check() money16 max_fee = totalRideValue + (totalRideValue / 2); if ((gParkFlags & PARK_FLAGS_PARK_OPEN) && park_get_entrance_fee() > max_fee) { - for (int i = 0; gParkEntranceX[i] != SPRITE_LOCATION_NULL; i++) { + for (sint32 i = 0; gParkEntranceX[i] != SPRITE_LOCATION_NULL; i++) { x = gParkEntranceX[i] + 16; y = gParkEntranceY[i] + 16; } @@ -449,7 +449,7 @@ static void scenario_day_update() static void scenario_week_update() { - int month = gDateMonthsElapsed & 7; + sint32 month = gDateMonthsElapsed & 7; finance_pay_wages(); finance_pay_research(); @@ -463,7 +463,7 @@ static void scenario_week_update() if (month <= MONTH_APRIL && (intptr_t)water_type != -1 && water_type->var_0E & 1) { // 100 attempts at finding some water to create a few ducks at - for (int i = 0; i < 100; i++) { + for (sint32 i = 0; i < 100; i++) { if (scenario_create_ducks()) break; } @@ -547,9 +547,9 @@ void scenario_update() * * rct2: 0x006744A9 */ -static int scenario_create_ducks() +static sint32 scenario_create_ducks() { - int i, j, r, c, x, y, waterZ, centreWaterZ, x2, y2; + sint32 i, j, r, c, x, y, waterZ, centreWaterZ, x2, y2; r = scenario_rand(); x = ((r >> 16) & 0xFFFF) & 0x7F; @@ -604,7 +604,7 @@ static int scenario_create_ducks() * * @return eax */ -unsigned int scenario_rand() +uint32 scenario_rand() { #ifdef DEBUG_DESYNC if (!gInUpdateCode) { @@ -618,12 +618,12 @@ unsigned int scenario_rand() return gScenarioSrand1 = ror32(originalSrand0, 3); } -unsigned int scenario_rand_max(unsigned int max) +uint32 scenario_rand_max(uint32 max) { if (max < 2) return 0; if ((max & (max - 1)) == 0) return scenario_rand() & (max - 1); - unsigned int rand, cap = ~((unsigned int)0) - (~((unsigned int)0) % max) - 1; + uint32 rand, cap = ~((uint32)0) - (~((uint32)0) % max) - 1; do { rand = scenario_rand(); } while (rand > cap); @@ -636,7 +636,7 @@ unsigned int scenario_rand_max(unsigned int max) */ static void scenario_prepare_rides_for_save() { - int isFiveCoasterObjective = gScenarioObjectiveType == OBJECTIVE_FINISH_5_ROLLERCOASTERS; + sint32 isFiveCoasterObjective = gScenarioObjectiveType == OBJECTIVE_FINISH_5_ROLLERCOASTERS; // Set all existing track to be indestructible map_element_iterator it; @@ -651,7 +651,7 @@ static void scenario_prepare_rides_for_save() } while (map_element_iterator_next(&it)); // Set all existing rides to have indestructible track - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { if (isFiveCoasterObjective) @@ -665,7 +665,7 @@ static void scenario_prepare_rides_for_save() * * rct2: 0x006726C7 */ -int scenario_prepare_for_save() +sint32 scenario_prepare_for_save() { gS6Info.entry.flags = 255; @@ -701,10 +701,10 @@ int scenario_prepare_for_save() * * rct2: 0x006AA039 */ -static int scenario_write_available_objects(FILE *file) +static sint32 scenario_write_available_objects(FILE *file) { - const int totalEntries = OBJECT_ENTRY_COUNT; - const int bufferLength = totalEntries * sizeof(rct_object_entry); + const sint32 totalEntries = OBJECT_ENTRY_COUNT; + const sint32 bufferLength = totalEntries * sizeof(rct_object_entry); // Initialise buffers uint8 *buffer = malloc(bufferLength); @@ -721,7 +721,7 @@ static int scenario_write_available_objects(FILE *file) // Write entries rct_object_entry *dstEntry = (rct_object_entry*)buffer; - for (int i = 0; i < OBJECT_ENTRY_COUNT; i++) { + for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++) { void *entryData = get_loaded_object_chunk(i); if (entryData == (void*)-1) { memset(dstEntry, 0xFF, sizeof(rct_object_entry)); @@ -752,12 +752,12 @@ void scenario_fix_ghosts(rct_s6_data *s6) // Remove all ghost elements rct_map_element *destinationElement = s6->map_elements; - for (int y = 0; y < 256; y++) { - for (int x = 0; x < 256; x++) { + for (sint32 y = 0; y < 256; y++) { + for (sint32 x = 0; x < 256; x++) { rct_map_element *originalElement = map_get_first_element_at(x, y); do { if (originalElement->flags & MAP_ELEMENT_FLAG_GHOST) { - int bannerIndex = map_element_get_banner_index(originalElement); + sint32 bannerIndex = map_element_get_banner_index(originalElement); if (bannerIndex != -1) { rct_banner *banner = &s6->banners[bannerIndex]; if (banner->type != BANNER_NULL) { @@ -781,7 +781,7 @@ void scenario_remove_trackless_rides(rct_s6_data *s6) { bool rideHasTrack[MAX_RIDES]; ride_all_has_any_track_elements(rideHasTrack); - for (int i = 0; i < MAX_RIDES; i++) { + for (sint32 i = 0; i < MAX_RIDES; i++) { rct_ride *ride = &s6->rides[i]; if (rideHasTrack[i] || ride->type == RIDE_TYPE_NULL) { @@ -833,7 +833,7 @@ static void scenario_objective_check_park_value_by() **/ static void scenario_objective_check_10_rollercoasters() { - int i, rcs = 0; + sint32 i, rcs = 0; uint8 type_already_counted[256]; rct_ride* ride; @@ -914,7 +914,7 @@ static void scenario_objective_check_monthly_ride_income() */ static void scenario_objective_check_10_rollercoasters_length() { - int i, rcs = 0; + sint32 i, rcs = 0; uint8 type_already_counted[256]; sint16 objective_length = gScenarioObjectiveNumGuests; rct_ride* ride; @@ -949,9 +949,9 @@ static void scenario_objective_check_finish_5_rollercoasters() // ORIGINAL BUG?: // This does not check if the rides are even rollercoasters nevermind the right rollercoasters to be finished. // It also did not exclude null rides. - int i; + sint32 i; rct_ride* ride; - int rcs = 0; + sint32 rcs = 0; FOR_ALL_RIDES(i, ride) if (ride->status != RIDE_STATUS_CLOSED && ride->excitement >= objectiveRideExcitement) rcs++; diff --git a/src/openrct2/scenario/scenario.h b/src/openrct2/scenario/scenario.h index 5f85739be3..b876606e79 100644 --- a/src/openrct2/scenario/scenario.h +++ b/src/openrct2/scenario/scenario.h @@ -404,7 +404,7 @@ extern char gScenarioDetails[256]; extern char gScenarioCompletedBy[32]; extern char gScenarioSavePath[MAX_PATH]; extern char gScenarioExpansionPacks[3256]; -extern int gFirstTimeSave; +extern sint32 gFirstTimeSave; extern uint16 gSavedAge; extern uint32 gLastAutoSaveUpdate; @@ -412,14 +412,14 @@ extern const char *_scenarioFileName; bool scenario_load_basic(const char *path, rct_s6_header *header, rct_s6_info *info); bool scenario_load_rw(SDL_RWops * rw); -int scenario_load(const char *path); -int scenario_load_and_play_from_path(const char *path); +sint32 scenario_load(const char *path); +sint32 scenario_load_and_play_from_path(const char *path); void scenario_begin(); void scenario_update(); -unsigned int scenario_rand(); -unsigned int scenario_rand_max(unsigned int max); -int scenario_prepare_for_save(); -int scenario_save(SDL_RWops* rw, int flags); +uint32 scenario_rand(); +uint32 scenario_rand_max(uint32 max); +sint32 scenario_prepare_for_save(); +sint32 scenario_save(SDL_RWops* rw, sint32 flags); void scenario_remove_trackless_rides(rct_s6_data *s6); void scenario_fix_ghosts(rct_s6_data *s6); void scenario_set_filename(const char *value); diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 448dd61523..4c17012ae1 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -69,7 +69,7 @@ static void TitleInitialise() seqId = 0; } } - title_sequence_change_preset((int)seqId); + title_sequence_change_preset((sint32)seqId); TryLoadSequence(); } @@ -210,7 +210,7 @@ extern "C" game_handle_input(); } - void DrawOpenRCT2(rct_drawpixelinfo * dpi, int x, int y) + void DrawOpenRCT2(rct_drawpixelinfo * dpi, sint32 x, sint32 y) { utf8 buffer[256]; @@ -234,9 +234,9 @@ extern "C" return _sequencePlayer; } - void title_sequence_change_preset(int preset) + void title_sequence_change_preset(sint32 preset) { - int count = (int)title_sequence_manager_get_count(); + sint32 count = (sint32)title_sequence_manager_get_count(); if (preset < 0 || preset >= count) { return; } diff --git a/src/openrct2/title/TitleScreen.h b/src/openrct2/title/TitleScreen.h index e717b4b07d..6671bd2733 100644 --- a/src/openrct2/title/TitleScreen.h +++ b/src/openrct2/title/TitleScreen.h @@ -28,10 +28,10 @@ extern "C" void title_load(); void title_create_windows(); void title_update(); - void DrawOpenRCT2(rct_drawpixelinfo *dpi, int x, int y); + void DrawOpenRCT2(rct_drawpixelinfo *dpi, sint32 x, sint32 y); void * title_get_sequence_player(); - void title_sequence_change_preset(int preset); + void title_sequence_change_preset(sint32 preset); #ifdef __cplusplus } #endif diff --git a/src/openrct2/title/TitleSequence.cpp b/src/openrct2/title/TitleSequence.cpp index 919f9a2bff..68cccd8993 100644 --- a/src/openrct2/title/TitleSequence.cpp +++ b/src/openrct2/title/TitleSequence.cpp @@ -141,7 +141,7 @@ extern "C" { handle = Memory::Allocate(); handle->Data = zip->GetFileData(filename, &handle->DataSize); - handle->RWOps = SDL_RWFromMem(handle->Data, (int)handle->DataSize); + handle->RWOps = SDL_RWFromMem(handle->Data, (sint32)handle->DataSize); handle->IsScenario = String::Equals(Path::GetExtension(filename), ".sc6", true); delete zip; } @@ -394,7 +394,7 @@ static std::vector GetSaves(IZipArchive * zip) static std::vector LegacyScriptRead(utf8 * script, size_t scriptLength, std::vector saves) { std::vector commands; - SDL_RWops * file = SDL_RWFromMem(script, (int)scriptLength); + SDL_RWops * file = SDL_RWFromMem(script, (sint32)scriptLength); do { char parts[3 * 128], *token, *part1, *part2; LegacyScriptGetLine(file, parts); @@ -468,7 +468,7 @@ static std::vector LegacyScriptRead(utf8 * script, size_t scriptLe { commands.push_back(command); } - } while (SDL_RWtell(file) < (int)scriptLength); + } while (SDL_RWtell(file) < (sint32)scriptLength); SDL_RWclose(file); return commands; @@ -476,18 +476,18 @@ static std::vector LegacyScriptRead(utf8 * script, size_t scriptLe static void LegacyScriptGetLine(SDL_RWops * file, char * parts) { - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) { parts[i * 128] = 0; } - int part = 0; - int cindex = 0; - int whitespace = 1; - int comment = 0; - int load = 0; + sint32 part = 0; + sint32 cindex = 0; + sint32 whitespace = 1; + sint32 comment = 0; + sint32 load = 0; for (; part < 3;) { - int c = 0; + sint32 c = 0; if (SDL_RWread(file, &c, 1, 1) != 1) { c = EOF; diff --git a/src/openrct2/util/sawyercoding.c b/src/openrct2/util/sawyercoding.c index 7a6dc267e9..2c7e9cc5fa 100644 --- a/src/openrct2/util/sawyercoding.c +++ b/src/openrct2/util/sawyercoding.c @@ -44,7 +44,7 @@ uint32 sawyercoding_calculate_checksum(const uint8* buffer, size_t length) * * rct2: 0x00676FD2 */ -int sawyercoding_validate_checksum(SDL_RWops* rw) +sint32 sawyercoding_validate_checksum(SDL_RWops* rw) { size_t i, dataSize; uint32 checksum, fileChecksum; @@ -286,7 +286,7 @@ size_t sawyercoding_encode_td6(const uint8* src, uint8* dst, size_t length){ } /* Based off of rct2: 0x006770C1 */ -int sawyercoding_validate_track_checksum(const uint8* src, size_t length){ +sint32 sawyercoding_validate_track_checksum(const uint8* src, size_t length){ uint32 file_checksum = *((uint32*)&src[length - 4]); uint32 checksum = 0; @@ -387,7 +387,7 @@ static size_t decode_chunk_repeat(uint8 *buffer, size_t length) *dst++ = src[++i]; } else { count = (src[i] & 7) + 1; - copyOffset = dst + (int)(src[i] >> 3) - 32; + copyOffset = dst + (sint32)(src[i] >> 3) - 32; memcpy(dst, copyOffset, count); dst = (uint8*)((uintptr_t)dst + count); } @@ -534,7 +534,7 @@ static void encode_chunk_rotate(uint8 *buffer, size_t length) #pragma endregion -int sawyercoding_detect_file_type(const uint8 *src, size_t length) +sint32 sawyercoding_detect_file_type(const uint8 *src, size_t length) { size_t i; @@ -550,9 +550,9 @@ int sawyercoding_detect_file_type(const uint8 *src, size_t length) return sawyercoding_detect_rct1_version(checksum - actualChecksum); } -int sawyercoding_detect_rct1_version(int gameVersion) +sint32 sawyercoding_detect_rct1_version(sint32 gameVersion) { - int fileType = (gameVersion) > 0 ? FILE_TYPE_SV4 : FILE_TYPE_SC4; + sint32 fileType = (gameVersion) > 0 ? FILE_TYPE_SV4 : FILE_TYPE_SC4; gameVersion=abs(gameVersion); if (gameVersion >= 108000 && gameVersion < 110000) diff --git a/src/openrct2/util/sawyercoding.h b/src/openrct2/util/sawyercoding.h index 7551c07aac..f4acdf1479 100644 --- a/src/openrct2/util/sawyercoding.h +++ b/src/openrct2/util/sawyercoding.h @@ -49,7 +49,7 @@ enum { FILE_TYPE_SC4 = (2 << 2) }; -int sawyercoding_validate_checksum(SDL_RWops* rw); +sint32 sawyercoding_validate_checksum(SDL_RWops* rw); uint32 sawyercoding_calculate_checksum(const uint8* buffer, size_t length); bool sawyercoding_read_chunk_safe(SDL_RWops *rw, void *dst, size_t dstLength); bool sawyercoding_skip_chunk(SDL_RWops *rw); @@ -61,9 +61,9 @@ size_t sawyercoding_decode_sc4(const uint8 *src, uint8 *dst, size_t length, size size_t sawyercoding_encode_sv4(const uint8 *src, uint8 *dst, size_t length); size_t sawyercoding_decode_td6(const uint8 *src, uint8 *dst, size_t length); size_t sawyercoding_encode_td6(const uint8 *src, uint8 *dst, size_t length); -int sawyercoding_validate_track_checksum(const uint8* src, size_t length); +sint32 sawyercoding_validate_track_checksum(const uint8* src, size_t length); -int sawyercoding_detect_file_type(const uint8 *src, size_t length); -int sawyercoding_detect_rct1_version(int gameVersion); +sint32 sawyercoding_detect_file_type(const uint8 *src, size_t length); +sint32 sawyercoding_detect_rct1_version(sint32 gameVersion); #endif diff --git a/src/openrct2/util/util.c b/src/openrct2/util/util.c index 19422c3dfa..099698dd8e 100644 --- a/src/openrct2/util/util.c +++ b/src/openrct2/util/util.c @@ -24,28 +24,28 @@ #include "util.h" #include "zlib.h" -int squaredmetres_to_squaredfeet(int squaredMetres) +sint32 squaredmetres_to_squaredfeet(sint32 squaredMetres) { // 1 metre squared = 10.7639104 feet squared // RCT2 approximates as 11 return squaredMetres * 11; } -int metres_to_feet(int metres) +sint32 metres_to_feet(sint32 metres) { // 1 metre = 3.2808399 feet // RCT2 approximates as 3.28125 return (metres * 840) / 256; } -int mph_to_kmph(int mph) +sint32 mph_to_kmph(sint32 mph) { // 1 mph = 1.60934 kmph // RCT2 approximates as 1.609375 return (mph * 1648) >> 10; } -int mph_to_dmps(int mph) +sint32 mph_to_dmps(sint32 mph) { // 1 mph = 4.4704 decimeters/s return (mph * 73243) >> 14; @@ -53,7 +53,7 @@ int mph_to_dmps(int mph) bool filename_valid_characters(const utf8 *filename) { - for (int i = 0; filename[i] != '\0'; i++) { + for (sint32 i = 0; filename[i] != '\0'; i++) { if (filename[i] == '\\' || filename[i] == '/' || filename[i] == ':' || filename[i] == '?' || filename[i] == '*' || filename[i] == '<' || filename[i] == '>' || filename[i] == '|') return false; @@ -172,21 +172,21 @@ bool readentirefile(const utf8 *path, void **outBuffer, size_t *outLength) return 1; } -int bitscanforward(int source) +sint32 bitscanforward(sint32 source) { #if defined(_MSC_VER) && (_MSC_VER >= 1400) // Visual Studio 2005 - int i; - uint8 success = _BitScanForward((unsigned long *)&i, (unsigned long)source); + sint32 i; + uint8 success = _BitScanForward((uint32 *)&i, (uint32)source); return success != 0 ? i : -1; #elif defined(__GNUC__) - int success = __builtin_ffs(source); + sint32 success = __builtin_ffs(source); return success - 1; #else #pragma message "Falling back to iterative bitscan forward, consider using intrinsics" // This is a low-hanging optimisation boost, check if your compiler offers // any intrinsic. // cf. https://github.com/OpenRCT2/OpenRCT2/pull/2093 - for (int i = 0; i < 32; i++) + for (sint32 i = 0; i < 32; i++) if (source & (1u << i)) return i; @@ -208,11 +208,11 @@ static bool bitcount_popcnt_available() #if defined(OpenRCT2_POPCNT_GNUC) // we could use __builtin_cpu_supports, but it requires runtime support from // the compiler's library, which clang doesn't have yet. - unsigned int eax, ebx, ecx = 0, edx; // avoid "maybe uninitialized" + uint32 eax, ebx, ecx = 0, edx; // avoid "maybe uninitialized" __get_cpuid(1, &eax, &ebx, &ecx, &edx); return (ecx & (1 << 23)); #elif defined(OpenRCT2_POPCNT_MSVC) - int regs[4]; + sint32 regs[4]; __cpuid(regs, 1); return (regs[2] & (1 << 23)); #else @@ -220,12 +220,12 @@ static bool bitcount_popcnt_available() #endif } -static int bitcount_popcnt(uint32 source) +static sint32 bitcount_popcnt(uint32 source) { #if defined(OpenRCT2_POPCNT_GNUC) // use asm directly in order to actually emit the instruction : using // __builtin_popcount results in an extra call to a library function. - int rv; + sint32 rv; asm volatile ("popcnt %1,%0" : "=r"(rv) : "rm"(source) : "cc"); return rv; #elif defined(OpenRCT2_POPCNT_MSVC) @@ -236,10 +236,10 @@ static int bitcount_popcnt(uint32 source) #endif } -static int bitcount_lut(uint32 source) +static sint32 bitcount_lut(uint32 source) { // https://graphics.stanford.edu/~seander/bithacks.html - static const unsigned char BitsSetTable256[256] = + static const uint8 BitsSetTable256[256] = { #define B2(n) n, n+1, n+1, n+2 #define B4(n) B2(n), B2(n+1), B2(n+1), B2(n+2) @@ -252,19 +252,19 @@ static int bitcount_lut(uint32 source) BitsSetTable256[source >> 24]; } -static int(*bitcount_fn)(uint32); +static sint32(*bitcount_fn)(uint32); void bitcount_init() { bitcount_fn = bitcount_popcnt_available() ? bitcount_popcnt : bitcount_lut; } -int bitcount(uint32 source) +sint32 bitcount(uint32 source) { return bitcount_fn(source); } -bool strequals(const char *a, const char *b, int length, bool caseInsensitive) +bool strequals(const char *a, const char *b, sint32 length, bool caseInsensitive) { return caseInsensitive ? _strnicmp(a, b, length) == 0 : @@ -272,10 +272,10 @@ bool strequals(const char *a, const char *b, int length, bool caseInsensitive) } /* case insensitive compare */ -int strcicmp(char const *a, char const *b) +sint32 strcicmp(char const *a, char const *b) { for (;; a++, b++) { - int d = tolower(*a) - tolower(*b); + sint32 d = tolower(*a) - tolower(*b); if (d != 0 || !*a) return d; } @@ -288,14 +288,14 @@ int strcicmp(char const *a, char const *b) // - Guest 100 // - John v2.0 // - John v2.1 -int strlogicalcmp(char const *a, char const *b) { +sint32 strlogicalcmp(char const *a, char const *b) { for (;; a++, b++) { - int result = tolower(*a) - tolower(*b); + sint32 result = tolower(*a) - tolower(*b); bool both_numeric = *a >= '0' && *a <= '9' && *b >= '0' && *b <= '9'; if (result != 0 || !*a || both_numeric) { // difference found || end of string if (both_numeric) { // a and b both start with a number // Get the numbers in the string at current positions - int na = 0 , nb = 0; + sint32 na = 0 , nb = 0; for (; *a >= '0' && *a <= '9'; a++) { na *= 10; na += *a - '0'; } for (; *b >= '0' && *b <= '9'; b++) { nb *= 10; nb += *b - '0'; } // In case the numbers are the same @@ -425,7 +425,7 @@ bool str_is_null_or_empty(const char *str) uint32 srand0, srand1, srand2, srand3; -void util_srand(int source) { +void util_srand(sint32 source) { srand0 = source; srand1 = srand0 ^ (source >> 24); srand2 = srand1 ^ (source >> 16); @@ -452,9 +452,9 @@ uint32 util_rand() { * @return Returns a pointer to memory holding decompressed data or NULL on failure. * @note It is caller's responsibility to free() the returned pointer once done with it. */ -unsigned char *util_zlib_inflate(unsigned char *data, size_t data_in_size, size_t *data_out_size) +uint8 *util_zlib_inflate(uint8 *data, size_t data_in_size, size_t *data_out_size) { - int ret = Z_OK; + sint32 ret = Z_OK; uLongf out_size = (uLong)*data_out_size; if (out_size == 0) { @@ -464,7 +464,7 @@ unsigned char *util_zlib_inflate(unsigned char *data, size_t data_in_size, size_ out_size = min(MAX_ZLIB_REALLOC, out_size); } uLongf buffer_size = out_size; - unsigned char *buffer = malloc(buffer_size); + uint8 *buffer = malloc(buffer_size); do { if (ret == Z_BUF_ERROR) { @@ -495,12 +495,12 @@ unsigned char *util_zlib_inflate(unsigned char *data, size_t data_in_size, size_ * @return Returns a pointer to memory holding compressed data or NULL on failure. * @note It is caller's responsibility to free() the returned pointer once done with it. */ -unsigned char *util_zlib_deflate(unsigned char *data, size_t data_in_size, size_t *data_out_size) +uint8 *util_zlib_deflate(uint8 *data, size_t data_in_size, size_t *data_out_size) { - int ret = Z_OK; + sint32 ret = Z_OK; uLongf out_size = (uLongf)*data_out_size; uLong buffer_size = compressBound((uLong)data_in_size); - unsigned char *buffer = malloc(buffer_size); + uint8 *buffer = malloc(buffer_size); do { if (ret == Z_BUF_ERROR) { diff --git a/src/openrct2/util/util.h b/src/openrct2/util/util.h index 39ede842b1..f33b483d7b 100644 --- a/src/openrct2/util/util.h +++ b/src/openrct2/util/util.h @@ -19,10 +19,10 @@ #include "../common.h" -int squaredmetres_to_squaredfeet(int squaredMetres); -int metres_to_feet(int metres); -int mph_to_kmph(int mph); -int mph_to_dmps(int mph); +sint32 squaredmetres_to_squaredfeet(sint32 squaredMetres); +sint32 metres_to_feet(sint32 metres); +sint32 mph_to_kmph(sint32 mph); +sint32 mph_to_dmps(sint32 mph); bool filename_valid_characters(const utf8 *filename); @@ -35,12 +35,12 @@ void path_remove_extension(utf8 *path); void path_end_with_separator(utf8 *path, size_t size); bool readentirefile(const utf8 *path, void **outBuffer, size_t *outLength); -int bitscanforward(int source); +sint32 bitscanforward(sint32 source); void bitcount_init(); -int bitcount(uint32 source); -bool strequals(const char *a, const char *b, int length, bool caseInsensitive); -int strcicmp(char const *a, char const *b); -int strlogicalcmp(char const *a, char const *b); +sint32 bitcount(uint32 source); +bool strequals(const char *a, const char *b, sint32 length, bool caseInsensitive); +sint32 strcicmp(char const *a, char const *b); +sint32 strlogicalcmp(char const *a, char const *b); utf8 * safe_strtrunc(utf8 * text, size_t size); char *safe_strcpy(char * destination, const char * source, size_t num); char *safe_strcat(char *destination, const char *source, size_t size); @@ -50,10 +50,10 @@ char *safe_strtrimleft(char *destination, const char *source, size_t size); bool utf8_is_bom(const char *str); bool str_is_null_or_empty(const char *str); -void util_srand(int source); +void util_srand(sint32 source); uint32 util_rand(); -unsigned char *util_zlib_deflate(unsigned char *data, size_t data_in_size, size_t *data_out_size); -unsigned char *util_zlib_inflate(unsigned char *data, size_t data_in_size, size_t *data_out_size); +uint8 *util_zlib_deflate(uint8 *data, size_t data_in_size, size_t *data_out_size); +uint8 *util_zlib_inflate(uint8 *data, size_t data_in_size, size_t *data_out_size); #endif diff --git a/src/openrct2/windows/about.c b/src/openrct2/windows/about.c index 7fe89a4520..74c3093a68 100644 --- a/src/openrct2/windows/about.c +++ b/src/openrct2/windows/about.c @@ -37,7 +37,7 @@ rct_widget window_about_widgets[] = { { WIDGETS_END }, }; -static void window_about_mouseup(rct_window *w, int widgetIndex); +static void window_about_mouseup(rct_window *w, sint32 widgetIndex); static void window_about_paint(rct_window *w, rct_drawpixelinfo *dpi); static rct_window_event_list window_about_events = { @@ -104,7 +104,7 @@ void window_about_open() * * rct2: 0x0066D4D5 */ -static void window_about_mouseup(rct_window *w, int widgetIndex) +static void window_about_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -125,7 +125,7 @@ static void window_about_mouseup(rct_window *w, int widgetIndex) */ static void window_about_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); diff --git a/src/openrct2/windows/banner.c b/src/openrct2/windows/banner.c index 038dd118c5..d70c07a256 100644 --- a/src/openrct2/windows/banner.c +++ b/src/openrct2/windows/banner.c @@ -76,10 +76,10 @@ rct_widget window_banner_widgets[] = { { WIDGETS_END }, }; -static void window_banner_mouseup(rct_window *w, int widgetIndex); -static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_banner_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void window_banner_textinput(rct_window *w, int widgetIndex, char *text); +static void window_banner_mouseup(rct_window *w, sint32 widgetIndex); +static void window_banner_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_banner_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void window_banner_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_banner_unknown_14(rct_window *w); static void window_banner_invalidate(rct_window *w); static void window_banner_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -144,8 +144,8 @@ void window_banner_open(rct_windownumber number) w->number = number; window_init_scroll_widgets(w); - int view_x = gBanners[w->number].x << 5; - int view_y = gBanners[w->number].y << 5; + sint32 view_x = gBanners[w->number].x << 5; + sint32 view_y = gBanners[w->number].y << 5; rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32); while(1) { @@ -159,7 +159,7 @@ void window_banner_open(rct_windownumber number) map_element++; } - int view_z = map_element->base_height<<3; + sint32 view_z = map_element->base_height<<3; w->frame_no = view_z; view_x += 16; @@ -189,11 +189,11 @@ void window_banner_open(rct_windownumber number) * * rct2: 0x6ba4d6 */ -static void window_banner_mouseup(rct_window *w, int widgetIndex) +static void window_banner_mouseup(rct_window *w, sint32 widgetIndex) { rct_banner* banner = &gBanners[w->number]; - int x = banner->x << 5; - int y = banner->y << 5; + sint32 x = banner->x << 5; + sint32 y = banner->y << 5; rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); @@ -224,7 +224,7 @@ static void window_banner_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x6ba4ff */ -static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_banner_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { rct_banner* banner = &gBanners[w->number]; @@ -234,7 +234,7 @@ static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* w break; case WIDX_TEXT_COLOUR_DROPDOWN_BUTTON: - for( int i = 0; i < 13; ++i){ + for( sint32 i = 0; i < 13; ++i){ gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = BannerColouredTextFormats[i + 1]; } @@ -260,7 +260,7 @@ static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* w * * rct2: 0x6ba517 */ -static void window_banner_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_banner_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { rct_banner* banner = &gBanners[w->number]; @@ -284,12 +284,12 @@ static void window_banner_dropdown(rct_window *w, int widgetIndex, int dropdownI * * rct2: 0x6ba50c */ -static void window_banner_textinput(rct_window *w, int widgetIndex, char *text) +static void window_banner_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex == WIDX_BANNER_TEXT && text != NULL) { - game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 0)), GAME_COMMAND_SET_BANNER_NAME, *((int*)(text + 8)), *((int*)(text + 4))); - game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 12)), GAME_COMMAND_SET_BANNER_NAME, *((int*)(text + 20)), *((int*)(text + 16))); - game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 24)), GAME_COMMAND_SET_BANNER_NAME, *((int*)(text + 32)), *((int*)(text + 28))); + game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_SET_BANNER_NAME, *((sint32*)(text + 8)), *((sint32*)(text + 4))); + game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 12)), GAME_COMMAND_SET_BANNER_NAME, *((sint32*)(text + 20)), *((sint32*)(text + 16))); + game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 24)), GAME_COMMAND_SET_BANNER_NAME, *((sint32*)(text + 32)), *((sint32*)(text + 28))); } } @@ -355,9 +355,9 @@ static void window_banner_unknown_14(rct_window *w) rct_banner* banner = &gBanners[w->number]; - int view_x = (banner->x << 5) + 16; - int view_y = (banner->y << 5) + 16; - int view_z = w->frame_no; + sint32 view_x = (banner->x << 5) + 16; + sint32 view_y = (banner->y << 5) + 16; + sint32 view_z = w->frame_no; // Create viewport rct_widget* viewportWidget = &window_banner_widgets[WIDX_VIEWPORT]; diff --git a/src/openrct2/windows/changelog.c b/src/openrct2/windows/changelog.c index 41a68abc14..aa7d10223f 100644 --- a/src/openrct2/windows/changelog.c +++ b/src/openrct2/windows/changelog.c @@ -50,12 +50,12 @@ rct_widget window_changelog_widgets[] = { }; static void window_changelog_close(rct_window *w); -static void window_changelog_mouseup(rct_window *w, int widgetIndex); +static void window_changelog_mouseup(rct_window *w, sint32 widgetIndex); static void window_changelog_resize(rct_window *w); -static void window_changelog_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); +static void window_changelog_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); static void window_changelog_invalidate(rct_window *w); static void window_changelog_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_changelog_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_changelog_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_changelog_events = { window_changelog_close, @@ -94,8 +94,8 @@ static void window_changelog_dispose_file(); static char *_changelogText = NULL; static size_t _changelogTextSize = 0; static char **_changelogLines = NULL; -static int _changelogNumLines = 0; -static int _changelogLongestLineWidth = 0; +static sint32 _changelogNumLines = 0; +static sint32 _changelogLongestLineWidth = 0; rct_window *window_changelog_open() { @@ -108,8 +108,8 @@ rct_window *window_changelog_open() if (!window_changelog_read_file()) return NULL; - int screenWidth = gScreenWidth; - int screenHeight = gScreenHeight; + sint32 screenWidth = gScreenWidth; + sint32 screenHeight = gScreenHeight; window = window_create_centred( screenWidth * 4 / 5, @@ -134,7 +134,7 @@ static void window_changelog_close(rct_window *w) window_changelog_dispose_file(); } -static void window_changelog_mouseup(rct_window *w, int widgetIndex) +static void window_changelog_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -145,8 +145,8 @@ static void window_changelog_mouseup(rct_window *w, int widgetIndex) static void window_changelog_resize(rct_window *w) { - int screenWidth = gScreenWidth; - int screenHeight = gScreenHeight; + sint32 screenWidth = gScreenWidth; + sint32 screenHeight = gScreenHeight; w->max_width = (screenWidth * 4) / 5; w->max_height = (screenHeight * 4) / 5; @@ -163,7 +163,7 @@ static void window_changelog_resize(rct_window *w) } } -static void window_changelog_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_changelog_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *width = _changelogLongestLineWidth + 4; *height = _changelogNumLines * 11; @@ -189,14 +189,14 @@ static void window_changelog_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); } -static void window_changelog_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_changelog_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { gCurrentFontFlags = 0; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - int x = 3; - int y = 3; - for (int i = 0; i < _changelogNumLines; i++) { + sint32 x = 3; + sint32 y = 3; + for (sint32 i = 0; i < _changelogNumLines; i++) { gfx_draw_string(dpi, _changelogLines[i], w->colours[0], x, y); y += 11; } @@ -224,14 +224,14 @@ static bool window_changelog_read_file() if (_changelogTextSize >= 3 && utf8_is_bom(_changelogText)) start += 3; - int changelogLinesCapacity = 8; + sint32 changelogLinesCapacity = 8; _changelogLines = malloc(changelogLinesCapacity * sizeof(char*)); _changelogLines[0] = start; _changelogNumLines = 1; char *ch = start; while (*ch != 0) { - unsigned char c = *ch; + uint8 c = *ch; if (c == '\n') { *ch++ = 0; _changelogNumLines++; @@ -262,8 +262,8 @@ static bool window_changelog_read_file() gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; _changelogLongestLineWidth = 0; - for (int i = 0; i < _changelogNumLines; i++) { - int width = gfx_get_string_width(_changelogLines[i]); + for (sint32 i = 0; i < _changelogNumLines; i++) { + sint32 width = gfx_get_string_width(_changelogLines[i]); _changelogLongestLineWidth = max(width, _changelogLongestLineWidth); } return true; diff --git a/src/openrct2/windows/cheats.c b/src/openrct2/windows/cheats.c index b0e3476057..31a912bf7a 100644 --- a/src/openrct2/windows/cheats.c +++ b/src/openrct2/windows/cheats.c @@ -287,18 +287,18 @@ static rct_widget *window_cheats_page_widgets[] = { window_cheats_rides_widgets, }; -static void window_cheats_money_mouseup(rct_window *w, int widgetIndex); -static void window_cheats_money_mousedown(int widgetIndex, rct_window *w, rct_widget* widget); -static void window_cheats_misc_mousedown(int widgetIndex, rct_window *w, rct_widget* widget); -static void window_cheats_misc_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void window_cheats_guests_mouseup(rct_window *w, int widgetIndex); -static void window_cheats_misc_mouseup(rct_window *w, int widgetIndex); -static void window_cheats_rides_mouseup(rct_window *w, int widgetIndex); +static void window_cheats_money_mouseup(rct_window *w, sint32 widgetIndex); +static void window_cheats_money_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget); +static void window_cheats_misc_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget); +static void window_cheats_misc_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void window_cheats_guests_mouseup(rct_window *w, sint32 widgetIndex); +static void window_cheats_misc_mouseup(rct_window *w, sint32 widgetIndex); +static void window_cheats_rides_mouseup(rct_window *w, sint32 widgetIndex); static void window_cheats_update(rct_window *w); static void window_cheats_invalidate(rct_window *w); static void window_cheats_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_cheats_set_page(rct_window *w, int page); -static void window_cheats_text_input(rct_window *w, int widgetIndex, char *text); +static void window_cheats_set_page(rct_window *w, sint32 page); +static void window_cheats_text_input(rct_window *w, sint32 widgetIndex, char *text); static rct_window_event_list window_cheats_money_events = { NULL, @@ -491,7 +491,7 @@ void window_cheats_open() park_rating_spinner_value = get_forced_park_rating() >= 0 ? get_forced_park_rating() : 999; } -static void window_cheats_money_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_cheats_money_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { switch (widgetIndex) { case WIDX_MONEY_SPINNER_INCREMENT: @@ -550,7 +550,7 @@ static void window_cheats_misc_mousedown(int widgetIndex, rct_window *w, rct_wid } } -static void window_cheats_misc_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_cheats_misc_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_WEATHER_DROPDOWN_BUTTON || dropdownIndex == -1) return; @@ -558,7 +558,7 @@ static void window_cheats_misc_dropdown(rct_window *w, int widgetIndex, int drop game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_FORCEWEATHER, dropdownIndex, GAME_COMMAND_CHEAT, 0, 0); } -static void window_cheats_money_mouseup(rct_window *w, int widgetIndex) +static void window_cheats_money_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -586,7 +586,7 @@ static void window_cheats_money_mouseup(rct_window *w, int widgetIndex) } } -static void window_cheats_guests_mouseup(rct_window *w, int widgetIndex) +static void window_cheats_guests_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -679,7 +679,7 @@ static void window_cheats_guests_mouseup(rct_window *w, int widgetIndex) } } -static void window_cheats_misc_mouseup(rct_window *w, int widgetIndex) +static void window_cheats_misc_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -754,7 +754,7 @@ static void window_cheats_misc_mouseup(rct_window *w, int widgetIndex) } } -static void window_cheats_rides_mouseup(rct_window *w, int widgetIndex) +static void window_cheats_rides_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -844,7 +844,7 @@ static void window_cheats_update(rct_window *w) static void window_cheats_invalidate(rct_window *w) { - int i; + sint32 i; colour_scheme_update(w); @@ -879,7 +879,7 @@ static void window_cheats_invalidate(rct_window *w) } }break; case WINDOW_CHEATS_PAGE_GUESTS: - set_format_arg(0, int, 10000); + set_format_arg(0, sint32, 10000); widget_set_checkbox_value(w, WIDX_GUEST_IGNORE_RIDE_INTENSITY, gCheatsIgnoreRideIntensity); widget_set_checkbox_value(w, WIDX_DISABLE_VANDALISM, gCheatsDisableVandalism); widget_set_checkbox_value(w, WIDX_DISABLE_LITTERING, gCheatsDisableLittering); @@ -943,7 +943,7 @@ static void window_cheats_paint(rct_window *w, rct_drawpixelinfo *dpi) static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) { - int sprite_idx; + sint32 sprite_idx; // Money tab if (!(w->disabled_widgets & (1 << WIDX_TAB_1))) { @@ -976,7 +976,7 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) } } -static void window_cheats_set_page(rct_window *w, int page) +static void window_cheats_set_page(rct_window *w, sint32 page) { w->page = page; w->frame_no = 0; @@ -988,7 +988,7 @@ static void window_cheats_set_page(rct_window *w, int page) w->event_handlers = window_cheats_page_events[page]; w->widgets = window_cheats_page_widgets[page]; - int maxY = 0; + sint32 maxY = 0; rct_widget *widget = &w->widgets[8]; while (widget->type != WWT_LAST) { maxY = max(maxY, widget->bottom); diff --git a/src/openrct2/windows/clear_scenery.c b/src/openrct2/windows/clear_scenery.c index f7453743e9..27c7923aea 100644 --- a/src/openrct2/windows/clear_scenery.c +++ b/src/openrct2/windows/clear_scenery.c @@ -52,14 +52,14 @@ rct_widget window_clear_scenery_widgets[] = { { WIDGETS_END }, }; -static int window_clear_scenery_should_close(); +static sint32 window_clear_scenery_should_close(); static void window_clear_scenery_close(rct_window *w); -static void window_clear_scenery_mouseup(rct_window *w, int widgetIndex); +static void window_clear_scenery_mouseup(rct_window *w, sint32 widgetIndex); static void window_clear_scenery_update(rct_window *w); static void window_clear_scenery_invalidate(rct_window *w); static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_clear_scenery_textinput(rct_window *w, int widgetIndex, char *text); +static void window_clear_scenery_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_clear_scenery_inputsize(rct_window *w); static rct_window_event_list window_clear_scenery_events = { @@ -134,7 +134,7 @@ static void window_clear_scenery_close(rct_window *w) * * rct2: 0x0068E185 */ -static void window_clear_scenery_mouseup(rct_window *w, int widgetIndex) +static void window_clear_scenery_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -172,9 +172,9 @@ static void window_clear_scenery_mouseup(rct_window *w, int widgetIndex) } } -static void window_clear_scenery_textinput(rct_window *w, int widgetIndex, char *text) +static void window_clear_scenery_textinput(rct_window *w, sint32 widgetIndex, char *text) { - int size; + sint32 size; char* end; if (widgetIndex != WIDX_PREVIEW || text == NULL) @@ -232,7 +232,7 @@ static void window_clear_scenery_invalidate(rct_window *w) */ static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); @@ -257,7 +257,7 @@ static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x0066D125 */ -static int window_clear_scenery_should_close() +static sint32 window_clear_scenery_should_close() { if (!(gInputFlags & INPUT_FLAG_TOOL_ACTIVE)) return 1; diff --git a/src/openrct2/windows/custom_currency.c b/src/openrct2/windows/custom_currency.c index 5f1ee92e0d..3a2b7251ef 100644 --- a/src/openrct2/windows/custom_currency.c +++ b/src/openrct2/windows/custom_currency.c @@ -51,10 +51,10 @@ rct_widget window_custom_currency_widgets[] = { }; -static void custom_currency_window_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void custom_currency_window_mouseup(rct_window *w, int widgetIndex); -static void custom_currency_window_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void custom_currency_window_text_input(struct rct_window *w, int widgetIndex, char *text); +static void custom_currency_window_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void custom_currency_window_mouseup(rct_window *w, sint32 widgetIndex); +static void custom_currency_window_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void custom_currency_window_text_input(struct rct_window *w, sint32 widgetIndex, char *text); static void custom_currency_window_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -125,7 +125,7 @@ void custom_currency_window_open() -static void custom_currency_window_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void custom_currency_window_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { widget = &w->widgets[widgetIndex - 1]; @@ -190,7 +190,7 @@ static void custom_currency_window_mousedown(int widgetIndex, rct_window *w, rct } } -static void custom_currency_window_mouseup(rct_window *w, int widgetIndex) +static void custom_currency_window_mouseup(rct_window *w, sint32 widgetIndex) { switch(widgetIndex) { case WIDX_RATE: @@ -207,7 +207,7 @@ static void custom_currency_window_mouseup(rct_window *w, int widgetIndex) } } -static void custom_currency_window_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void custom_currency_window_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if(dropdownIndex == -1) return; @@ -231,11 +231,11 @@ static void custom_currency_window_dropdown(rct_window *w, int widgetIndex, int } } -static void custom_currency_window_text_input(struct rct_window *w, int widgetIndex, char *text) +static void custom_currency_window_text_input(struct rct_window *w, sint32 widgetIndex, char *text) { if (text == NULL) return; - int rate; + sint32 rate; char* end; switch(widgetIndex){ case WIDX_SYMBOL_TEXT: @@ -270,7 +270,7 @@ static void custom_currency_window_text_input(struct rct_window *w, int widgetIn static void custom_currency_window_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; set_format_arg(0, sint32, 100); diff --git a/src/openrct2/windows/debug_paint.c b/src/openrct2/windows/debug_paint.c index 007c893371..122d3e8415 100644 --- a/src/openrct2/windows/debug_paint.c +++ b/src/openrct2/windows/debug_paint.c @@ -45,7 +45,7 @@ static rct_widget window_debug_paint_widgets[] = { { WIDGETS_END }, }; -static void window_debug_paint_mouseup(rct_window * w, int widgetIndex); +static void window_debug_paint_mouseup(rct_window * w, sint32 widgetIndex); static void window_debug_paint_invalidate(rct_window * w); static void window_debug_paint_paint(rct_window * w, rct_drawpixelinfo * dpi); @@ -107,7 +107,7 @@ void window_debug_paint_open() window->colours[1] = COLOUR_GREY; } -static void window_debug_paint_mouseup(rct_window * w, int widgetIndex) +static void window_debug_paint_mouseup(rct_window * w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_TOGGLE_OLD_DRAWING: diff --git a/src/openrct2/windows/demolish_ride_prompt.c b/src/openrct2/windows/demolish_ride_prompt.c index 808c517585..b7dfffd649 100644 --- a/src/openrct2/windows/demolish_ride_prompt.c +++ b/src/openrct2/windows/demolish_ride_prompt.c @@ -45,7 +45,7 @@ static rct_widget window_ride_demolish_widgets[] = { { WIDGETS_END } }; -static void window_ride_demolish_mouseup(rct_window *w, int widgetIndex); +static void window_ride_demolish_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_demolish_invalidate(rct_window *w); static void window_ride_demolish_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -82,7 +82,7 @@ static rct_window_event_list window_ride_demolish_events = { }; /** Based off of rct2: 0x006B486A */ -void window_ride_demolish_prompt_open(int rideIndex) +void window_ride_demolish_prompt_open(sint32 rideIndex) { rct_window *w; @@ -102,7 +102,7 @@ void window_ride_demolish_prompt_open(int rideIndex) * * rct2: 0x006B4933 */ -static void window_ride_demolish_mouseup(rct_window *w, int widgetIndex) +static void window_ride_demolish_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_DEMOLISH: @@ -134,8 +134,8 @@ static void window_ride_demolish_paint(rct_window *w, rct_drawpixelinfo *dpi) set_format_arg(0, rct_string_id, ride->name); set_format_arg(2, uint32, ride->name_arguments); - int x = w->x + WW / 2; - int y = w->y + (WH / 2) - 3; + sint32 x = w->x + WW / 2; + sint32 y = w->y + (WH / 2) - 3; gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, WW - 4, STR_DEMOLISH_RIDE_ID, COLOUR_BLACK); } diff --git a/src/openrct2/windows/dropdown.c b/src/openrct2/windows/dropdown.c index f7eca90b2d..509a289fa3 100644 --- a/src/openrct2/windows/dropdown.c +++ b/src/openrct2/windows/dropdown.c @@ -23,7 +23,7 @@ #include "../sprites.h" #include "dropdown.h" -int gAppropriateImageDropdownItemsPerRow[] = { +sint32 gAppropriateImageDropdownItemsPerRow[] = { 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 5, 4, 4, 5, 5, 5, 4, 5, 6, 5, 5, 7, 4, 5, 6, 5, 6, @@ -39,32 +39,32 @@ static rct_widget window_dropdown_widgets[] = { { WIDGETS_END }, }; -int _dropdown_num_columns; -int _dropdown_num_rows; -int _dropdown_item_width; -int _dropdown_item_height; +sint32 _dropdown_num_columns; +sint32 _dropdown_num_rows; +sint32 _dropdown_item_width; +sint32 _dropdown_item_height; -int gDropdownNumItems; +sint32 gDropdownNumItems; rct_string_id gDropdownItemsFormat[64]; sint64 gDropdownItemsArgs[64]; uint64 gDropdownItemsChecked; uint64 gDropdownItemsDisabled; bool gDropdownIsColour; -int gDropdownLastColourHover; -int gDropdownHighlightedIndex; -int gDropdownDefaultIndex; +sint32 gDropdownLastColourHover; +sint32 gDropdownHighlightedIndex; +sint32 gDropdownDefaultIndex; -bool dropdown_is_checked(int index) +bool dropdown_is_checked(sint32 index) { return gDropdownItemsChecked & (1ULL << index); } -bool dropdown_is_disabled(int index) +bool dropdown_is_disabled(sint32 index) { return gDropdownItemsDisabled & (1ULL << index); } -void dropdown_set_checked(int index, bool value) +void dropdown_set_checked(sint32 index, bool value) { if (value) { gDropdownItemsChecked |= 1ULL << index; @@ -73,7 +73,7 @@ void dropdown_set_checked(int index, bool value) } } -void dropdown_set_disabled(int index, bool value) +void dropdown_set_disabled(sint32 index, bool value) { if (value) { gDropdownItemsDisabled |= 1ULL << index; @@ -126,9 +126,9 @@ static rct_window_event_list window_dropdown_events = { * @param num_items (bx) * @param colour (al) */ -void window_dropdown_show_text(int x, int y, int extray, uint8 colour, uint8 flags, int num_items) +void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items) { - int i, string_width, max_string_width; + sint32 i, string_width, max_string_width; char buffer[256]; // Calculate the longest string width @@ -154,7 +154,7 @@ void window_dropdown_show_text(int x, int y, int extray, uint8 colour, uint8 fla * @param num_items (bx) * @param colour (al) */ -void window_dropdown_show_text_custom_width(int x, int y, int extray, uint8 colour, uint8 flags, int num_items, int width) +void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items, sint32 width) { rct_window* w; @@ -174,7 +174,7 @@ void window_dropdown_show_text_custom_width(int x, int y, int extray, uint8 colo _dropdown_num_rows = num_items; width = _dropdown_item_width * _dropdown_num_columns + 3; - int height = _dropdown_item_height * _dropdown_num_rows + 3; + sint32 height = _dropdown_item_height * _dropdown_num_rows + 3; if (x + width > gScreenWidth) x = max(0, gScreenWidth - width); if (y + height > gScreenHeight) @@ -220,9 +220,9 @@ void window_dropdown_show_text_custom_width(int x, int y, int extray, uint8 colo * @param itemHeight (ah) * @param numColumns (bl) */ -void window_dropdown_show_image(int x, int y, int extray, uint8 colour, uint8 flags, int numItems, int itemWidth, int itemHeight, int numColumns) +void window_dropdown_show_image(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 numItems, sint32 itemWidth, sint32 itemHeight, sint32 numColumns) { - int width, height; + sint32 width, height; rct_window* w; gInputFlags &= ~(INPUT_FLAG_DROPDOWN_STAY_OPEN | INPUT_FLAG_DROPDOWN_MOUSE_UP); @@ -281,12 +281,12 @@ void window_dropdown_close() static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int cell_x, cell_y, l, t, r, b, item, image, colour; + sint32 cell_x, cell_y, l, t, r, b, item, image, colour; window_draw_widgets(w, dpi); - int highlightedIndex = gDropdownHighlightedIndex; - for (int i = 0; i < gDropdownNumItems; i++) { + sint32 highlightedIndex = gDropdownHighlightedIndex; + for (sint32 i = 0; i < gDropdownNumItems; i++) { cell_x = i % _dropdown_num_columns; cell_y = i / _dropdown_num_columns; @@ -362,23 +362,23 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi) * New function based on 6e914e * returns -1 if index is invalid */ -int dropdown_index_from_point(int x, int y, rct_window *w) +sint32 dropdown_index_from_point(sint32 x, sint32 y, rct_window *w) { - int top = y - w->y - 2; + sint32 top = y - w->y - 2; if (top < 0) return -1; - int left = x - w->x; + sint32 left = x - w->x; if (left >= w->width) return -1; left -= 2; if (left < 0) return -1; - int column_no = left / _dropdown_item_width; + sint32 column_no = left / _dropdown_item_width; if (column_no >= _dropdown_num_columns) return -1; - int row_no = top / _dropdown_item_height; + sint32 row_no = top / _dropdown_item_height; if (row_no >= _dropdown_num_rows) return -1; - int dropdown_index = row_no * _dropdown_num_columns + column_no; + sint32 dropdown_index = row_no * _dropdown_num_columns + column_no; if (dropdown_index >= gDropdownNumItems) return -1; return dropdown_index; @@ -401,7 +401,7 @@ void window_dropdown_show_colour(rct_window *w, rct_widget *widget, uint8 dropdo void window_dropdown_show_colour_available(rct_window *w, rct_widget *widget, uint8 dropdownColour, uint8 selectedColour, uint32 availableColours) { - int i, numItems; + sint32 i, numItems; // Count number of available colours numItems = 0; @@ -409,7 +409,7 @@ void window_dropdown_show_colour_available(rct_window *w, rct_widget *widget, ui if (availableColours & (1 << i)) numItems++; - int defaultIndex = -1; + sint32 defaultIndex = -1; // Set items for (i = 0; i < 32; i++) { if (availableColours & (1 << i)) { diff --git a/src/openrct2/windows/dropdown.h b/src/openrct2/windows/dropdown.h index 62dbb62486..86539d7c32 100644 --- a/src/openrct2/windows/dropdown.h +++ b/src/openrct2/windows/dropdown.h @@ -27,28 +27,28 @@ enum DROPDOWN_FLAG_STAY_OPEN = (1 << 7) }; -extern int gAppropriateImageDropdownItemsPerRow[]; +extern sint32 gAppropriateImageDropdownItemsPerRow[]; -extern int gDropdownNumItems; +extern sint32 gDropdownNumItems; extern rct_string_id gDropdownItemsFormat[64]; extern sint64 gDropdownItemsArgs[64]; extern uint64 gDropdownItemsChecked; extern uint64 gDropdownItemsDisabled; extern bool gDropdownIsColour; -extern int gDropdownLastColourHover; -extern int gDropdownHighlightedIndex; -extern int gDropdownDefaultIndex; +extern sint32 gDropdownLastColourHover; +extern sint32 gDropdownHighlightedIndex; +extern sint32 gDropdownDefaultIndex; -bool dropdown_is_checked(int index); -bool dropdown_is_disabled(int index); -void dropdown_set_checked(int index, bool value); -void dropdown_set_disabled(int index, bool value); +bool dropdown_is_checked(sint32 index); +bool dropdown_is_disabled(sint32 index); +void dropdown_set_checked(sint32 index, bool value); +void dropdown_set_disabled(sint32 index, bool value); -void window_dropdown_show_text(int x, int y, int extray, uint8 colour, uint8 flags, int num_items); -void window_dropdown_show_text_custom_width(int x, int y, int extray, uint8 colour, uint8 flags, int num_items, int width); -void window_dropdown_show_image(int x, int y, int extray, uint8 colour, uint8 flags, int numItems, int itemWidth, int itemHeight, int numColumns); +void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items); +void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items, sint32 width); +void window_dropdown_show_image(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 numItems, sint32 itemWidth, sint32 itemHeight, sint32 numColumns); void window_dropdown_close(); -int dropdown_index_from_point(int x, int y, rct_window* w); +sint32 dropdown_index_from_point(sint32 x, sint32 y, rct_window* w); void window_dropdown_show_colour(rct_window *w, rct_widget *widget, uint8 dropdownColour, uint8 selectedColour); void window_dropdown_show_colour_available(rct_window *w, rct_widget *widget, uint8 dropdownColour, uint8 selectedColour, uint32 availableColours); diff --git a/src/openrct2/windows/editor_bottom_toolbar.c b/src/openrct2/windows/editor_bottom_toolbar.c index b2dfcd0544..54181fa2ad 100644 --- a/src/openrct2/windows/editor_bottom_toolbar.c +++ b/src/openrct2/windows/editor_bottom_toolbar.c @@ -48,7 +48,7 @@ static rct_widget window_editor_bottom_toolbar_widgets[] = { { WIDGETS_END }, }; -static void window_editor_bottom_toolbar_mouseup(rct_window *w, int widgetIndex); +static void window_editor_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_bottom_toolbar_invalidate(rct_window *w); static void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -169,7 +169,7 @@ void window_editor_bottom_toolbar_jump_back_to_object_selection() { */ static void sub_6DFED0() { - for (int i = 0; i < 56; i++) { + for (sint32 i = 0; i < 56; i++) { gResearchedSceneryItems[i] = 0xFFFFFFFF; } } @@ -228,7 +228,7 @@ static bool window_editor_bottom_toolbar_check_object_selection() { rct_window *w; - int missingObjectType = editor_check_object_selection(); + sint32 missingObjectType = editor_check_object_selection(); if (missingObjectType < 0) { window_close_by_class(WC_EDITOR_OBJECT_SELECTION); return true; @@ -249,21 +249,21 @@ static bool window_editor_bottom_toolbar_check_object_selection() */ static void sub_66F6E3() { - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { gResearchedRideTypes[i] = 0xFFFFFFFF; } - for (int i = 0; i < countof(RideTypePossibleTrackConfigurations); i++) { + for (sint32 i = 0; i < countof(RideTypePossibleTrackConfigurations); i++) { gResearchedTrackTypesA[i] = (RideTypePossibleTrackConfigurations[i] ) & 0xFFFFFFFFULL; gResearchedTrackTypesB[i] = (RideTypePossibleTrackConfigurations[i] >> 32ULL) & 0xFFFFFFFFULL; } - for (int i = countof(RideTypePossibleTrackConfigurations); i < 128; i++) { + for (sint32 i = countof(RideTypePossibleTrackConfigurations); i < 128; i++) { gResearchedTrackTypesA[i] = (uint32)-1; gResearchedTrackTypesB[i] = (uint32)-1; } - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { gResearchedRideEntries[i] = 0xFFFFFFFF; } @@ -350,7 +350,7 @@ void window_editor_bottom_toolbar_jump_forward_to_save_scenario() * * rct2: 0x0066F5AE */ -static void window_editor_bottom_toolbar_mouseup(rct_window *w, int widgetIndex) +static void window_editor_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_PREVIOUS_STEP_BUTTON) { if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) || @@ -474,10 +474,10 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) w->colours[1], INSET_RECT_F_30); } - short stateX = + sint16 stateX = (window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].right + window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left) / 2 + w->x; - short stateY = w->height - 0x0C + w->y; + sint16 stateY = w->height - 0x0C + w->y; gfx_draw_string_centred(dpi, EditorStepNames[gS6Info.editor_step], stateX, stateY, NOT_TRANSLUCENT(w->colours[2]) | COLOUR_FLAG_OUTLINE, 0); @@ -486,16 +486,16 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 6 + w->x, window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + 6 + w->y, 0); - int textColour = NOT_TRANSLUCENT(w->colours[1]); + sint32 textColour = NOT_TRANSLUCENT(w->colours[1]); if (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_PREVIOUS_STEP_BUTTON ) { textColour = COLOUR_WHITE; } - short textX = (window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 30 + + sint16 textX = (window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 30 + window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].right) / 2 + w->x; - short textY = window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + 6 + w->y; + sint16 textY = window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + 6 + w->y; rct_string_id stringId = EditorStepNames[gS6Info.editor_step - 1]; if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) @@ -510,7 +510,7 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right - 29 + w->x, window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 6 + w->y, 0); - int textColour = NOT_TRANSLUCENT(w->colours[1]); + sint32 textColour = NOT_TRANSLUCENT(w->colours[1]); if (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_NEXT_STEP_BUTTON @@ -518,9 +518,9 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) textColour = COLOUR_WHITE; } - short textX = (window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + + sint16 textX = (window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right - 30) / 2 + w->x; - short textY = window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 6 + w->y; + sint16 textY = window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 6 + w->y; rct_string_id stringId = EditorStepNames[gS6Info.editor_step + 1]; if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) diff --git a/src/openrct2/windows/editor_inventions_list.c b/src/openrct2/windows/editor_inventions_list.c index 2d569b70ae..3722fd07bd 100644 --- a/src/openrct2/windows/editor_inventions_list.c +++ b/src/openrct2/windows/editor_inventions_list.c @@ -71,19 +71,19 @@ static rct_widget window_editor_inventions_list_drag_widgets[] = { #pragma region Events static void window_editor_inventions_list_close(rct_window *w); -static void window_editor_inventions_list_mouseup(rct_window *w, int widgetIndex); +static void window_editor_inventions_list_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_inventions_list_update(rct_window *w); -static void window_editor_inventions_list_scrollgetheight(rct_window *w, int scrollIndex, int *width, int *height); -static void window_editor_inventions_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_editor_inventions_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_editor_inventions_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); -static void window_editor_inventions_list_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId); +static void window_editor_inventions_list_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_editor_inventions_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_editor_inventions_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_editor_inventions_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); +static void window_editor_inventions_list_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId); static void window_editor_inventions_list_invalidate(rct_window *w); static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); -static void window_editor_inventions_list_drag_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId); -static void window_editor_inventions_list_drag_moved(rct_window* w, int x, int y); +static void window_editor_inventions_list_drag_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId); +static void window_editor_inventions_list_drag_moved(rct_window* w, sint32 x, sint32 y); static void window_editor_inventions_list_drag_paint(rct_window *w, rct_drawpixelinfo *dpi); // 0x0098177C @@ -167,7 +167,7 @@ static const rct_string_id EditorInventionsResearchCategories[] = { static void window_editor_inventions_list_drag_open(rct_research_item *researchItem); static void move_research_item(rct_research_item *beforeItem); -static int research_item_is_always_researched(rct_research_item *researchItem) +static sint32 research_item_is_always_researched(rct_research_item *researchItem) { return (researchItem->entryIndex & (RESEARCH_ENTRY_FLAG_RIDE_ALWAYS_RESEARCHED | RESEARCH_ENTRY_FLAG_SCENERY_SET_ALWAYS_RESEARCHED)) != 0; } @@ -258,7 +258,7 @@ extern rct_object_entry RequiredSelectedObjects[7]; */ static void research_scenery_sets_setup(){ - for (int i = 0; i < countof(RequiredSelectedObjects); i++) { + for (sint32 i = 0; i < countof(RequiredSelectedObjects); i++) { rct_object_entry * object = &RequiredSelectedObjects[i]; uint8 entry_type, entry_index; @@ -341,7 +341,7 @@ static rct_string_id research_item_get_name(uint32 researchItem) static void research_items_shuffle() { rct_research_item *researchItem, *researchOrderBase, researchItemTemp; - int i, numNonResearchedItems; + sint32 i, numNonResearchedItems; // Skip pre-researched items for (researchItem = gResearchItems; researchItem->entryIndex != RESEARCHED_ITEMS_SEPARATOR; researchItem++) {} @@ -355,7 +355,7 @@ static void research_items_shuffle() // Shuffle list for (i = 0; i < numNonResearchedItems; i++) { - int ri = util_rand() % numNonResearchedItems; + sint32 ri = util_rand() % numNonResearchedItems; if (ri == i) continue; @@ -369,7 +369,7 @@ static void research_items_make_all_unresearched() { rct_research_item *researchItem, *nextResearchItem, researchItemTemp; - int sorted; + sint32 sorted; do { sorted = 1; for (researchItem = gResearchItems; researchItem->entryIndex != RESEARCHED_ITEMS_SEPARATOR; researchItem++) { @@ -452,7 +452,7 @@ static void move_research_item(rct_research_item *beforeItem) * * rct2: 0x0068558E */ -static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y(int scrollIndex, int y) +static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y(sint32 scrollIndex, sint32 y) { rct_research_item *researchItem; @@ -477,7 +477,7 @@ static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y(i * * rct2: 0x006855BB */ -static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y_include_seps(int scrollIndex, int y) +static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y_include_seps(sint32 scrollIndex, sint32 y) { rct_research_item *researchItem; @@ -498,20 +498,20 @@ static rct_research_item *window_editor_inventions_list_get_item_from_scroll_y_i return researchItem; } -static rct_research_item *get_research_item_at(int x, int y) +static rct_research_item *get_research_item_at(sint32 x, sint32 y) { rct_window *w = window_find_by_class(WC_EDITOR_INVENTION_LIST); if (w != NULL && w->x <= x && w->y < y && w->x + w->width > x && w->y + w->height > y) { - short widgetIndex = window_find_widget_from_point(w, x, y); + sint16 widgetIndex = window_find_widget_from_point(w, x, y); rct_widget *widget = &w->widgets[widgetIndex]; if (widgetIndex == WIDX_PRE_RESEARCHED_SCROLL || widgetIndex == WIDX_RESEARCH_ORDER_SCROLL) { gPressedWidget.widget_index = widgetIndex; - int outX, outY, outScrollArea, outScrollId; + sint32 outX, outY, outScrollArea, outScrollId; widget_scroll_get_part(w, widget, x, y, &outX, &outY, &outScrollArea, &outScrollId); if (outScrollArea == SCROLL_PART_VIEW) { outScrollId = outScrollId == 0 ? 0 : 1; - int scrollY = y - (w->y + widget->top) + w->scrolls[outScrollId].v_top + 5; + sint32 scrollY = y - (w->y + widget->top) + w->scrolls[outScrollId].v_top + 5; return window_editor_inventions_list_get_item_from_scroll_y_include_seps(outScrollId, scrollY); } } @@ -575,7 +575,7 @@ static void window_editor_inventions_list_close(rct_window *w) * * rct2: 0x0068521B */ -static void window_editor_inventions_list_mouseup(rct_window *w, int widgetIndex) +static void window_editor_inventions_list_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -622,7 +622,7 @@ static void window_editor_inventions_list_update(rct_window *w) * * rct2: 0x00685239 */ -static void window_editor_inventions_list_scrollgetheight(rct_window *w, int scrollIndex, int *width, int *height) +static void window_editor_inventions_list_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { rct_research_item *researchItem; @@ -646,7 +646,7 @@ static void window_editor_inventions_list_scrollgetheight(rct_window *w, int scr * * rct2: 0x006852D4 */ -static void window_editor_inventions_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_editor_inventions_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { rct_research_item *researchItem; @@ -665,7 +665,7 @@ static void window_editor_inventions_list_scrollmousedown(rct_window *w, int scr * * rct2: 0x00685275 */ -static void window_editor_inventions_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_editor_inventions_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { rct_research_item *researchItem; @@ -680,7 +680,7 @@ static void window_editor_inventions_list_scrollmouseover(rct_window *w, int scr * * rct2: 0x0068526B */ -static void window_editor_inventions_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_editor_inventions_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -689,10 +689,10 @@ static void window_editor_inventions_list_tooltip(rct_window* w, int widgetIndex * * rct2: 0x00685291 */ -static void window_editor_inventions_list_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId) +static void window_editor_inventions_list_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId) { rct_research_item *researchItem; - int scrollIndex; + sint32 scrollIndex; switch (widgetIndex) { case WIDX_PRE_RESEARCHED_SCROLL: @@ -740,7 +740,7 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo rct_widget *widget; rct_research_item *researchItem; rct_string_id stringId; - int x, y, width; + sint32 x, y, width; window_draw_widgets(w, dpi); @@ -778,8 +778,8 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo return; // Preview image - int objectEntryType = 7; - int eax = researchItem->entryIndex & 0xFFFFFF; + sint32 objectEntryType = 7; + sint32 eax = researchItem->entryIndex & 0xFFFFFF; if (eax >= 0x10000) objectEntryType = 0; @@ -799,7 +799,7 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo x = w->x + widget->left + 1; y = w->y + widget->top + 1; width = widget->right - widget->left - 1; - int height = widget->bottom - widget->top - 1; + sint32 height = widget->bottom - widget->top - 1; if (clip_drawpixelinfo(&clipDPI, dpi, x, y, width, height)) { object_draw_preview(object, &clipDPI, width, height); } @@ -823,10 +823,10 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo * * rct2: 0x006850BD */ -static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { rct_research_item *researchItem; - int left, top, bottom, itemY, disableItemMovement; + sint32 left, top, bottom, itemY, disableItemMovement; sint32 researchItemEndMarker; rct_string_id stringId; utf8 buffer[256], *ptr; @@ -912,7 +912,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix static void window_editor_inventions_list_drag_open(rct_research_item *researchItem) { char buffer[256]; - int stringWidth; + sint32 stringWidth; rct_string_id stringId; rct_window *w; @@ -942,7 +942,7 @@ static void window_editor_inventions_list_drag_open(rct_research_item *researchI * * rct2: 0x0068549C */ -static void window_editor_inventions_list_drag_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId) +static void window_editor_inventions_list_drag_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId) { rct_window *inventionListWindow = window_find_by_class(WC_EDITOR_INVENTION_LIST); if (inventionListWindow != NULL) { @@ -960,7 +960,7 @@ static void window_editor_inventions_list_drag_cursor(rct_window *w, int widgetI * * rct2: 0x00685412 */ -static void window_editor_inventions_list_drag_moved(rct_window* w, int x, int y) +static void window_editor_inventions_list_drag_moved(rct_window* w, sint32 x, sint32 y) { rct_research_item *researchItem; @@ -980,7 +980,7 @@ static void window_editor_inventions_list_drag_moved(rct_window* w, int x, int y static void window_editor_inventions_list_drag_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_string_id stringId; - int x, y; + sint32 x, y; x = w->x; y = w->y + 2; diff --git a/src/openrct2/windows/editor_object_selection.c b/src/openrct2/windows/editor_object_selection.c index 61d1e42bc7..3ec26db867 100644 --- a/src/openrct2/windows/editor_object_selection.c +++ b/src/openrct2/windows/editor_object_selection.c @@ -182,19 +182,19 @@ static rct_widget window_editor_object_selection_widgets[] = { #pragma region Events static void window_editor_object_selection_close(rct_window *w); -static void window_editor_object_selection_mouseup(rct_window *w, int widgetIndex); +static void window_editor_object_selection_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_object_selection_resize(rct_window *w); -static void window_editor_object_selection_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_editor_object_selection_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_editor_object_selection_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_editor_object_selection_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_editor_object_selection_update(rct_window *w); -static void window_editor_object_selection_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_editor_object_selection_scroll_mousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_editor_object_selection_scroll_mouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_editor_object_selection_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_editor_object_selection_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_editor_object_selection_scroll_mousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_editor_object_selection_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_editor_object_selection_invalidate(rct_window *w); static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); -static void window_editor_object_selection_textinput(rct_window *w, int widgetIndex, char *text); +static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); +static void window_editor_object_selection_textinput(rct_window *w, sint32 widgetIndex, char *text); static rct_window_event_list window_editor_object_selection_events = { window_editor_object_selection_close, @@ -229,15 +229,15 @@ static rct_window_event_list window_editor_object_selection_events = { #pragma endregion -const int window_editor_object_selection_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 }; -const int window_editor_object_selection_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 }; +const sint32 window_editor_object_selection_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 }; +const sint32 window_editor_object_selection_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 }; -static void window_editor_object_set_page(rct_window *w, int page); +static void window_editor_object_set_page(rct_window *w, sint32 page); static void window_editor_object_selection_set_pressed_tab(rct_window *w); static void window_editor_object_selection_select_default_objects(); static void window_editor_object_selection_select_required_objects(); -static int window_editor_object_selection_select_object(uint8 bh, int flags, const rct_object_entry *entry); -static int get_object_from_object_selection(uint8 object_type, int y); +static sint32 window_editor_object_selection_select_object(uint8 bh, sint32 flags, const rct_object_entry *entry); +static sint32 get_object_from_object_selection(uint8 object_type, sint32 y); static void window_editor_object_selection_manage_tracks(); static void editor_load_selected_objects(); static bool filter_selected(uint8 objectFlags); @@ -247,7 +247,7 @@ static bool filter_chunks(const ObjectRepositoryItem * item); static void filter_update_counts(); void reset_selected_object_count_and_size(); -static int sub_6AB211(); +static sint32 sub_6AB211(); /** rct2: 0x0098DA74 */ rct_object_entry RequiredSelectedObjects[] = { @@ -317,16 +317,16 @@ typedef struct list_item { static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item); -typedef int (*sortFunc_t)(const void *, const void *); +typedef sint32(*sortFunc_t)(const void *, const void *); -static int _numListItems = 0; +static sint32 _numListItems = 0; static list_item *_listItems = NULL; -static int _listSortType = RIDE_SORT_TYPE; +static sint32 _listSortType = RIDE_SORT_TYPE; static bool _listSortDescending = false; static void * _loadedObject = NULL; static uint8 * _objectSelectionFlags = NULL; -static int _numSelectedObjectsForType[11]; -static int _numAvailableObjectsForType[11]; +static sint32 _numSelectedObjectsForType[11]; +static sint32 _numAvailableObjectsForType[11]; static bool _maxObjectsWasHit; static void visible_list_dispose() @@ -335,7 +335,7 @@ static void visible_list_dispose() _numListItems = 0; } -static int visible_list_sort_ride_name(const void *rawA, const void *rawB) +static sint32 visible_list_sort_ride_name(const void *rawA, const void *rawB) { list_item *a = (list_item*)rawA; list_item *b = (list_item*)rawB; @@ -345,14 +345,14 @@ static int visible_list_sort_ride_name(const void *rawA, const void *rawB) return strcmp(nameA, nameB); } -static int visible_list_sort_ride_type(const void *rawA, const void *rawB) +static sint32 visible_list_sort_ride_type(const void *rawA, const void *rawB) { list_item *a = (list_item*)rawA; list_item *b = (list_item*)rawB; const char *rideTypeA = language_get_string(get_ride_type_string_id(a->repositoryItem)); const char *rideTypeB = language_get_string(get_ride_type_string_id(b->repositoryItem)); - int result = strcmp(rideTypeA, rideTypeB); + sint32 result = strcmp(rideTypeA, rideTypeB); if (result != 0) return result; @@ -361,7 +361,7 @@ static int visible_list_sort_ride_type(const void *rawA, const void *rawB) static void visible_list_refresh(rct_window *w) { - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); visible_list_dispose(); w->selected_list_item = -1; @@ -370,7 +370,7 @@ static void visible_list_refresh(rct_window *w) list_item *currentListItem = &_listItems[0]; const ObjectRepositoryItem *items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 selectionFlags = _objectSelectionFlags[i]; const ObjectRepositoryItem * item = &items[i]; uint8 objectType = item->ObjectEntry.flags & 0x0F; @@ -418,8 +418,8 @@ static void visible_list_refresh(rct_window *w) qsort(_listItems, _numListItems, sizeof(list_item), sortFunc); if (_listSortDescending) { - for (int i = 0; i < _numListItems / 2; i++) { - int ri = _numListItems - i - 1; + for (sint32 i = 0; i < _numListItems / 2; i++) { + sint32 ri = _numListItems - i - 1; list_item temp = _listItems[i]; _listItems[i] = _listItems[ri]; _listItems[ri] = temp; @@ -468,7 +468,7 @@ void window_editor_object_selection_open() _filter_flags = gConfigInterface.object_selection_filter_flags; memset(_filter_string, 0, sizeof(_filter_string)); - for (int i = WIDX_TAB_1; i <= WIDX_TAB_11; i++) + for (sint32 i = WIDX_TAB_1; i <= WIDX_TAB_11; i++) window->enabled_widgets |= (1LL << i); window_init_scroll_widgets(window); @@ -490,9 +490,9 @@ void window_editor_object_selection_open() */ static void setup_track_manager_objects() { - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 * selectionFlags = &_objectSelectionFlags[i]; const ObjectRepositoryItem * item = &items[i]; uint8 object_type = item->ObjectEntry.flags & 0xF; @@ -516,9 +516,9 @@ static void setup_track_manager_objects() */ static void setup_track_designer_objects() { - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 * selectionFlags = &_objectSelectionFlags[i]; const ObjectRepositoryItem * item = &items[i]; uint8 objectType = item->ObjectEntry.flags & 0xF; @@ -622,9 +622,9 @@ static void setup_in_use_selection_flags() } } - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 *selectionFlags = &_objectSelectionFlags[i]; const ObjectRepositoryItem * item = &items[i]; *selectionFlags &= ~OBJECT_SELECTION_FLAG_IN_USE; @@ -647,9 +647,9 @@ static void setup_in_use_selection_flags() * * rct2: 0x006AB211 */ -static int sub_6AB211() +static sint32 sub_6AB211() { - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); _objectSelectionFlags = (uint8*)calloc(numObjects, sizeof(uint8)); if (_objectSelectionFlags == NULL){ log_error("Failed to allocate memory for object flag list."); @@ -662,7 +662,7 @@ static int sub_6AB211() } const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 objectType = items[i].ObjectEntry.flags & 0xF; _numAvailableObjectsForType[objectType]++; } @@ -726,13 +726,13 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal */ static void unload_unselected_objects() { - int numItems = (int)object_repository_get_items_count(); + sint32 numItems = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); size_t numObjectsToUnload = 0; rct_object_entry * objectsToUnload = (rct_object_entry *)malloc(numItems * sizeof(rct_object_entry)); - for (int i = 0; i < numItems; i++) { + for (sint32 i = 0; i < numItems; i++) { if (!(_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) { const rct_object_entry * entry = &items[i].ObjectEntry; @@ -781,7 +781,7 @@ static void window_editor_object_selection_close(rct_window *w) * * rct2: 0x006AAFAB */ -static void window_editor_object_selection_mouseup(rct_window *w, int widgetIndex) +static void window_editor_object_selection_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -890,9 +890,9 @@ static void window_editor_object_selection_resize(rct_window *w) window_set_resize(w, 600, 400, 1200, 1000); } -void window_editor_object_selection_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +void window_editor_object_selection_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - int num_items; + sint32 num_items; //widget = &w->widgets[widgetIndex - 1]; @@ -938,7 +938,7 @@ void window_editor_object_selection_mousedown(int widgetIndex, rct_window*w, rct } } -static void window_editor_object_selection_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_editor_object_selection_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -972,7 +972,7 @@ static void window_editor_object_selection_dropdown(rct_window *w, int widgetInd * * rct2: 0x006AB031 */ -static void window_editor_object_selection_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_editor_object_selection_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = _numListItems * 12; } @@ -981,13 +981,13 @@ static void window_editor_object_selection_scrollgetsize(rct_window *w, int scro * * rct2: 0x006AB0B6 */ -static void window_editor_object_selection_scroll_mousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_editor_object_selection_scroll_mousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { // Used for in-game object selection cheat to prevent crashing the game // when windows attempt to draw objects that don't exist any more window_close_all_except_class(WC_EDITOR_OBJECT_SELECTION); - int selected_object = get_object_from_object_selection((w->selected_tab & 0xFF), y); + sint32 selected_object = get_object_from_object_selection((w->selected_tab & 0xFF), y); if (selected_object == -1) return; @@ -1014,7 +1014,7 @@ static void window_editor_object_selection_scroll_mousedown(rct_window *w, int s return; } - int ebx = 6; + sint32 ebx = 6; // If already selected if (!(object_selection_flags & OBJECT_SELECTION_FLAG_SELECTED)) ebx = 7; @@ -1044,9 +1044,9 @@ static void window_editor_object_selection_scroll_mousedown(rct_window *w, int s * * rct2: 0x006AB079 */ -static void window_editor_object_selection_scroll_mouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_editor_object_selection_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int selectedObject = get_object_from_object_selection(w->selected_tab & 0xFF, y); + sint32 selectedObject = get_object_from_object_selection(w->selected_tab & 0xFF, y); if (selectedObject != -1) { list_item * listItem = &_listItems[selectedObject]; uint8 objectSelectionFlags = *listItem->flags; @@ -1076,7 +1076,7 @@ static void window_editor_object_selection_scroll_mouseover(rct_window *w, int s * * rct2: 0x006AB058 */ -static void window_editor_object_selection_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_editor_object_selection_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { switch (widgetIndex) { case WIDX_TAB_1: @@ -1147,8 +1147,8 @@ static void window_editor_object_selection_invalidate(rct_window *w) } // Align tabs, hide advanced ones - int x = 3; - for (int i = 0; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) { + sint32 x = 3; + for (sint32 i = 0; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) { rct_widget *widget = &w->widgets[WIDX_TAB_1 + i]; if (!(w->list_information_type & 1) && ((1 << i) & 0x5E)) { @@ -1163,7 +1163,7 @@ static void window_editor_object_selection_invalidate(rct_window *w) if (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TRACK_DESIGNER)) { w->widgets[WIDX_ADVANCED].type = WWT_EMPTY; - for (int i = 1; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) + for (sint32 i = 1; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) w->widgets[WIDX_TAB_1 + i].type = WWT_EMPTY; x = 150; } else { @@ -1191,18 +1191,18 @@ static void window_editor_object_selection_invalidate(rct_window *w) w->enabled_widgets |= (1 << WIDX_FILTER_RIDE_TAB_ALL) | (1 << WIDX_FILTER_RIDE_TAB_TRANSPORT) | (1 << WIDX_FILTER_RIDE_TAB_GENTLE) | (1 << WIDX_FILTER_RIDE_TAB_COASTER) | (1 << WIDX_FILTER_RIDE_TAB_THRILL) | (1 << WIDX_FILTER_RIDE_TAB_WATER) | (1 << WIDX_FILTER_RIDE_TAB_STALL); - for (int i = 0; i < 7; i++) + for (sint32 i = 0; i < 7; i++) w->pressed_widgets &= ~(1 << (WIDX_FILTER_RIDE_TAB_ALL + i)); if ((_filter_flags & 0x7E0) == 0x7E0) w->pressed_widgets |= (1 << WIDX_FILTER_RIDE_TAB_ALL); else { - for (int i = 0; i < 6; i++) { + for (sint32 i = 0; i < 6; i++) { if (_filter_flags & (1 << (5 + i))) w->pressed_widgets |= (uint64)(1 << (WIDX_FILTER_RIDE_TAB_TRANSPORT + i)); } } w->widgets[WIDX_FILTER_RIDE_TAB_FRAME].type = WWT_IMGBTN; - for (int i = WIDX_FILTER_RIDE_TAB_ALL; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) + for (sint32 i = WIDX_FILTER_RIDE_TAB_ALL; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) w->widgets[i].type = WWT_TAB; w->widgets[WIDX_LIST_SORT_TYPE].type = WWT_13; @@ -1217,7 +1217,7 @@ static void window_editor_object_selection_invalidate(rct_window *w) w->enabled_widgets &= ~((1 << WIDX_FILTER_RIDE_TAB_ALL) | (1 << WIDX_FILTER_RIDE_TAB_TRANSPORT) | (1 << WIDX_FILTER_RIDE_TAB_GENTLE) | (1 << WIDX_FILTER_RIDE_TAB_COASTER) | (1 << WIDX_FILTER_RIDE_TAB_THRILL) | (1 << WIDX_FILTER_RIDE_TAB_WATER) | (1 << WIDX_FILTER_RIDE_TAB_STALL)); - for (int i = WIDX_FILTER_RIDE_TAB_FRAME; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) + for (sint32 i = WIDX_FILTER_RIDE_TAB_FRAME; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) w->widgets[i].type = WWT_EMPTY; w->widgets[WIDX_LIST_SORT_TYPE].type = WWT_EMPTY; @@ -1231,7 +1231,7 @@ static void window_editor_object_selection_invalidate(rct_window *w) */ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y, width, type; + sint32 i, x, y, width, type; rct_widget *widget; rct_object_entry *highlightedEntry; rct_string_id stringId; @@ -1261,8 +1261,8 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf gfx_draw_sprite(dpi, SPR_TAB_RIDE_16 + i, x, y, 0); } - const int ride_tabs[] = { SPR_TAB_RIDE_16, 0x20000000 | SPR_TAB_RIDES_TRANSPORT_0, SPR_TAB_RIDES_GENTLE_0, 0x20000000 | SPR_TAB_RIDES_ROLLER_COASTERS_0, SPR_TAB_RIDES_THRILL_0, SPR_TAB_RIDES_WATER_0, SPR_TAB_RIDES_SHOP_0, SPR_TAB_FINANCES_RESEARCH_0 }; - const int ThrillRidesTabAnimationSequence[] = { + const sint32 ride_tabs[] = { SPR_TAB_RIDE_16, 0x20000000 | SPR_TAB_RIDES_TRANSPORT_0, SPR_TAB_RIDES_GENTLE_0, 0x20000000 | SPR_TAB_RIDES_ROLLER_COASTERS_0, SPR_TAB_RIDES_THRILL_0, SPR_TAB_RIDES_WATER_0, SPR_TAB_RIDES_SHOP_0, SPR_TAB_FINANCES_RESEARCH_0 }; + const sint32 ThrillRidesTabAnimationSequence[] = { 5, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0 }; @@ -1273,8 +1273,8 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf if (widget->type == WWT_EMPTY) continue; - int spriteIndex = ride_tabs[i]; - int frame = 0; + sint32 spriteIndex = ride_tabs[i]; + sint32 frame = 0; if (i != 0 && w->pressed_widgets & (1ULL << (WIDX_FILTER_RIDE_TAB_ALL + i))) { frame = w->frame_no / window_editor_object_selection_animation_divisor[i - 1]; } @@ -1303,8 +1303,8 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf x = w->x + 3; y = w->y + w->height - 13; - int numSelected = _numSelectedObjectsForType[w->selected_tab]; - int totalSelectable = object_entry_group_counts[w->selected_tab]; + sint32 numSelected = _numSelectedObjectsForType[w->selected_tab]; + sint32 totalSelectable = object_entry_group_counts[w->selected_tab]; if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) totalSelectable = 4; @@ -1340,7 +1340,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf x = w->x + widget->left + 1; y = w->y + widget->top + 1; width = widget->right - widget->left - 1; - int height = widget->bottom - widget->top - 1; + sint32 height = widget->bottom - widget->top - 1; if (clip_drawpixelinfo(&clipDPI, dpi, x, y, width, height)) { object_draw_preview(_loadedObject, &clipDPI, width, height); } @@ -1402,9 +1402,9 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf * * rct2: 0x006AADA3 */ -static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int x, y, i, colour, colour2; + sint32 x, y, i, colour, colour2; bool ridePage = (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS); @@ -1473,7 +1473,7 @@ static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpi } } -static void window_editor_object_set_page(rct_window *w, int page) +static void window_editor_object_set_page(rct_window *w, sint32 page) { if (w->selected_tab == page) return; @@ -1498,7 +1498,7 @@ static void window_editor_object_set_page(rct_window *w, int page) static void window_editor_object_selection_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_OBJECT_SELECTION_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->selected_tab); @@ -1511,7 +1511,7 @@ static void window_editor_object_selection_set_pressed_tab(rct_window *w) static void window_editor_object_selection_select_default_objects() { if (_numSelectedObjectsForType[0] == 0) { - for (int i = 0; i < countof(DefaultSelectedObjects); i++) { + for (sint32 i = 0; i < countof(DefaultSelectedObjects); i++) { window_editor_object_selection_select_object(0, 7, &DefaultSelectedObjects[i]); } } @@ -1523,7 +1523,7 @@ static void window_editor_object_selection_select_default_objects() */ static void window_editor_object_selection_select_required_objects() { - int i; + sint32 i; for (i = 0; i < countof(RequiredSelectedObjects); i++) window_editor_object_selection_select_object(0, 0xF, &RequiredSelectedObjects[i]); @@ -1539,9 +1539,9 @@ void reset_selected_object_count_and_size() _numSelectedObjectsForType[objectType] = 0; } - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 objectType = items[i].ObjectEntry.flags & 0xF; if (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED) { _numSelectedObjectsForType[objectType]++; @@ -1565,9 +1565,9 @@ static void set_object_selection_error(uint8 is_master_object, rct_string_id err * * rct2: 0x006AB54F */ -static int window_editor_object_selection_select_object(uint8 bh, int flags, const rct_object_entry *entry) +static sint32 window_editor_object_selection_select_object(uint8 bh, sint32 flags, const rct_object_entry *entry) { - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * item = object_repository_find_object_by_entry(entry); if (item == NULL) { set_object_selection_error(bh, STR_OBJECT_SELECTION_ERR_OBJECT_DATA_NOT_FOUND); @@ -1575,9 +1575,9 @@ static int window_editor_object_selection_select_object(uint8 bh, int flags, con } // Get repository item index - int index = -1; + sint32 index = -1; const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { if (&items[i] == item) { index = i; } @@ -1599,7 +1599,7 @@ static int window_editor_object_selection_select_object(uint8 bh, int flags, con uint8 objectType = item->ObjectEntry.flags & 0xF; if (objectType == OBJECT_TYPE_SCENERY_SETS && (flags & (1 << 2))) { - for (int j = 0; j < item->NumThemeObjects; j++) { + for (sint32 j = 0; j < item->NumThemeObjects; j++) { window_editor_object_selection_select_object(++bh, flags, &item->ThemeObjects[j]); } } @@ -1664,9 +1664,9 @@ static int window_editor_object_selection_select_object(uint8 bh, int flags, con * * rct2: 0x006AA703 */ -static int get_object_from_object_selection(uint8 object_type, int y) +static sint32 get_object_from_object_selection(uint8 object_type, sint32 y) { - int listItemIndex = y / 12; + sint32 listItemIndex = y / 12; if (listItemIndex < 0 || listItemIndex >= _numListItems) return -1; @@ -1679,35 +1679,35 @@ static int get_object_from_object_selection(uint8 object_type, int y) */ static void window_editor_object_selection_manage_tracks() { - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { gResearchedRideTypes[i] = 0xFFFFFFFF; } - for (int i = 0; i < countof(RideTypePossibleTrackConfigurations); i++) { + for (sint32 i = 0; i < countof(RideTypePossibleTrackConfigurations); i++) { gResearchedTrackTypesA[i] = (RideTypePossibleTrackConfigurations[i] ) & 0xFFFFFFFFULL; gResearchedTrackTypesB[i] = (RideTypePossibleTrackConfigurations[i] >> 32ULL) & 0xFFFFFFFFULL; } - for (int i = countof(RideTypePossibleTrackConfigurations); i < 128; i++) { + for (sint32 i = countof(RideTypePossibleTrackConfigurations); i < 128; i++) { gResearchedTrackTypesA[i] = (uint32)-1; gResearchedTrackTypesB[i] = (uint32)-1; } - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { gResearchedRideEntries[i] = 0xFFFFFFFF; } gS6Info.editor_step = EDITOR_STEP_TRACK_DESIGNS_MANAGER; - int entry_index = 0; + sint32 entry_index = 0; for (; ((intptr_t)object_entry_groups[0].chunks[entry_index]) == -1; ++entry_index); rct_ride_entry* ride_entry = get_ride_entry(entry_index); uint8* ride_type_array = &ride_entry->ride_type[0]; - int ride_type; - for (int i = 0; (ride_type = ride_type_array[i]) == 0xFF; i++) { } + sint32 ride_type; + for (sint32 i = 0; (ride_type = ride_type_array[i]) == 0xFF; i++) { } ride_list_item item = { ride_type, entry_index }; // track_load_list(item); @@ -1720,9 +1720,9 @@ static void window_editor_object_selection_manage_tracks() */ static void editor_load_selected_objects() { - int numItems = (int)object_repository_get_items_count(); + sint32 numItems = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numItems; i++) { + for (sint32 i = 0; i < numItems; i++) { if (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED) { const ObjectRepositoryItem * item = &items[i]; const rct_object_entry * entry = &item->ObjectEntry; @@ -1757,7 +1757,7 @@ static void window_editor_object_selection_update(rct_window *w) widget_invalidate(w, WIDX_FILTER_STRING_BUTTON); } - for (int i = WIDX_FILTER_RIDE_TAB_TRANSPORT; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) { + for (sint32 i = WIDX_FILTER_RIDE_TAB_TRANSPORT; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) { if (!(w->pressed_widgets & (1ULL << i))) continue; @@ -1770,7 +1770,7 @@ static void window_editor_object_selection_update(rct_window *w) } } -static void window_editor_object_selection_textinput(rct_window *w, int widgetIndex, char *text) +static void window_editor_object_selection_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_FILTER_STRING_BUTTON || text == NULL) return; @@ -1833,11 +1833,11 @@ static bool filter_string(const ObjectRepositoryItem * item) safe_strcpy(filter_lower, _filter_string, sizeof(_filter_string)); // Make use of lowercase characters only - for (int i = 0; name_lower[i] != '\0'; i++) + for (sint32 i = 0; name_lower[i] != '\0'; i++) name_lower[i] = (char)tolower(name_lower[i]); - for (int i = 0; type_lower[i] != '\0'; i++) + for (sint32 i = 0; type_lower[i] != '\0'; i++) type_lower[i] = (char)tolower(type_lower[i]); - for (int i = 0; filter_lower[i] != '\0'; i++) + for (sint32 i = 0; filter_lower[i] != '\0'; i++) filter_lower[i] = (char)tolower(filter_lower[i]); return strstr(name_lower, filter_lower) != NULL || (((item->ObjectEntry.flags & 0x0F) == OBJECT_TYPE_RIDE) && strstr(type_lower, filter_lower) != NULL); @@ -1864,7 +1864,7 @@ static bool filter_chunks(const ObjectRepositoryItem * item) } else { uint8 rideType = 0; - for (int i = 0; i < 3; i++) { + for (sint32 i = 0; i < 3; i++) { if (item->RideType[i] != 255) { rideType = item->RideType[i]; break; @@ -1882,7 +1882,7 @@ static void filter_update_counts() { if (!_FILTER_ALL || strlen(_filter_string) > 0) { uint8 *selectionFlags = _objectSelectionFlags; - for (int i = 0; i < 11; i++) { + for (sint32 i = 0; i < 11; i++) { _filter_object_counts[i] = 0; } @@ -1906,7 +1906,7 @@ static void filter_update_counts() static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item) { rct_string_id result = STR_NONE; - for (int i = 0; i < 3; i++) { + for (sint32 i = 0; i < 3; i++) { uint8 rideType = item->RideType[i]; if (rideType != 255) { result = RideNaming[rideType].name; @@ -1916,12 +1916,12 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item) return result; } -bool editor_check_object_group_at_least_one_selected(int checkObjectType) +bool editor_check_object_group_at_least_one_selected(sint32 checkObjectType) { - int numObjects = (int)object_repository_get_items_count(); + sint32 numObjects = (sint32)object_repository_get_items_count(); const ObjectRepositoryItem * items = object_repository_get_items(); - for (int i = 0; i < numObjects; i++) { + for (sint32 i = 0; i < numObjects; i++) { uint8 objectType = items[i].ObjectEntry.flags & 0x0F; if (checkObjectType == objectType && (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) { return true; diff --git a/src/openrct2/windows/editor_objective_options.c b/src/openrct2/windows/editor_objective_options.c index 40a6b74e97..69d77d1296 100644 --- a/src/openrct2/windows/editor_objective_options.c +++ b/src/openrct2/windows/editor_objective_options.c @@ -129,24 +129,24 @@ static rct_widget *window_editor_objective_options_widgets[] = { #pragma region Events -static void window_editor_objective_options_main_mouseup(rct_window *w, int widgetIndex); +static void window_editor_objective_options_main_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_objective_options_main_resize(rct_window *w); -static void window_editor_objective_options_main_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_editor_objective_options_main_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_editor_objective_options_main_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_editor_objective_options_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_editor_objective_options_main_update(rct_window *w); -static void window_editor_objective_options_main_textinput(rct_window *w, int widgetIndex, char *text); +static void window_editor_objective_options_main_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_editor_objective_options_main_invalidate(rct_window *w); static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_editor_objective_options_rides_mouseup(rct_window *w, int widgetIndex); +static void window_editor_objective_options_rides_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_objective_options_rides_resize(rct_window *w); static void window_editor_objective_options_rides_update(rct_window *w); -static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, int scrollIndex, int *width, int *height); -static void window_editor_objective_options_rides_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_editor_objective_options_rides_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); +static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_editor_objective_options_rides_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_editor_objective_options_rides_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); static void window_editor_objective_options_rides_invalidate(rct_window *w); static void window_editor_objective_options_rides_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); // 0x009A9DF4 static rct_window_event_list window_objective_options_main_events = { @@ -290,7 +290,7 @@ void window_editor_objective_options_open() static void window_editor_objective_options_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < 2; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); @@ -310,7 +310,7 @@ static void window_editor_objective_options_anchor_border_widgets(rct_window *w) static void window_editor_objective_options_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi) { rct_widget *widget; - int spriteIndex; + sint32 spriteIndex; // Tab 1 widget = &w->widgets[WIDX_TAB_1]; @@ -336,7 +336,7 @@ static void window_editor_objective_options_draw_tab_images(rct_window *w, rct_d * * rct2: 0x00668496 */ -static void window_editor_objective_options_set_page(rct_window *w, int page) +static void window_editor_objective_options_set_page(rct_window *w, sint32 page) { if (w->page == page) return; @@ -362,7 +362,7 @@ static void window_editor_objective_options_set_page(rct_window *w, int page) * * rct2: 0x0067201D */ -static void window_editor_objective_options_set_objective(rct_window *w, int objective) +static void window_editor_objective_options_set_objective(rct_window *w, sint32 objective) { gScenarioObjectiveType = objective; window_invalidate(w); @@ -407,7 +407,7 @@ static void window_editor_objective_options_set_objective(rct_window *w, int obj * * rct2: 0x006719CA */ -static void window_editor_objective_options_main_mouseup(rct_window *w, int widgetIndex) +static void window_editor_objective_options_main_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -441,7 +441,7 @@ static void window_editor_objective_options_main_resize(rct_window *w) static void window_editor_objective_options_show_objective_dropdown(rct_window *w) { - int i, numItems, objectiveType; + sint32 i, numItems, objectiveType; rct_widget *dropdownWidget; uint32 parkFlags; @@ -519,7 +519,7 @@ static void window_editor_objective_options_show_objective_dropdown(rct_window * static void window_editor_objective_options_show_climate_dropdown(rct_window *w) { - int i; + sint32 i; rct_widget *dropdownWidget; dropdownWidget = &w->widgets[WIDX_CLIMATE]; @@ -542,7 +542,7 @@ static void window_editor_objective_options_show_climate_dropdown(rct_window *w) static void window_editor_objective_options_show_category_dropdown(rct_window *w) { - int i; + sint32 i; rct_widget *dropdownWidget; dropdownWidget = &w->widgets[WIDX_CATEGORY]; @@ -683,7 +683,7 @@ static void window_editor_objective_options_arg_2_decrease(rct_window *w) * * rct2: 0x00671A0D */ -static void window_editor_objective_options_main_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_editor_objective_options_main_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { switch (widgetIndex) { case WIDX_OBJECTIVE_DROPDOWN: @@ -714,7 +714,7 @@ static void window_editor_objective_options_main_mousedown(int widgetIndex, rct_ * * rct2: 0x00671A54 */ -static void window_editor_objective_options_main_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_editor_objective_options_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { uint8 newObjectiveType; @@ -783,7 +783,7 @@ static void window_editor_objective_options_main_update(rct_window *w) * * rct2: 0x00671A73 */ -static void window_editor_objective_options_main_textinput(rct_window *w, int widgetIndex, char *text) +static void window_editor_objective_options_main_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (text == NULL) return; @@ -890,7 +890,7 @@ static void window_editor_objective_options_main_invalidate(rct_window *w) static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_stex_entry *stex; - int x, y, width; + sint32 x, y, width; rct_string_id stringId; uint32 arg; @@ -1055,7 +1055,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi * * rct2: 0x006724A4 */ -static void window_editor_objective_options_rides_mouseup(rct_window *w, int widgetIndex) +static void window_editor_objective_options_rides_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -1083,7 +1083,7 @@ static void window_editor_objective_options_rides_resize(rct_window *w) */ static void window_editor_objective_options_rides_update(rct_window *w) { - int i, numItems; + sint32 i, numItems; rct_ride *ride; w->frame_no++; @@ -1109,7 +1109,7 @@ static void window_editor_objective_options_rides_update(rct_window *w) * * rct2: 0x006724BF */ -static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, int scrollIndex, int *width, int *height) +static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = w->no_list_items * 12; } @@ -1118,10 +1118,10 @@ static void window_editor_objective_options_rides_scrollgetheight(rct_window *w, * * rct2: 0x006724FC */ -static void window_editor_objective_options_rides_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_editor_objective_options_rides_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { rct_ride *ride; - int i; + sint32 i; i = y / 12; if (i < 0 || i >= w->no_list_items) @@ -1136,9 +1136,9 @@ static void window_editor_objective_options_rides_scrollmousedown(rct_window *w, * * rct2: 0x006724CC */ -static void window_editor_objective_options_rides_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_editor_objective_options_rides_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int i; + sint32 i; i = y / 12; if (i < 0 || i >= w->no_list_items) @@ -1189,16 +1189,16 @@ static void window_editor_objective_options_rides_paint(rct_window *w, rct_drawp * * rct2: 0x0067236F */ -static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { rct_string_id stringId; rct_ride *ride; - int colour = ColourMapA[w->colours[1]].mid_light; + sint32 colour = ColourMapA[w->colours[1]].mid_light; gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, colour); - for (int i = 0; i < w->no_list_items; i++) { - int y = i * 12; + for (sint32 i = 0; i < w->no_list_items; i++) { + sint32 y = i * 12; if (y + 12 < dpi->y || y >= dpi->y + dpi->height) continue; @@ -1233,7 +1233,7 @@ static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct static void window_editor_objective_options_update_disabled_widgets(rct_window *w) { rct_ride *ride; - int i, numRides; + sint32 i, numRides; // Check if there are any rides (not shops or facilities) numRides = 0; diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index 417767e835..931f432f47 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -180,24 +180,24 @@ static rct_widget *window_editor_scenario_options_widgets[] = { #pragma region Events -static void window_editor_scenario_options_financial_mouseup(rct_window *w, int widgetIndex); +static void window_editor_scenario_options_financial_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_scenario_options_financial_resize(rct_window *w); -static void window_editor_scenario_options_financial_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); +static void window_editor_scenario_options_financial_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); static void window_editor_scenario_options_financial_update(rct_window *w); static void window_editor_scenario_options_financial_invalidate(rct_window *w); static void window_editor_scenario_options_financial_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_editor_scenario_options_guests_mouseup(rct_window *w, int widgetIndex); +static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_scenario_options_guests_resize(rct_window *w); -static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); +static void window_editor_scenario_options_guests_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); static void window_editor_scenario_options_guests_update(rct_window *w); static void window_editor_scenario_options_guests_invalidate(rct_window *w); static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_editor_scenario_options_park_mouseup(rct_window *w, int widgetIndex); +static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 widgetIndex); static void window_editor_scenario_options_park_resize(rct_window *w); -static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_editor_scenario_options_park_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_editor_scenario_options_park_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_editor_scenario_options_park_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_editor_scenario_options_park_update(rct_window *w); static void window_editor_scenario_options_park_invalidate(rct_window *w); static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -351,7 +351,7 @@ void window_editor_scenario_options_open() static void window_editor_scenario_options_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_EDITOR_SCENARIO_OPTIONS_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); @@ -375,7 +375,7 @@ static void window_editor_scenario_options_anchor_border_widgets(rct_window *w) static void window_editor_scenario_options_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi) { rct_widget *widget; - int spriteIndex; + sint32 spriteIndex; // Tab 1 widget = &w->widgets[WIDX_TAB_1]; @@ -403,7 +403,7 @@ static void window_editor_scenario_options_draw_tab_images(rct_window *w, rct_dr * * rct2: 0x00668496 */ -static void window_editor_scenario_options_set_page(rct_window *w, int page) +static void window_editor_scenario_options_set_page(rct_window *w, sint32 page) { if (w->page == page) return; @@ -428,7 +428,7 @@ static void window_editor_scenario_options_set_page(rct_window *w, int page) * * rct2: 0x0067049D */ -static void window_editor_scenario_options_financial_mouseup(rct_window *w, int widgetIndex) +static void window_editor_scenario_options_financial_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -474,7 +474,7 @@ static void window_editor_scenario_options_financial_resize(rct_window *w) * * rct2: 0x006704C8 */ -static void window_editor_scenario_options_financial_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_editor_scenario_options_financial_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_INITIAL_CASH_INCREASE: @@ -593,7 +593,7 @@ static void window_editor_scenario_options_financial_invalidate(rct_window *w) if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY_SCENARIO)) || (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY))) { w->pressed_widgets |= (1 << WIDX_NO_MONEY); - for (int i = WIDX_INITIAL_CASH; i <= WIDX_FORBID_MARKETING; i++) + for (sint32 i = WIDX_INITIAL_CASH; i <= WIDX_FORBID_MARKETING; i++) w->widgets[i].type = WWT_EMPTY; } else { w->pressed_widgets &= ~(1 << WIDX_NO_MONEY); @@ -628,7 +628,7 @@ static void window_editor_scenario_options_financial_invalidate(rct_window *w) */ static void window_editor_scenario_options_financial_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); window_editor_scenario_options_draw_tab_images(w, dpi); @@ -684,7 +684,7 @@ static void window_editor_scenario_options_financial_paint(rct_window *w, rct_dr * * rct2: 0x00670A62 */ -static void window_editor_scenario_options_guests_mouseup(rct_window *w, int widgetIndex) +static void window_editor_scenario_options_guests_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -719,7 +719,7 @@ static void window_editor_scenario_options_guests_resize(rct_window *w) * * rct2: 0x00670A89 */ -static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_editor_scenario_options_guests_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_CASH_PER_GUEST_INCREASE: @@ -852,7 +852,7 @@ static void window_editor_scenario_options_guests_invalidate(rct_window *w) */ static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y, arg; + sint32 x, y, arg; window_draw_widgets(w, dpi); window_editor_scenario_options_draw_tab_images(w, dpi); @@ -912,7 +912,7 @@ static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawp * * rct2: 0x00670FD8 */ -static void window_editor_scenario_options_park_mouseup(rct_window *w, int widgetIndex) +static void window_editor_scenario_options_park_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -959,7 +959,7 @@ static void window_editor_scenario_options_park_resize(rct_window *w) * * rct2: 0x00671019 */ -static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_editor_scenario_options_park_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_widget *dropdownWidget; @@ -1039,7 +1039,7 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w * * rct2: 0x00671060 */ -static void window_editor_scenario_options_park_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_editor_scenario_options_park_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex == WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN && dropdownIndex != -1) { if(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) { @@ -1103,7 +1103,7 @@ static void window_editor_scenario_options_park_invalidate(rct_window *w) if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY_SCENARIO)) || (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (gParkFlags & PARK_FLAGS_NO_MONEY))) { - for (int i = WIDX_LAND_COST; i <= WIDX_ENTRY_PRICE_DECREASE; i++) + for (sint32 i = WIDX_LAND_COST; i <= WIDX_ENTRY_PRICE_DECREASE; i++) w->widgets[i].type = WWT_EMPTY; } else { w->widgets[WIDX_LAND_COST].type = WWT_SPINNER; @@ -1158,7 +1158,7 @@ static void window_editor_scenario_options_park_invalidate(rct_window *w) */ static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y, arg; + sint32 x, y, arg; rct_string_id stringId; window_draw_widgets(w, dpi); diff --git a/src/openrct2/windows/error.c b/src/openrct2/windows/error.c index cc606344af..85f03c308b 100644 --- a/src/openrct2/windows/error.c +++ b/src/openrct2/windows/error.c @@ -79,7 +79,7 @@ static uint16 _window_error_num_lines; void window_error_open(rct_string_id title, rct_string_id message) { utf8 *dst; - int numLines, fontHeight, x, y, width, height, maxY; + sint32 numLines, fontHeight, x, y, width, height, maxY; rct_window *w; window_close_by_class(WC_ERROR); @@ -155,7 +155,7 @@ static void window_error_unknown5(rct_window *w) */ static void window_error_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int t, l, r, b; + sint32 t, l, r, b; l = w->x; t = w->y; diff --git a/src/openrct2/windows/finances.c b/src/openrct2/windows/finances.c index fc3079acbd..11f66a25a4 100644 --- a/src/openrct2/windows/finances.c +++ b/src/openrct2/windows/finances.c @@ -198,35 +198,35 @@ static rct_widget *window_finances_page_widgets[] = { #pragma region Events -static void window_finances_summary_mouseup(rct_window *w, int widgetIndex); -static void window_finances_summary_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); +static void window_finances_summary_mouseup(rct_window *w, sint32 widgetIndex); +static void window_finances_summary_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); static void window_finances_summary_update(rct_window *w); static void window_finances_summary_invalidate(rct_window *w); static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_finances_financial_graph_mouseup(rct_window *w, int widgetIndex); +static void window_finances_financial_graph_mouseup(rct_window *w, sint32 widgetIndex); static void window_finances_financial_graph_update(rct_window *w); static void window_finances_financial_graph_invalidate(rct_window *w); static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_finances_park_value_graph_mouseup(rct_window *w, int widgetIndex); +static void window_finances_park_value_graph_mouseup(rct_window *w, sint32 widgetIndex); static void window_finances_park_value_graph_update(rct_window *w); static void window_finances_park_value_graph_invalidate(rct_window *w); static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_finances_profit_graph_mouseup(rct_window *w, int widgetIndex); +static void window_finances_profit_graph_mouseup(rct_window *w, sint32 widgetIndex); static void window_finances_profit_graph_update(rct_window *w); static void window_finances_profit_graph_invalidate(rct_window *w); static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_finances_marketing_mouseup(rct_window *w, int widgetIndex); +static void window_finances_marketing_mouseup(rct_window *w, sint32 widgetIndex); static void window_finances_marketing_update(rct_window *w); static void window_finances_marketing_invalidate(rct_window *w); static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_finances_research_mouseup(rct_window *w, int widgetIndex); -static void window_finances_research_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_finances_research_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_finances_research_mouseup(rct_window *w, sint32 widgetIndex); +static void window_finances_research_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_finances_research_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_finances_research_update(rct_window *w); static void window_finances_research_invalidate(rct_window *w); static void window_finances_research_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -519,7 +519,7 @@ static uint32 window_finances_page_hold_down_widgets[] = { #pragma endregion -const int window_finances_tab_animation_loops[] = { 16, 32, 32, 32, 38, 16 }; +const sint32 window_finances_tab_animation_loops[] = { 16, 32, 32, 32, 38, 16 }; static const rct_string_id window_finances_summary_row_labels[RCT_EXPENDITURE_TYPE_COUNT] = { STR_FINANCES_SUMMARY_RIDE_CONSTRUCTION, @@ -538,7 +538,7 @@ static const rct_string_id window_finances_summary_row_labels[RCT_EXPENDITURE_TY STR_FINANCES_SUMMARY_LOAN_INTEREST, }; -static void window_finances_set_page(rct_window *w, int page); +static void window_finances_set_page(rct_window *w, sint32 page); static void window_finances_set_pressed_tab(rct_window *w); static void window_finances_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); @@ -594,7 +594,7 @@ void window_finances_research_open() * * rct2: 0x0069CA99 */ -static void window_finances_summary_mouseup(rct_window *w, int widgetIndex) +static void window_finances_summary_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -606,7 +606,7 @@ static void window_finances_summary_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0069CAB0 */ -static void window_finances_summary_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_finances_summary_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { money32 newLoan; @@ -661,7 +661,7 @@ static void window_finances_summary_invalidate(rct_window *w) */ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, j, x, y; + sint32 i, j, x, y; window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); @@ -774,7 +774,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x0069CF70 */ -static void window_finances_financial_graph_mouseup(rct_window *w, int widgetIndex) +static void window_finances_financial_graph_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -816,7 +816,7 @@ static void window_finances_financial_graph_invalidate(rct_window *w) */ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y, graphLeft, graphTop, graphRight, graphBottom; + sint32 i, x, y, graphLeft, graphTop, graphRight, graphBottom; window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); @@ -846,7 +846,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin gfx_fill_rect_inset(dpi, graphLeft, graphTop, graphRight, graphBottom, w->colours[1], INSET_RECT_F_30); // Calculate the Y axis scale (log2 of highest [+/-]balance) - int yAxisScale = 0; + sint32 yAxisScale = 0; for (i = 0; i < 64; i++) { money32 balance = gCashHistory[i]; if (balance == MONEY32_UNDEFINED) @@ -884,7 +884,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin * * rct2: 0x0069D338 */ -static void window_finances_park_value_graph_mouseup(rct_window *w, int widgetIndex) +static void window_finances_park_value_graph_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -926,7 +926,7 @@ static void window_finances_park_value_graph_invalidate(rct_window *w) */ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y, graphLeft, graphTop, graphRight, graphBottom; + sint32 i, x, y, graphLeft, graphTop, graphRight, graphBottom; window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); @@ -952,7 +952,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli gfx_fill_rect_inset(dpi, graphLeft, graphTop, graphRight, graphBottom, w->colours[1], INSET_RECT_F_30); // Calculate the Y axis scale (log2 of highest [+/-]balance) - int yAxisScale = 0; + sint32 yAxisScale = 0; for (i = 0; i < 64; i++) { money32 balance = gParkValueHistory[i]; if (balance == MONEY32_UNDEFINED) @@ -990,7 +990,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli * * rct2: 0x0069D715 */ -static void window_finances_profit_graph_mouseup(rct_window *w, int widgetIndex) +static void window_finances_profit_graph_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1032,7 +1032,7 @@ static void window_finances_profit_graph_invalidate(rct_window *w) */ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y, graphLeft, graphTop, graphRight, graphBottom; + sint32 i, x, y, graphLeft, graphTop, graphRight, graphBottom; window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); @@ -1058,7 +1058,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo gfx_fill_rect_inset(dpi, graphLeft, graphTop, graphRight, graphBottom, w->colours[1], INSET_RECT_F_30); // Calculate the Y axis scale (log2 of highest [+/-]balance) - int yAxisScale = 0; + sint32 yAxisScale = 0; for (i = 0; i < 64; i++) { money32 balance = gWeeklyProfitHistory[i]; if (balance == MONEY32_UNDEFINED) @@ -1096,7 +1096,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo * * rct2: 0x0069D9F9 */ -static void window_finances_marketing_mouseup(rct_window *w, int widgetIndex) +static void window_finances_marketing_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1125,7 +1125,7 @@ static void window_finances_marketing_update(rct_window *w) */ static void window_finances_marketing_invalidate(rct_window *w) { - int i; + sint32 i; colour_scheme_update(w); @@ -1137,12 +1137,12 @@ static void window_finances_marketing_invalidate(rct_window *w) window_finances_set_pressed_tab(w); // Count number of active campaigns - int numActiveCampaigns = 0; + sint32 numActiveCampaigns = 0; for (i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) if (gMarketingCampaignDaysLeft[i] != 0) numActiveCampaigns++; - int y = max(1, numActiveCampaigns) * 10 + 92; + sint32 y = max(1, numActiveCampaigns) * 10 + 92; // Update group box positions window_finances_marketing_widgets[WIDX_ACITVE_CAMPAGINS_GROUP].bottom = y - 20; @@ -1173,7 +1173,7 @@ static void window_finances_marketing_invalidate(rct_window *w) */ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y, weeksRemaining; + sint32 i, x, y, weeksRemaining; rct_ride *ride; window_draw_widgets(w, dpi); @@ -1182,7 +1182,7 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp x = w->x + 8; y = w->y + 62; - int noCampaignsActive = 1; + sint32 noCampaignsActive = 1; for (i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { if (gMarketingCampaignDaysLeft[i] == 0) continue; @@ -1245,9 +1245,9 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp * * rct2: 0x0069DB3F */ -static void window_finances_research_mouseup(rct_window *w, int widgetIndex) +static void window_finances_research_mouseup(rct_window *w, sint32 widgetIndex) { - int activeResearchTypes; + sint32 activeResearchTypes; switch (widgetIndex) { case WIDX_CLOSE: @@ -1279,10 +1279,10 @@ static void window_finances_research_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0069DB66 */ -static void window_finances_research_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_finances_research_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { rct_widget *dropdownWidget; - int i; + sint32 i; if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON) return; @@ -1303,7 +1303,7 @@ static void window_finances_research_mousedown(int widgetIndex, rct_window *w, r dropdownWidget->right - dropdownWidget->left - 3 ); - int currentResearchLevel = gResearchFundingLevel; + sint32 currentResearchLevel = gResearchFundingLevel; dropdown_set_checked(currentResearchLevel, true); } @@ -1311,7 +1311,7 @@ static void window_finances_research_mousedown(int widgetIndex, rct_window *w, r * * rct2: 0x0069DB6D */ -static void window_finances_research_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_finances_research_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1) return; @@ -1349,17 +1349,17 @@ static void window_finances_research_invalidate(rct_window *w) window_finances_research_widgets[WIDX_RESEARCH_FUNDING].type = WWT_EMPTY; window_finances_research_widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON].type = WWT_EMPTY; } - int currentResearchLevel = gResearchFundingLevel; + sint32 currentResearchLevel = gResearchFundingLevel; // Current funding window_finances_research_widgets[WIDX_RESEARCH_FUNDING].text = ResearchFundingLevelNames[currentResearchLevel]; // Checkboxes uint8 activeResearchTypes = gResearchPriorities; - int uncompletedResearchTypes = gResearchUncompletedCategories; - for (int i = 0; i < 7; i++) { - int mask = 1 << i; - int widgetMask = 1 << (i + WIDX_TRANSPORT_RIDES); + sint32 uncompletedResearchTypes = gResearchUncompletedCategories; + for (sint32 i = 0; i < 7; i++) { + sint32 mask = 1 << i; + sint32 widgetMask = 1 << (i + WIDX_TRANSPORT_RIDES); // Set checkbox disabled if research type is complete if (uncompletedResearchTypes & mask) { @@ -1397,7 +1397,7 @@ static void window_finances_research_paint(rct_window *w, rct_drawpixelinfo *dpi * * rct2: 0x0069CAC5 */ -static void window_finances_set_page(rct_window *w, int page) +static void window_finances_set_page(rct_window *w, sint32 page) { w->page = page; w->frame_no = 0; @@ -1430,19 +1430,19 @@ static void window_finances_set_page(rct_window *w, int page) static void window_finances_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_FINANCES_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); } -static void window_finances_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +static void window_finances_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_1 + page; + sint32 widgetIndex = WIDX_TAB_1 + page; if (!(w->disabled_widgets & (1LL << widgetIndex))) { if (w->page == page) { - int frame = w->frame_no / 2; + sint32 frame = w->frame_no / 2; if (page == WINDOW_FINANCES_PAGE_SUMMARY) frame %= 8; spriteIndex += frame; diff --git a/src/openrct2/windows/footpath.c b/src/openrct2/windows/footpath.c index 0fd4f97a57..c983b008ff 100644 --- a/src/openrct2/windows/footpath.c +++ b/src/openrct2/windows/footpath.c @@ -97,14 +97,14 @@ static rct_widget window_footpath_widgets[] = { }; static void window_footpath_close(rct_window *w); -static void window_footpath_mouseup(rct_window *w, int widgetIndex); -static void window_footpath_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_footpath_mouseup(rct_window *w, sint32 widgetIndex); +static void window_footpath_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_footpath_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_footpath_update(rct_window *w); -static void window_footpath_toolupdate(rct_window* w, int widgetIndex, int x, int y); -static void window_footpath_tooldown(rct_window* w, int widgetIndex, int x, int y); -static void window_footpath_tooldrag(rct_window* w, int widgetIndex, int x, int y); -static void window_footpath_toolup(rct_window* w, int widgetIndex, int x, int y); +static void window_footpath_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_footpath_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_footpath_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_footpath_toolup(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); static void window_footpath_invalidate(rct_window *w); static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -188,23 +188,23 @@ const uint8 default_path_slope[] = { }; /** rct2: 0x0098D7E0 */ -unsigned char footpath_construction_preview_images[][4] = { +uint8 footpath_construction_preview_images[][4] = { {5, 10, 5, 10}, // Flat {16, 17, 18, 19}, // Upwards {18, 19, 16, 17}, // Downwards }; -static void window_footpath_mousedown_direction(int direction); -static void window_footpath_mousedown_slope(int slope); -static void window_footpath_show_footpath_types_dialog(rct_window *w, rct_widget *widget, int showQueues); -static void window_footpath_set_provisional_path_at_point(int x, int y); -static void window_footpath_set_selection_start_bridge_at_point(int screenX, int screenY); -static void window_footpath_place_path_at_point(int x, int y); -static void window_footpath_start_bridge_at_point(int screenX, int screenY); +static void window_footpath_mousedown_direction(sint32 direction); +static void window_footpath_mousedown_slope(sint32 slope); +static void window_footpath_show_footpath_types_dialog(rct_window *w, rct_widget *widget, sint32 showQueues); +static void window_footpath_set_provisional_path_at_point(sint32 x, sint32 y); +static void window_footpath_set_selection_start_bridge_at_point(sint32 screenX, sint32 screenY); +static void window_footpath_place_path_at_point(sint32 x, sint32 y); +static void window_footpath_start_bridge_at_point(sint32 screenX, sint32 screenY); static void window_footpath_construct(); static void window_footpath_remove(); static void window_footpath_set_enabled_and_pressed_widgets(); -static void footpath_get_next_path_info(int *type, int *x, int *y, int *z, int *slope); +static void footpath_get_next_path_info(sint32 *type, sint32 *x, sint32 *y, sint32 *z, sint32 *slope); static void footpath_select_default(); /** @@ -285,7 +285,7 @@ static void window_footpath_close(rct_window *w) * * rct2: 0x006A7E92 */ -static void window_footpath_mouseup(rct_window *w, int widgetIndex) +static void window_footpath_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -334,7 +334,7 @@ static void window_footpath_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x006A7EC5 */ -static void window_footpath_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_footpath_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { switch (widgetIndex) { case WIDX_FOOTPATH_TYPE: @@ -371,7 +371,7 @@ static void window_footpath_mousedown(int widgetIndex, rct_window*w, rct_widget* * * rct2: 0x006A7F18 */ -static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_footpath_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex == WIDX_FOOTPATH_TYPE) gFootpathSelectedType = SELECTED_PATH_TYPE_NORMAL; @@ -381,15 +381,15 @@ static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdow return; // Get path id - int pathId = dropdownIndex; + sint32 pathId = dropdownIndex; if (pathId == -1) { pathId = gFootpathSelectedId; } else { - int flags = 4; + sint32 flags = 4; if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode) flags = 0; - int i = 0, j = 0; + sint32 i = 0, j = 0; for (; i < 16; i++) { rct_footpath_entry *pathType = get_footpath_entry(i); if (pathType == (rct_footpath_entry*)-1) @@ -418,7 +418,7 @@ static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdow * * rct2: 0x006A8032 */ -static void window_footpath_toolupdate(rct_window* w, int widgetIndex, int x, int y) +static void window_footpath_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) { window_footpath_set_provisional_path_at_point(x, y); @@ -431,7 +431,7 @@ static void window_footpath_toolupdate(rct_window* w, int widgetIndex, int x, in * * rct2: 0x006A8047 */ -static void window_footpath_tooldown(rct_window* w, int widgetIndex, int x, int y) +static void window_footpath_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) window_footpath_place_path_at_point(x, y); @@ -443,7 +443,7 @@ static void window_footpath_tooldown(rct_window* w, int widgetIndex, int x, int * * rct2: 0x006A8067 */ -static void window_footpath_tooldrag(rct_window* w, int widgetIndex, int x, int y) +static void window_footpath_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) { window_footpath_place_path_at_point(x, y); @@ -454,7 +454,7 @@ static void window_footpath_tooldrag(rct_window* w, int widgetIndex, int x, int * * rct2: 0x006A8066 */ -static void window_footpath_toolup(rct_window* w, int widgetIndex, int x, int y) +static void window_footpath_toolup(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_CONSTRUCT_ON_LAND) { _footpathErrorOccured = false; @@ -467,7 +467,7 @@ static void window_footpath_toolup(rct_window* w, int widgetIndex, int x, int y) */ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window *w) { - int type, x, y, z, slope; + sint32 type, x, y, z, slope; if (gFootpathConstructionMode != PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL) return; @@ -542,7 +542,7 @@ static void window_footpath_update(rct_window *w) */ static void window_footpath_invalidate(rct_window *w) { - int selectedPath; + sint32 selectedPath; rct_footpath_entry *pathType; colour_scheme_update(w); @@ -564,7 +564,7 @@ static void window_footpath_invalidate(rct_window *w) pathType = get_footpath_entry(selectedPath); // TODO: Should probably add constants for object sprites - int pathImage = 71 + pathType->image; + sint32 pathImage = 71 + pathType->image; window_footpath_widgets[WIDX_FOOTPATH_TYPE].image = pathImage; // Disable queue line button when the path is scenario editor-only (and therefore usually shouldn't have one) @@ -596,17 +596,17 @@ static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi) slope = 1; else if (gFootpathConstructSlope == 6) slope = 2; - int image = footpath_construction_preview_images[slope][direction]; + sint32 image = footpath_construction_preview_images[slope][direction]; - int selectedPath = gFootpathSelectedId; + sint32 selectedPath = gFootpathSelectedId; rct_footpath_entry *pathType = get_footpath_entry(selectedPath); image += pathType->image; if (gFootpathSelectedType != SELECTED_PATH_TYPE_NORMAL) image += 51; // Draw construction image - int x = w->x + (window_footpath_widgets[WIDX_CONSTRUCT].left + window_footpath_widgets[WIDX_CONSTRUCT].right) / 2; - int y = w->y + window_footpath_widgets[WIDX_CONSTRUCT].bottom - 60; + sint32 x = w->x + (window_footpath_widgets[WIDX_CONSTRUCT].left + window_footpath_widgets[WIDX_CONSTRUCT].right) / 2; + sint32 y = w->y + window_footpath_widgets[WIDX_CONSTRUCT].bottom - 60; gfx_draw_sprite(dpi, image, x, y, 0); // Draw build this... label @@ -616,8 +616,8 @@ static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi) } // Draw cost - int x = w->x + (window_footpath_widgets[WIDX_CONSTRUCT].left + window_footpath_widgets[WIDX_CONSTRUCT].right) / 2; - int y = w->y + window_footpath_widgets[WIDX_CONSTRUCT].bottom - 12; + sint32 x = w->x + (window_footpath_widgets[WIDX_CONSTRUCT].left + window_footpath_widgets[WIDX_CONSTRUCT].right) / 2; + sint32 y = w->y + window_footpath_widgets[WIDX_CONSTRUCT].bottom - 12; if (_window_footpath_cost != MONEY32_UNDEFINED) if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, COLOUR_BLACK, &_window_footpath_cost); @@ -627,9 +627,9 @@ static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006A7F88 */ -static void window_footpath_show_footpath_types_dialog(rct_window *w, rct_widget *widget, int showQueues) +static void window_footpath_show_footpath_types_dialog(rct_window *w, rct_widget *widget, sint32 showQueues) { - int i, flags, numPathTypes, image; + sint32 i, flags, numPathTypes, image; rct_footpath_entry *pathType; numPathTypes = 0; @@ -669,7 +669,7 @@ static void window_footpath_show_footpath_types_dialog(rct_window *w, rct_widget * * rct2: 0x006A8111 0x006A8135 0x006A815C 0x006A8183 */ -static void window_footpath_mousedown_direction(int direction) +static void window_footpath_mousedown_direction(sint32 direction) { footpath_provisional_update(); gFootpathConstructDirection = (direction - get_current_rotation()) & 3; @@ -681,7 +681,7 @@ static void window_footpath_mousedown_direction(int direction) * * rct2: 0x006A81AA 0x006A81C5 0x006A81E0 */ -static void window_footpath_mousedown_slope(int slope) +static void window_footpath_mousedown_slope(sint32 slope) { footpath_provisional_update(); gFootpathConstructSlope = slope; @@ -693,12 +693,12 @@ static void window_footpath_mousedown_slope(int slope) * * rct2: 0x006A81FB */ -static void window_footpath_set_provisional_path_at_point(int x, int y) +static void window_footpath_set_provisional_path_at_point(sint32 x, sint32 y) { map_invalidate_selection_rect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - int interactionType; + sint32 interactionType; rct_map_element *mapElement; rct_xy16 mapCoord = { 0 }; get_map_coordinates_from_pos(x, y, VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, &interactionType, &mapElement, NULL); @@ -730,10 +730,10 @@ static void window_footpath_set_provisional_path_at_point(int x, int y) footpath_provisional_update(); // Set provisional path - int slope = default_path_slope[mapElement->properties.surface.slope & 0x1F]; + sint32 slope = default_path_slope[mapElement->properties.surface.slope & 0x1F]; if (interactionType == VIEWPORT_INTERACTION_ITEM_FOOTPATH) slope = mapElement->properties.surface.slope & 7; - int pathType = (gFootpathSelectedType << 7) + (gFootpathSelectedId & 0xFF); + sint32 pathType = (gFootpathSelectedType << 7) + (gFootpathSelectedId & 0xFF); _window_footpath_cost = footpath_provisional_set(pathType, x, y, mapElement->base_height, slope); window_invalidate_by_class(WC_FOOTPATH); @@ -744,9 +744,9 @@ static void window_footpath_set_provisional_path_at_point(int x, int y) * * rct2: 0x006A8388 */ -static void window_footpath_set_selection_start_bridge_at_point(int screenX, int screenY) +static void window_footpath_set_selection_start_bridge_at_point(sint32 screenX, sint32 screenY) { - int x, y, direction; + sint32 x, y, direction; rct_map_element *mapElement; map_invalidate_selection_rect(); @@ -769,7 +769,7 @@ static void window_footpath_set_selection_start_bridge_at_point(int screenX, int gMapSelectArrowPosition.x = x; gMapSelectArrowPosition.y = y; - int z = mapElement->base_height; + sint32 z = mapElement->base_height; if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) { uint8 slope = mapElement->properties.surface.slope; @@ -788,9 +788,9 @@ static void window_footpath_set_selection_start_bridge_at_point(int screenX, int * * rct2: 0x006A82C5 */ -static void window_footpath_place_path_at_point(int x, int y) +static void window_footpath_place_path_at_point(sint32 x, sint32 y) { - int interactionType, presentType, selectedType, z, cost; + sint32 interactionType, presentType, selectedType, z, cost; rct_map_element *mapElement; if (_footpathErrorOccured) @@ -831,9 +831,9 @@ static void window_footpath_place_path_at_point(int x, int y) * * rct2: 0x006A840F */ -static void window_footpath_start_bridge_at_point(int screenX, int screenY) +static void window_footpath_start_bridge_at_point(sint32 screenX, sint32 screenY) { - int x, y, z, direction; + sint32 x, y, z, direction; rct_map_element *mapElement; footpath_bridge_get_info_from_pos(screenX, screenY, &x, &y, &direction, &mapElement); @@ -884,7 +884,7 @@ static void window_footpath_construct() _window_footpath_cost = MONEY32_UNDEFINED; footpath_provisional_update(); - int type, x, y, z, slope; + sint32 type, x, y, z, slope; footpath_get_next_path_info(&type, &x, &y, &z, &slope); // Try to place the path at the desired location @@ -943,10 +943,10 @@ static void window_footpath_construct() */ static void footpath_remove_map_element(rct_map_element *mapElement) { - int x, y, z; + sint32 x, y, z; z = mapElement->base_height; - int pathType = mapElement->properties.path.type; + sint32 pathType = mapElement->properties.path.type; if (pathType & 4) { pathType &= 3; pathType ^= 2; @@ -955,7 +955,7 @@ static void footpath_remove_map_element(rct_map_element *mapElement) } // Find a connected edge - int edge = gFootpathConstructDirection ^ 2; + sint32 edge = gFootpathConstructDirection ^ 2; if (!(mapElement->properties.path.edges & (1 << edge))) { edge = (edge + 1) & 3; if (!(mapElement->properties.path.edges & (1 << edge))) { @@ -995,7 +995,7 @@ static void footpath_remove_map_element(rct_map_element *mapElement) static rct_map_element *footpath_get_map_element_to_remove() { rct_map_element *mapElement; - int x, y, z, zLow; + sint32 x, y, z, zLow; x = gFootpathConstructFromPosition.x / 32; y = gFootpathConstructFromPosition.y / 32; @@ -1060,7 +1060,7 @@ static void window_footpath_set_enabled_and_pressed_widgets() gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_CONSTRUCT; gMapSelectFlags |= MAP_SELECT_FLAG_GREEN; - int direction = gFootpathConstructDirection; + sint32 direction = gFootpathConstructDirection; gMapSelectionTiles[0].x = gFootpathConstructFromPosition.x + TileDirectionDelta[direction].x; gMapSelectionTiles[0].y = gFootpathConstructFromPosition.y + TileDirectionDelta[direction].y; gMapSelectionTiles[1].x = -1; @@ -1069,14 +1069,14 @@ static void window_footpath_set_enabled_and_pressed_widgets() uint64 pressedWidgets = w->pressed_widgets & 0xFFFF887F; uint64 disabledWidgets = 0; - int currentRotation = get_current_rotation(); + sint32 currentRotation = get_current_rotation(); if (gFootpathConstructionMode >= PATH_CONSTRUCTION_MODE_BRIDGE_OR_TUNNEL) { // Set pressed directional widget - int direction = (gFootpathConstructDirection + currentRotation) & 3; + sint32 direction = (gFootpathConstructDirection + currentRotation) & 3; pressedWidgets |= (1LL << (WIDX_DIRECTION_NW + direction)); // Set pressed slope widget - int slope = gFootpathConstructSlope; + sint32 slope = gFootpathConstructSlope; if (slope == 6) pressedWidgets |= (1 << WIDX_SLOPEDOWN); else if (slope == 0) @@ -1121,9 +1121,9 @@ static void window_footpath_set_enabled_and_pressed_widgets() * * rct2: 0x006A7B20 */ -static void footpath_get_next_path_info(int *type, int *x, int *y, int *z, int *slope) +static void footpath_get_next_path_info(sint32 *type, sint32 *x, sint32 *y, sint32 *z, sint32 *slope) { - int direction; + sint32 direction; direction = gFootpathConstructDirection; *x = gFootpathConstructFromPosition.x + TileDirectionDelta[direction].x; @@ -1144,7 +1144,7 @@ static void footpath_select_default() { // Select first available footpath gFootpathSelectedId = 0; - for (int i = 0; i < object_entry_group_counts[OBJECT_TYPE_PATHS]; i++) { + for (sint32 i = 0; i < object_entry_group_counts[OBJECT_TYPE_PATHS]; i++) { rct_footpath_entry *pathEntry = get_footpath_entry(i); if (pathEntry != (rct_footpath_entry*)-1) { gFootpathSelectedId = i; diff --git a/src/openrct2/windows/game_bottom_toolbar.c b/src/openrct2/windows/game_bottom_toolbar.c index 1536b45039..c11409a6be 100644 --- a/src/openrct2/windows/game_bottom_toolbar.c +++ b/src/openrct2/windows/game_bottom_toolbar.c @@ -72,16 +72,16 @@ rct_widget window_game_bottom_toolbar_widgets[] = { { WIDGETS_END }, }; -static void window_game_bottom_toolbar_mouseup(rct_window *w, int widgetIndex); -static void window_game_bottom_toolbar_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_game_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex); +static void window_game_bottom_toolbar_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_game_bottom_toolbar_invalidate(rct_window *w); static void window_game_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_game_bottom_toolbar_update(rct_window* w); -static void window_game_bottom_toolbar_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId); +static void window_game_bottom_toolbar_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId); static void window_game_bottom_toolbar_unknown05(rct_window *w); static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, rct_window *w); -static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, rct_window *w, int colour, int x, int y, uint8 factor); +static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, rct_window *w, sint32 colour, sint32 x, sint32 y, uint8 factor); static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, rct_window *w); static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rct_window *w); @@ -162,7 +162,7 @@ void window_game_bottom_toolbar_open() * * rct2: 0x0066C588 */ -static void window_game_bottom_toolbar_mouseup(rct_window *w, int widgetIndex) +static void window_game_bottom_toolbar_mouseup(rct_window *w, sint32 widgetIndex) { rct_news_item *newsItem; @@ -191,8 +191,8 @@ static void window_game_bottom_toolbar_mouseup(rct_window *w, int widgetIndex) { newsItem = news_item_get(0); - int x, y, z; - int subject = newsItem->assoc; + sint32 x, y, z; + sint32 subject = newsItem->assoc; news_item_get_subject_location(newsItem->type, subject, &x, &y, &z); @@ -211,17 +211,17 @@ static void window_game_bottom_toolbar_mouseup(rct_window *w, int widgetIndex) } } -static void window_game_bottom_toolbar_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_game_bottom_toolbar_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { - int month, day; + sint32 month, day; switch (widgetIndex) { case WIDX_MONEY: - set_format_arg(0, int, gCurrentProfit); - set_format_arg(4, int, gParkValue); + set_format_arg(0, sint32, gCurrentProfit); + set_format_arg(4, sint32, gParkValue); break; case WIDX_PARK_RATING: - set_format_arg(0, short, gParkRating); + set_format_arg(0, sint16, gParkRating); break; case WIDX_DATE: month = gDateMonthsElapsed % 8; @@ -239,7 +239,7 @@ static void window_game_bottom_toolbar_tooltip(rct_window* w, int widgetIndex, r */ static void window_game_bottom_toolbar_invalidate(rct_window *w) { - int x; + sint32 x; rct_news_item *newsItem; colour_scheme_update(w); @@ -284,8 +284,8 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w) w->disabled_widgets &= ~(1 << WIDX_NEWS_LOCATE); // Find out if the news item is no longer valid - int y, z; - int subject = newsItem->assoc; + sint32 y, z; + sint32 subject = newsItem->assoc; news_item_get_subject_location(newsItem->type, subject, &x, &y, &z); if (x == SPRITE_LOCATION_NULL) @@ -362,7 +362,7 @@ static void window_game_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *d static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, rct_window *w) { - int x, y; + sint32 x, y; // Draw green inset rectangle on panel gfx_fill_rect_inset( @@ -422,9 +422,9 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r * * rct2: 0x0066C76C */ -static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, rct_window *w, int colour, int x, int y, uint8 factor) +static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, rct_window *w, sint32 colour, sint32 x, sint32 y, uint8 factor) { - short bar_width; + sint16 bar_width; bar_width = (factor * (90 + WIDTH_MOD)) / 256; gfx_fill_rect_inset(dpi, x, y + 1, x + (93 + WIDTH_MOD), y + 9, w->colours[1], INSET_RECT_F_30); @@ -440,7 +440,7 @@ static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, rct_window *w) { - int x, y, temperature; + sint32 x, y, temperature; rct_string_id format; // Draw green inset rectangle on panel @@ -458,14 +458,14 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, y = window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].top + w->y + 2; // Date - int year = date_get_year(gDateMonthsElapsed) + 1; - int month = date_get_month(gDateMonthsElapsed & 7); - int day = ((gDateMonthTicks * days_in_month[month]) >> 16) & 0xFF; + sint32 year = date_get_year(gDateMonthsElapsed) + 1; + sint32 month = date_get_month(gDateMonthsElapsed & 7); + sint32 day = ((gDateMonthTicks * days_in_month[month]) >> 16) & 0xFF; rct_string_id stringId = DateFormatStringFormatIds[gConfigGeneral.date_format]; set_format_arg(0, rct_string_id, DateDayNames[day]); - set_format_arg(2, short, month); - set_format_arg(4, short, year); + set_format_arg(2, sint16, month); + set_format_arg(4, sint16, year); gfx_draw_string_centred( dpi, stringId, @@ -485,7 +485,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, temperature = climate_celsius_to_fahrenheit(temperature); format = STR_FAHRENHEIT_VALUE; } - set_format_arg(0, short, temperature); + set_format_arg(0, sint16, temperature); gfx_draw_string_left(dpi, format, gCommonFormatArgs, COLOUR_BLACK, x, y + 6); x += 30; @@ -507,7 +507,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, */ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rct_window *w) { - int x, y, width; + sint32 x, y, width; rct_news_item *newsItem; rct_widget *middleOutsetWidget; @@ -549,7 +549,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rc } rct_peep* peep = GET_PEEP(newsItem->assoc); - int clip_x = 10, clip_y = 19; + sint32 clip_x = 10, clip_y = 19; if (peep->type == PEEP_TYPE_STAFF){ if (peep->staff_type == STAFF_TYPE_ENTERTAINER){ @@ -620,7 +620,7 @@ static void window_game_bottom_toolbar_update(rct_window* w){ * * rct2: 0x0066C644 */ -static void window_game_bottom_toolbar_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId) +static void window_game_bottom_toolbar_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId) { switch (widgetIndex) { case WIDX_MONEY: diff --git a/src/openrct2/windows/guest.c b/src/openrct2/windows/guest.c index ef8affb798..bb15932c46 100644 --- a/src/openrct2/windows/guest.c +++ b/src/openrct2/windows/guest.c @@ -171,23 +171,23 @@ rct_widget *window_guest_page_widgets[] = { window_guest_inventory_widgets }; -void window_guest_set_page(rct_window* w, int page); +void window_guest_set_page(rct_window* w, sint32 page); void window_guest_disable_widgets(rct_window* w); void window_guest_viewport_init(rct_window* w); void window_guest_overview_close(rct_window *w); void window_guest_overview_resize(rct_window *w); -void window_guest_overview_mouse_up(rct_window *w, int widgetIndex); +void window_guest_overview_mouse_up(rct_window *w, sint32 widgetIndex); void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi); void window_guest_overview_invalidate(rct_window *w); void window_guest_overview_unknown_14(rct_window *w); void window_guest_overview_update(rct_window* w); -void window_guest_overview_text_input(rct_window *w, int widgetIndex, char *text); -void window_guest_overview_tool_update(rct_window* w, int widgetIndex, int x, int y); -void window_guest_overview_tool_down(rct_window* w, int widgetIndex, int x, int y); -void window_guest_overview_tool_abort(rct_window *w, int widgetIndex); +void window_guest_overview_text_input(rct_window *w, sint32 widgetIndex, char *text); +void window_guest_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_guest_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_guest_overview_tool_abort(rct_window *w, sint32 widgetIndex); -void window_guest_mouse_up(rct_window *w, int widgetIndex); +void window_guest_mouse_up(rct_window *w, sint32 widgetIndex); void window_guest_unknown_05(rct_window *w); void window_guest_stats_resize(rct_window *w); @@ -197,13 +197,13 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi); void window_guest_rides_resize(rct_window *w); void window_guest_rides_update(rct_window *w); -void window_guest_rides_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); -void window_guest_rides_scroll_get_size(rct_window *w, int scrollIndex, int *width, int *height); -void window_guest_rides_scroll_mouse_down(rct_window *w, int scrollIndex, int x, int y); -void window_guest_rides_scroll_mouse_over(rct_window *w, int scrollIndex, int x, int y); +void window_guest_rides_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); +void window_guest_rides_scroll_get_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +void window_guest_rides_scroll_mouse_down(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +void window_guest_rides_scroll_mouse_over(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); void window_guest_rides_invalidate(rct_window *w); void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi); -void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); void window_guest_finance_resize(rct_window *w); void window_guest_finance_update(rct_window *w); @@ -592,11 +592,11 @@ void window_guest_overview_resize(rct_window *w){ window_guest_viewport_init(w); } -void game_command_callback_pickup_guest(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_pickup_guest(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { switch(ecx){ case 0:{ - int peepnum = eax; + sint32 peepnum = eax; rct_window* w = window_find_by_number(WC_PEEP, peepnum); if (w) { tool_set(w, WIDX_PICKUP, 7); @@ -615,7 +615,7 @@ void game_command_callback_pickup_guest(int eax, int ebx, int ecx, int edx, int * * rct2: 0x00696A06 */ -void window_guest_overview_mouse_up(rct_window *w, int widgetIndex) +void window_guest_overview_mouse_up(rct_window *w, sint32 widgetIndex) { rct_peep* peep = GET_PEEP(w->number); @@ -655,7 +655,7 @@ void window_guest_overview_mouse_up(rct_window *w, int widgetIndex) * * rct2: 0x696AA0 */ -void window_guest_set_page(rct_window* w, int page){ +void window_guest_set_page(rct_window* w, sint32 page){ if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) { if(w->number == gCurrentToolWidget.window_number && @@ -663,7 +663,7 @@ void window_guest_set_page(rct_window* w, int page){ tool_cancel(); } - int listen = 0; + sint32 listen = 0; if ( page == WINDOW_GUEST_OVERVIEW && w->page==WINDOW_GUEST_OVERVIEW && w->viewport){ if(!(w->viewport->flags & VIEWPORT_FLAG_SOUND_ON)) listen = 1; @@ -729,7 +729,7 @@ void window_guest_viewport_init(rct_window* w){ rct_ride *ride = get_ride(peep->current_ride); if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK){ rct_vehicle* train = GET_VEHICLE(ride->vehicles[peep->current_train]); - int car = peep->current_car; + sint32 car = peep->current_car; for (; car != 0; car--){ train = GET_VEHICLE(train->next_vehicle_on_train); @@ -741,9 +741,9 @@ void window_guest_viewport_init(rct_window* w){ } if (peep->x == SPRITE_LOCATION_NULL && final_check){ rct_ride *ride = get_ride(peep->current_ride); - int x = (ride->overall_view & 0xFF) * 32 + 16; - int y = (ride->overall_view >> 8) * 32 + 16; - int height = map_element_height(x, y); + sint32 x = (ride->overall_view & 0xFF) * 32 + 16; + sint32 y = (ride->overall_view >> 8) * 32 + 16; + sint32 height = map_element_height(x, y); height += 32; focus.coordinate.x = x; focus.coordinate.y = y; @@ -791,10 +791,10 @@ void window_guest_viewport_init(rct_window* w){ if (!(w->viewport)){ rct_widget* view_widget = &w->widgets[WIDX_VIEWPORT]; - int x = view_widget->left + 1 + w->x; - int y = view_widget->top + 1 + w->y; - int width = view_widget->right - view_widget->left - 1; - int height = view_widget->bottom - view_widget->top - 1; + sint32 x = view_widget->left + 1 + w->x; + sint32 y = view_widget->top + 1 + w->y; + sint32 width = view_widget->right - view_widget->left - 1; + sint32 height = view_widget->bottom - view_widget->top - 1; viewport_create(w, x, y, width, height, 0, focus.coordinate.x, focus.coordinate.y, focus.coordinate.z, focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id); w->flags |= WF_NO_SCROLLING; @@ -817,10 +817,10 @@ static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dp return; rct_widget* widget = &w->widgets[WIDX_TAB_1]; - int width = widget->right - widget->left - 1; - int height = widget->bottom - widget->top - 1; - int x = widget->left + 1 + w->x; - int y = widget->top + 1 + w->y; + sint32 width = widget->right - widget->left - 1; + sint32 height = widget->bottom - widget->top - 1; + sint32 x = widget->left + 1 + w->x; + sint32 y = widget->top + 1 + w->y; if (w->page == WINDOW_GUEST_OVERVIEW) height++; rct_drawpixelinfo clip_dpi; @@ -836,9 +836,9 @@ static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dp if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == STAFF_TYPE_ENTERTAINER) y++; - int ebx = g_sprite_entries[peep->sprite_type].sprite_image->base_image + 1; + sint32 ebx = g_sprite_entries[peep->sprite_type].sprite_image->base_image + 1; - int eax = 0; + sint32 eax = 0; if (w->page == WINDOW_GUEST_OVERVIEW){ eax = w->var_496; @@ -846,7 +846,7 @@ static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dp } ebx += eax; - int sprite_id = ebx | (peep->tshirt_colour << 19) | (peep->trousers_colour << 24) | 0xA0000000; + sint32 sprite_id = ebx | (peep->tshirt_colour << 19) | (peep->trousers_colour << 24) | 0xA0000000; gfx_draw_sprite(&clip_dpi, sprite_id, x, y, 0); // If holding a balloon @@ -880,11 +880,11 @@ static void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){ return; rct_widget* widget = &w->widgets[WIDX_TAB_2]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; rct_peep* peep = GET_PEEP(w->number); - int image_id = get_peep_face_sprite_large(peep); + sint32 image_id = get_peep_face_sprite_large(peep); if (w->page == WINDOW_GUEST_STATS){ // If currently viewing this tab animate tab // if it is very sick or angry. @@ -911,10 +911,10 @@ static void window_guest_rides_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){ if (w->disabled_widgets & (1 << WIDX_TAB_3)) return; rct_widget* widget = &w->widgets[WIDX_TAB_3]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; - int image_id = SPR_TAB_RIDE_0; + sint32 image_id = SPR_TAB_RIDE_0; if ( w->page == WINDOW_GUEST_RIDES ){ image_id += (w->frame_no / 4) & 0xF; @@ -931,10 +931,10 @@ static void window_guest_finance_tab_paint(rct_window* w, rct_drawpixelinfo* dpi if (w->disabled_widgets & (1 << WIDX_TAB_4)) return; rct_widget* widget = &w->widgets[WIDX_TAB_4]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; - int image_id = SPR_TAB_FINANCES_SUMMARY_0; + sint32 image_id = SPR_TAB_FINANCES_SUMMARY_0; if ( w->page == WINDOW_GUEST_FINANCE ){ image_id += (w->frame_no / 2) & 0x7; @@ -951,10 +951,10 @@ static void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dp if (w->disabled_widgets & (1 << WIDX_TAB_5)) return; rct_widget* widget = &w->widgets[WIDX_TAB_5]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; - int image_id = SPR_TAB_THOUGHTS_0; + sint32 image_id = SPR_TAB_THOUGHTS_0; if ( w->page == WINDOW_GUEST_THOUGHTS ){ image_id += (w->frame_no / 2) & 0x7; @@ -971,10 +971,10 @@ static void window_guest_inventory_tab_paint(rct_window* w, rct_drawpixelinfo* d if (w->disabled_widgets & (1 << WIDX_TAB_6)) return; rct_widget* widget = &w->widgets[WIDX_TAB_6]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; - int image_id = SPR_TAB_GUEST_INVENTORY; + sint32 image_id = SPR_TAB_GUEST_INVENTORY; gfx_draw_sprite(dpi, image_id, x, y, 0); } @@ -1009,23 +1009,23 @@ void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) set_format_arg(0, uint32, argument1); set_format_arg(4, uint32, argument2); rct_widget* widget = &w->widgets[WIDX_ACTION_LBL]; - int x = (widget->left + widget->right) / 2 + w->x; - int y = w->y + widget->top - 1; - int width = widget->right - widget->left; + sint32 x = (widget->left + widget->right) / 2 + w->x; + sint32 y = w->y + widget->top - 1; + sint32 width = widget->right - widget->left; gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, x, y, width); // Draw the marquee thought widget = &w->widgets[WIDX_MARQUEE]; width = widget->right - widget->left - 3; - int left = widget->left + 2 + w->x; - int top = widget->top + w->y; - int height = widget->bottom - widget->top; + sint32 left = widget->left + 2 + w->x; + sint32 top = widget->top + w->y; + sint32 height = widget->bottom - widget->top; rct_drawpixelinfo dpi_marquee; if (!clip_drawpixelinfo(&dpi_marquee, dpi, left, top, width, height)) { return; } - int i = 0; + sint32 i = 0; for (; i < PEEP_MAX_THOUGHTS; ++i){ if (peep->thoughts[i].type == PEEP_THOUGHT_TYPE_NONE){ w->list_information_type = 0; @@ -1108,7 +1108,7 @@ void window_guest_overview_invalidate(rct_window *w) * rct2: 0x696F45 */ void window_guest_overview_update(rct_window* w){ - int var_496 = w->var_496; + sint32 var_496 = w->var_496; var_496++; var_496 %= 24; w->var_496 = var_496; @@ -1128,7 +1128,7 @@ void window_guest_overview_update(rct_window* w){ // Create the "I have the strangest feeling I am being watched thought" if ((w->highlighted_item & 0xFFFF) >= 3840) { if (!(w->highlighted_item & 0x3FF)) { - int random = util_rand() & 0xFFFF; + sint32 random = util_rand() & 0xFFFF; if (random <= 0x2AAA) { rct_peep* peep = GET_PEEP(w->number); peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_WATCHED, 0xFF); @@ -1139,7 +1139,7 @@ void window_guest_overview_update(rct_window* w){ } /* rct2: 0x696A6A */ -void window_guest_overview_text_input(rct_window *w, int widgetIndex, char *text) +void window_guest_overview_text_input(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_RENAME) return; @@ -1148,16 +1148,16 @@ void window_guest_overview_text_input(rct_window *w, int widgetIndex, char *text return; gGameCommandErrorTitle = STR_CANT_NAME_GUEST; - game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 0)), GAME_COMMAND_SET_GUEST_NAME, *((int*)(text + 8)), *((int*)(text + 4))); - game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 12)), GAME_COMMAND_SET_GUEST_NAME, *((int*)(text + 20)), *((int*)(text + 16))); - game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 24)), GAME_COMMAND_SET_GUEST_NAME, *((int*)(text + 32)), *((int*)(text + 28))); + game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_SET_GUEST_NAME, *((sint32*)(text + 8)), *((sint32*)(text + 4))); + game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 12)), GAME_COMMAND_SET_GUEST_NAME, *((sint32*)(text + 20)), *((sint32*)(text + 16))); + game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 24)), GAME_COMMAND_SET_GUEST_NAME, *((sint32*)(text + 32)), *((sint32*)(text + 28))); } /** * * rct2: 0x696A5F */ -void window_guest_overview_tool_update(rct_window* w, int widgetIndex, int x, int y) +void window_guest_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex != WIDX_PICKUP) return; @@ -1166,7 +1166,7 @@ void window_guest_overview_tool_update(rct_window* w, int widgetIndex, int x, in gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; - int map_x, map_y; + sint32 map_x, map_y; footpath_get_coordinates_from_pos(x, y + 16, &map_x, &map_y, NULL, NULL); if (map_x != MAP_LOCATION_NULL) { gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE; @@ -1180,7 +1180,7 @@ void window_guest_overview_tool_update(rct_window* w, int widgetIndex, int x, in gPickupPeepImage = UINT32_MAX; - int interactionType; + sint32 interactionType; get_map_coordinates_from_pos(x, y, VIEWPORT_INTERACTION_MASK_NONE, NULL, NULL, &interactionType, NULL, NULL); if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE) return; @@ -1208,12 +1208,12 @@ void window_guest_overview_tool_update(rct_window* w, int widgetIndex, int x, in * * rct2: 0x696A54 */ -void window_guest_overview_tool_down(rct_window* w, int widgetIndex, int x, int y) +void window_guest_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex != WIDX_PICKUP) return; - int dest_x, dest_y; + sint32 dest_x, dest_y; rct_map_element* mapElement; footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, NULL, &mapElement); @@ -1228,7 +1228,7 @@ void window_guest_overview_tool_down(rct_window* w, int widgetIndex, int x, int * * rct2: 0x696A49 */ -void window_guest_overview_tool_abort(rct_window *w, int widgetIndex) +void window_guest_overview_tool_abort(rct_window *w, sint32 widgetIndex) { if (widgetIndex != WIDX_PICKUP) return; @@ -1240,7 +1240,7 @@ void window_guest_overview_tool_abort(rct_window *w, int widgetIndex) * This is a combination of 5 functions that were identical * rct2: 0x69744F, 0x697795, 0x697BDD, 0x697E18, 0x698279 */ -void window_guest_mouse_up(rct_window *w, int widgetIndex) +void window_guest_mouse_up(rct_window *w, sint32 widgetIndex) { switch (widgetIndex){ case WIDX_CLOSE: @@ -1327,13 +1327,13 @@ void window_guest_stats_invalidate(rct_window *w) * * ebp: colour, contains flag 0x80000000 for blinking */ -static void window_guest_stats_bars_paint(int value, int x, int y, rct_window *w, rct_drawpixelinfo *dpi, int colour){ +static void window_guest_stats_bars_paint(sint32 value, sint32 x, sint32 y, rct_window *w, rct_drawpixelinfo *dpi, sint32 colour){ value *= 0x76; value >>= 8; gfx_fill_rect_inset(dpi, x + 0x3A, y + 1, x + 0x3A + 0x79, y + 9, w->colours[1], INSET_RECT_F_30); - int blink_flag = colour & (1u << 0x1F); //0x80000000 + sint32 blink_flag = colour & (1u << 0x1F); //0x80000000 colour &= ~(1u << 0x1F); if (!blink_flag || game_is_paused() || @@ -1365,16 +1365,16 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) // Not sure why this is not stats widgets //cx - int x = w->x + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].left + 4; + sint32 x = w->x + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].left + 4; //dx - int y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].top + 4; + sint32 y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].top + 4; //Happiness gfx_draw_string_left(dpi, STR_GUEST_STAT_HAPPINESS_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int happiness = peep->happiness; + sint32 happiness = peep->happiness; if (happiness < 10)happiness = 10; - int ebp = COLOUR_BRIGHT_GREEN; + sint32 ebp = COLOUR_BRIGHT_GREEN; if (happiness < 50){ ebp |= 0x80000000; } @@ -1384,7 +1384,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 10; gfx_draw_string_left(dpi, STR_GUEST_STAT_ENERGY_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int energy = ((peep->energy - 32) * 85) / 32; + sint32 energy = ((peep->energy - 32) * 85) / 32; ebp = COLOUR_BRIGHT_GREEN; if (energy < 50){ ebp |= 0x80000000; @@ -1396,7 +1396,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 10; gfx_draw_string_left(dpi, STR_GUEST_STAT_HUNGER_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int hunger = peep->hunger; + sint32 hunger = peep->hunger; if (hunger > 190) hunger = 190; hunger -= 32; @@ -1415,7 +1415,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 10; gfx_draw_string_left(dpi, STR_GUEST_STAT_THIRST_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int thirst = peep->thirst; + sint32 thirst = peep->thirst; if (thirst > 190) thirst = 190; thirst -= 32; @@ -1434,7 +1434,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 10; gfx_draw_string_left(dpi, STR_GUEST_STAT_NAUSEA_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int nausea = peep->nausea - 32; + sint32 nausea = peep->nausea - 32; if (nausea < 0) nausea = 0; nausea *= 36; @@ -1450,7 +1450,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 10; gfx_draw_string_left(dpi, STR_GUEST_STAT_TOILET_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y); - int bathroom = peep->bathroom - 32; + sint32 bathroom = peep->bathroom - 32; if (bathroom > 210) bathroom = 210; bathroom -= 32; @@ -1467,7 +1467,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) // Time in park y += 11; if (peep->time_in_park != -1){ - int eax = gScenarioTicks; + sint32 eax = gScenarioTicks; eax -= peep->time_in_park; eax >>= 11; set_format_arg(0, uint16, eax & 0xFFFF); @@ -1482,9 +1482,9 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) y += 10; // Intensity - int intensity = peep->intensity / 16; + sint32 intensity = peep->intensity / 16; set_format_arg(0, uint16, intensity); - int string_id = STR_GUEST_STAT_PREFERRED_INTESITY_BELOW; + sint32 string_id = STR_GUEST_STAT_PREFERRED_INTESITY_BELOW; if (peep->intensity & 0xF){ set_format_arg(0, uint16, peep->intensity & 0xF); set_format_arg(2, uint16, intensity); @@ -1502,7 +1502,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) STR_PEEP_STAT_NAUSEA_TOLERANCE_HIGH, }; y += 10; - int nausea_tolerance = peep->nausea_tolerance & 0x3; + sint32 nausea_tolerance = peep->nausea_tolerance & 0x3; set_format_arg(0, rct_string_id, nauseaTolerances[nausea_tolerance]); gfx_draw_string_left(dpi, STR_GUEST_STAT_NAUSEA_TOLERANCE, gCommonFormatArgs, COLOUR_BLACK, x, y); } @@ -1530,7 +1530,7 @@ void window_guest_rides_update(rct_window *w) rct_peep* peep = GET_PEEP(w->number); // Every 2048 ticks do a full window_invalidate - int number_of_ticks = gScenarioTicks - peep->time_in_park; + sint32 number_of_ticks = gScenarioTicks - peep->time_in_park; if (!(number_of_ticks & 0x7FF)) window_invalidate(w); uint8 curr_list_position = 0; @@ -1557,7 +1557,7 @@ void window_guest_rides_update(rct_window *w) * * rct2: 0x697844 */ -void window_guest_rides_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +void window_guest_rides_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -1566,7 +1566,7 @@ void window_guest_rides_tooltip(rct_window* w, int widgetIndex, rct_string_id *s * * rct2: 0x69784E */ -void window_guest_rides_scroll_get_size(rct_window *w, int scrollIndex, int *width, int *height) +void window_guest_rides_scroll_get_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = w->no_list_items * 10; @@ -1575,7 +1575,7 @@ void window_guest_rides_scroll_get_size(rct_window *w, int scrollIndex, int *wid window_invalidate(w); } - int visable_height = *height + sint32 visable_height = *height - window_guest_rides_widgets[WIDX_RIDE_SCROLL].bottom + window_guest_rides_widgets[WIDX_RIDE_SCROLL].top + 21; @@ -1592,9 +1592,9 @@ void window_guest_rides_scroll_get_size(rct_window *w, int scrollIndex, int *wid * * rct2: 0x006978CC */ -void window_guest_rides_scroll_mouse_down(rct_window *w, int scrollIndex, int x, int y) +void window_guest_rides_scroll_mouse_down(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) return; @@ -1606,9 +1606,9 @@ void window_guest_rides_scroll_mouse_down(rct_window *w, int scrollIndex, int x, * * rct2: 0x0069789C */ -void window_guest_rides_scroll_mouse_over(rct_window *w, int scrollIndex, int x, int y) +void window_guest_rides_scroll_mouse_over(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items)return; @@ -1672,16 +1672,16 @@ void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_peep* peep = GET_PEEP(w->number); //cx - int x = w->x + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].left + 2; + sint32 x = w->x + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].left + 2; //dx - int y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].top + 2; + sint32 y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].top + 2; gfx_draw_string_left(dpi, STR_GUEST_LABEL_RIDES_BEEN_ON, NULL, COLOUR_BLACK, x, y); y = w->y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].bottom - 12; - int ride_string_id = STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE; - int ride_string_arguments = 0; + sint32 ride_string_id = STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE; + sint32 ride_string_arguments = 0; if (peep->favourite_ride != 0xFF){ rct_ride* ride = get_ride(peep->favourite_ride); ride_string_arguments = ride->name_arguments; @@ -1697,23 +1697,23 @@ void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006976FC */ -void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { // ax - int left = dpi->x; + sint32 left = dpi->x; // bx - int right = dpi->x + dpi->width - 1; + sint32 right = dpi->x + dpi->width - 1; // cx - int top = dpi->y; + sint32 top = dpi->y; // dx - int bottom = dpi->y + dpi->height - 1; + sint32 bottom = dpi->y + dpi->height - 1; - int colour = ColourMapA[w->colours[1]].mid_light; + sint32 colour = ColourMapA[w->colours[1]].mid_light; gfx_fill_rect(dpi, left, top, right, bottom, colour); - for (int list_index = 0; list_index < w->no_list_items; list_index++){ - int y = list_index * 10; - int string_format = STR_BLACK_STRING; + for (sint32 list_index = 0; list_index < w->no_list_items; list_index++){ + sint32 y = list_index * 10; + sint32 string_format = STR_BLACK_STRING; if (list_index == w->selected_list_item){ gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1); string_format = STR_WINDOW_COLOUR_2_STRINGID; @@ -1796,9 +1796,9 @@ void window_guest_finance_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_peep* peep = GET_PEEP(w->number); //cx - int x = w->x + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].left + 4; + sint32 x = w->x + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].left + 4; //dx - int y = w->y + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].top + 4; + sint32 y = w->y + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].top + 4; // Cash in pocket set_format_arg(0, money32, peep->cash_in_pocket); @@ -1939,9 +1939,9 @@ void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_peep* peep = GET_PEEP(w->number); //cx - int x = w->x + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left + 4; + sint32 x = w->x + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left + 4; //dx - int y = w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].top + 4; + sint32 y = w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].top + 4; gfx_draw_string_left(dpi, STR_GUEST_RECENT_THOUGHTS_LABEL, NULL, COLOUR_BLACK, x, y); @@ -1950,7 +1950,7 @@ void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi) if (thought->type == PEEP_THOUGHT_TYPE_NONE) return; if (thought->var_2 == 0) continue; - int width = window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].right + sint32 width = window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].right - window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left - 8; @@ -2024,7 +2024,7 @@ void window_guest_inventory_invalidate(rct_window *w) window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_6); } -static rct_string_id window_guest_inventory_format_item(rct_peep *peep, int item) +static rct_string_id window_guest_inventory_format_item(rct_peep *peep, sint32 item) { rct_ride *ride; @@ -2114,17 +2114,17 @@ void window_guest_inventory_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_peep *peep = GET_PEEP(w->number); rct_widget *pageBackgroundWidget = &window_guest_inventory_widgets[WIDX_PAGE_BACKGROUND]; - int x = w->x + pageBackgroundWidget->left + 4; - int y = w->y + pageBackgroundWidget->top + 2; - int itemNameWidth = pageBackgroundWidget->right - pageBackgroundWidget->left - 8; + sint32 x = w->x + pageBackgroundWidget->left + 4; + sint32 y = w->y + pageBackgroundWidget->top + 2; + sint32 itemNameWidth = pageBackgroundWidget->right - pageBackgroundWidget->left - 8; - int maxY = w->y + w->height - 22; - int numItems = 0; + sint32 maxY = w->y + w->height - 22; + sint32 numItems = 0; gfx_draw_string_left(dpi, STR_CARRYING, NULL, COLOUR_BLACK, x, y); y += 10; - for (int item = 0; item < SHOP_ITEM_COUNT; item++) { + for (sint32 item = 0; item < SHOP_ITEM_COUNT; item++) { if (y >= maxY) break; if (!peep_has_item(peep, item)) continue; diff --git a/src/openrct2/windows/guest_list.c b/src/openrct2/windows/guest_list.c index 056e4325ae..a005fa93d4 100644 --- a/src/openrct2/windows/guest_list.c +++ b/src/openrct2/windows/guest_list.c @@ -89,18 +89,18 @@ static rct_widget window_guest_list_widgets[] = { { WIDGETS_END }, }; -static void window_guest_list_mouseup(rct_window *w, int widgetIndex); +static void window_guest_list_mouseup(rct_window *w, sint32 widgetIndex); static void window_guest_list_resize(rct_window *w); -static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_guest_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_guest_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_guest_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_guest_list_update(rct_window *w); -static void window_guest_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_guest_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_guest_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_guest_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_guest_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_guest_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_guest_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_guest_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_guest_list_invalidate(rct_window *w); static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_guest_list_events = { NULL, @@ -137,13 +137,13 @@ static uint32 _window_guest_list_last_find_groups_tick; static uint32 _window_guest_list_last_find_groups_selected_view; static uint32 _window_guest_list_last_find_groups_wait; -static int _window_guest_list_highlighted_index; // 0x00F1EE10 -static int _window_guest_list_selected_tab; // 0x00F1EE12 -static int _window_guest_list_selected_filter; // 0x00F1EE06 -static int _window_guest_list_selected_page; // 0x00F1EE07 +static sint32 _window_guest_list_highlighted_index; // 0x00F1EE10 +static sint32 _window_guest_list_selected_tab; // 0x00F1EE12 +static sint32 _window_guest_list_selected_filter; // 0x00F1EE06 +static sint32 _window_guest_list_selected_page; // 0x00F1EE07 static uint32 _window_guest_list_selected_view; // 0x00F1EE13 -static int _window_guest_list_num_pages; // 0x00F1EE08 -static int _window_guest_list_num_groups; // 0x00F1AF22 +static sint32 _window_guest_list_num_pages; // 0x00F1EE08 +static sint32 _window_guest_list_num_groups; // 0x00F1AF22 static bool _window_guest_list_tracking_only; static uint16 _window_guest_list_filter_arguments[4]; @@ -153,7 +153,7 @@ static uint32 _window_guest_list_groups_argument_2[240]; static uint8 _window_guest_list_groups_guest_faces[240 * 58]; static uint8 _window_guest_list_group_index[240]; -static int window_guest_list_is_peep_in_filter(rct_peep* peep); +static sint32 window_guest_list_is_peep_in_filter(rct_peep* peep); static void window_guest_list_find_groups(); static void get_arguments_from_peep(rct_peep *peep, uint32 *argument_1, uint32* argument_2); @@ -231,7 +231,7 @@ void window_guest_list_open() * * @param index The number of the ride or index of the thought */ -void window_guest_list_open_with_filter(int type, int index) +void window_guest_list_open_with_filter(sint32 type, sint32 index) { window_guest_list_open(); @@ -305,7 +305,7 @@ void window_guest_list_open_with_filter(int type, int index) * * rct2: 0x00699AAF */ -static void window_guest_list_mouseup(rct_window *w, int widgetIndex) +static void window_guest_list_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -348,9 +348,9 @@ static void window_guest_list_resize(rct_window *w) * * rct2: 0x00699AC4 */ -static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_guest_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - int i; + sint32 i; switch (widgetIndex) { case WIDX_TAB_1: case WIDX_TAB_2: @@ -416,7 +416,7 @@ static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widge * * rct2: 0x00699AE1 */ -static void window_guest_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_guest_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { switch (widgetIndex) { case WIDX_PAGE_DROPDOWN_BUTTON: @@ -453,9 +453,9 @@ static void window_guest_list_update(rct_window *w) * * rct2: 0x00699C55 */ -static void window_guest_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_guest_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int i, y, numGuests, spriteIndex; + sint32 i, y, numGuests, spriteIndex; rct_peep *peep; switch (_window_guest_list_selected_tab) { @@ -475,7 +475,7 @@ static void window_guest_list_scrollgetsize(rct_window *w, int scrollIndex, int } w->var_492 = numGuests; y = numGuests * 10; - _window_guest_list_num_pages = (int) ceilf((float)numGuests / 3173); + _window_guest_list_num_pages = (sint32) ceilf((float)numGuests / 3173); if (_window_guest_list_num_pages == 0) _window_guest_list_selected_page = 0; else if (_window_guest_list_selected_page >= _window_guest_list_num_pages) @@ -520,9 +520,9 @@ static void window_guest_list_scrollgetsize(rct_window *w, int scrollIndex, int * * rct2: 0x00699D7D */ -static void window_guest_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_guest_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int i, spriteIndex; + sint32 i, spriteIndex; rct_peep *peep; switch (_window_guest_list_selected_tab) { @@ -567,9 +567,9 @@ static void window_guest_list_scrollmousedown(rct_window *w, int scrollIndex, in * * rct2: 0x00699D3B */ -static void window_guest_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_guest_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int i; + sint32 i; i = y / (_window_guest_list_selected_tab == PAGE_INDIVIDUAL ? 10 : 21); i += _window_guest_list_selected_page * 3173; @@ -583,7 +583,7 @@ static void window_guest_list_scrollmouseover(rct_window *w, int scrollIndex, in * * rct2: 0x00699E4A */ -static void window_guest_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_guest_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -633,7 +633,7 @@ static void window_guest_list_invalidate(rct_window *w) */ static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y; + sint32 i, x, y; rct_string_id format; // Widgets @@ -689,9 +689,9 @@ static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x00699701 */ -static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int spriteIndex, numGuests, i, j, y; + sint32 spriteIndex, numGuests, i, j, y; rct_string_id format; rct_peep *peep; rct_peep_thought *thought; @@ -822,7 +822,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, * returns 0 for in filter and 1 for not in filter * rct2: 0x0069B865 */ -static int window_guest_list_is_peep_in_filter(rct_peep* peep) +static sint32 window_guest_list_is_peep_in_filter(rct_peep* peep) { char temp; @@ -886,7 +886,7 @@ static void get_arguments_from_peep(rct_peep *peep, uint32 *argument_1, uint32* */ static void window_guest_list_find_groups() { - int spriteIndex, spriteIndex2, groupIndex, faceIndex; + sint32 spriteIndex, spriteIndex2, groupIndex, faceIndex; rct_peep *peep, *peep2; uint32 tick256 = floor2(gScenarioTicks, 256); @@ -956,8 +956,8 @@ static void window_guest_list_find_groups() continue; } - int curr_num_guests = _window_guest_list_groups_num_guests[groupIndex]; - int swap_position = 0; + sint32 curr_num_guests = _window_guest_list_groups_num_guests[groupIndex]; + sint32 swap_position = 0; //This section places the groups in size order. while (1) { if (swap_position >= groupIndex) @@ -967,12 +967,12 @@ static void window_guest_list_find_groups() swap_position++; } - int argument_1 = _window_guest_list_groups_argument_1[groupIndex]; - int argument_2 = _window_guest_list_groups_argument_2[groupIndex]; - int bl = _window_guest_list_group_index[groupIndex]; + sint32 argument_1 = _window_guest_list_groups_argument_1[groupIndex]; + sint32 argument_2 = _window_guest_list_groups_argument_2[groupIndex]; + sint32 bl = _window_guest_list_group_index[groupIndex]; do { - int temp = curr_num_guests; + sint32 temp = curr_num_guests; curr_num_guests = _window_guest_list_groups_num_guests[swap_position]; _window_guest_list_groups_num_guests[swap_position] = temp; diff --git a/src/openrct2/windows/install_track.c b/src/openrct2/windows/install_track.c index 208253d9ac..94628c477d 100644 --- a/src/openrct2/windows/install_track.c +++ b/src/openrct2/windows/install_track.c @@ -53,10 +53,10 @@ static rct_widget window_install_track_widgets[] = { }; static void window_install_track_close(rct_window *w); -static void window_install_track_mouseup(rct_window *w, int widgetIndex); +static void window_install_track_mouseup(rct_window *w, sint32 widgetIndex); static void window_install_track_invalidate(rct_window *w); static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_install_track_text_input(rct_window *w, int widgetIndex, char *text); +static void window_install_track_text_input(rct_window *w, sint32 widgetIndex, char *text); static rct_window_event_list window_install_track_events = { window_install_track_close, @@ -125,8 +125,8 @@ void window_install_track_open(const utf8 *path) gTrackDesignSceneryToggle = false; _currentTrackPieceDirection = 2; - int x = gScreenWidth / 2 - 201; - int y = max(28, gScreenHeight / 2 - 200); + sint32 x = gScreenWidth / 2 - 201; + sint32 y = max(28, gScreenHeight / 2 - 200); rct_window *w = window_create(x, y, 402, 400, &window_install_track_events, WC_INSTALL_TRACK, 0); w->widgets = window_install_track_widgets; @@ -160,7 +160,7 @@ static void window_install_track_close(rct_window *w) * * rct2: 0x006D407A */ -static void window_install_track_mouseup(rct_window *w, int widgetIndex) +static void window_install_track_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -216,9 +216,9 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi) // Track preview rct_widget *widget = &window_install_track_widgets[WIDX_TRACK_PREVIEW]; - int x = w->x + widget->left + 1; - int y = w->y + widget->top + 1; - int colour = ColourMapA[w->colours[0]].darkest; + sint32 x = w->x + widget->left + 1; + sint32 y = w->y + widget->top + 1; + sint32 colour = ColourMapA[w->colours[0]].darkest; gfx_fill_rect(dpi, x, y, x + 369, y + 216, colour); rct_g1_element *substituteElement = &g1Elements[0]; @@ -294,7 +294,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi) if (ride_type_has_flag(td6->type, RIDE_TYPE_FLAG_HAS_G_FORCES)) { // Maximum positive vertical Gs - int gForces = td6->max_positive_vertical_g * 32; + sint32 gForces = td6->max_positive_vertical_g * 32; gfx_draw_string_left(dpi, STR_MAX_POSITIVE_VERTICAL_G, &gForces, COLOUR_BLACK, x, y); y += 10; @@ -312,7 +312,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi) if (td6->version_and_colour_scheme / 4 >= 2) { if (td6->total_air_time != 0) { // Total air time - int airTime = td6->total_air_time * 25; + sint32 airTime = td6->total_air_time * 25; gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &airTime, COLOUR_BLACK, x, y); y += 10; } @@ -357,7 +357,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006D40A7 */ -static void window_install_track_text_input(rct_window *w, int widgetIndex, char *text) +static void window_install_track_text_input(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_INSTALL || str_is_null_or_empty(text)) { return; diff --git a/src/openrct2/windows/land.c b/src/openrct2/windows/land.c index 33068e7157..b54501a815 100644 --- a/src/openrct2/windows/land.c +++ b/src/openrct2/windows/land.c @@ -58,13 +58,13 @@ static rct_widget window_land_widgets[] = { }; static void window_land_close(rct_window *w); -static void window_land_mouseup(rct_window *w, int widgetIndex); -static void window_land_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_land_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_land_mouseup(rct_window *w, sint32 widgetIndex); +static void window_land_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_land_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_land_update(rct_window *w); static void window_land_invalidate(rct_window *w); static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_land_textinput(rct_window *w, int widgetIndex, char *text); +static void window_land_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_land_inputsize(rct_window *w); static rct_window_event_list window_land_events = { @@ -110,8 +110,8 @@ static char window_land_wall_texture_order[] = { 0, 0 }; -int _selectedFloorTexture; -int _selectedWallTexture; +sint32 _selectedFloorTexture; +sint32 _selectedWallTexture; /** * @@ -164,7 +164,7 @@ static void window_land_close(rct_window *w) * * rct2: 0x00664064 */ -static void window_land_mouseup(rct_window *w, int widgetIndex) +static void window_land_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -204,10 +204,10 @@ static void window_land_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0066407B */ -static void window_land_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_land_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - int i; - int defaultIndex = -1; + sint32 i; + sint32 defaultIndex = -1; switch (widgetIndex) { case WIDX_FLOOR: for (i = 0; i < 14; i++) { @@ -255,9 +255,9 @@ static void window_land_mousedown(int widgetIndex, rct_window*w, rct_widget* wid * * rct2: 0x00664090 */ -static void window_land_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_land_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { - int type; + sint32 type; switch (widgetIndex) { case WIDX_FLOOR: @@ -295,9 +295,9 @@ static void window_land_dropdown(rct_window *w, int widgetIndex, int dropdownInd } } -static void window_land_textinput(rct_window *w, int widgetIndex, char *text) +static void window_land_textinput(rct_window *w, sint32 widgetIndex, char *text) { - int size; + sint32 size; char* end; if (widgetIndex != WIDX_PREVIEW || text == NULL) @@ -362,7 +362,7 @@ static void window_land_invalidate(rct_window *w) */ static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y, numTiles; + sint32 x, y, numTiles; money32 price; rct_widget *previewWidget = &window_land_widgets[WIDX_PREVIEW]; diff --git a/src/openrct2/windows/land_rights.c b/src/openrct2/windows/land_rights.c index 5a6f0fcb65..7f530b311d 100644 --- a/src/openrct2/windows/land_rights.c +++ b/src/openrct2/windows/land_rights.c @@ -51,14 +51,14 @@ static rct_widget window_land_rights_widgets[] = { { WIDGETS_END }, }; -static int window_land_rights_should_close(); +static sint32 window_land_rights_should_close(); static void window_land_rights_close(rct_window *w); -static void window_land_rights_mouseup(rct_window *w, int widgetIndex); +static void window_land_rights_mouseup(rct_window *w, sint32 widgetIndex); static void window_land_rights_update(rct_window *w); static void window_land_rights_invalidate(rct_window *w); static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_land_rights_textinput(rct_window *w, int widgetIndex, char *text); +static void window_land_rights_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_land_rights_inputsize(rct_window *w); static rct_window_event_list window_land_rights_events = { @@ -123,7 +123,7 @@ static void window_land_rights_close(rct_window *w) tool_cancel(); } -static void window_land_rights_mouseup(rct_window *w, int widgetIndex) +static void window_land_rights_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -165,9 +165,9 @@ static void window_land_rights_mouseup(rct_window *w, int widgetIndex) } } -static void window_land_rights_textinput(rct_window *w, int widgetIndex, char *text) +static void window_land_rights_textinput(rct_window *w, sint32 widgetIndex, char *text) { - int size; + sint32 size; char* end; if (widgetIndex != WIDX_PREVIEW || text == NULL) @@ -230,7 +230,7 @@ static void window_land_rights_invalidate(rct_window *w) static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; x = w->x + (window_land_rights_widgets[WIDX_PREVIEW].left + window_land_rights_widgets[WIDX_PREVIEW].right) / 2; y = w->y + (window_land_rights_widgets[WIDX_PREVIEW].top + window_land_rights_widgets[WIDX_PREVIEW].bottom) / 2; @@ -251,7 +251,7 @@ static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi) } } -static int window_land_rights_should_close() +static sint32 window_land_rights_should_close() { if (!(gInputFlags & INPUT_FLAG_TOOL_ACTIVE)) return 1; diff --git a/src/openrct2/windows/loadsave.c b/src/openrct2/windows/loadsave.c index 906a3a3eba..8c75413f77 100644 --- a/src/openrct2/windows/loadsave.c +++ b/src/openrct2/windows/loadsave.c @@ -68,15 +68,15 @@ static rct_widget window_loadsave_widgets[] = { #pragma region Events static void window_loadsave_close(rct_window *w); -static void window_loadsave_mouseup(rct_window *w, int widgetIndex); -static void window_loadsave_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_loadsave_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_loadsave_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_loadsave_textinput(rct_window *w, int widgetIndex, char *text); -static void window_loadsave_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_loadsave_mouseup(rct_window *w, sint32 widgetIndex); +static void window_loadsave_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_loadsave_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_loadsave_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_loadsave_textinput(rct_window *w, sint32 widgetIndex, char *text); +static void window_loadsave_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_loadsave_invalidate(rct_window *w); static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_loadsave_events = { window_loadsave_close, @@ -125,22 +125,22 @@ typedef struct loadsave_list_item { loadsave_callback gLoadSaveCallback; -int _listItemsCount = 0; +sint32 _listItemsCount = 0; loadsave_list_item *_listItems = NULL; char _directory[MAX_PATH]; char _shortenedDirectory[MAX_PATH]; static char _parentDirectory[MAX_PATH]; char _extension[32]; char _defaultName[MAX_PATH]; -int _type; +sint32 _type; -static void window_loadsave_populate_list(rct_window *w, int includeNewItem, const char *directory, const char *extension); +static void window_loadsave_populate_list(rct_window *w, sint32 includeNewItem, const char *directory, const char *extension); static void window_loadsave_select(rct_window *w, const char *path); -static void window_loadsave_sort_list(int index, int endIndex); +static void window_loadsave_sort_list(sint32 index, sint32 endIndex); static rct_window *window_overwrite_prompt_open(const char *name, const char *path); -static int window_loadsave_get_dir(utf8 *last_save, char *path, const char *subdir, size_t pathSize) +static sint32 window_loadsave_get_dir(utf8 *last_save, char *path, const char *subdir, size_t pathSize) { if (last_save && platform_ensure_directory_exists(last_save)) safe_strcpy(path, last_save, pathSize); @@ -154,7 +154,7 @@ static int window_loadsave_get_dir(utf8 *last_save, char *path, const char *subd return 1; } -rct_window *window_loadsave_open(int type, char *defaultName) +rct_window *window_loadsave_open(sint32 type, char *defaultName) { gLoadSaveCallback = NULL; _type = type; @@ -273,7 +273,7 @@ static bool browse(bool isSave, char *path, size_t pathSize) return platform_open_common_file_dialog(path, &desc, pathSize); } -static void window_loadsave_mouseup(rct_window *w, int widgetIndex) +static void window_loadsave_mouseup(rct_window *w, sint32 widgetIndex) { char path[MAX_PATH]; @@ -341,21 +341,21 @@ static void window_loadsave_mouseup(rct_window *w, int widgetIndex) } } -static void window_loadsave_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_loadsave_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = w->no_list_items * 10; } -static void window_loadsave_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_loadsave_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int selectedItem; + sint32 selectedItem; selectedItem = y / 10; if (selectedItem >= w->no_list_items) return; if (_listItems[selectedItem].type == TYPE_DIRECTORY){ // The selected item is a folder - int includeNewItem; + sint32 includeNewItem; w->no_list_items = 0; w->selected_list_item = -1; @@ -378,9 +378,9 @@ static void window_loadsave_scrollmousedown(rct_window *w, int scrollIndex, int } } -static void window_loadsave_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_loadsave_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int selectedItem; + sint32 selectedItem; selectedItem = y / 10; if (selectedItem >= w->no_list_items) @@ -391,10 +391,10 @@ static void window_loadsave_scrollmouseover(rct_window *w, int scrollIndex, int window_invalidate(w); } -static void window_loadsave_textinput(rct_window *w, int widgetIndex, char *text) +static void window_loadsave_textinput(rct_window *w, sint32 widgetIndex, char *text) { char path[MAX_PATH]; - int i, overwrite; + sint32 i, overwrite; if (text == NULL || text[0] == 0) return; @@ -445,7 +445,7 @@ static void window_loadsave_textinput(rct_window *w, int widgetIndex, char *text } -static void window_loadsave_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_loadsave_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -490,12 +490,12 @@ static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_centred_clipped(dpi, STR_DATE, &id, COLOUR_GREY, w->x + 4 + (w->width - 8) * 3 / 4, w->y + 50, (w->width - 8) / 2); } -static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); - for (int i = 0; i < w->no_list_items; i++) { - int y = i * 10; + for (sint32 i = 0; i < w->no_list_items; i++) { + sint32 y = i * 10; if (y > dpi->y + dpi->height) break; @@ -514,7 +514,7 @@ static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i } } -static int list_item_sort(const void *a, const void *b) +static sint32 list_item_sort(const void *a, const void *b) { const loadsave_list_item *itemA = (loadsave_list_item*)a; const loadsave_list_item *itemB = (loadsave_list_item*)b; @@ -528,24 +528,24 @@ static int list_item_sort(const void *a, const void *b) case SORT_NAME_DESCENDING: return -strcicmp(itemA->name, itemB->name); case SORT_DATE_DESCENDING: - return (int) -difftime(itemA->date_modified, itemB->date_modified); + return (sint32) -difftime(itemA->date_modified, itemB->date_modified); case SORT_DATE_ASCENDING: - return (int) difftime(itemA->date_modified, itemB->date_modified); + return (sint32) difftime(itemA->date_modified, itemB->date_modified); default: return strcicmp(itemA->name, itemB->name); } } -static void window_loadsave_sort_list(int index, int endIndex) +static void window_loadsave_sort_list(sint32 index, sint32 endIndex) { - int count = endIndex - index + 1; + sint32 count = endIndex - index + 1; if (count < 0) return; qsort(_listItems + index, count, sizeof(loadsave_list_item), list_item_sort); } -static void window_loadsave_populate_list(rct_window *w, int includeNewItem, const char *directory, const char *extension) +static void window_loadsave_populate_list(rct_window *w, sint32 includeNewItem, const char *directory, const char *extension) { safe_strcpy(_directory, directory, sizeof(_directory)); if (_extension != extension) { @@ -556,7 +556,7 @@ static void window_loadsave_populate_list(rct_window *w, int includeNewItem, con if (_listItems != NULL) free(_listItems); - int listItemCapacity = 8; + sint32 listItemCapacity = 8; _listItems = malloc(listItemCapacity * sizeof(loadsave_list_item)); _listItemsCount = 0; @@ -564,11 +564,11 @@ static void window_loadsave_populate_list(rct_window *w, int includeNewItem, con window_loadsave_widgets[WIDX_NEW_FILE].type = includeNewItem ? WWT_CLOSEBOX : WWT_EMPTY; window_loadsave_widgets[WIDX_NEW_FOLDER].type = includeNewItem ? WWT_CLOSEBOX : WWT_EMPTY; - int drives = platform_get_drives(); + sint32 drives = platform_get_drives(); if (str_is_null_or_empty(directory) && drives) { // List Windows drives w->disabled_widgets |= (1 << WIDX_NEW_FILE) | (1 << WIDX_NEW_FOLDER) | (1 << WIDX_UP); - for (int x = 0; x < 26; x++){ + for (sint32 x = 0; x < 26; x++){ if (listItemCapacity <= _listItemsCount) { listItemCapacity *= 2; void *new_memory = realloc(_listItems, listItemCapacity * sizeof(loadsave_list_item)); @@ -622,7 +622,7 @@ static void window_loadsave_populate_list(rct_window *w, int includeNewItem, con // List all directories char subDir[MAX_PATH]; - int fileEnumHandle = platform_enumerate_directories_begin(directory); + sint32 fileEnumHandle = platform_enumerate_directories_begin(directory); while (platform_enumerate_directories_next(fileEnumHandle, subDir)) { if (listItemCapacity <= _listItemsCount) { listItemCapacity *= 2; @@ -683,7 +683,7 @@ static void window_loadsave_populate_list(rct_window *w, int includeNewItem, con } } -static void window_loadsave_invoke_callback(int result, const utf8 * path) +static void window_loadsave_invoke_callback(sint32 result, const utf8 * path) { if (gLoadSaveCallback != NULL) { gLoadSaveCallback(result, path); @@ -731,7 +731,7 @@ static void window_loadsave_select(rct_window *w, const char *path) save_path(&gConfigGeneral.last_save_game_directory, path); rw = SDL_RWFromFile(path, "wb+"); if (rw != NULL) { - int success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 1 : 0); + sint32 success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 1 : 0); SDL_RWclose(rw); if (success) { safe_strcpy(gScenarioSavePath, path, MAX_PATH); @@ -766,7 +766,7 @@ static void window_loadsave_select(rct_window *w, const char *path) rw = SDL_RWFromFile(path, "wb+"); if (rw != NULL) { scenario_set_filename(path); - int success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 3 : 2); + sint32 success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 3 : 2); SDL_RWclose(rw); if (success) { window_close_by_class(WC_LOADSAVE); @@ -784,11 +784,11 @@ static void window_loadsave_select(rct_window *w, const char *path) case (LOADSAVETYPE_SAVE | LOADSAVETYPE_SCENARIO) : { save_path(&gConfigGeneral.last_save_scenario_directory, path); - int parkFlagsBackup = gParkFlags; + sint32 parkFlagsBackup = gParkFlags; gParkFlags &= ~PARK_FLAGS_18; gS6Info.editor_step = 255; rw = SDL_RWFromFile(path, "wb+"); - int success = 0; + sint32 success = 0; if (rw != NULL) { scenario_set_filename(path); success = scenario_save(rw, gConfigGeneral.save_plugin_data ? 3 : 2); @@ -818,7 +818,7 @@ static void window_loadsave_select(rct_window *w, const char *path) char p[MAX_PATH]; safe_strcpy(p, path, sizeof(p)); path_set_extension(p, "td6", sizeof(p)); - int success = track_design_save_to_file(p); + sint32 success = track_design_save_to_file(p); if (success) { window_close_by_class(WC_LOADSAVE); @@ -854,7 +854,7 @@ static rct_widget window_overwrite_prompt_widgets[] = { { WIDGETS_END } }; -static void window_overwrite_prompt_mouseup(rct_window *w, int widgetIndex); +static void window_overwrite_prompt_mouseup(rct_window *w, sint32 widgetIndex); static void window_overwrite_prompt_invalidate(rct_window *w); static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -911,7 +911,7 @@ static rct_window *window_overwrite_prompt_open(const char *name, const char *pa return w; } -static void window_overwrite_prompt_mouseup(rct_window *w, int widgetIndex) +static void window_overwrite_prompt_mouseup(rct_window *w, sint32 widgetIndex) { rct_window *loadsaveWindow; @@ -943,8 +943,8 @@ static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi) set_format_arg(0, rct_string_id, STR_STRING); set_format_arg(2, char *, _window_overwrite_prompt_name); - int x = w->x + w->width / 2; - int y = w->y + (w->height / 2) - 3; + sint32 x = w->x + w->width / 2; + sint32 y = w->y + (w->height / 2) - 3; gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, w->width - 4, STR_FILEBROWSER_OVERWRITE_PROMPT, COLOUR_BLACK); } diff --git a/src/openrct2/windows/map.c b/src/openrct2/windows/map.c index 994d2be3d4..c361ff2313 100644 --- a/src/openrct2/windows/map.c +++ b/src/openrct2/windows/map.c @@ -116,20 +116,20 @@ static const uint16 RideKeyColours[] = { static void window_map_close(rct_window *w); static void window_map_resize(rct_window *w); -static void window_map_mouseup(rct_window *w, int widgetIndex); -static void window_map_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); +static void window_map_mouseup(rct_window *w, sint32 widgetIndex); +static void window_map_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); static void window_map_update(rct_window *w); -static void window_map_toolupdate(rct_window* w, int widgetIndex, int x, int y); -static void window_map_tooldown(rct_window* w, int widgetIndex, int x, int y); -static void window_map_tooldrag(rct_window* w, int widgetIndex, int x, int y); -static void window_map_toolabort(rct_window *w, int widgetIndex); -static void window_map_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_map_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_map_textinput(rct_window *w, int widgetIndex, char *text); -static void window_map_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_map_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_map_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_map_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_map_toolabort(rct_window *w, sint32 widgetIndex); +static void window_map_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_map_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_map_textinput(rct_window *w, sint32 widgetIndex, char *text); +static void window_map_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_map_invalidate(rct_window *w); static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_map_events = { window_map_close, @@ -182,16 +182,16 @@ static void window_map_inputsize_land(rct_window *w); static void window_map_inputsize_map(rct_window *w); static void window_map_set_bounds(rct_window* w); -static void window_map_set_land_rights_tool_update(int x, int y); -static void window_map_place_park_entrance_tool_update(int x, int y); -static void window_map_set_peep_spawn_tool_update(int x, int y); -static void window_map_place_park_entrance_tool_down(int x, int y); -static void window_map_set_peep_spawn_tool_down(int x, int y); +static void window_map_set_land_rights_tool_update(sint32 x, sint32 y); +static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y); +static void window_map_set_peep_spawn_tool_update(sint32 x, sint32 y); +static void window_map_place_park_entrance_tool_down(sint32 x, sint32 y); +static void window_map_set_peep_spawn_tool_down(sint32 x, sint32 y); static void map_window_increase_map_size(); static void map_window_decrease_map_size(); static void map_window_set_pixels(rct_window *w); -static void map_window_screen_to_map(int screenX, int screenY, int *mapX, int *mapY); +static void map_window_screen_to_map(sint32 screenX, sint32 screenY, sint32 *mapX, sint32 *mapY); /** * @@ -270,7 +270,7 @@ static void window_map_close(rct_window *w) * * rct2: 0x0068CFC1 */ -static void window_map_mouseup(rct_window *w, int widgetIndex) +static void window_map_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -403,7 +403,7 @@ static void window_map_resize(rct_window *w) * * rct2: 0x0068D040 */ -static void window_map_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_map_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_MAP_SIZE_SPINNER_UP: @@ -427,7 +427,7 @@ static void window_map_update(rct_window *w) window_map_center_on_view_point(); } - for (int i = 0; i < 16; i++) + for (sint32 i = 0; i < 16; i++) map_window_set_pixels(w); window_invalidate(w); @@ -452,7 +452,7 @@ static void window_map_update(rct_window *w) * * rct2: 0x0068D093 */ -static void window_map_toolupdate(rct_window* w, int widgetIndex, int x, int y) +static void window_map_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_SET_LAND_RIGHTS: @@ -471,7 +471,7 @@ static void window_map_toolupdate(rct_window* w, int widgetIndex, int x, int y) * * rct2: 0x0068D074 */ -static void window_map_tooldown(rct_window* w, int widgetIndex, int x, int y) +static void window_map_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_BUILD_PARK_ENTRANCE: @@ -487,7 +487,7 @@ static void window_map_tooldown(rct_window* w, int widgetIndex, int x, int y) * * rct2: 0x0068D088 */ -static void window_map_tooldrag(rct_window* w, int widgetIndex, int x, int y) +static void window_map_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_SET_LAND_RIGHTS: @@ -511,7 +511,7 @@ static void window_map_tooldrag(rct_window* w, int widgetIndex, int x, int y) * * rct2: 0x0068D055 */ -static void window_map_toolabort(rct_window *w, int widgetIndex) +static void window_map_toolabort(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_SET_LAND_RIGHTS: @@ -540,7 +540,7 @@ static void window_map_toolabort(rct_window *w, int widgetIndex) * * rct2: 0x0068D7CC */ -static void window_map_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_map_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { window_map_invalidate(w); @@ -552,9 +552,9 @@ static void window_map_scrollgetsize(rct_window *w, int scrollIndex, int *width, * * rct2: 0x0068D726 */ -static void window_map_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_map_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int mapX = 0, mapY = 0, mapZ = 0; + sint32 mapX = 0, mapY = 0, mapZ = 0; rct_window *mainWindow; map_window_screen_to_map(x, y, &mapX, &mapY); @@ -569,9 +569,9 @@ static void window_map_scrollmousedown(rct_window *w, int scrollIndex, int x, in if (land_tool_is_active()) { // Set land terrain - int landToolSize = max(1, gLandToolSize); - int size = (landToolSize * 32) - 32; - int radius = (landToolSize * 16) - 16; + sint32 landToolSize = max(1, gLandToolSize); + sint32 size = (landToolSize * 32) - 32; + sint32 radius = (landToolSize * 16) - 16; mapX = (mapX - radius) & 0xFFE0; mapY = (mapY - radius) & 0xFFE0; @@ -596,9 +596,9 @@ static void window_map_scrollmousedown(rct_window *w, int scrollIndex, int x, in ); } else if (widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS)) { // Set land rights - int landToolSize = max(1, gLandToolSize); - int size = (landToolSize * 32) - 32; - int radius = (landToolSize * 16) - 16; + sint32 landToolSize = max(1, gLandToolSize); + sint32 size = (landToolSize * 32) - 32; + sint32 radius = (landToolSize * 16) - 16; mapX = (mapX - radius) & 0xFFE0; mapY = (mapY - radius) & 0xFFE0; @@ -624,9 +624,9 @@ static void window_map_scrollmousedown(rct_window *w, int scrollIndex, int x, in } } -static void window_map_textinput(rct_window *w, int widgetIndex, char *text) +static void window_map_textinput(rct_window *w, sint32 widgetIndex, char *text) { - int size; + sint32 size; char* end; if (text == NULL) @@ -648,7 +648,7 @@ static void window_map_textinput(rct_window *w, int widgetIndex, char *text) size += 2; size=clamp(MINIMUM_MAP_SIZE_TECHNICAL, size, MAXIMUM_MAP_SIZE_TECHNICAL); - int currentSize = gMapSize; + sint32 currentSize = gMapSize; while (size < currentSize) { map_window_decrease_map_size(); currentSize--; @@ -667,7 +667,7 @@ static void window_map_textinput(rct_window *w, int widgetIndex, char *text) * * rct2: 0x0068D140 */ -static void window_map_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_map_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_MAP); } @@ -679,7 +679,7 @@ static void window_map_tooltip(rct_window* w, int widgetIndex, rct_string_id *st static void window_map_invalidate(rct_window *w) { uint64 pressedWidgets; - int i, height; + sint32 i, height; colour_scheme_update(w); @@ -816,8 +816,8 @@ static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); window_map_draw_tab_images(w, dpi); - int x = w->x + (window_map_widgets[WIDX_LAND_TOOL].left + window_map_widgets[WIDX_LAND_TOOL].right) / 2; - int y = w->y + (window_map_widgets[WIDX_LAND_TOOL].top + window_map_widgets[WIDX_LAND_TOOL].bottom) / 2; + sint32 x = w->x + (window_map_widgets[WIDX_LAND_TOOL].left + window_map_widgets[WIDX_LAND_TOOL].right) / 2; + sint32 y = w->y + (window_map_widgets[WIDX_LAND_TOOL].top + window_map_widgets[WIDX_LAND_TOOL].bottom) / 2; // Draw land tool size if (widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS) && gLandToolSize > 7) { @@ -849,7 +849,7 @@ static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi) STR_MAP_TOILET, }; - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { gfx_fill_rect(dpi, x, y + 2, x + 6, y + 8, RideKeyColours[i]); gfx_draw_string_left(dpi, mapLabels[i], w, COLOUR_BLACK, x + 10, y); y += 10; @@ -868,7 +868,7 @@ static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x0068CF23 */ -static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { rct_g1_element *g1_element, pushed_g1_element; @@ -1168,7 +1168,7 @@ static void window_map_paint_hud_rectangle(rct_drawpixelinfo *dpi) * * rct2: 0x0068D24E */ -static void window_map_set_land_rights_tool_update(int x, int y) +static void window_map_set_land_rights_tool_update(sint32 x, sint32 y) { sint16 mapX, mapY; rct_viewport *viewport; @@ -1182,12 +1182,12 @@ static void window_map_set_land_rights_tool_update(int x, int y) gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE; gMapSelectType = MAP_SELECT_TYPE_FULL; - int landToolSize = gLandToolSize; + sint32 landToolSize = gLandToolSize; if (landToolSize == 0) landToolSize = 1; - int size = (landToolSize * 32) - 32; - int radius = (landToolSize * 16) - 16; + sint32 size = (landToolSize * 32) - 32; + sint32 radius = (landToolSize * 16) - 16; mapX = (mapX - radius) & 0xFFE0; mapY = (mapY - radius) & 0xFFE0; gMapSelectPositionA.x = mapX; @@ -1201,7 +1201,7 @@ static void window_map_set_land_rights_tool_update(int x, int y) * * rct2: 0x00666EEF */ -static void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, int *direction) +static void sub_666EEF(sint32 x, sint32 y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, sint32 *direction) { rct_map_element *mapElement; @@ -1227,10 +1227,10 @@ static void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, i * * rct2: 0x00666FD0 */ -static void window_map_place_park_entrance_tool_update(int x, int y) +static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y) { sint16 mapX, mapY, mapZ = 0; - int direction, sideDirection; + sint32 direction, sideDirection; map_invalidate_selection_rect(); map_invalidate_map_selection_tiles(); @@ -1271,9 +1271,9 @@ static void window_map_place_park_entrance_tool_update(int x, int y) * * rct2: 0x0068D4E9 */ -static void window_map_set_peep_spawn_tool_update(int x, int y) +static void window_map_set_peep_spawn_tool_update(sint32 x, sint32 y) { - int mapX, mapY, mapZ, direction; + sint32 mapX, mapY, mapZ, direction; rct_map_element *mapElement; map_invalidate_selection_rect(); @@ -1309,12 +1309,12 @@ static void window_map_set_peep_spawn_tool_update(int x, int y) * * rct2: 0x006670A4 */ -static void window_map_place_park_entrance_tool_down(int x, int y) +static void window_map_place_park_entrance_tool_down(sint32 x, sint32 y) { park_remove_ghost_entrance(); sint16 mapX, mapY, mapZ; - int direction; + sint32 direction; sub_666EEF(x, y, &mapX, &mapY, &mapZ, &direction); if (mapX != MAP_LOCATION_NULL) { gGameCommandErrorTitle = STR_CANT_BUILD_PARK_ENTRANCE_HERE; @@ -1342,10 +1342,10 @@ static void window_map_place_park_entrance_tool_down(int x, int y) * * rct2: 0x0068D573 */ -static void window_map_set_peep_spawn_tool_down(int x, int y) +static void window_map_set_peep_spawn_tool_down(sint32 x, sint32 y) { rct_map_element *mapElement, *surfaceMapElement; - int mapX, mapY, mapZ, direction; + sint32 mapX, mapY, mapZ, direction; footpath_get_coordinates_from_pos(x, y, &mapX, &mapY, &direction, &mapElement); if (mapX == 0x8000) @@ -1360,7 +1360,7 @@ static void window_map_set_peep_spawn_tool_down(int x, int y) mapY = mapY + 16 + (word_981D6C[direction].y * 15); mapZ = mapElement->base_height / 2; - int peepSpawnIndex = 0; + sint32 peepSpawnIndex = 0; if (gLandToolSize != 1 && gPeepSpawns[0].x != 0xFFFF) peepSpawnIndex = 1; @@ -1564,7 +1564,7 @@ static const uint8 RideColourKey[] = { COLOUR_KEY_RIDE, // }; -static uint16 map_window_get_pixel_colour_peep(int x, int y) +static uint16 map_window_get_pixel_colour_peep(sint32 x, sint32 y) { rct_map_element *mapElement; uint16 colour; @@ -1577,9 +1577,9 @@ static uint16 map_window_get_pixel_colour_peep(int x, int y) if (!(mapElement->properties.surface.ownership & OWNERSHIP_OWNED)) colour = 10 | (colour & 0xFF00); - const int maxSupportedMapElementType = (int)countof(ElementTypeAddColour); + const sint32 maxSupportedMapElementType = (sint32)countof(ElementTypeAddColour); while (!map_element_is_last_for_tile(mapElement++)) { - int mapElementType = map_element_get_type(mapElement) >> 2; + sint32 mapElementType = map_element_get_type(mapElement) >> 2; if (mapElementType >= maxSupportedMapElementType) { mapElementType = MAP_ELEMENT_TYPE_CORRUPT >> 2; } @@ -1590,7 +1590,7 @@ static uint16 map_window_get_pixel_colour_peep(int x, int y) return colour; } -static uint16 map_window_get_pixel_colour_ride(int x, int y) +static uint16 map_window_get_pixel_colour_ride(sint32 x, sint32 y) { rct_map_element *mapElement; rct_ride *ride; @@ -1634,9 +1634,9 @@ static void map_window_set_pixels(rct_window *w) { uint16 colour = 0; uint8 *destination; - int x = 0, y = 0, dx = 0, dy = 0; + sint32 x = 0, y = 0, dx = 0, dy = 0; - int pos = (_currentLine * 511) + 255; + sint32 pos = (_currentLine * 511) + 255; rct_xy16 destinationPosition = {.y = pos/512, .x = pos % 512}; destination = &(*_mapImageData)[destinationPosition.y][destinationPosition.x]; switch (get_current_rotation()) { @@ -1666,7 +1666,7 @@ static void map_window_set_pixels(rct_window *w) break; } - for (int i = 0; i < 256; i++) { + for (sint32 i = 0; i < 256; i++) { if ( x > 0 && y > 0 && @@ -1696,9 +1696,9 @@ static void map_window_set_pixels(rct_window *w) _currentLine = 0; } -static void map_window_screen_to_map(int screenX, int screenY, int *mapX, int *mapY) +static void map_window_screen_to_map(sint32 screenX, sint32 screenY, sint32 *mapX, sint32 *mapY) { - int x, y; + sint32 x, y; screenX = ((screenX + 8) - 256) / 2; screenY = ((screenY + 8) ) / 2; diff --git a/src/openrct2/windows/map_tooltip.c b/src/openrct2/windows/map_tooltip.c index e2486e71c0..25c82a4c79 100644 --- a/src/openrct2/windows/map_tooltip.c +++ b/src/openrct2/windows/map_tooltip.c @@ -60,9 +60,9 @@ static rct_window_event_list window_map_tooltip_events = { #define MAP_TOOLTIP_ARGS -static int _lastCursorX; -static int _lastCursorY; -static int _cursorHoldDuration; +static sint32 _lastCursorX; +static sint32 _lastCursorY; +static sint32 _cursorHoldDuration; static void window_map_tooltip_open(); @@ -72,7 +72,7 @@ static void window_map_tooltip_open(); */ void window_map_tooltip_update_visibility() { - int cursorX, cursorY, inputFlags; + sint32 cursorX, cursorY, inputFlags; cursorX = gCursorState.x; cursorY = gCursorState.y; @@ -108,7 +108,7 @@ void window_map_tooltip_update_visibility() static void window_map_tooltip_open() { rct_window* w; - int x, y, width, height; + sint32 x, y, width, height; width = 200; height = 44; diff --git a/src/openrct2/windows/mapgen.c b/src/openrct2/windows/mapgen.c index 8337f57975..1f73f91926 100644 --- a/src/openrct2/windows/mapgen.c +++ b/src/openrct2/windows/mapgen.c @@ -169,8 +169,8 @@ static rct_widget window_mapgen_simplex_widgets[] = { { WIDGETS_END }, }; -const int window_mapgen_tab_animation_divisor[] = { 1, 1, 1 }; -const int window_mapgen_tab_animation_frames[] = { 1, 1, 1 }; +const sint32 window_mapgen_tab_animation_divisor[] = { 1, 1, 1 }; +const sint32 window_mapgen_tab_animation_frames[] = { 1, 1, 1 }; static rct_widget *window_mapgen_page_widgets[] = { @@ -183,23 +183,23 @@ static rct_widget *window_mapgen_page_widgets[] = { #pragma region Events -static void window_mapgen_base_mouseup(rct_window *w, int widgetIndex); -static void window_mapgen_base_mousedown(int widgetIndex, rct_window *w, rct_widget* widget); -static void window_mapgen_base_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_mapgen_base_mouseup(rct_window *w, sint32 widgetIndex); +static void window_mapgen_base_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget); +static void window_mapgen_base_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_mapgen_base_update(rct_window *w); -static void window_mapgen_textinput(rct_window *w, int widgetIndex, char *text); +static void window_mapgen_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_mapgen_base_invalidate(rct_window *w); static void window_mapgen_base_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_mapgen_random_mouseup(rct_window *w, int widgetIndex); -static void window_mapgen_random_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); +static void window_mapgen_random_mouseup(rct_window *w, sint32 widgetIndex); +static void window_mapgen_random_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); static void window_mapgen_random_update(rct_window *w); static void window_mapgen_random_invalidate(rct_window *w); static void window_mapgen_random_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_mapgen_simplex_mouseup(rct_window *w, int widgetIndex); -static void window_mapgen_simplex_mousedown(int widgetIndex, rct_window *w, rct_widget* widget); -static void window_mapgen_simplex_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_mapgen_simplex_mouseup(rct_window *w, sint32 widgetIndex); +static void window_mapgen_simplex_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget); +static void window_mapgen_simplex_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_mapgen_simplex_update(rct_window *w); static void window_mapgen_simplex_invalidate(rct_window *w); static void window_mapgen_simplex_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -387,7 +387,7 @@ static uint32 window_mapgen_page_hold_down_widgets[] = { #pragma endregion -const int window_mapgen_tab_animation_loops[] = { 16, 16, 16 }; +const sint32 window_mapgen_tab_animation_loops[] = { 16, 16, 16 }; #define MINIMUM_MAP_SIZE_TECHNICAL 15 #define MAXIMUM_MAP_SIZE_TECHNICAL 256 @@ -398,7 +398,7 @@ const int window_mapgen_tab_animation_loops[] = { 16, 16, 16 }; #define WATERLEVEL_MIN 0 #define WATERLEVEL_MAX 54 -static void window_mapgen_set_page(rct_window *w, int page); +static void window_mapgen_set_page(rct_window *w, sint32 page); static void window_mapgen_set_pressed_tab(rct_window *w); static void window_mapgen_anchor_border_widgets(rct_window *w); static void window_mapgen_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); @@ -415,18 +415,18 @@ static char window_land_wall_texture_order[] = { 0, 0 }; -static int _mapSize = 150; -static int _baseHeight = 12; -static int _waterLevel = 16; -static int _floorTexture = TERRAIN_GRASS; -static int _wallTexture = TERRAIN_EDGE_ROCK; -static int _randomTerrrain = 1; -static int _placeTrees = 1; +static sint32 _mapSize = 150; +static sint32 _baseHeight = 12; +static sint32 _waterLevel = 16; +static sint32 _floorTexture = TERRAIN_GRASS; +static sint32 _wallTexture = TERRAIN_EDGE_ROCK; +static sint32 _randomTerrrain = 1; +static sint32 _placeTrees = 1; -static int _simplex_low = 6; -static int _simplex_high = 10; +static sint32 _simplex_low = 6; +static sint32 _simplex_high = 10; static sint32 _simplex_base_freq = 60; -static int _simplex_octaves = 4; +static sint32 _simplex_octaves = 4; rct_window *window_mapgen_open() { @@ -460,7 +460,7 @@ rct_window *window_mapgen_open() #pragma region Base page -static void window_mapgen_base_mouseup(rct_window *w, int widgetIndex) +static void window_mapgen_base_mouseup(rct_window *w, sint32 widgetIndex) { mapgen_settings mapgenSettings; @@ -502,10 +502,10 @@ static void window_mapgen_base_mouseup(rct_window *w, int widgetIndex) } } -static void window_mapgen_base_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_mapgen_base_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { - int i; - int defaultIndex = -1; + sint32 i; + sint32 defaultIndex = -1; switch (widgetIndex) { case WIDX_MAP_SIZE_UP: _mapSize = min(_mapSize + 1, MAXIMUM_MAP_SIZE_TECHNICAL); @@ -570,9 +570,9 @@ static void window_mapgen_base_mousedown(int widgetIndex, rct_window *w, rct_wid } } -static void window_mapgen_base_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_mapgen_base_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { - int type; + sint32 type; switch (widgetIndex) { case WIDX_FLOOR_TEXTURE: @@ -618,9 +618,9 @@ static void window_mapgen_base_update(rct_window *w) widget_invalidate(w, WIDX_TAB_1); } -static void window_mapgen_textinput(rct_window *w, int widgetIndex, char *text) +static void window_mapgen_textinput(rct_window *w, sint32 widgetIndex, char *text) { - int value; + sint32 value; char* end; if (text == NULL) @@ -694,7 +694,7 @@ static void window_mapgen_base_paint(rct_window *w, rct_drawpixelinfo *dpi) #pragma region Random page -static void window_mapgen_random_mouseup(rct_window *w, int widgetIndex) +static void window_mapgen_random_mouseup(rct_window *w, sint32 widgetIndex) { mapgen_settings mapgenSettings; @@ -732,7 +732,7 @@ static void window_mapgen_random_mouseup(rct_window *w, int widgetIndex) } } -static void window_mapgen_random_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_mapgen_random_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { } @@ -774,7 +774,7 @@ static void window_mapgen_random_paint(rct_window *w, rct_drawpixelinfo *dpi) #pragma region Simplex page -static void window_mapgen_simplex_mouseup(rct_window *w, int widgetIndex) +static void window_mapgen_simplex_mouseup(rct_window *w, sint32 widgetIndex) { mapgen_settings mapgenSettings; @@ -813,10 +813,10 @@ static void window_mapgen_simplex_mouseup(rct_window *w, int widgetIndex) } } -static void window_mapgen_simplex_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_mapgen_simplex_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { - int i; - int defaultIndex = -1; + sint32 i; + sint32 defaultIndex = -1; switch (widgetIndex) { case WIDX_SIMPLEX_LOW_UP: _simplex_low = min(_simplex_low + 1, 24); @@ -905,9 +905,9 @@ static void window_mapgen_simplex_mousedown(int widgetIndex, rct_window *w, rct_ } } -static void window_mapgen_simplex_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_mapgen_simplex_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { - int type; + sint32 type; switch (widgetIndex) { case WIDX_SIMPLEX_FLOOR_TEXTURE: @@ -1002,7 +1002,7 @@ static void window_mapgen_simplex_paint(rct_window *w, rct_drawpixelinfo *dpi) #pragma region Common -static void window_mapgen_set_page(rct_window *w, int page) +static void window_mapgen_set_page(rct_window *w, sint32 page) { w->page = page; w->frame_no = 0; @@ -1024,7 +1024,7 @@ static void window_mapgen_set_page(rct_window *w, int page) static void window_mapgen_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_MAPGEN_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); @@ -1032,8 +1032,8 @@ static void window_mapgen_set_pressed_tab(rct_window *w) static void window_mapgen_anchor_border_widgets(rct_window *w) { - int width = w->widgets[WIDX_GENERATE].right - w->widgets[WIDX_GENERATE].left; - int height = w->widgets[WIDX_GENERATE].bottom - w->widgets[WIDX_GENERATE].top; + sint32 width = w->widgets[WIDX_GENERATE].right - w->widgets[WIDX_GENERATE].left; + sint32 height = w->widgets[WIDX_GENERATE].bottom - w->widgets[WIDX_GENERATE].top; w->widgets[WIDX_GENERATE].left = w->width - 3 - width; w->widgets[WIDX_GENERATE].right = w->width - 3; @@ -1049,13 +1049,13 @@ static void window_mapgen_anchor_border_widgets(rct_window *w) w->widgets[WIDX_CLOSE].right = w->width - 3; } -static void window_mapgen_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +static void window_mapgen_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_1 + page; + sint32 widgetIndex = WIDX_TAB_1 + page; if (!(w->disabled_widgets & (1LL << widgetIndex))) { if (w->page == page) { - int frame = w->frame_no / window_mapgen_tab_animation_divisor[w->page]; + sint32 frame = w->frame_no / window_mapgen_tab_animation_divisor[w->page]; spriteIndex += (frame % window_mapgen_tab_animation_frames[w->page]); } diff --git a/src/openrct2/windows/maze_construction.c b/src/openrct2/windows/maze_construction.c index c24344c013..0f212d06bc 100644 --- a/src/openrct2/windows/maze_construction.c +++ b/src/openrct2/windows/maze_construction.c @@ -88,12 +88,12 @@ static rct_widget window_maze_construction_widgets[] = { #pragma region Events static void window_maze_construction_close(rct_window *w); -static void window_maze_construction_mouseup(rct_window *w, int widgetIndex); +static void window_maze_construction_mouseup(rct_window *w, sint32 widgetIndex); static void window_maze_construction_resize(rct_window *w); -static void window_maze_construction_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); +static void window_maze_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); static void window_maze_construction_update(rct_window *w); -static void window_maze_construction_toolupdate(rct_window* w, int widgetIndex, int x, int y); -static void window_maze_construction_tooldown(rct_window* w, int widgetIndex, int x, int y); +static void window_maze_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_maze_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); static void window_maze_construction_invalidate(rct_window *w); static void window_maze_construction_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -131,7 +131,7 @@ static rct_window_event_list window_maze_construction_events = { #pragma endregion -static void window_maze_construction_construct(int direction); +static void window_maze_construction_construct(sint32 direction); /** * @@ -174,7 +174,7 @@ static void window_maze_construction_close(rct_window *w) uint8 rideIndex = _currentRideIndex; rct_ride* ride = get_ride(rideIndex); if (ride->overall_view == 0xFFFF) { - int savedPausedState = gGamePaused; + sint32 savedPausedState = gGamePaused; gGamePaused = 0; game_do_command(0, 9, 0, rideIndex, GAME_COMMAND_DEMOLISH_RIDE, 0, 0); gGamePaused = savedPausedState; @@ -183,7 +183,7 @@ static void window_maze_construction_close(rct_window *w) } } -static void window_maze_construction_entrance_mouseup(rct_window *w, int widgetIndex){ +static void window_maze_construction_entrance_mouseup(rct_window *w, sint32 widgetIndex){ if (tool_set(w, widgetIndex, 12)) return; @@ -206,7 +206,7 @@ static void window_maze_construction_entrance_mouseup(rct_window *w, int widgetI * * rct2: 0x006CD461 */ -static void window_maze_construction_mouseup(rct_window *w, int widgetIndex) +static void window_maze_construction_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex){ case WIDX_CLOSE: @@ -251,7 +251,7 @@ static void window_maze_construction_resize(rct_window *w) if (currentDisabledWidgets == disabledWidgets) return; - for (int i = 0; i < 64; i++) { + for (sint32 i = 0; i < 64; i++) { if ((disabledWidgets & (1ULL << i)) != (currentDisabledWidgets & (1ULL << i))) { widget_invalidate(w, i); } @@ -263,7 +263,7 @@ static void window_maze_construction_resize(rct_window *w) * * rct2: 0x006CD48C */ -static void window_maze_construction_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_maze_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_MAZE_BUILD_MODE: @@ -327,7 +327,7 @@ static void window_maze_construction_update(rct_window *w) * * rct2: 0x006CD63E */ -static void window_maze_construction_toolupdate(rct_window* w, int widgetIndex, int x, int y) +static void window_maze_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex){ case WIDX_MAZE_DIRECTION_GROUPBOX: @@ -344,7 +344,7 @@ static void window_maze_construction_toolupdate(rct_window* w, int widgetIndex, * * rct2: 0x006C825F */ -static void window_maze_construction_entrance_tooldown(int x, int y, rct_window* w){ +static void window_maze_construction_entrance_tooldown(sint32 x, sint32 y, rct_window* w){ sub_6C9627(); map_invalidate_selection_rect(); @@ -352,7 +352,7 @@ static void window_maze_construction_entrance_tooldown(int x, int y, rct_window* gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - int direction = 0; + sint32 direction = 0; ride_get_entrance_or_exit_position_from_screen_position(x, y, &x, &y, &direction); if (gRideEntranceExitPlaceDirection == 0xFF) @@ -397,7 +397,7 @@ static void window_maze_construction_entrance_tooldown(int x, int y, rct_window* * * rct2: 0x006CD65D */ -static void window_maze_construction_tooldown(rct_window* w, int widgetIndex, int x, int y) +static void window_maze_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex){ case WIDX_MAZE_DIRECTION_GROUPBOX: @@ -469,9 +469,9 @@ void window_maze_construction_update_pressed_widgets() * * rct2: 0x006CD4AB */ -static void window_maze_construction_construct(int direction) +static void window_maze_construction_construct(sint32 direction) { - int x, y, z, flags, mode; + sint32 x, y, z, flags, mode; sub_6C9627(); diff --git a/src/openrct2/windows/multiplayer.c b/src/openrct2/windows/multiplayer.c index c1060fcc05..b8ffc769fe 100644 --- a/src/openrct2/windows/multiplayer.c +++ b/src/openrct2/windows/multiplayer.c @@ -113,36 +113,36 @@ const uint64 window_multiplayer_page_enabled_widgets[] = { static uint8 _selectedGroup = 0; -static void window_multiplayer_information_mouseup(rct_window *w, int widgetIndex); +static void window_multiplayer_information_mouseup(rct_window *w, sint32 widgetIndex); static void window_multiplayer_information_resize(rct_window *w); static void window_multiplayer_information_update(rct_window *w); static void window_multiplayer_information_invalidate(rct_window *w); static void window_multiplayer_information_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_multiplayer_players_mouseup(rct_window *w, int widgetIndex); +static void window_multiplayer_players_mouseup(rct_window *w, sint32 widgetIndex); static void window_multiplayer_players_resize(rct_window *w); static void window_multiplayer_players_update(rct_window *w); -static void window_multiplayer_players_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_multiplayer_players_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_multiplayer_players_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); +static void window_multiplayer_players_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_multiplayer_players_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_multiplayer_players_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); static void window_multiplayer_players_invalidate(rct_window *w); static void window_multiplayer_players_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); -static void window_multiplayer_groups_mouseup(rct_window *w, int widgetIndex); +static void window_multiplayer_groups_mouseup(rct_window *w, sint32 widgetIndex); static void window_multiplayer_groups_resize(rct_window *w); -static void window_multiplayer_groups_mousedown(int widgetIndex, rct_window* w, rct_widget* widget); -static void window_multiplayer_groups_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_multiplayer_groups_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget); +static void window_multiplayer_groups_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_multiplayer_groups_update(rct_window *w); -static void window_multiplayer_groups_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_multiplayer_groups_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_multiplayer_groups_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_multiplayer_groups_text_input(rct_window *w, int widgetIndex, char *text); +static void window_multiplayer_groups_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_multiplayer_groups_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_multiplayer_groups_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_multiplayer_groups_text_input(rct_window *w, sint32 widgetIndex, char *text); static void window_multiplayer_groups_invalidate(rct_window *w); static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); -static void window_multiplayer_options_mouseup(rct_window *w, int widgetIndex); +static void window_multiplayer_options_mouseup(rct_window *w, sint32 widgetIndex); static void window_multiplayer_options_resize(rct_window *w); static void window_multiplayer_options_update(rct_window *w); static void window_multiplayer_options_invalidate(rct_window *w); @@ -279,11 +279,11 @@ static rct_window_event_list *window_multiplayer_page_events[] = { &window_multiplayer_options_events }; -static const int window_multiplayer_animation_divisor[] = { 4, 4, 2, 2 }; -static const int window_multiplayer_animation_frames[] = { 8, 8, 7, 4 }; +static const sint32 window_multiplayer_animation_divisor[] = { 4, 4, 2, 2 }; +static const sint32 window_multiplayer_animation_frames[] = { 8, 8, 7, 4 }; static void window_multiplayer_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi); -static void window_multiplayer_set_page(rct_window* w, int page); +static void window_multiplayer_set_page(rct_window* w, sint32 page); static bool _windowInformationSizeDirty; static rct_xy16 _windowInformationSize; @@ -298,7 +298,7 @@ void window_multiplayer_open() } } -static void window_multiplayer_set_page(rct_window* w, int page) +static void window_multiplayer_set_page(rct_window* w, sint32 page) { _windowInformationSizeDirty = true; @@ -332,7 +332,7 @@ static void window_multiplayer_anchor_border_widgets(rct_window *w) static void window_multiplayer_set_pressed_tab(rct_window *w) { - for (int i = 0; i < 2; i++) { + for (sint32 i = 0; i < 2; i++) { w->pressed_widgets &= ~(1 << (WIDX_TAB1 + i)); } w->pressed_widgets |= 1LL << (WIDX_TAB1 + w->page); @@ -341,7 +341,7 @@ static void window_multiplayer_set_pressed_tab(rct_window *w) static void window_multiplayer_groups_show_group_dropdown(rct_window *w, rct_widget *widget) { rct_widget *dropdownWidget; - int numItems, i; + sint32 numItems, i; dropdownWidget = widget - 1; @@ -371,7 +371,7 @@ static void window_multiplayer_groups_show_group_dropdown(rct_window *w, rct_wid #pragma region Information page -static void window_multiplayer_information_mouseup(rct_window *w, int widgetIndex) +static void window_multiplayer_information_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -394,16 +394,16 @@ static rct_xy16 window_multiplayer_information_get_size() return _windowInformationSize; } - int width = 450; - int height = 110; - int numLines, fontSpriteBase; + sint32 width = 450; + sint32 height = 110; + sint32 numLines, fontSpriteBase; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; utf8 * buffer = _strdup(network_get_server_description()); gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase); free(buffer); - int lineHeight = font_get_line_height(fontSpriteBase); + sint32 lineHeight = font_get_line_height(fontSpriteBase); height += (numLines + 1) * lineHeight; _windowInformationSizeDirty = false; @@ -440,9 +440,9 @@ static void window_multiplayer_information_paint(rct_window *w, rct_drawpixelinf if (clip_drawpixelinfo(&clippedDPI, dpi, w->x, w->y, w->width, w->height)) { dpi = &clippedDPI; - int x = 3; - int y = 50; - int width = w->width - 6; + sint32 x = 3; + sint32 y = 50; + sint32 width = w->width - 6; const utf8 * name = network_get_server_name(); { @@ -481,7 +481,7 @@ static void window_multiplayer_information_paint(rct_window *w, rct_drawpixelinf #pragma region Players page -static void window_multiplayer_players_mouseup(rct_window *w, int widgetIndex) +static void window_multiplayer_players_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -515,9 +515,9 @@ static void window_multiplayer_players_update(rct_window *w) widget_invalidate(w, WIDX_TAB1 + w->page); } -static void window_multiplayer_players_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_multiplayer_players_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int i; + sint32 i; if (w->selected_list_item != -1) { w->selected_list_item = -1; @@ -534,9 +534,9 @@ static void window_multiplayer_players_scrollgetsize(rct_window *w, int scrollIn } } -static void window_multiplayer_players_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_multiplayer_players_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) @@ -548,9 +548,9 @@ static void window_multiplayer_players_scrollmousedown(rct_window *w, int scroll window_player_open(network_get_player_id(index)); } -static void window_multiplayer_players_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_multiplayer_players_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) @@ -574,7 +574,7 @@ static void window_multiplayer_players_invalidate(rct_window *w) static void window_multiplayer_players_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_string_id stringId; - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); window_multiplayer_draw_tab_images(w, dpi); @@ -592,12 +592,12 @@ static void window_multiplayer_players_paint(rct_window *w, rct_drawpixelinfo *d gfx_draw_string_left(dpi, stringId, &w->no_list_items, w->colours[2], x, y); } -static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int y; + sint32 y; y = 0; - for (int i = 0; i < network_get_num_players(); i++) { + for (sint32 i = 0; i < network_get_num_players(); i++) { if (y > dpi->y + dpi->height) { break; } @@ -607,7 +607,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli // Draw player name char* lineCh = buffer; - int colour = COLOUR_BLACK; + sint32 colour = COLOUR_BLACK; if (i == w->selected_list_item) { gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1); safe_strcpy(buffer, network_get_player_name(i), sizeof(buffer)); @@ -625,7 +625,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli // Draw group name lineCh = buffer; - int group = network_get_group_index(network_get_player_group(i)); + sint32 group = network_get_group_index(network_get_player_group(i)); if (group != -1) { lineCh = utf8_write_codepoint(lineCh, FORMAT_BLACK); safe_strcpy(lineCh, network_get_group_name(group), sizeof(buffer) - (lineCh - buffer)); @@ -634,7 +634,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli } // Draw last action - int action = network_get_player_last_action(i, 2000); + sint32 action = network_get_player_last_action(i, 2000); set_format_arg(0, rct_string_id, STR_ACTION_NA); if (action != -999) { set_format_arg(0, rct_string_id, network_get_action_name_string_id(action)); @@ -643,7 +643,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli // Draw ping lineCh = buffer; - int ping = network_get_player_ping(i); + sint32 ping = network_get_player_ping(i); if (ping <= 100) { lineCh = utf8_write_codepoint(lineCh, FORMAT_GREEN); } else @@ -663,7 +663,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli #pragma region Groups page -static void window_multiplayer_groups_mouseup(rct_window *w, int widgetIndex) +static void window_multiplayer_groups_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -684,7 +684,7 @@ static void window_multiplayer_groups_mouseup(rct_window *w, int widgetIndex) game_do_command(1 | (_selectedGroup << 8), GAME_COMMAND_FLAG_APPLY, 0, 0, GAME_COMMAND_MODIFY_GROUPS, 0, 0); break; case WIDX_RENAME_GROUP:; - int groupIndex = network_get_group_index(_selectedGroup); + sint32 groupIndex = network_get_group_index(_selectedGroup); const utf8 *groupName = network_get_group_name(groupIndex); window_text_input_raw_open(w, widgetIndex, STR_GROUP_NAME, STR_ENTER_NEW_NAME_FOR_THIS_GROUP, (utf8*)groupName, 32); break; @@ -702,7 +702,7 @@ static void window_multiplayer_groups_resize(rct_window *w) window_invalidate(w); } -static void window_multiplayer_groups_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +static void window_multiplayer_groups_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { switch (widgetIndex) { case WIDX_DEFAULT_GROUP_DROPDOWN: @@ -714,7 +714,7 @@ static void window_multiplayer_groups_mousedown(int widgetIndex, rct_window* w, } } -static void window_multiplayer_groups_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_multiplayer_groups_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) { return; @@ -738,9 +738,9 @@ static void window_multiplayer_groups_update(rct_window *w) widget_invalidate(w, WIDX_TAB1 + w->page); } -static void window_multiplayer_groups_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_multiplayer_groups_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int i; + sint32 i; if (w->selected_list_item != -1) { w->selected_list_item = -1; @@ -757,9 +757,9 @@ static void window_multiplayer_groups_scrollgetsize(rct_window *w, int scrollInd } } -static void window_multiplayer_groups_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_multiplayer_groups_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) @@ -771,9 +771,9 @@ static void window_multiplayer_groups_scrollmousedown(rct_window *w, int scrollI game_do_command(2 | (_selectedGroup << 8), GAME_COMMAND_FLAG_APPLY, index, 0, GAME_COMMAND_MODIFY_GROUPS, 0, 0); } -static void window_multiplayer_groups_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_multiplayer_groups_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) @@ -783,7 +783,7 @@ static void window_multiplayer_groups_scrollmouseover(rct_window *w, int scrollI window_invalidate(w); } -static void window_multiplayer_groups_text_input(rct_window *w, int widgetIndex, char *text) +static void window_multiplayer_groups_text_input(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_RENAME_GROUP) return; @@ -791,9 +791,9 @@ static void window_multiplayer_groups_text_input(rct_window *w, int widgetIndex, if (text == NULL) return; - game_do_command(3 | (_selectedGroup << 8) | (1 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 0)), GAME_COMMAND_MODIFY_GROUPS, *((int*)(text + 8)), *((int*)(text + 4))); - game_do_command(3 | (_selectedGroup << 8) | (2 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 12)), GAME_COMMAND_MODIFY_GROUPS, *((int*)(text + 20)), *((int*)(text + 16))); - game_do_command(3 | (_selectedGroup << 8) | (0 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 24)), GAME_COMMAND_MODIFY_GROUPS, *((int*)(text + 32)), *((int*)(text + 28))); + game_do_command(3 | (_selectedGroup << 8) | (1 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_MODIFY_GROUPS, *((sint32*)(text + 8)), *((sint32*)(text + 4))); + game_do_command(3 | (_selectedGroup << 8) | (2 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 12)), GAME_COMMAND_MODIFY_GROUPS, *((sint32*)(text + 20)), *((sint32*)(text + 16))); + game_do_command(3 | (_selectedGroup << 8) | (0 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 24)), GAME_COMMAND_MODIFY_GROUPS, *((sint32*)(text + 32)), *((sint32*)(text + 28))); } static void window_multiplayer_groups_invalidate(rct_window *w) @@ -817,7 +817,7 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp window_multiplayer_draw_tab_images(w, dpi); rct_widget* widget = &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP]; - int group = network_get_group_index(network_get_default_group()); + sint32 group = network_get_group_index(network_get_default_group()); if (group != -1) { char buffer[300]; char* lineCh; @@ -836,8 +836,8 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp ); } - int x = w->x + window_multiplayer_groups_widgets[WIDX_CONTENT_PANEL].left + 4; - int y = w->y + window_multiplayer_groups_widgets[WIDX_CONTENT_PANEL].top + 4; + sint32 x = w->x + window_multiplayer_groups_widgets[WIDX_CONTENT_PANEL].left + 4; + sint32 y = w->y + window_multiplayer_groups_widgets[WIDX_CONTENT_PANEL].top + 4; gfx_draw_string_left(dpi, STR_DEFAULT_GROUP, NULL, w->colours[2], x, y); @@ -866,13 +866,13 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp } } -static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int y = 0; + sint32 y = 0; gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); - for (int i = 0; i < network_get_num_actions(); i++) { + for (sint32 i = 0; i < network_get_num_actions(); i++) { if (i == w->selected_list_item) { gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1); } @@ -882,7 +882,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelin if (y + 11 >= dpi->y) { char buffer[300] = {0}; - int groupindex = network_get_group_index(_selectedGroup); + sint32 groupindex = network_get_group_index(_selectedGroup); if (groupindex != -1){ if (network_can_perform_action(groupindex, i)) { char* lineCh = buffer; @@ -904,7 +904,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelin #pragma region Options page -static void window_multiplayer_options_mouseup(rct_window *w, int widgetIndex) +static void window_multiplayer_options_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -963,15 +963,15 @@ static void window_multiplayer_options_paint(rct_window *w, rct_drawpixelinfo *d #pragma endregion -static void window_multiplayer_draw_tab_image(rct_window *w, rct_drawpixelinfo *dpi, int page, int spriteIndex) +static void window_multiplayer_draw_tab_image(rct_window *w, rct_drawpixelinfo *dpi, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB1 + page; + sint32 widgetIndex = WIDX_TAB1 + page; if (!widget_is_disabled(w, widgetIndex)) { if (w->page == page) { - int numFrames = window_multiplayer_animation_frames[w->page]; + sint32 numFrames = window_multiplayer_animation_frames[w->page]; if (numFrames > 1) { - int frame = w->frame_no / window_multiplayer_animation_divisor[w->page]; + sint32 frame = w->frame_no / window_multiplayer_animation_divisor[w->page]; spriteIndex += (frame % numFrames); } } diff --git a/src/openrct2/windows/music_credits.c b/src/openrct2/windows/music_credits.c index 1ad080c6c6..16283ab32a 100644 --- a/src/openrct2/windows/music_credits.c +++ b/src/openrct2/windows/music_credits.c @@ -81,10 +81,10 @@ static const rct_string_id music_credits_rct2[] = { STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WHAT_SHALL_WE_DO_WITH_THE_DRUNKEN_SAILOR, }; -static void window_music_credits_mouseup(rct_window *w, int widgetIndex); -static void window_music_credits_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); +static void window_music_credits_mouseup(rct_window *w, sint32 widgetIndex); +static void window_music_credits_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); static void window_music_credits_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_music_credits_events = { NULL, @@ -152,7 +152,7 @@ void window_music_credits_open() * * rct2: 0x0066DB2C */ -static void window_music_credits_mouseup(rct_window *w, int widgetIndex) +static void window_music_credits_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -165,7 +165,7 @@ static void window_music_credits_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0066DB37 */ -static void window_music_credits_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_music_credits_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = 560; } @@ -183,13 +183,13 @@ static void window_music_credits_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x0066D7BF */ -static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int x = 245; + sint32 x = 245; - int y = 2; + sint32 y = 2; - for (int i = 0; i < countof(music_credits); i++) { + for (sint32 i = 0; i < countof(music_credits); i++) { gfx_draw_string_centred(dpi, music_credits[i], x, y, COLOUR_BLACK, NULL); y += 10; } @@ -204,7 +204,7 @@ static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *d gfx_fill_rect_inset(dpi, 4, y, 484, y+1, w->colours[1], INSET_RECT_FLAG_BORDER_INSET); y += 11; - for (int i = 0; i < countof(music_credits_rct2); i++) { + for (sint32 i = 0; i < countof(music_credits_rct2); i++) { gfx_draw_string_centred(dpi, music_credits_rct2[i], x, y, COLOUR_BLACK, NULL); y += 10; } diff --git a/src/openrct2/windows/network_status.c b/src/openrct2/windows/network_status.c index 03b062cd9d..f034c8e775 100644 --- a/src/openrct2/windows/network_status.c +++ b/src/openrct2/windows/network_status.c @@ -40,9 +40,9 @@ static rct_widget window_network_status_widgets[] = { static char window_network_status_text[1024]; static void window_network_status_onclose(rct_window *w); -static void window_network_status_mouseup(rct_window *w, int widgetIndex); +static void window_network_status_mouseup(rct_window *w, sint32 widgetIndex); static void window_network_status_update(rct_window *w); -static void window_network_status_textinput(rct_window *w, int widgetIndex, char *text); +static void window_network_status_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_network_status_invalidate(rct_window *w); static void window_network_status_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -129,7 +129,7 @@ static void window_network_status_onclose(rct_window *w) } } -static void window_network_status_mouseup(rct_window *w, int widgetIndex) +static void window_network_status_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -143,7 +143,7 @@ static void window_network_status_update(rct_window *w) widget_invalidate(w, WIDX_BACKGROUND); } -static void window_network_status_textinput(rct_window *w, int widgetIndex, char *text) +static void window_network_status_textinput(rct_window *w, sint32 widgetIndex, char *text) { _password[0] = '\0'; switch (widgetIndex) { @@ -179,8 +179,8 @@ static void window_network_status_paint(rct_window *w, rct_drawpixelinfo *dpi) lineCh = utf8_write_codepoint(lineCh, FORMAT_BLACK); safe_strcpy(lineCh, window_network_status_text, sizeof(buffer) - (lineCh - buffer)); gfx_clip_string(buffer, w->widgets[WIDX_BACKGROUND].right - 50); - int x = w->x + (w->width / 2); - int y = w->y + (w->height / 2); + sint32 x = w->x + (w->width / 2); + sint32 y = w->y + (w->height / 2); x -= gfx_get_string_width(buffer) / 2; gfx_draw_string(dpi, buffer, COLOUR_BLACK, x, y); } diff --git a/src/openrct2/windows/new_campaign.c b/src/openrct2/windows/new_campaign.c index be6c7b6f0e..8f127610da 100644 --- a/src/openrct2/windows/new_campaign.c +++ b/src/openrct2/windows/new_campaign.c @@ -57,9 +57,9 @@ static rct_widget window_new_campaign_widgets[] = { }; -static void window_new_campaign_mouseup(rct_window *w, int widgetIndex); -static void window_new_campaign_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_new_campaign_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_new_campaign_mouseup(rct_window *w, sint32 widgetIndex); +static void window_new_campaign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_new_campaign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_new_campaign_invalidate(rct_window *w); static void window_new_campaign_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -97,7 +97,7 @@ static rct_window_event_list window_new_campaign_events = { uint8 window_new_campaign_rides[MAX_RIDES]; uint8 window_new_campaign_shop_items[64]; -static int ride_value_compare(const void *a, const void *b) +static sint32 ride_value_compare(const void *a, const void *b) { rct_ride *rideA, *rideB; @@ -106,7 +106,7 @@ static int ride_value_compare(const void *a, const void *b) return rideB->value - rideA->value; } -static int ride_name_compare(const void *a, const void *b) +static sint32 ride_name_compare(const void *a, const void *b) { char rideAName[256], rideBName[256]; rct_ride *rideA, *rideB; @@ -128,7 +128,7 @@ void window_new_campaign_open(sint16 campaignType) { rct_window *w; rct_ride *ride; - int i, numApplicableRides; + sint32 i, numApplicableRides; w = window_bring_to_front_by_class(WC_NEW_CAMPAIGN); if (w != NULL) { @@ -189,7 +189,7 @@ void window_new_campaign_open(sint16 campaignType) */ static void window_new_campaign_get_shop_items() { - int i, numItems; + sint32 i, numItems; rct_ride *ride; uint64 items = 0; @@ -218,7 +218,7 @@ static void window_new_campaign_get_shop_items() * * rct2: 0x0069E50B */ -static void window_new_campaign_mouseup(rct_window *w, int widgetIndex) +static void window_new_campaign_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -235,7 +235,7 @@ static void window_new_campaign_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0069E51C */ -static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_new_campaign_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { rct_widget *dropdownWidget; @@ -246,8 +246,8 @@ static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_wi if (w->campaign.campaign_type == ADVERTISING_CAMPAIGN_FOOD_OR_DRINK_FREE) { window_new_campaign_get_shop_items(); if (window_new_campaign_shop_items[0] != 255) { - int numItems = 0; - for (int i = 0; i < 40; i++) { + sint32 numItems = 0; + for (sint32 i = 0; i < 40; i++) { if (window_new_campaign_shop_items[i] == 255) break; @@ -267,8 +267,8 @@ static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_wi ); } } else { - int numItems = 0; - for (int i = 0; i < 40; i++) { + sint32 numItems = 0; + for (sint32 i = 0; i < 40; i++) { if (window_new_campaign_rides[i] == 255) break; @@ -305,7 +305,7 @@ static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_wi * * rct2: 0x0069E537 */ -static void window_new_campaign_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_new_campaign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_RIDE_DROPDOWN_BUTTON) return; @@ -373,7 +373,7 @@ static void window_new_campaign_invalidate(rct_window *w) */ static void window_new_campaign_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); diff --git a/src/openrct2/windows/new_ride.c b/src/openrct2/windows/new_ride.c index 86d10052e9..b6647735fb 100644 --- a/src/openrct2/windows/new_ride.c +++ b/src/openrct2/windows/new_ride.c @@ -201,16 +201,16 @@ static rct_widget window_new_ride_widgets[] = { #pragma region Events -static void window_new_ride_mouseup(rct_window *w, int widgetIndex); -static void window_new_ride_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); +static void window_new_ride_mouseup(rct_window *w, sint32 widgetIndex); +static void window_new_ride_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); static void window_new_ride_update(rct_window *w); -static void window_new_ride_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_new_ride_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_new_ride_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_new_ride_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_new_ride_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_new_ride_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_new_ride_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_new_ride_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_new_ride_invalidate(rct_window *w); static void window_new_ride_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); // 0x0098E354 static rct_window_event_list window_new_ride_events = { @@ -256,17 +256,17 @@ static const rct_string_id window_new_ride_titles[WINDOW_NEW_RIDE_PAGE_COUNT] = STR_RESEARCH_AND_DEVELOPMENT, }; -const int window_new_ride_tab_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 }; -const int window_new_ride_tab_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 }; +const sint32 window_new_ride_tab_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 }; +const sint32 window_new_ride_tab_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 }; -static void window_new_ride_set_page(rct_window *w, int page); +static void window_new_ride_set_page(rct_window *w, sint32 page); static void window_new_ride_refresh_widget_sizing(rct_window *w); -static ride_list_item window_new_ride_scroll_get_ride_list_item_at(rct_window *w, int x, int y); -static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixelinfo *dpi, ride_list_item item, int x, int y, int width); +static ride_list_item window_new_ride_scroll_get_ride_list_item_at(rct_window *w, sint32 x, sint32 y); +static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixelinfo *dpi, ride_list_item item, sint32 x, sint32 y, sint32 width); static void window_new_ride_select(rct_window *w); static ride_list_item _lastTrackDesignCountRideType; -static int _lastTrackDesignCount; +static sint32 _lastTrackDesignCount; static bool _trackSelectionByType; /** @@ -282,7 +282,7 @@ void window_new_ride_init_vars() _windowNewRideCurrentTab = WINDOW_NEW_RIDE_PAGE_TRANSPORT; } - for (short i = 0; i < 6; i++) { + for (sint16 i = 0; i < 6; i++) { /* Reset what is highlighted in each tab. Each 16bit number represents the item in its respective tab. @@ -302,7 +302,7 @@ static void window_new_ride_populate_list() ride_list_item *nextListItem = _windowNewRideListItems; // For each ride type in the view order list - for (int i = 0; i < countof(RideTypeViewOrder); i++) { + for (sint32 i = 0; i < countof(RideTypeViewOrder); i++) { uint8 rideType = RideTypeViewOrder[i]; if (rideType == RIDE_TYPE_NULL) continue; @@ -316,7 +316,7 @@ static void window_new_ride_populate_list() safe_strcpy(preferredVehicleName, " ", sizeof(preferredVehicleName)); if (ride_type_is_invented(rideType)) { - int dh = 0; + sint32 dh = 0; uint8 *rideEntryIndexPtr = get_ride_entry_indices_for_ride_type(rideType); // For each ride entry for this ride type @@ -385,15 +385,15 @@ static void window_new_ride_populate_list() */ static void window_new_ride_scroll_to_focused_ride(rct_window *w) { - int scrollWidth = 0; - int scrollHeight = 0; + sint32 scrollWidth = 0; + sint32 scrollHeight = 0; window_get_scroll_size(w, 0, &scrollWidth, &scrollHeight); // Find row index of the focused ride type rct_widget *listWidget = &window_new_ride_widgets[WIDX_RIDE_LIST]; assert(_windowNewRideCurrentTab < countof(_windowNewRideHighlightedItem)); - int focusRideType = _windowNewRideHighlightedItem[_windowNewRideCurrentTab].ride_type_and_entry; - int count = 0, row = 0; + sint32 focusRideType = _windowNewRideHighlightedItem[_windowNewRideCurrentTab].ride_type_and_entry; + sint32 count = 0, row = 0; ride_list_item *listItem = _windowNewRideListItems; while (listItem->type != 255 || listItem->entry_index != 255) { if (listItem->type == focusRideType) { @@ -406,7 +406,7 @@ static void window_new_ride_scroll_to_focused_ride(rct_window *w) }; // Update the Y scroll position - int listWidgetHeight = listWidget->bottom - listWidget->top - 1; + sint32 listWidgetHeight = listWidget->bottom - listWidget->top - 1; scrollHeight = max(0, scrollHeight - listWidgetHeight); w->scrolls[0].v_top = min(row * 116, scrollHeight); widget_scroll_update_thumbs(w, WIDX_RIDE_LIST); @@ -502,7 +502,7 @@ void window_new_ride_focus(ride_list_item rideItem) } } -static void window_new_ride_set_page(rct_window *w, int page) +static void window_new_ride_set_page(rct_window *w, sint32 page) { _windowNewRideCurrentTab = page; w->frame_no = 0; @@ -529,7 +529,7 @@ static void window_new_ride_set_page(rct_window *w, int page) */ static void window_new_ride_refresh_widget_sizing(rct_window *w) { - int width, height; + sint32 width, height; // Show or hide unrelated widgets if (_windowNewRideCurrentTab != WINDOW_NEW_RIDE_PAGE_RESEARCH) { @@ -576,22 +576,22 @@ static void window_new_ride_refresh_widget_sizing(rct_window *w) static void window_new_ride_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_NEW_RIDE_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + _windowNewRideCurrentTab); } -const int ThrillRidesTabAnimationSequence[] = { +const sint32 ThrillRidesTabAnimationSequence[] = { 5, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0 }; -static void window_new_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +static void window_new_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_1 + page; + sint32 widgetIndex = WIDX_TAB_1 + page; if (w->widgets[widgetIndex].type != WWT_EMPTY && !(w->disabled_widgets & (1LL << widgetIndex))) { - int frame = 0; + sint32 frame = 0; if (_windowNewRideCurrentTab == page) frame = w->frame_no / window_new_ride_tab_animation_divisor[page]; @@ -619,14 +619,14 @@ static void window_new_ride_draw_tab_images(rct_drawpixelinfo *dpi, rct_window * * * rct2: 0x006B6B38 */ -static void window_new_ride_mouseup(rct_window *w, int widgetIndex) +static void window_new_ride_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: window_close(w); break; case WIDX_LAST_DEVELOPMENT_BUTTON: - news_item_open_subject(NEWS_ITEM_RESEARCH, (int)gResearchLastItemSubject); + news_item_open_subject(NEWS_ITEM_RESEARCH, (sint32)gResearchLastItemSubject); break; case WIDX_RESEARCH_FUNDING_BUTTON: window_finances_research_open(); @@ -638,7 +638,7 @@ static void window_new_ride_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x006B6B4F */ -static void window_new_ride_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_new_ride_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { if (widgetIndex >= WIDX_TAB_1 && widgetIndex <= WIDX_TAB_7) window_new_ride_set_page(w, widgetIndex - WIDX_TAB_1); @@ -669,11 +669,11 @@ static void window_new_ride_update(rct_window *w) * * rct2: 0x006B6BC9 */ -static void window_new_ride_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_new_ride_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { ride_list_item *listItem = _windowNewRideListItems; - int count = 0; + sint32 count = 0; while (listItem->type != 255 || listItem->entry_index != 255) { count++; listItem++; @@ -685,7 +685,7 @@ static void window_new_ride_scrollgetsize(rct_window *w, int scrollIndex, int *w * * rct2: 0x006B6C89 */ -static void window_new_ride_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_new_ride_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { ride_list_item item; @@ -705,7 +705,7 @@ static void window_new_ride_scrollmousedown(rct_window *w, int scrollIndex, int * * rct2: 0x006B6C51 */ -static void window_new_ride_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_new_ride_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { ride_list_item item; @@ -726,7 +726,7 @@ static void window_new_ride_scrollmouseover(rct_window *w, int scrollIndex, int * * rct2: 0x006B6BBF */ -static void window_new_ride_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_new_ride_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -778,20 +778,20 @@ static void window_new_ride_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006B6ABF */ -static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { if (_windowNewRideCurrentTab == WINDOW_NEW_RIDE_PAGE_RESEARCH) return; gfx_clear(dpi, ColourMapA[w->colours[1]].mid_light); - int x = 1; - int y = 1; + sint32 x = 1; + sint32 y = 1; ride_list_item *listItem = _windowNewRideListItems; while (listItem->type != 255 || listItem->entry_index != 255) { rct_ride_entry *rideEntry; // Draw flat button rectangle - int flags = 0; + sint32 flags = 0; if (w->new_ride.selected_ride_id == *((sint16*)listItem)) flags |= INSET_RECT_FLAG_BORDER_INSET; if (w->new_ride.highlighted_ride_id == *((sint16*)listItem) || flags != 0) @@ -799,7 +799,7 @@ static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i // Draw ride image with feathered border rideEntry = get_ride_entry(listItem->entry_index); - int image_id = rideEntry->images_offset; + sint32 image_id = rideEntry->images_offset; if (listItem->type != rideEntry->ride_type[0]) { image_id++; if (listItem->type != rideEntry->ride_type[1]) @@ -823,7 +823,7 @@ static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i * * rct2: 0x006B6D3C */ -static ride_list_item window_new_ride_scroll_get_ride_list_item_at(rct_window *w, int x, int y) +static ride_list_item window_new_ride_scroll_get_ride_list_item_at(rct_window *w, sint32 x, sint32 y) { ride_list_item result; result.type = 255; @@ -832,12 +832,12 @@ static ride_list_item window_new_ride_scroll_get_ride_list_item_at(rct_window *w if (--x < 0 || --y < 0) return result; - int column = x / 116; - int row = y / 116; + sint32 column = x / 116; + sint32 row = y / 116; if (column >= 5) return result; - int index = column + (row * 5); + sint32 index = column + (row * 5); ride_list_item *listItem = _windowNewRideListItems; while (listItem->type != 255 || listItem->entry_index != 255) { @@ -849,7 +849,7 @@ static ride_list_item window_new_ride_scroll_get_ride_list_item_at(rct_window *w return result; } -static int get_num_track_designs(ride_list_item item) +static sint32 get_num_track_designs(ride_list_item item) { char entry[9]; const char *entryPtr = NULL; @@ -861,14 +861,14 @@ static int get_num_track_designs(ride_list_item item) } } - return (int)track_repository_get_count_for_ride(item.type, entryPtr); + return (sint32)track_repository_get_count_for_ride(item.type, entryPtr); } /** * * rct2: 0x006B701C */ -static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixelinfo *dpi, ride_list_item item, int x, int y, int width) +static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixelinfo *dpi, ride_list_item item, sint32 x, sint32 y, sint32 width) { rct_ride_entry *rideEntry = get_ride_entry(item.entry_index); @@ -913,7 +913,7 @@ static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixeli // Price if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) { // Get price of ride - int unk2 = RideConstructionDefaultTrackType[item.type]; + sint32 unk2 = RideConstructionDefaultTrackType[item.type]; money32 price = RideTrackCosts[item.type].track_price; if (ride_type_has_flag(item.type, RIDE_TYPE_FLAG_FLAT_RIDE)) { price *= FlatRideTrackPricing[unk2]; diff --git a/src/openrct2/windows/news.c b/src/openrct2/windows/news.c index 374dfc98b2..f6ecdc9503 100644 --- a/src/openrct2/windows/news.c +++ b/src/openrct2/windows/news.c @@ -41,14 +41,14 @@ static rct_widget window_news_widgets[] = { { WIDGETS_END }, }; -static void window_news_mouseup(rct_window *w, int widgetIndex); +static void window_news_mouseup(rct_window *w, sint32 widgetIndex); static void window_news_update(rct_window *w); -static void window_news_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_news_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_news_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_news_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_news_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_news_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_news_invalidate(rct_window *w); static void window_news_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_news_events = { NULL, @@ -108,8 +108,8 @@ void window_news_open() // sub_66E4BA: rct_widget *widget; - int width = 0; - int height = 0; + sint32 width = 0; + sint32 height = 0; window_get_scroll_size(window, 0, &width, &height); widget = &window_news_widgets[WIDX_SCROLL]; window->scrolls[0].v_top = max(0, height - (widget->bottom - widget->top - 1)); @@ -121,7 +121,7 @@ void window_news_open() * * rct2: 0x0066D4D5 */ -static void window_news_mouseup(rct_window *w, int widgetIndex) +static void window_news_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -139,7 +139,7 @@ static void window_news_mouseup(rct_window *w, int widgetIndex) */ static void window_news_update(rct_window *w) { - int i, j, x, y, z; + sint32 i, j, x, y, z; if (w->news.var_480 == -1) return; @@ -179,9 +179,9 @@ static void window_news_update(rct_window *w) * * rct2: 0x0066EA3C */ -static void window_news_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_news_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int i; + sint32 i; *height = 0; for (i = 11; i < 61; i++) { @@ -196,9 +196,9 @@ static void window_news_scrollgetsize(rct_window *w, int scrollIndex, int *width * * rct2: 0x0066EA5C */ -static void window_news_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_news_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int i, buttonIndex; + sint32 i, buttonIndex; buttonIndex = 0; for (i = 11; i < 61; i++) { @@ -247,7 +247,7 @@ static void window_news_scrollmousedown(rct_window *w, int scrollIndex, int x, i * * rct2: 0x0066EAAE */ -static void window_news_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_news_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -270,9 +270,9 @@ static void window_news_invalidate(rct_window *w) * * rct2: 0x0066E4EE */ -static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int i, x, y, yy, press; + sint32 i, x, y, yy, press; y = 0; for (i = 11; i < 61; i++) { @@ -329,11 +329,11 @@ static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int s } rct_peep* peep = GET_PEEP(newsItem->assoc); - int clip_x = 10, clip_y = 19; + sint32 clip_x = 10, clip_y = 19; // If normal peep set sprite to normal (no food) // If staff set sprite to staff sprite - int sprite_type = 0; + sint32 sprite_type = 0; if (peep->type == PEEP_TYPE_STAFF){ sprite_type = peep->sprite_type; if (peep->staff_type == STAFF_TYPE_ENTERTAINER){ diff --git a/src/openrct2/windows/news_options.c b/src/openrct2/windows/news_options.c index 532fc4f616..b81d0567fb 100644 --- a/src/openrct2/windows/news_options.c +++ b/src/openrct2/windows/news_options.c @@ -85,7 +85,7 @@ static rct_widget window_news_options_widgets[] = { { WIDGETS_END }, }; -static void window_news_options_mouseup(rct_window *w, int widgetIndex); +static void window_news_options_mouseup(rct_window *w, sint32 widgetIndex); static void window_news_options_update(rct_window *w); static void window_news_options_invalidate(rct_window *w); static void window_news_options_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -121,7 +121,7 @@ static rct_window_event_list window_news_options_events = { NULL }; -static void window_news_options_set_page(rct_window *w, int page); +static void window_news_options_set_page(rct_window *w, sint32 page); static void window_news_options_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi); static bool *get_notification_value_ptr(const notification_def *ndef); @@ -152,7 +152,7 @@ void window_news_options_open() } } -static void window_news_options_mouseup(rct_window *w, int widgetIndex) +static void window_news_options_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -165,10 +165,10 @@ static void window_news_options_mouseup(rct_window *w, int widgetIndex) break; default: { - int checkBoxIndex = widgetIndex - WIDX_CHECKBOX_0; + sint32 checkBoxIndex = widgetIndex - WIDX_CHECKBOX_0; if (checkBoxIndex >= 0) { - int matchIndex = 0; - for (int i = 0; i < countof(NewsItemOptionDefinitions); i++) { + sint32 matchIndex = 0; + for (sint32 i = 0; i < countof(NewsItemOptionDefinitions); i++) { const notification_def *ndef = &NewsItemOptionDefinitions[i]; if (ndef->category != w->page) continue; @@ -208,11 +208,11 @@ static void window_news_options_invalidate(rct_window *w) // Set checkboxes rct_widget *baseCheckBox = &w->widgets[WIDX_CHECKBOX_0]; - int y = baseCheckBox->top; + sint32 y = baseCheckBox->top; - int checkboxWidgetIndex = WIDX_CHECKBOX_0; + sint32 checkboxWidgetIndex = WIDX_CHECKBOX_0; rct_widget *checkboxWidget = &w->widgets[checkboxWidgetIndex]; - for (int i = 0; i < countof(NewsItemOptionDefinitions); i++) { + for (sint32 i = 0; i < countof(NewsItemOptionDefinitions); i++) { const notification_def *ndef = &NewsItemOptionDefinitions[i]; if (ndef->category != w->page) continue; @@ -260,7 +260,7 @@ static void window_news_options_paint(rct_window *w, rct_drawpixelinfo *dpi) window_news_options_draw_tab_images(w, dpi); } -static void window_news_options_set_page(rct_window *w, int page) +static void window_news_options_set_page(rct_window *w, sint32 page) { if (w->page != page) { w->page = page; @@ -269,18 +269,18 @@ static void window_news_options_set_page(rct_window *w, int page) } } -const int window_news_option_tab_animation_divisor[] = { 1, 4, 4 }; -const int window_news_option_tab_animation_frames[] = { 1, 16, 8 }; +const sint32 window_news_option_tab_animation_divisor[] = { 1, 4, 4 }; +const sint32 window_news_option_tab_animation_frames[] = { 1, 16, 8 }; -static void window_news_options_draw_tab_image(rct_window *w, rct_drawpixelinfo *dpi, int page, int spriteIndex) +static void window_news_options_draw_tab_image(rct_window *w, rct_drawpixelinfo *dpi, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_PARK + page; + sint32 widgetIndex = WIDX_TAB_PARK + page; if (!(w->disabled_widgets & (1LL << widgetIndex))) { if (w->page == page) { - int numFrames = window_news_option_tab_animation_frames[w->page]; + sint32 numFrames = window_news_option_tab_animation_frames[w->page]; if (numFrames > 1) { - int frame = w->frame_no / window_news_option_tab_animation_divisor[w->page]; + sint32 frame = w->frame_no / window_news_option_tab_animation_divisor[w->page]; spriteIndex += (frame % numFrames); } } diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index 926eb3ff14..41c97dcaf5 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -373,26 +373,26 @@ static const rct_string_id window_options_fullscreen_mode_names[] = { STR_OPTIONS_DISPLAY_FULLSCREEN_BORDERLESS, }; -const int window_options_tab_animation_divisor[] = { 4, 4, 8, 2, 2, 2, 1 }; -const int window_options_tab_animation_frames[] = { 16, 8, 8, 16, 4, 16, 1 }; +const sint32 window_options_tab_animation_divisor[] = { 4, 4, 8, 2, 2, 2, 1 }; +const sint32 window_options_tab_animation_frames[] = { 16, 8, 8, 16, 4, 16, 1 }; -static void window_options_set_page(rct_window *w, int page); +static void window_options_set_page(rct_window *w, sint32 page); static void window_options_set_pressed_tab(rct_window *w); -static void window_options_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex); +static void window_options_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex); static void window_options_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); -static void window_options_show_dropdown(rct_window *w, rct_widget *widget, int num_items); +static void window_options_show_dropdown(rct_window *w, rct_widget *widget, sint32 num_items); static void window_options_update_height_markers(); #pragma region Events -static void window_options_mouseup(rct_window *w, int widgetIndex); -static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_options_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_options_mouseup(rct_window *w, sint32 widgetIndex); +static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_options_update(rct_window *w); static void window_options_invalidate(rct_window *w); static void window_options_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_options_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_options_text_input(rct_window *w, int widgetIndex, char *text); +static void window_options_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_options_text_input(rct_window *w, sint32 widgetIndex, char *text); static rct_window_event_list window_options_events = { NULL, @@ -572,7 +572,7 @@ void window_options_open() * * rct2: 0x006BAFCA */ -static void window_options_mouseup(rct_window *w, int widgetIndex) +static void window_options_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -853,9 +853,9 @@ static void window_options_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x006BB01B */ -static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - int num_items; + sint32 num_items; widget = &w->widgets[widgetIndex - 1]; @@ -866,8 +866,8 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* { platform_update_fullscreen_resolutions(); - int selectedResolution = -1; - for (int i = 0; i < gNumResolutions; i++) { + sint32 selectedResolution = -1; + for (sint32 i = 0; i < gNumResolutions; i++) { resolution_t *resolution = &gResolutions[i]; gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; @@ -903,12 +903,12 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* break; case WIDX_DRAWING_ENGINE_DROPDOWN: { - int numItems = 3; + sint32 numItems = 3; #ifdef DISABLE_OPENGL numItems = 2; #endif - for (int i = 0; i < numItems; i++) { + for (sint32 i = 0; i < numItems; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = DrawingEngineStringIds[i]; } @@ -973,9 +973,9 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* break; case WIDX_CURRENCY_DROPDOWN: num_items = CURRENCY_END + 1; // All the currencies plus the separator - int num_ordinary_currencies = CURRENCY_END - 1; // All the currencies except custom currency + sint32 num_ordinary_currencies = CURRENCY_END - 1; // All the currencies except custom currency - for (int i = 0; i < num_ordinary_currencies; i++) { + for (size_t i = 0; i < num_ordinary_currencies; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = CurrencyDescriptors[i].stringId; } @@ -1017,7 +1017,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* dropdown_set_checked(gConfigGeneral.temperature_format, true); break; case WIDX_LANGUAGE_DROPDOWN: - for (int i = 1; i < LANGUAGE_COUNT; i++) { + for (size_t i = 1; i < LANGUAGE_COUNT; i++) { gDropdownItemsFormat[i - 1] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i - 1] = (uintptr_t)LanguagesDescriptors[i].native_name; } @@ -1025,7 +1025,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* dropdown_set_checked(gCurrentLanguage - 1, true); break; case WIDX_DATE_FORMAT_DROPDOWN: - for (int i = 0; i < 4; i++) { + for (size_t i = 0; i < 4; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = DateFormatStringIds[i]; } @@ -1041,7 +1041,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* audio_populate_devices(); // populate the list with the sound devices - for (int i = 0; i < gAudioDeviceCount; i++) { + for (size_t i = 0; i < gAudioDeviceCount; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)gAudioDevices[i].name; } @@ -1053,7 +1053,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* case WIDX_TITLE_MUSIC_DROPDOWN: num_items = 4; - for (int i = 0; i < num_items ; i++) { + for (size_t i = 0; i < num_items ; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = window_options_title_music_names[i]; } @@ -1068,9 +1068,9 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* case WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE: switch (widgetIndex) { case WIDX_THEMES_DROPDOWN: - num_items = (int)theme_manager_get_num_available_themes(); + num_items = (sint32)theme_manager_get_num_available_themes(); - for (int i = 0; i < num_items; i++) { + for (sint32 i = 0; i < num_items; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)theme_manager_get_available_theme_name(i); } @@ -1085,7 +1085,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* widget->right - widget->left - 3 ); - dropdown_set_checked((int)theme_manager_get_active_available_theme_index(), true); + dropdown_set_checked((sint32)theme_manager_get_active_available_theme_index(), true); widget_invalidate(w, WIDX_THEMES_DROPDOWN); break; @@ -1115,7 +1115,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* case WINDOW_OPTIONS_PAGE_MISC: switch (widgetIndex) { case WIDX_AUTOSAVE_DROPDOWN: - for (int i = AUTOSAVE_EVERY_MINUTE; i <= AUTOSAVE_NEVER; i++) { + for (size_t i = AUTOSAVE_EVERY_MINUTE; i <= AUTOSAVE_NEVER; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = window_options_autosave_names[i]; } @@ -1124,8 +1124,8 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* dropdown_set_checked(gConfigGeneral.autosave_frequency, true); break; case WIDX_TITLE_SEQUENCE_DROPDOWN: - num_items = (int)title_sequence_manager_get_count(); - for (int i = 0; i < num_items; i++) { + num_items = (sint32)title_sequence_manager_get_count(); + for (size_t i = 0; i < num_items; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)title_sequence_manager_get_name(i); } @@ -1142,7 +1142,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* dropdown_set_checked(gTitleCurrentSequence, true); break; case WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN: - for (int i = 0; i < 7; i++) { + for (size_t i = 0; i < 7; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = RideInspectionIntervalNames[i]; } @@ -1152,7 +1152,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* break; case WIDX_WINDOW_LIMIT_UP: { - int i = gConfigGeneral.window_limit; + sint32 i = gConfigGeneral.window_limit; if (i < WINDOW_LIMIT_MAX) { window_set_window_limit(++i); } @@ -1161,7 +1161,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* } case WIDX_WINDOW_LIMIT_DOWN: { - int i = gConfigGeneral.window_limit; + sint32 i = gConfigGeneral.window_limit; if (i > WINDOW_LIMIT_MIN) { window_set_window_limit(--i); } @@ -1180,7 +1180,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* * * rct2: 0x006BB076 */ -static void window_options_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -1287,7 +1287,7 @@ static void window_options_dropdown(rct_window *w, int widgetIndex, int dropdown break; case WIDX_LANGUAGE_DROPDOWN: { - int fallbackLanguage = gCurrentLanguage; + sint32 fallbackLanguage = gCurrentLanguage; if (dropdownIndex != gCurrentLanguage - 1) { if (!language_open(dropdownIndex + 1)) { @@ -1660,7 +1660,7 @@ static void window_options_invalidate(rct_window *w) } // Automatically adjust window height to fit widgets - int y = 0; + sint32 y = 0; for (widget = &w->widgets[WIDX_PAGE_START]; widget->type != WWT_LAST; widget++) { y = max(y, widget->bottom); } @@ -1706,7 +1706,7 @@ static void window_options_paint(rct_window *w, rct_drawpixelinfo *dpi) case WINDOW_OPTIONS_PAGE_DISPLAY: gfx_draw_string_left(dpi, STR_FULLSCREEN_MODE, w, w->colours[1], w->x + 10, w->y + window_options_display_widgets[WIDX_FULLSCREEN].top + 1); - int colour = w->colours[1]; + sint32 colour = w->colours[1]; // disable resolution dropdown on "Fullscreen (desktop)" if (gConfigGeneral.fullscreen_mode == 2) { colour |= COLOUR_FLAG_INSET; @@ -1726,7 +1726,7 @@ static void window_options_paint(rct_window *w, rct_drawpixelinfo *dpi) window_options_culture_widgets[WIDX_DRAWING_ENGINE].right - window_options_culture_widgets[WIDX_DRAWING_ENGINE].left - 11 ); - int scale = (int)(gConfigGeneral.window_scale * 100); + sint32 scale = (sint32)(gConfigGeneral.window_scale * 100); gfx_draw_string_left(dpi, STR_WINDOW_OBJECTIVE_VALUE_RATING, &scale, w->colours[1], w->x + w->widgets[WIDX_SCALE].left + 1, w->y + w->widgets[WIDX_SCALE].top + 1); colour = w->colours[1]; @@ -1881,7 +1881,7 @@ static void window_options_paint(rct_window *w, rct_drawpixelinfo *dpi) } // helper function, all dropdown boxes have similar properties -static void window_options_show_dropdown(rct_window *w, rct_widget *widget, int num_items) +static void window_options_show_dropdown(rct_window *w, rct_widget *widget, sint32 num_items) { window_dropdown_show_text_custom_width( w->x + widget->left, @@ -1900,14 +1900,14 @@ static void window_options_update_height_markers() gfx_invalidate_screen(); } -static void window_options_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_options_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { if (w->page == WINDOW_OPTIONS_PAGE_AUDIO) { *width = 1000; } } -static void window_options_text_input(rct_window *w, int widgetIndex, char *text) +static void window_options_text_input(rct_window *w, sint32 widgetIndex, char *text) { if (text == NULL) return; @@ -1922,7 +1922,7 @@ static void window_options_text_input(rct_window *w, int widgetIndex, char *text #pragma region Common -static void window_options_set_page(rct_window *w, int page) +static void window_options_set_page(rct_window *w, sint32 page) { w->page = page; w->frame_no = 0; @@ -1939,19 +1939,19 @@ static void window_options_set_page(rct_window *w, int page) static void window_options_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_OPTIONS_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); } -static void window_options_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +static void window_options_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_1 + page; + sint32 widgetIndex = WIDX_TAB_1 + page; if (!(w->disabled_widgets & (1LL << widgetIndex))) { if (w->page == page) { - int frame = w->frame_no / window_options_tab_animation_divisor[w->page]; + sint32 frame = w->frame_no / window_options_tab_animation_divisor[w->page]; spriteIndex += (frame % window_options_tab_animation_frames[w->page]); } diff --git a/src/openrct2/windows/park.c b/src/openrct2/windows/park.c index 699e9c169b..c3e4bdc00f 100644 --- a/src/openrct2/windows/park.c +++ b/src/openrct2/windows/park.c @@ -157,53 +157,53 @@ static rct_widget *window_park_page_widgets[] = { #pragma region Events static void window_park_entrance_close(rct_window *w); -static void window_park_entrance_mouseup(rct_window *w, int widgetIndex); +static void window_park_entrance_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_entrance_resize(rct_window *w); -static void window_park_entrance_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_park_entrance_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_park_entrance_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_park_entrance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_park_entrance_update(rct_window *w); -static void window_park_entrance_toolupdate(rct_window* w, int widgetIndex, int x, int y); -static void window_park_entrance_tooldown(rct_window* w, int widgetIndex, int x, int y); -static void window_park_entrance_tooldrag(rct_window* w, int widgetIndex, int x, int y); -static void window_park_entrance_toolabort(rct_window *w, int widgetIndex); -static void window_park_entrance_textinput(rct_window *w, int widgetIndex, char *text); +static void window_park_entrance_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_park_entrance_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_park_entrance_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_park_entrance_toolabort(rct_window *w, sint32 widgetIndex); +static void window_park_entrance_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_park_entrance_invalidate(rct_window *w); static void window_park_entrance_paint(rct_window *w, rct_drawpixelinfo *dpi); -void toggle_land_rights_window(rct_window *parkWindow, int widgetIndex); +void toggle_land_rights_window(rct_window *parkWindow, sint32 widgetIndex); -static void window_park_rating_mouseup(rct_window *w, int widgetIndex); +static void window_park_rating_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_rating_resize(rct_window *w); static void window_park_rating_update(rct_window *w); static void window_park_rating_invalidate(rct_window *w); static void window_park_rating_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_park_guests_mouseup(rct_window *w, int widgetIndex); +static void window_park_guests_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_guests_resize(rct_window *w); static void window_park_guests_update(rct_window *w); static void window_park_guests_invalidate(rct_window *w); static void window_park_guests_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_park_price_mouseup(rct_window *w, int widgetIndex); +static void window_park_price_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_price_resize(rct_window *w); -static void window_park_price_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); +static void window_park_price_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); static void window_park_price_update(rct_window *w); static void window_park_price_invalidate(rct_window *w); static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_park_stats_mouseup(rct_window *w, int widgetIndex); +static void window_park_stats_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_stats_resize(rct_window *w); static void window_park_stats_update(rct_window *w); static void window_park_stats_invalidate(rct_window *w); static void window_park_stats_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_park_objective_mouseup(rct_window *w, int widgetIndex); +static void window_park_objective_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_objective_resize(rct_window *w); static void window_park_objective_update(rct_window *w); -static void window_park_objective_textinput(rct_window *w, int widgetIndex, char *text); +static void window_park_objective_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_park_objective_invalidate(rct_window *w); static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_park_awards_mouseup(rct_window *w, int widgetIndex); +static void window_park_awards_mouseup(rct_window *w, sint32 widgetIndex); static void window_park_awards_resize(rct_window *w); static void window_park_awards_update(rct_window *w); static void window_park_awards_invalidate(rct_window *w); @@ -556,7 +556,7 @@ static const window_park_award ParkAwards[] = { }; static void window_park_init_viewport(rct_window *w); -static void window_park_set_page(rct_window *w, int page); +static void window_park_set_page(rct_window *w, sint32 page); static void window_park_anchor_border_widgets(rct_window *w); static void window_park_set_pressed_tab(rct_window *w); static void window_park_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); @@ -643,7 +643,7 @@ static void window_park_entrance_close(rct_window *w) * * rct2: 0x0066817C */ -static void window_park_entrance_mouseup(rct_window *w, int widgetIndex) +static void window_park_entrance_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -694,7 +694,7 @@ static void window_park_entrance_resize(rct_window *w) * * rct2: 0x006681BF */ -static void window_park_entrance_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_park_entrance_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { if (widgetIndex == WIDX_OPEN_OR_CLOSE) { gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL; @@ -724,7 +724,7 @@ static void window_park_entrance_mousedown(int widgetIndex, rct_window*w, rct_wi * * rct2: 0x006682B8 */ -static void window_park_entrance_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_park_entrance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex == WIDX_OPEN_OR_CLOSE) { if (dropdownIndex == -1) @@ -833,7 +833,7 @@ static void window_park_entrance_tool_update_land_rights(sint16 x, sint16 y) * * rct2: 0x006681D1 */ -static void window_park_entrance_toolupdate(rct_window* w, int widgetIndex, int x, int y) +static void window_park_entrance_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex){ case WIDX_BUY_LAND_RIGHTS: @@ -846,7 +846,7 @@ static void window_park_entrance_toolupdate(rct_window* w, int widgetIndex, int * * rct2: 0x006681E6 */ -static void window_park_entrance_tooldown(rct_window* w, int widgetIndex, int x, int y) +static void window_park_entrance_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex){ case WIDX_BUY_LAND_RIGHTS: @@ -886,7 +886,7 @@ static void window_park_entrance_tooldown(rct_window* w, int widgetIndex, int x, * * rct2: 0x006681FB */ -static void window_park_entrance_tooldrag(rct_window* w, int widgetIndex, int x, int y) +static void window_park_entrance_tooldrag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { rct_window* w2 = window_find_by_number(0xB, 0); @@ -930,7 +930,7 @@ static void window_park_entrance_tooldrag(rct_window* w, int widgetIndex, int x, * * rct2: 0x0066822A */ -static void window_park_entrance_toolabort(rct_window *w, int widgetIndex) +static void window_park_entrance_toolabort(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_BUY_LAND_RIGHTS) { hide_gridlines(); @@ -949,7 +949,7 @@ static void window_park_entrance_toolabort(rct_window *w, int widgetIndex) * * rct2: 0x0066848B */ -static void window_park_entrance_textinput(rct_window *w, int widgetIndex, char *text) +static void window_park_entrance_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex == WIDX_RENAME && text != NULL) park_set_name(text); @@ -961,7 +961,7 @@ static void window_park_entrance_textinput(rct_window *w, int widgetIndex, char */ static void window_park_entrance_invalidate(rct_window *w) { - int i, height; + sint32 i, height; colour_scheme_update(w); @@ -1084,7 +1084,7 @@ static void window_park_entrance_paint(rct_window *w, rct_drawpixelinfo *dpi) */ static void window_park_init_viewport(rct_window *w) { - int i, x, y, z, r, xy, zr, viewportFlags; + sint32 i, x, y, z, r, xy, zr, viewportFlags; x = y = z = r = xy = zr = 0; rct_viewport *viewport; @@ -1153,7 +1153,7 @@ static void window_park_init_viewport(rct_window *w) window_invalidate(w); } -void toggle_land_rights_window(rct_window *parkWindow, int widgetIndex) +void toggle_land_rights_window(rct_window *parkWindow, sint32 widgetIndex) { if ((gInputFlags & INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_PARK_INFORMATION && gCurrentToolWidget.widget_index == WIDX_BUY_LAND_RIGHTS) { @@ -1205,7 +1205,7 @@ void window_park_rating_open() * * rct2: 0x00668A06 */ -static void window_park_rating_mouseup(rct_window *w, int widgetIndex) +static void window_park_rating_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1261,7 +1261,7 @@ static void window_park_rating_invalidate(rct_window *w) */ static void window_park_rating_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; rct_widget *widget; window_draw_widgets(w, dpi); @@ -1321,7 +1321,7 @@ void window_park_guests_open() * * rct2: 0x00668DEB */ -static void window_park_guests_mouseup(rct_window *w, int widgetIndex) +static void window_park_guests_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1378,7 +1378,7 @@ static void window_park_guests_invalidate(rct_window *w) */ static void window_park_guests_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; rct_widget *widget; window_draw_widgets(w, dpi); @@ -1409,7 +1409,7 @@ static void window_park_guests_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x00669011 */ -static void window_park_price_mouseup(rct_window *w, int widgetIndex) +static void window_park_price_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1430,9 +1430,9 @@ static void window_park_price_resize(rct_window *w) * * rct2: 0x0066902C */ -static void window_park_price_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_park_price_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - int newFee; + sint32 newFee; switch (widgetIndex) { case WIDX_CLOSE: @@ -1514,7 +1514,7 @@ static void window_park_price_invalidate(rct_window *w) */ static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); window_park_draw_tab_images(dpi, w); @@ -1533,7 +1533,7 @@ static void window_park_price_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x0066928C */ -static void window_park_stats_mouseup(rct_window *w, int widgetIndex) +static void window_park_stats_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1556,7 +1556,7 @@ static void window_park_stats_resize(rct_window *w) */ static void window_park_stats_update(rct_window *w) { - int i; + sint32 i; w->frame_no++; widget_invalidate(w, WIDX_TAB_5); @@ -1605,7 +1605,7 @@ static void window_park_stats_invalidate(rct_window *w) */ static void window_park_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y, parkSize, stringIndex; + sint32 x, y, parkSize, stringIndex; window_draw_widgets(w, dpi); window_park_draw_tab_images(dpi, w); @@ -1684,7 +1684,7 @@ void window_park_objective_open() * * rct2: 0x006695AA */ -static void window_park_objective_mouseup(rct_window *w, int widgetIndex) +static void window_park_objective_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -1736,7 +1736,7 @@ static void window_park_objective_update(rct_window *w) * * rct2: 0x006695CC */ -static void window_park_objective_textinput(rct_window *w, int widgetIndex, char *text) +static void window_park_objective_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex == WIDX_ENTER_NAME && text != NULL && text[0] != 0) { scenario_success_submit_name(text); @@ -1771,7 +1771,7 @@ static void window_park_objective_invalidate(rct_window *w) */ static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; window_draw_widgets(w, dpi); window_park_draw_tab_images(dpi, w); @@ -1790,7 +1790,7 @@ static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi) // Objective set_format_arg(0, uint16, gScenarioObjectiveNumGuests); - set_format_arg(2, short, date_get_total_months(MONTH_OCTOBER, gScenarioObjectiveYear)); + set_format_arg(2, sint16, date_get_total_months(MONTH_OCTOBER, gScenarioObjectiveYear)); set_format_arg(4, money32, gScenarioObjectiveCurrency); y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 221, ObjectiveNames[gScenarioObjectiveType], COLOUR_BLACK); @@ -1846,7 +1846,7 @@ void window_park_awards_open() * * rct2: 0x00669851 */ -static void window_park_awards_mouseup(rct_window *w, int widgetIndex) +static void window_park_awards_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) window_close(w); @@ -1905,10 +1905,10 @@ static void window_park_awards_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); window_park_draw_tab_images(dpi, w); - int x = w->x + window_park_awards_widgets[WIDX_PAGE_BACKGROUND].left + 4; - int y = w->y + window_park_awards_widgets[WIDX_PAGE_BACKGROUND].top + 4; - int count = 0; - for (int i = 0; i < MAX_AWARDS; i++) { + sint32 x = w->x + window_park_awards_widgets[WIDX_PAGE_BACKGROUND].left + 4; + sint32 y = w->y + window_park_awards_widgets[WIDX_PAGE_BACKGROUND].top + 4; + sint32 count = 0; + for (sint32 i = 0; i < MAX_AWARDS; i++) { rct_award *award = &gCurrentAwards[i]; if (award->time == 0) continue; @@ -1932,9 +1932,9 @@ static void window_park_awards_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x00668496 */ -static void window_park_set_page(rct_window *w, int page) +static void window_park_set_page(rct_window *w, sint32 page) { - int listen; + sint32 listen; if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number) @@ -1980,7 +1980,7 @@ static void window_park_anchor_border_widgets(rct_window *w) static void window_park_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < 7; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); @@ -1988,7 +1988,7 @@ static void window_park_set_pressed_tab(rct_window *w) static void window_park_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) { - int sprite_idx; + sint32 sprite_idx; // Entrance tab if (!(w->disabled_widgets & (1 << WIDX_TAB_1))) diff --git a/src/openrct2/windows/player.c b/src/openrct2/windows/player.c index fedaf08069..781a340b0c 100644 --- a/src/openrct2/windows/player.c +++ b/src/openrct2/windows/player.c @@ -92,10 +92,10 @@ rct_widget *window_player_page_widgets[] = { #pragma region Events void window_player_overview_close(rct_window *w); -void window_player_overview_mouse_up(rct_window *w, int widgetIndex); +void window_player_overview_mouse_up(rct_window *w, sint32 widgetIndex); void window_player_overview_resize(rct_window *w); -void window_player_overview_mouse_down(int widgetIndex, rct_window *w, rct_widget *widget); -void window_player_overview_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +void window_player_overview_mouse_down(sint32 widgetIndex, rct_window *w, rct_widget *widget); +void window_player_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); void window_player_overview_update(rct_window* w); void window_player_overview_invalidate(rct_window *w); void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -132,7 +132,7 @@ static rct_window_event_list window_player_overview_events = { }; void window_player_statistics_close(rct_window *w); -void window_player_statistics_mouse_up(rct_window *w, int widgetIndex); +void window_player_statistics_mouse_up(rct_window *w, sint32 widgetIndex); void window_player_statistics_resize(rct_window *w); void window_player_statistics_update(rct_window* w); void window_player_statistics_invalidate(rct_window *w); @@ -176,7 +176,7 @@ static rct_window_event_list *window_player_page_events[] = { #pragma endregion -static void window_player_set_page(rct_window* w, int page); +static void window_player_set_page(rct_window* w, sint32 page); static void window_player_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); static void window_player_update_viewport(rct_window *w, bool scroll); static void window_player_update_title(rct_window* w); @@ -235,8 +235,8 @@ void window_player_open(uint8 id) static void window_player_overview_show_group_dropdown(rct_window *w, rct_widget *widget) { rct_widget *dropdownWidget; - int numItems, i; - int player = network_get_player_index((uint8)w->number); + sint32 numItems, i; + sint32 player = network_get_player_index((uint8)w->number); if (player == -1) { return; } @@ -268,7 +268,7 @@ void window_player_overview_close(rct_window *w) } -void window_player_overview_mouse_up(rct_window *w, int widgetIndex) +void window_player_overview_mouse_up(rct_window *w, sint32 widgetIndex) { switch(widgetIndex){ case WIDX_CLOSE: @@ -281,7 +281,7 @@ void window_player_overview_mouse_up(rct_window *w, int widgetIndex) case WIDX_LOCATE:{ rct_window* mainWindow = window_get_main(); if (mainWindow != NULL) { - int player = network_get_player_index((uint8)w->number); + sint32 player = network_get_player_index((uint8)w->number); if (player == -1) { return; } @@ -297,7 +297,7 @@ void window_player_overview_mouse_up(rct_window *w, int widgetIndex) } } -void window_player_overview_mouse_down(int widgetIndex, rct_window *w, rct_widget *widget) +void window_player_overview_mouse_down(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch(widgetIndex){ case WIDX_GROUP_DROPDOWN: @@ -306,16 +306,16 @@ void window_player_overview_mouse_down(int widgetIndex, rct_window *w, rct_widge } } -void window_player_overview_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +void window_player_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { - int player = network_get_player_index((uint8)w->number); + sint32 player = network_get_player_index((uint8)w->number); if (player == -1) { return; } if (dropdownIndex == -1) { return; } - int group = network_get_group_id(dropdownIndex); + sint32 group = network_get_group_id(dropdownIndex); game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, group, GAME_COMMAND_SET_PLAYER_GROUP, 0, 0); window_invalidate(w); } @@ -351,13 +351,13 @@ void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); window_player_draw_tab_images(dpi, w); - int player = network_get_player_index((uint8)w->number); + sint32 player = network_get_player_index((uint8)w->number); if (player == -1) { return; } // Draw current group - int groupindex = network_get_group_index(network_get_player_group(player)); + sint32 groupindex = network_get_group_index(network_get_player_group(player)); if (groupindex != -1) { rct_widget* widget = &window_player_overview_widgets[WIDX_GROUP]; char buffer[300]; @@ -379,8 +379,8 @@ void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) } // Draw ping - int x = w->x + 90; - int y = w->y + 24; + sint32 x = w->x + 90; + sint32 y = w->y + 24; set_format_arg(0, rct_string_id, STR_PING); gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, 0, x, y); @@ -391,8 +391,8 @@ void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) // Draw last action x = w->x + (w->width / 2); y = w->y + w->height - 13; - int width = w->width - 8; - int lastaction = network_get_player_last_action(player, 0); + sint32 width = w->width - 8; + sint32 lastaction = network_get_player_last_action(player, 0); set_format_arg(0, rct_string_id, STR_ACTION_NA); if (lastaction != -999) { set_format_arg(0, rct_string_id, network_get_action_name_string_id(lastaction)); @@ -433,7 +433,7 @@ void window_player_overview_invalidate(rct_window *w) w->widgets[WIDX_VIEWPORT].right = w->width - 26; w->widgets[WIDX_VIEWPORT].bottom = w->height - 14; - int groupDropdownWidth = w->widgets[WIDX_GROUP].right - w->widgets[WIDX_GROUP].left; + sint32 groupDropdownWidth = w->widgets[WIDX_GROUP].right - w->widgets[WIDX_GROUP].left; w->widgets[WIDX_GROUP].left = (w->width - groupDropdownWidth) / 2; w->widgets[WIDX_GROUP].right = w->widgets[WIDX_GROUP].left + groupDropdownWidth; w->widgets[WIDX_GROUP_DROPDOWN].left = w->widgets[WIDX_GROUP].right - 10; @@ -462,7 +462,7 @@ void window_player_statistics_close(rct_window *w) } } -void window_player_statistics_mouse_up(rct_window *w, int widgetIndex) +void window_player_statistics_mouse_up(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -521,13 +521,13 @@ void window_player_statistics_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); window_player_draw_tab_images(dpi, w); - int player = network_get_player_index((uint8)w->number); + sint32 player = network_get_player_index((uint8)w->number); if (player == -1) { return; } - int x = w->x + window_player_overview_widgets[WIDX_PAGE_BACKGROUND].left + 4; - int y = w->y + window_player_overview_widgets[WIDX_PAGE_BACKGROUND].top + 4; + sint32 x = w->x + window_player_overview_widgets[WIDX_PAGE_BACKGROUND].left + 4; + sint32 y = w->y + window_player_overview_widgets[WIDX_PAGE_BACKGROUND].top + 4; set_format_arg(0, uint32, network_get_player_commands_ran(player)); gfx_draw_string_left(dpi, STR_COMMANDS_RAN, gCommonFormatArgs, COLOUR_BLACK, x, y); @@ -538,9 +538,9 @@ void window_player_statistics_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_MONEY_SPENT, gCommonFormatArgs, COLOUR_BLACK, x, y); } -static void window_player_set_page(rct_window* w, int page) +static void window_player_set_page(rct_window* w, sint32 page) { - int originalPage = w->page; + sint32 originalPage = w->page; w->page = page; w->frame_no = 0; @@ -579,7 +579,7 @@ static void window_player_set_page(rct_window* w, int page) static void window_player_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) { rct_widget *widget; - int x, y, imageId; + sint32 x, y, imageId; // Tab 1 if (!widget_is_disabled(w, WIDX_TAB_1)) { @@ -607,7 +607,7 @@ static void window_player_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) static void window_player_update_viewport(rct_window *w, bool scroll) { - int playerIndex = network_get_player_index((uint8)w->number); + sint32 playerIndex = network_get_player_index((uint8)w->number); if (playerIndex == -1) { return; } @@ -616,7 +616,7 @@ static void window_player_update_viewport(rct_window *w, bool scroll) if (viewport != NULL) { rct_xyz16 coord = network_get_player_last_action_coord(playerIndex); if (coord.x != 0 || coord.y != 0 || coord.z != 0) { - int viewX, viewY; + sint32 viewX, viewY; center_2d_coordinates(coord.x, coord.y, coord.z, &viewX, &viewY, viewport); // Don't scroll if the view was originally undefined @@ -646,7 +646,7 @@ static void window_player_update_viewport(rct_window *w, bool scroll) static void window_player_update_title(rct_window* w) { - int player = network_get_player_index((uint8)w->number); + sint32 player = network_get_player_index((uint8)w->number); if (player != -1) { set_format_arg(0, const char *, network_get_player_name(player)); // set title caption to player name } else { diff --git a/src/openrct2/windows/publisher_credits.c b/src/openrct2/windows/publisher_credits.c index 4fc1c3612a..74c7b3290b 100644 --- a/src/openrct2/windows/publisher_credits.c +++ b/src/openrct2/windows/publisher_credits.c @@ -33,10 +33,10 @@ rct_widget window_publisher_credits_widgets[] = { { WIDGETS_END }, }; -static void window_publisher_credits_mouseup(rct_window *w, int widgetIndex); -static void window_publisher_credits_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); +static void window_publisher_credits_mouseup(rct_window *w, sint32 widgetIndex); +static void window_publisher_credits_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); static void window_publisher_credits_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_publisher_credits_events = { NULL, @@ -104,7 +104,7 @@ void window_publisher_credits_open() * * rct2: 0x0066D7A8 */ -static void window_publisher_credits_mouseup(rct_window *w, int widgetIndex) +static void window_publisher_credits_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -117,7 +117,7 @@ static void window_publisher_credits_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0066D7B3 */ -static void window_publisher_credits_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_publisher_credits_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = 820; } @@ -131,7 +131,7 @@ static void window_publisher_credits_paint(rct_window *w, rct_drawpixelinfo *dpi window_draw_widgets(w, dpi); } -int credits_order[] = { +sint32 credits_order[] = { STR_CREDITS_PUBLISHER_LINE_0, STR_CREDITS_PUBLISHER_LINE_1, STR_CREDITS_PUBLISHER_LINE_2, @@ -160,10 +160,10 @@ int credits_order[] = { * * rct2: 0x0066D5D1 */ -static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int x = 200; - int y = 2; + sint32 x = 200; + sint32 y = 2; gfx_draw_sprite(dpi, SPR_CREDITS_INFOGRAMES, x - 49, y, 0); @@ -173,7 +173,7 @@ static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinf y += 14; - for (int i = 0; i < sizeof(credits_order)/sizeof(int); i++) { + for (sint32 i = 0; i < sizeof(credits_order)/sizeof(sint32); i++) { gfx_draw_string_centred(dpi, credits_order[i], x, y, COLOUR_BLACK, NULL); y += 11; } diff --git a/src/openrct2/windows/research.c b/src/openrct2/windows/research.c index d7bd231c55..55e3eb2c7c 100644 --- a/src/openrct2/windows/research.c +++ b/src/openrct2/windows/research.c @@ -104,14 +104,14 @@ static rct_widget *window_research_page_widgets[] = { #pragma region Events -static void window_research_development_mouseup(rct_window *w, int widgetIndex); +static void window_research_development_mouseup(rct_window *w, sint32 widgetIndex); static void window_research_development_update(rct_window *w); static void window_research_development_invalidate(rct_window *w); static void window_research_development_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_research_funding_mouseup(rct_window *w, int widgetIndex); -static void window_research_funding_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_research_funding_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_research_funding_mouseup(rct_window *w, sint32 widgetIndex); +static void window_research_funding_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_research_funding_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_research_funding_update(rct_window *w); static void window_research_funding_invalidate(rct_window *w); static void window_research_funding_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -211,7 +211,7 @@ static uint32 window_research_page_enabled_widgets[] = { #pragma endregion -const int window_research_tab_animation_loops[] = { 16, 16 }; +const sint32 window_research_tab_animation_loops[] = { 16, 16 }; static const rct_string_id ResearchCategoryNames[] = { STR_RESEARCH_CATEGORY_TRANSPORT, @@ -230,7 +230,7 @@ static const rct_string_id ResearchStageNames[] = { STR_RESEARCH_STAGE_UNKNOWN, }; -static void window_research_set_page(rct_window *w, int page); +static void window_research_set_page(rct_window *w, sint32 page); static void window_research_set_pressed_tab(rct_window *w); static void window_research_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); @@ -271,7 +271,7 @@ void window_research_open() * * rct2: 0x006B6B38 */ -static void window_research_development_mouseup(rct_window *w, int widgetIndex) +static void window_research_development_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -282,7 +282,7 @@ static void window_research_development_mouseup(rct_window *w, int widgetIndex) window_research_set_page(w, widgetIndex - WIDX_TAB_1); break; case WIDX_LAST_DEVELOPMENT_BUTTON: - news_item_open_subject(NEWS_ITEM_RESEARCH, (int)gResearchLastItemSubject); + news_item_open_subject(NEWS_ITEM_RESEARCH, (sint32)gResearchLastItemSubject); break; } } @@ -334,12 +334,12 @@ static void window_research_development_paint(rct_window *w, rct_drawpixelinfo * window_research_development_page_paint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP); } -void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, int baseWidgetIndex) +void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex) { baseWidgetIndex = baseWidgetIndex - WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP; - int x = w->x + 10; - int y = w->y + w->widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP + baseWidgetIndex].top + 12; + sint32 x = w->x + 10; + sint32 y = w->y + w->widgets[WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP + baseWidgetIndex].top + 12; rct_string_id stringId; if (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL) { @@ -430,9 +430,9 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp * * rct2: 0x0069DB3F */ -static void window_research_funding_mouseup(rct_window *w, int widgetIndex) +static void window_research_funding_mouseup(rct_window *w, sint32 widgetIndex) { - int activeResearchTypes; + sint32 activeResearchTypes; switch (widgetIndex) { case WIDX_CLOSE: @@ -460,10 +460,10 @@ static void window_research_funding_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0069DB66 */ -static void window_research_funding_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_research_funding_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { rct_widget *dropdownWidget; - int i; + sint32 i; if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON) return; @@ -484,7 +484,7 @@ static void window_research_funding_mousedown(int widgetIndex, rct_window *w, rc dropdownWidget->right - dropdownWidget->left - 3 ); - int currentResearchLevel = gResearchFundingLevel; + sint32 currentResearchLevel = gResearchFundingLevel; dropdown_set_checked(currentResearchLevel, true); } @@ -492,7 +492,7 @@ static void window_research_funding_mousedown(int widgetIndex, rct_window *w, rc * * rct2: 0x0069DB6D */ -static void window_research_funding_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_research_funding_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1) return; @@ -539,15 +539,15 @@ static void window_research_funding_invalidate(rct_window *w) window_research_funding_widgets[WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON].type = WWT_DROPDOWN_BUTTON; // Current funding - int currentResearchLevel = gResearchFundingLevel; + sint32 currentResearchLevel = gResearchFundingLevel; window_research_funding_widgets[WIDX_RESEARCH_FUNDING].text = ResearchFundingLevelNames[currentResearchLevel]; } // Checkboxes uint8 activeResearchTypes = gResearchPriorities; - for (int i = 0; i < 7; i++) { - int mask = 1 << i; - int widgetMask = 1 << (i + WIDX_TRANSPORT_RIDES); + for (sint32 i = 0; i < 7; i++) { + sint32 mask = 1 << i; + sint32 widgetMask = 1 << (i + WIDX_TRANSPORT_RIDES); // Set checkbox disabled if research type is complete if (gResearchUncompletedCategories & mask) { @@ -577,12 +577,12 @@ static void window_research_funding_paint(rct_window *w, rct_drawpixelinfo *dpi) window_research_funding_page_paint(w, dpi, WIDX_RESEARCH_FUNDING); } -void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, int baseWidgetIndex) +void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 baseWidgetIndex) { if (gParkFlags & PARK_FLAGS_NO_MONEY) return; - int currentResearchLevel = gResearchFundingLevel; + sint32 currentResearchLevel = gResearchFundingLevel; money32 currentResearchCostPerWeek = research_cost_table[currentResearchLevel]; gfx_draw_string_left(dpi, STR_RESEARCH_COST_PER_MONTH, ¤tResearchCostPerWeek, COLOUR_BLACK, w->x + 10, w->y + 77); } @@ -595,7 +595,7 @@ void window_research_funding_page_paint(rct_window *w, rct_drawpixelinfo *dpi, i * * rct2: 0x0069CAC5 */ -static void window_research_set_page(rct_window *w, int page) +static void window_research_set_page(rct_window *w, sint32 page) { w->page = page; w->frame_no = 0; @@ -628,19 +628,19 @@ static void window_research_set_page(rct_window *w, int page) static void window_research_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_RESEARCH_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); } -static void window_research_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +static void window_research_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_1 + page; + sint32 widgetIndex = WIDX_TAB_1 + page; if (!(w->disabled_widgets & (1LL << widgetIndex))) { if (w->page == page) { - int frame = w->frame_no / 2; + sint32 frame = w->frame_no / 2; if (page == WINDOW_RESEARCH_PAGE_DEVELOPMENT) frame %= 8; spriteIndex += frame; diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index 98e35c0f3d..9e963829d8 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -539,98 +539,98 @@ const uint64 window_ride_page_hold_down_widgets[] = { static void window_ride_init_viewport(rct_window *w); -static void window_ride_main_mouseup(rct_window *w, int widgetIndex); +static void window_ride_main_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_main_resize(rct_window *w); -static void window_ride_main_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_main_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_main_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_main_update(rct_window *w); -static void window_ride_main_textinput(rct_window *w, int widgetIndex, char *text); +static void window_ride_main_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_ride_main_unknown_14(rct_window *w); static void window_ride_main_invalidate(rct_window *w); static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_vehicle_mouseup(rct_window *w, int widgetIndex); +static void window_ride_vehicle_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_vehicle_resize(rct_window *w); -static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_vehicle_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_vehicle_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_vehicle_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_vehicle_update(rct_window *w); static void window_ride_vehicle_invalidate(rct_window *w); static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); -static void window_ride_operating_mouseup(rct_window *w, int widgetIndex); +static void window_ride_operating_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_operating_resize(rct_window *w); -static void window_ride_operating_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_operating_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_operating_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_operating_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_operating_update(rct_window *w); static void window_ride_operating_invalidate(rct_window *w); static void window_ride_operating_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_maintenance_mouseup(rct_window *w, int widgetIndex); +static void window_ride_maintenance_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_maintenance_resize(rct_window *w); -static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_maintenance_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_maintenance_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_maintenance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_maintenance_update(rct_window *w); static void window_ride_maintenance_invalidate(rct_window *w); static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_ride_colour_close(rct_window *w); -static void window_ride_colour_mouseup(rct_window *w, int widgetIndex); +static void window_ride_colour_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_colour_resize(rct_window *w); -static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_colour_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_colour_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_colour_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_colour_update(rct_window *w); -static void window_ride_colour_tooldown(rct_window *w, int widgetIndex, int x, int y); -static void window_ride_colour_tooldrag(rct_window *w, int widgetIndex, int x, int y); +static void window_ride_colour_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_ride_colour_tooldrag(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); static void window_ride_colour_invalidate(rct_window *w); static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); -static void window_ride_music_mouseup(rct_window *w, int widgetIndex); +static void window_ride_music_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_music_resize(rct_window *w); -static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_music_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_music_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_music_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_music_update(rct_window *w); static void window_ride_music_invalidate(rct_window *w); static void window_ride_music_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_ride_measurements_close(rct_window *w); -static void window_ride_measurements_mouseup(rct_window *w, int widgetIndex); +static void window_ride_measurements_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_measurements_resize(rct_window *w); -static void window_ride_measurements_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_measurements_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_measurements_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_measurements_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_measurements_update(rct_window *w); -static void window_ride_measurements_tooldown(rct_window *w, int widgetIndex, int x, int y); -static void window_ride_measurements_toolabort(rct_window *w, int widgetIndex); +static void window_ride_measurements_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_ride_measurements_toolabort(rct_window *w, sint32 widgetIndex); static void window_ride_measurements_invalidate(rct_window *w); static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_graphs_mouseup(rct_window *w, int widgetIndex); +static void window_ride_graphs_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_graphs_resize(rct_window *w); -static void window_ride_graphs_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_graphs_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); static void window_ride_graphs_update(rct_window *w); -static void window_ride_graphs_scrollgetheight(rct_window *w, int scrollIndex, int *width, int *height); -static void window_ride_graphs_15(rct_window *w, int scrollIndex, int scrollAreaType); -static void window_ride_graphs_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_ride_graphs_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_ride_graphs_15(rct_window *w, sint32 scrollIndex, sint32 scrollAreaType); +static void window_ride_graphs_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_ride_graphs_invalidate(rct_window *w); static void window_ride_graphs_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); -static void window_ride_income_mouseup(rct_window *w, int widgetIndex); +static void window_ride_income_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_income_resize(rct_window *w); -static void window_ride_income_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_income_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); static void window_ride_income_update(rct_window *w); static void window_ride_income_invalidate(rct_window *w); static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_customer_mouseup(rct_window *w, int widgetIndex); +static void window_ride_customer_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_customer_resize(rct_window *w); static void window_ride_customer_update(rct_window *w); static void window_ride_customer_invalidate(rct_window *w); static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_ride_set_colours(); -static void window_ride_set_page(rct_window *w, int page); +static void window_ride_set_page(rct_window *w, sint32 page); // 0x0098DFD4 static rct_window_event_list window_ride_main_events = { @@ -969,7 +969,7 @@ static rct_window_event_list *window_ride_page_events[] = { static uint8 _rideType; -static void set_operating_setting(int rideNumber, uint8 setting, uint8 value); +static void set_operating_setting(sint32 rideNumber, uint8 setting, uint8 value); // Cached overall view for each ride // (Re)calculated when the ride window is opened @@ -980,8 +980,8 @@ typedef struct ride_overall_view_t { ride_overall_view ride_overall_views[MAX_RIDES] = {0}; -const int window_ride_tab_animation_divisor[] = { 0, 0, 2, 2, 4, 2, 8, 8, 2, 0 }; -const int window_ride_tab_animation_frames[] = { 0, 0, 4, 16, 8, 16, 8, 8, 8, 0 }; +const sint32 window_ride_tab_animation_divisor[] = { 0, 0, 2, 2, 4, 2, 8, 8, 2, 0 }; +const sint32 window_ride_tab_animation_frames[] = { 0, 0, 4, 16, 8, 16, 8, 8, 8, 0 }; static const rct_string_id RatingNames[] = { STR_RATING_LOW, @@ -1271,13 +1271,13 @@ static const rct_window_graphs_y_axis window_graphs_y_axi[] = { {13, -4, 1, STR_RIDE_STATS_G_FORCE_FORMAT}, // GRAPH_LATERAL }; -static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, sint32 page, sint32 spriteIndex) { - int widgetIndex = WIDX_TAB_1 + page; + sint32 widgetIndex = WIDX_TAB_1 + page; if (!(w->disabled_widgets & (1LL << widgetIndex))) { if (w->page == page) { - int frame = w->frame_no / window_ride_tab_animation_divisor[w->page]; + sint32 frame = w->frame_no / window_ride_tab_animation_divisor[w->page]; spriteIndex += (frame % window_ride_tab_animation_frames[w->page]); } @@ -1291,11 +1291,11 @@ static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, in */ static void window_ride_draw_tab_main(rct_drawpixelinfo *dpi, rct_window *w) { - int widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN; + sint32 widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_MAIN; if (!(w->disabled_widgets & (1LL << widgetIndex))) { - int spriteIndex = 0; - int rideType = get_ride(w->number)->type; + sint32 spriteIndex = 0; + sint32 rideType = get_ride(w->number)->type; switch (gRideClassifications[rideType]) { case RIDE_CLASS_RIDE: @@ -1325,14 +1325,14 @@ static void window_ride_draw_tab_main(rct_drawpixelinfo *dpi, rct_window *w) */ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w) { - int widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE; + sint32 widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_VEHICLE; rct_widget *widget = &w->widgets[widgetIndex]; if (!(w->disabled_widgets & (1LL << widgetIndex))) { - int x = widget->left + 1; - int y = widget->top + 1; - int width = widget->right - x; - int height = widget->bottom - 3 - y; + sint32 x = widget->left + 1; + sint32 y = widget->top + 1; + sint32 width = widget->right - x; + sint32 height = widget->bottom - 3 - y; if (w->page == WINDOW_RIDE_PAGE_VEHICLE) height += 4; @@ -1364,7 +1364,7 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w) rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[vehicle]; vehicle_colour vehicleColour = ride_get_vehicle_colour(ride, 0); - int spriteIndex = 32; + sint32 spriteIndex = 32; if (w->page == WINDOW_RIDE_PAGE_VEHICLE) spriteIndex += w->frame_no; spriteIndex /= (rideVehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_11) ? 4 : 2; @@ -1384,11 +1384,11 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo *dpi, rct_window *w) */ static void window_ride_draw_tab_customer(rct_drawpixelinfo *dpi, rct_window *w) { - int widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER; + sint32 widgetIndex = WIDX_TAB_1 + WINDOW_RIDE_PAGE_CUSTOMER; if (!(w->disabled_widgets & (1LL << widgetIndex))) { rct_widget *widget = &w->widgets[widgetIndex]; - int spriteIndex = 0; + sint32 spriteIndex = 0; if (w->page == WINDOW_RIDE_PAGE_CUSTOMER) spriteIndex = w->var_492 & ~3; @@ -1480,8 +1480,8 @@ static void window_ride_update_overall_view(uint8 ride_index) { map_element_iterator_begin(&it); - int minx = INT_MAX, miny = INT_MAX, minz = INT_MAX; - int maxx = INT_MIN, maxy = INT_MIN, maxz = INT_MIN; + sint32 minx = INT_MAX, miny = INT_MAX, minz = INT_MAX; + sint32 maxx = INT_MIN, maxy = INT_MIN, maxz = INT_MIN; while (map_element_iterator_next(&it)) { if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_TRACK) @@ -1490,10 +1490,10 @@ static void window_ride_update_overall_view(uint8 ride_index) { if (it.element->properties.track.ride_index != ride_index) continue; - int x = it.x * 32; - int y = it.y * 32; - int z1 = it.element->base_height * 8; - int z2 = it.element->clearance_height * 8; + sint32 x = it.x * 32; + sint32 y = it.y * 32; + sint32 z1 = it.element->base_height * 8; + sint32 z2 = it.element->clearance_height * 8; minx = min(minx, x); miny = min(miny, y); @@ -1510,11 +1510,11 @@ static void window_ride_update_overall_view(uint8 ride_index) { view->z = (minz + maxz) / 2 + 8; // Calculate size to determine from how far away to view the ride - int dx = maxx - minx; - int dy = maxy - miny; - int dz = maxz - minz; + sint32 dx = maxx - minx; + sint32 dy = maxy - miny; + sint32 dz = maxz - minz; - int size = (int) sqrt(dx*dx + dy*dy + dz*dz); + sint32 size = (sint32) sqrt(dx*dx + dy*dy + dz*dz); // Each farther zoom level shows twice as many tiles (log) // Appropriate zoom is lowered by one to fill the entire view with the ride @@ -1526,12 +1526,12 @@ static void window_ride_update_overall_view(uint8 ride_index) { * * rct2: 0x006AEAB4 */ -static rct_window *window_ride_open(int rideIndex) +static rct_window *window_ride_open(sint32 rideIndex) { rct_window *w; rct_ride *ride; uint8 *rideEntryIndexPtr; - int numSubTypes; + sint32 numSubTypes; w = window_create_auto_pos(316, 207, window_ride_page_events[0], WC_RIDE, WF_10 | WF_RESIZABLE); w->widgets = window_ride_page_widgets[0]; @@ -1570,7 +1570,7 @@ static rct_window *window_ride_open(int rideIndex) * * rct2: 0x006ACC28 */ -rct_window *window_ride_main_open(int rideIndex) +rct_window *window_ride_main_open(sint32 rideIndex) { rct_window *w; @@ -1601,9 +1601,9 @@ rct_window *window_ride_main_open(int rideIndex) * * rct2: 0x006ACCCE */ -rct_window *window_ride_open_station(int rideIndex, int stationIndex) +rct_window *window_ride_open_station(sint32 rideIndex, sint32 stationIndex) { - int i; + sint32 i; rct_ride *ride; rct_window *w; @@ -1654,7 +1654,7 @@ rct_window *window_ride_open_station(int rideIndex, int stationIndex) rct_window *window_ride_open_track(rct_map_element *mapElement) { - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; if ( (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) || (TrackSequenceProperties[mapElement->properties.track.type][0] & TRACK_SEQUENCE_FLAG_ORIGIN) @@ -1675,12 +1675,12 @@ rct_window *window_ride_open_vehicle(rct_vehicle *vehicle) { rct_vehicle *headVehicle = vehicle_get_head(vehicle); uint16 headVehicleSpriteIndex = headVehicle->sprite_index; - int rideIndex = headVehicle->ride; + sint32 rideIndex = headVehicle->ride; rct_ride *ride = get_ride(rideIndex); // Get view index - int view = 1; - for (int i = 0; i < 32; i++) { + sint32 view = 1; + for (sint32 i = 0; i < 32; i++) { if (ride->vehicles[i] == headVehicleSpriteIndex) break; @@ -1700,10 +1700,10 @@ rct_window *window_ride_open_vehicle(rct_vehicle *vehicle) tool_cancel(); } - int openedPeepWindow = 0; + sint32 openedPeepWindow = 0; if (w->ride.view == view) { - int numPeepsLeft = vehicle->num_peeps; - for (int i = 0; i < 32 && numPeepsLeft > 0; i++) { + sint32 numPeepsLeft = vehicle->num_peeps; + for (sint32 i = 0; i < 32 && numPeepsLeft > 0; i++) { uint16 peepSpriteIndex = vehicle->peep[i]; if (peepSpriteIndex == SPRITE_INDEX_NULL) continue; @@ -1755,9 +1755,9 @@ rct_window *window_ride_open_vehicle(rct_vehicle *vehicle) * * rct2: 0x006AF1D2 */ -static void window_ride_set_page(rct_window *w, int page) +static void window_ride_set_page(rct_window *w, sint32 page) { - int listen; + sint32 listen; if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number) @@ -1801,7 +1801,7 @@ static void window_ride_set_page(rct_window *w, int page) static void window_ride_set_pressed_tab(rct_window *w) { - int i; + sint32 i; for (i = 0; i < WINDOW_RIDE_PAGE_COUNT; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); @@ -1829,7 +1829,7 @@ static void window_ride_init_viewport(rct_window *w) if (w->page != WINDOW_RIDE_PAGE_MAIN) return; rct_ride* ride = get_ride(w->number); - int eax = w->viewport_focus_coordinates.var_480 - 1; + sint32 eax = w->viewport_focus_coordinates.var_480 - 1; union{ sprite_focus sprite; @@ -1856,8 +1856,8 @@ static void window_ride_init_viewport(rct_window *w) focus.sprite.type |= 0xC0; } else if (eax >= ride->num_vehicles && eax < (ride->num_vehicles + ride->num_stations)){ - int stationIndex = -1; - int count = eax - ride->num_vehicles; + sint32 stationIndex = -1; + sint32 count = eax - ride->num_vehicles; do { stationIndex++; if (ride->station_starts[stationIndex] != 0xFFFF) @@ -1923,10 +1923,10 @@ static void window_ride_init_viewport(rct_window *w) if (!w->viewport && ride->overall_view != 0xFFFF){ rct_widget* view_widget = &w->widgets[WIDX_VIEWPORT]; - int x = view_widget->left + 1 + w->x; - int y = view_widget->top + 1 + w->y; - int width = view_widget->right - view_widget->left - 1; - int height = view_widget->bottom - view_widget->top - 1; + sint32 x = view_widget->left + 1 + w->x; + sint32 y = view_widget->top + 1 + w->y; + sint32 width = view_widget->right - view_widget->left - 1; + sint32 height = view_widget->bottom - view_widget->top - 1; viewport_create( w, x, @@ -1966,11 +1966,11 @@ static void window_ride_rename(rct_window *w) * * rct2: 0x006AF17E */ -static void window_ride_main_mouseup(rct_window *w, int widgetIndex) +static void window_ride_main_mouseup(rct_window *w, sint32 widgetIndex) { uint8 rideIndex; rct_ride *ride; - int status; + sint32 status; switch (widgetIndex) { case WIDX_CLOSE: @@ -2039,9 +2039,9 @@ static void window_ride_main_mouseup(rct_window *w, int widgetIndex) */ static void window_ride_main_resize(rct_window *w) { - const int offset = gCheatsAllowArbitraryRideTypeChanges ? 15 : 0; + const sint32 offset = gCheatsAllowArbitraryRideTypeChanges ? 15 : 0; w->flags |= WF_RESIZABLE; - int minHeight = 180 + offset; + sint32 minHeight = 180 + offset; if (theme_get_flags() & UITHEME_FLAG_USE_LIGHTS_RIDE) minHeight = 200 + offset + RCT1_LIGHT_OFFSET - (ride_type_has_flag(get_ride(w->number)->type, RIDE_TYPE_FLAG_NO_TEST_MODE) ? 14 : 0); window_set_resize(w, 316, minHeight, 500, 450); @@ -2057,7 +2057,7 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) rct_widget *dropdownWidget = widget - 1; rct_ride *ride = get_ride(w->number); - int numItems = 1; + sint32 numItems = 1; if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_NO_VEHICLES)) { numItems += ride->num_stations; numItems += ride->num_vehicles; @@ -2076,11 +2076,11 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) // First item gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[0] = STR_OVERALL_VIEW; - int currentItem = 1; + sint32 currentItem = 1; // Vehicles - int name = RideComponentNames[RideNameConvention[ride->type].vehicle].number; - for (int i = 1; i <= ride->num_vehicles; i++) { + sint32 name = RideComponentNames[RideNameConvention[ride->type].vehicle].number; + for (sint32 i = 1; i <= ride->num_vehicles; i++) { gDropdownItemsFormat[currentItem] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[currentItem] = name | (currentItem << 16); currentItem++; @@ -2088,7 +2088,7 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) // Stations name = RideComponentNames[RideNameConvention[ride->type].station].number; - for (int i = 1; i <= ride->num_stations; i++) { + for (sint32 i = 1; i <= ride->num_stations; i++) { gDropdownItemsFormat[currentItem] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[currentItem] = name | (i << 16); currentItem++; @@ -2096,8 +2096,8 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) // Set highlighted item if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) { - int j = 2; - for (int i = 0; i < ride->num_vehicles; i++) { + sint32 j = 2; + for (sint32 i = 0; i < ride->num_vehicles; i++) { gDropdownItemsDisabled |= j; j <<= 1; } @@ -2114,7 +2114,7 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) static void window_ride_show_open_dropdown(rct_window *w, rct_widget *widget) { rct_ride *ride; - int numItems, highlightedIndex = 0, checkedIndex; + sint32 numItems, highlightedIndex = 0, checkedIndex; ride = get_ride(w->number); @@ -2187,7 +2187,7 @@ static void window_ride_show_open_dropdown(rct_window *w, rct_widget *widget) * * rct2: 0x006AF1BD */ -static void window_ride_main_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_main_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_VIEW_DROPDOWN: @@ -2225,10 +2225,10 @@ static void window_ride_main_mousedown(int widgetIndex, rct_window *w, rct_widge * * rct2: 0x006AF300 */ -static void window_ride_main_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_main_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { rct_ride *ride; - int status = 0; + sint32 status = 0; switch (widgetIndex) { case WIDX_VIEW_DROPDOWN: @@ -2295,7 +2295,7 @@ static void window_ride_main_update(rct_window *w) return; if (w->ride.view <= ride->num_vehicles) { - int vehicleIndex = w->ride.view - 1; + sint32 vehicleIndex = w->ride.view - 1; uint16 vehicleSpriteIndex = ride->vehicles[vehicleIndex]; if (vehicleSpriteIndex == SPRITE_INDEX_NULL) return; @@ -2320,7 +2320,7 @@ static void window_ride_main_update(rct_window *w) * * rct2: 0x006AF2F9 */ -static void window_ride_main_textinput(rct_window *w, int widgetIndex, char *text) +static void window_ride_main_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_RENAME || text == NULL) return; @@ -2344,7 +2344,7 @@ static void window_ride_main_unknown_14(rct_window *w) static void window_ride_main_invalidate(rct_window *w) { rct_widget *widgets; - int i, height; + sint32 i, height; colour_scheme_update(w); @@ -2377,7 +2377,7 @@ static void window_ride_main_invalidate(rct_window *w) window_ride_anchor_border_widgets(w); - const int offset = gCheatsAllowArbitraryRideTypeChanges ? 15 : 0; + const sint32 offset = gCheatsAllowArbitraryRideTypeChanges ? 15 : 0; // Anchor main page specific widgets window_ride_main_widgets[WIDX_VIEWPORT].right = w->width - 26; window_ride_main_widgets[WIDX_VIEWPORT].bottom = w->height - (14 + offset); @@ -2462,7 +2462,7 @@ static void window_ride_main_invalidate(rct_window *w) */ static rct_string_id window_ride_get_status_overall_view(rct_window *w, void *arguments) { - int argument; + sint32 argument; rct_string_id formatSecondary, stringId; ride_get_status(w->number, &formatSecondary, &argument); @@ -2483,7 +2483,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window *w, void *argumen { rct_ride *ride; rct_vehicle *vehicle; - int vehicleIndex; + sint32 vehicleIndex; uint16 vehicleSpriteIndex; rct_string_id stringId; @@ -2496,7 +2496,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window *w, void *argumen vehicle = &(get_sprite(vehicleSpriteIndex)->vehicle); if (vehicle->status != VEHICLE_STATUS_CRASHING && vehicle->status != VEHICLE_STATUS_CRASHED) { - int trackType = vehicle->track_type >> 2; + sint32 trackType = vehicle->track_type >> 2; if (trackType == TRACK_ELEM_BLOCK_BRAKES || trackType == TRACK_ELEM_CABLE_LIFT_HILL || trackType == TRACK_ELEM_25_DEG_UP_TO_FLAT || @@ -2536,8 +2536,8 @@ static rct_string_id window_ride_get_status_vehicle(rct_window *w, void *argumen static rct_string_id window_ride_get_status_station(rct_window *w, void *arguments) { rct_ride *ride = get_ride(w->number); - int count = w->ride.view - ride->num_vehicles - 1; - int stationIndex = -1; + sint32 count = w->ride.view - ride->num_vehicles - 1; + sint32 stationIndex = -1; rct_string_id stringId = 0; do { @@ -2559,7 +2559,7 @@ static rct_string_id window_ride_get_status_station(rct_window *w, void *argumen // Queue length if (stringId == 0) { - int queueLength = ride->queue_length[stationIndex]; + sint32 queueLength = ride->queue_length[stationIndex]; set_format_arg_body(arguments, 2, (uintptr_t)queueLength, sizeof(uint16)); stringId = STR_QUEUE_EMPTY; if (queueLength == 1) @@ -2654,7 +2654,7 @@ static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006B272D */ -static void window_ride_vehicle_mouseup(rct_window *w, int widgetIndex) +static void window_ride_vehicle_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -2688,12 +2688,12 @@ static void window_ride_vehicle_resize(rct_window *w) * * rct2: 0x006B2748 */ -static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_vehicle_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_widget *dropdownWidget = widget - 1; rct_ride *ride; rct_ride_entry *rideEntry, *currentRideEntry; - int numItems, rideEntryIndex, selectedIndex, rideTypeIterator, rideTypeIteratorMax; + sint32 numItems, rideEntryIndex, selectedIndex, rideTypeIterator, rideTypeIteratorMax; uint8 *rideEntryIndexPtr; bool selectionShouldBeExpanded; @@ -2782,7 +2782,7 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi * * rct2: 0x006B2767 */ -static void window_ride_vehicle_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_vehicle_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -2816,7 +2816,7 @@ static void window_ride_vehicle_invalidate(rct_window *w) rct_ride *ride; rct_ride_entry *rideEntry; rct_string_id stringId; - int carsPerTrain; + sint32 carsPerTrain; colour_scheme_update(w); @@ -2917,7 +2917,7 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_ride *ride; rct_ride_entry *rideEntry; - int x, y; + sint32 x, y; sint16 factor; window_draw_widgets(w, dpi); @@ -2969,10 +2969,10 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi) } typedef struct rct_vehichle_paintinfo { - short x; - short y; - int sprite_index; - int tertiary_colour; + sint16 x; + sint16 y; + sint32 sprite_index; + sint32 tertiary_colour; } rct_vehichle_paintinfo; rct_vehichle_paintinfo _sprites_to_draw[144]; @@ -2981,7 +2981,7 @@ rct_vehichle_paintinfo _sprites_to_draw[144]; * * rct2: 0x006B2502 */ -static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { rct_ride *ride = get_ride(w->number); rct_ride_entry *rideEntry = get_ride_entry_by_ride(ride); @@ -2990,26 +2990,26 @@ static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dp gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width, dpi->y + dpi->height, 12); rct_widget *widget = &window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_PREVIEW]; - int startX = max(2, ((widget->right - widget->left) - ((ride->num_vehicles - 1) * 36)) / 2 - 25); - int startY = widget->bottom - widget->top - 4; + sint32 startX = max(2, ((widget->right - widget->left) - ((ride->num_vehicles - 1) * 36)) / 2 - 25); + sint32 startY = widget->bottom - widget->top - 4; rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, 0)]; startY += rideVehicleEntry->tab_height; // For each train - for (int i = 0; i < ride->num_vehicles; i++) { + for (sint32 i = 0; i < ride->num_vehicles; i++) { rct_vehichle_paintinfo *nextSpriteToDraw = _sprites_to_draw; - int x = startX; - int y = startY; + sint32 x = startX; + sint32 y = startY; // For each car in train - for (int j = 0; j < ride->num_cars_per_train; j++) { + for (sint32 j = 0; j < ride->num_cars_per_train; j++) { rideVehicleEntry = &rideEntry->vehicles[ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, j)]; x += rideVehicleEntry->spacing / 17432; y -= (rideVehicleEntry->spacing / 2) / 17432; // Get colour of vehicle - int vehicleColourIndex = 0; + sint32 vehicleColourIndex = 0; switch (ride->colour_scheme_type & 3) { case VEHICLE_COLOUR_SCHEME_SAME: vehicleColourIndex = 0; @@ -3023,7 +3023,7 @@ static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dp } vehicle_colour vehicleColour = ride_get_vehicle_colour(ride, vehicleColourIndex); - int spriteIndex = 16; + sint32 spriteIndex = 16; if (rideVehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_11) spriteIndex /= 2; @@ -3061,7 +3061,7 @@ static void window_ride_vehicle_scrollpaint(rct_window *w, rct_drawpixelinfo *dp #pragma region Operating -static void set_operating_setting(int rideNumber, uint8 setting, uint8 value) +static void set_operating_setting(sint32 rideNumber, uint8 setting, uint8 value) { gGameCommandErrorTitle = STR_CANT_CHANGE_OPERATING_MODE; game_do_command(0, (value << 8) | 1, 0, (setting << 8) | rideNumber, GAME_COMMAND_SET_RIDE_SETTING, 0, 0); @@ -3141,7 +3141,7 @@ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget) rct_widget *dropdownWidget; rct_ride *ride; const uint8 *availableModes, *mode; - int i, numAvailableModes; + sint32 i, numAvailableModes; dropdownWidget = widget - 1; ride = get_ride(w->number); @@ -3197,7 +3197,7 @@ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget) static void window_ride_load_dropdown(rct_window *w, rct_widget *widget) { rct_widget *dropdownWidget; - int i; + sint32 i; dropdownWidget = widget - 1; rct_ride *ride = get_ride(w->number); @@ -3223,7 +3223,7 @@ static void window_ride_load_dropdown(rct_window *w, rct_widget *widget) * * rct2: 0x006B10A7 */ -static void window_ride_operating_mouseup(rct_window *w, int widgetIndex) +static void window_ride_operating_mouseup(rct_window *w, sint32 widgetIndex) { rct_ride *ride; @@ -3276,7 +3276,7 @@ static void window_ride_operating_resize(rct_window *w) * * rct2: 0x006B10F4 */ -static void window_ride_operating_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_operating_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_ride *ride = get_ride(w->number); uint8 upper_bound, lower_bound; @@ -3342,7 +3342,7 @@ static void window_ride_operating_mousedown(int widgetIndex, rct_window *w, rct_ * * rct2: 0x006B1165 */ -static void window_ride_operating_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_operating_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { rct_ride *ride; const uint8 *availableModes; @@ -3660,7 +3660,7 @@ static void window_ride_locate_mechanic(rct_window *w) * * rct2: 0x006B7D08 */ -static void window_ride_maintenance_draw_bar(rct_window *w, rct_drawpixelinfo *dpi, int x, int y, int value, int unk) +static void window_ride_maintenance_draw_bar(rct_window *w, rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 value, sint32 unk) { gfx_fill_rect_inset(dpi, x, y, x + 149, y + 8, w->colours[1], INSET_RECT_F_30); if (unk & (1u << 31)) { @@ -3679,7 +3679,7 @@ static void window_ride_maintenance_draw_bar(rct_window *w, rct_drawpixelinfo *d * * rct2: 0x006B1AAD */ -static void window_ride_maintenance_mouseup(rct_window *w, int widgetIndex) +static void window_ride_maintenance_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -3716,7 +3716,7 @@ static void window_ride_maintenance_resize(rct_window *w) * * rct2: 0x006B1ACE */ -static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_maintenance_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_ride *ride = get_ride(w->number); rct_ride_entry *ride_type = get_ride_entry(ride->subtype); @@ -3725,12 +3725,12 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc } rct_widget *dropdownWidget = widget; - int j, num_items; + sint32 j, num_items; switch (widgetIndex) { case WIDX_INSPECTION_INTERVAL_DROPDOWN: dropdownWidget--; - for (int i = 0; i < 7; i++) { + for (sint32 i = 0; i < 7; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = RideInspectionIntervalNames[i]; } @@ -3755,7 +3755,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc } gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[0] = STR_DEBUG_FIX_RIDE; - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { if (RideAvailableBreakdowns[ride_type->ride_type[j]] & (uint8)(1 << i)) { if (i == BREAKDOWN_BRAKES_FAILURE && (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED || ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED)) { if (ride->num_vehicles != 1) @@ -3780,9 +3780,9 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc ); num_items = 1; - int breakdownReason = ride->breakdown_reason_pending; + sint32 breakdownReason = ride->breakdown_reason_pending; if (breakdownReason != BREAKDOWN_NONE && (ride->lifecycle_flags & RIDE_LIFECYCLE_BREAKDOWN_PENDING)) { - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { if (RideAvailableBreakdowns[ride_type->ride_type[j]] & (uint8)(1 << i)) { if (i == BREAKDOWN_BRAKES_FAILURE && (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED || ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED)) { if (ride->num_vehicles != 1) @@ -3812,7 +3812,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc * * rct2: 0x006B1AD9 */ -static void window_ride_maintenance_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_maintenance_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -3833,7 +3833,7 @@ static void window_ride_maintenance_dropdown(rct_window *w, int widgetIndex, int case BREAKDOWN_SAFETY_CUT_OUT: if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK)) break; - for (int i = 0; i < ride->num_vehicles; ++i) { + for (sint32 i = 0; i < ride->num_vehicles; ++i) { uint16 spriteId = ride->vehicles[i]; do { vehicle = GET_VEHICLE(spriteId); @@ -3868,13 +3868,13 @@ static void window_ride_maintenance_dropdown(rct_window *w, int widgetIndex, int window_error_open(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_IS_CLOSED); } else { - int j; + sint32 j; for (j = 0; j < 3; j++) { if (ride_type->ride_type[j] != 0xFF) break; } - int i; - int num_items = 1; + sint32 i; + sint32 num_items = 1; for (i = 0; i < 8; i++) { if (RideAvailableBreakdowns[ride_type->ride_type[j]] & (uint8)(1 << i)) { if (i == BREAKDOWN_BRAKES_FAILURE && (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED || ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED)) { @@ -3961,8 +3961,8 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi) // Locate mechanic button image rct_widget *widget = &window_ride_maintenance_widgets[WIDX_LOCATE_MECHANIC]; - int x = w->x + widget->left; - int y = w->y + widget->top; + sint32 x = w->x + widget->left; + sint32 y = w->y + widget->top; gfx_draw_sprite(dpi, (gStaffMechanicColour << 24) | 0xA0000000 | SPR_MECHANIC, x, y, 0); // Inspection label @@ -4065,12 +4065,12 @@ const uint8 window_ride_entrance_style_list[] = { RIDE_ENTRANCE_STYLE_NONE }; -static uint32 window_ride_get_colour_button_image(int colour) +static uint32 window_ride_get_colour_button_image(sint32 colour) { return 0x60000000 | (colour << 19) | SPR_PALETTE_BTN; } -static int window_ride_has_track_colour(rct_ride *ride, int trackColour) +static sint32 window_ride_has_track_colour(rct_ride *ride, sint32 trackColour) { uint16 colourUse = RideEntranceDefinitions[ride->entrance_style].colour_use_flags; @@ -4082,11 +4082,11 @@ static int window_ride_has_track_colour(rct_ride *ride, int trackColour) } } -static void window_ride_set_track_colour_scheme(rct_window *w, int x, int y) +static void window_ride_set_track_colour_scheme(rct_window *w, sint32 x, sint32 y) { rct_map_element *mapElement; uint8 newColourScheme; - int interactionType, z, direction; + sint32 interactionType, z, direction; newColourScheme = (uint8)w->ride_colour; @@ -4129,7 +4129,7 @@ static void window_ride_colour_close(rct_window *w) * * rct2: 0x006B02A1 */ -static void window_ride_colour_mouseup(rct_window *w, int widgetIndex) +static void window_ride_colour_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -4166,14 +4166,14 @@ static void window_ride_colour_resize(rct_window *w) * * rct2: 0x006B02C6 */ -static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_colour_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_ride *ride; uint16 colourSchemeIndex; vehicle_colour vehicleColour; rct_widget *dropdownWidget; rct_ride_entry *rideEntry; - int i, numItems; + sint32 i, numItems; rct_string_id stringId; ride = get_ride(w->number); @@ -4311,7 +4311,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid * * rct2: 0x006B0331 */ -static void window_ride_colour_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_colour_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -4372,7 +4372,7 @@ static void window_ride_colour_update(rct_window *w) * * rct2: 0x006B04EC */ -static void window_ride_colour_tooldown(rct_window *w, int widgetIndex, int x, int y) +static void window_ride_colour_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA) window_ride_set_track_colour_scheme(w, x, y); @@ -4382,7 +4382,7 @@ static void window_ride_colour_tooldown(rct_window *w, int widgetIndex, int x, i * * rct2: 0x006B04F3 */ -static void window_ride_colour_tooldrag(rct_window *w, int widgetIndex, int x, int y) +static void window_ride_colour_tooldrag(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA) window_ride_set_track_colour_scheme(w, x, y); @@ -4417,7 +4417,7 @@ static void window_ride_colour_invalidate(rct_window *w) set_format_arg(2, uint32, ride->name_arguments); // Track colours - int colourScheme = w->ride_colour; + sint32 colourScheme = w->ride_colour; trackColour = ride_get_track_colour(ride, colourScheme); // Maze style @@ -4486,7 +4486,7 @@ static void window_ride_colour_invalidate(rct_window *w) // Vehicle colours if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_NO_VEHICLES) && ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS)) { - int vehicleColourSchemeType = ride->colour_scheme_type & 3; + sint32 vehicleColourSchemeType = ride->colour_scheme_type & 3; if (vehicleColourSchemeType == 0) w->var_48C = 0; @@ -4497,7 +4497,7 @@ static void window_ride_colour_invalidate(rct_window *w) window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].image = window_ride_get_colour_button_image(vehicleColour.main); uint32 colourFlags = 0; - for (int i = 0; i < ride->num_cars_per_train; i++) { + for (sint32 i = 0; i < ride->num_cars_per_train; i++) { uint8 vehicleTypeIndex = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, i); colourFlags |= rideEntry->vehicles[vehicleTypeIndex].flags_b; @@ -4586,15 +4586,15 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) // if (rideEntry->shop_item == 0xFF) { - int x = w->x + widget->left; - int y = w->y + widget->top; + sint32 x = w->x + widget->left; + sint32 y = w->y + widget->top; // Track if (ride->type == RIDE_TYPE_MAZE) { - int spriteIndex = MazeOptions[trackColour.supports].sprite; + sint32 spriteIndex = MazeOptions[trackColour.supports].sprite; gfx_draw_sprite(dpi, spriteIndex, x, y, 0); } else { - int spriteIndex = TrackColourPreviews[ride->type].track; + sint32 spriteIndex = TrackColourPreviews[ride->type].track; if (spriteIndex != 0) { spriteIndex |= (trackColour.additional << 24) | (trackColour.main << 19); spriteIndex |= 0xA0000000; @@ -4610,11 +4610,11 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) } } } else { - int x = w->x + (widget->left + widget->right) / 2 - 8; - int y = w->y + (widget->bottom + widget->top) / 2 - 6; + sint32 x = w->x + (widget->left + widget->right) / 2 - 8; + sint32 y = w->y + (widget->bottom + widget->top) / 2 - 6; uint8 shopItem = rideEntry->shop_item_secondary == 255 ? rideEntry->shop_item : rideEntry->shop_item_secondary; - int spriteIndex = ShopItemImage[shopItem]; + sint32 spriteIndex = ShopItemImage[shopItem]; spriteIndex |= ride->track_colour_main[0] << 19; spriteIndex |= 0x20000000; @@ -4638,12 +4638,12 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) if (ride->entrance_style != RIDE_ENTRANCE_STYLE_NONE) { const rct_ride_entrance_definition *entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - int terniaryColour = 0; + sint32 terniaryColour = 0; if (entranceStyle->base_image_id & 0x40000000) { terniaryColour = 0x40000000 | (GlassPaletteIds[trackColour.main] << 19); } - int spriteIndex = (trackColour.additional << 24) | (trackColour.main << 19); + sint32 spriteIndex = (trackColour.additional << 24) | (trackColour.main << 19); spriteIndex |= 0xA0000000; spriteIndex += RideEntranceDefinitions[ride->entrance_style].sprite_index; @@ -4665,12 +4665,12 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006B0192 */ -static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { rct_ride *ride; rct_ride_entry *rideEntry; rct_widget *vehiclePreviewWidget; - int trainCarIndex, x, y, spriteIndex; + sint32 trainCarIndex, x, y, spriteIndex; vehicle_colour vehicleColour; ride = get_ride(w->number); @@ -4749,7 +4749,7 @@ static void window_ride_toggle_music(rct_window *w) { rct_ride *ride = get_ride(w->number); - int activateMusic = (ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) ? 0 : 1; + sint32 activateMusic = (ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) ? 0 : 1; gGameCommandErrorTitle = STR_CANT_CHANGE_OPERATING_MODE; game_do_command(0, (activateMusic << 8) | 1, 0, (6 << 8) | w->number, GAME_COMMAND_SET_RIDE_SETTING, 0, 0); @@ -4759,7 +4759,7 @@ static void window_ride_toggle_music(rct_window *w) * * rct2: 0x006B1ED7 */ -static void window_ride_music_mouseup(rct_window *w, int widgetIndex) +static void window_ride_music_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -4797,10 +4797,10 @@ static void window_ride_music_resize(rct_window *w) * * rct2: 0x006B1EFC */ -static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_music_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_widget *dropdownWidget; - int i; + sint32 i; if (widgetIndex != WIDX_MUSIC_DROPDOWN) return; @@ -4808,7 +4808,7 @@ static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widg dropdownWidget = widget - 1; rct_ride *ride = get_ride(w->number); - int numItems = 0; + sint32 numItems = 0; if (ride->type == RIDE_TYPE_MERRY_GO_ROUND) { window_ride_current_music_style_order[numItems++] = MUSIC_STYLE_FAIRGROUND_ORGAN; } else { @@ -4847,7 +4847,7 @@ static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widg * * rct2: 0x006B1F03 */ -static void window_ride_music_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_music_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { uint8 musicStyle; @@ -4877,7 +4877,7 @@ static void window_ride_music_update(rct_window *w) static void window_ride_music_invalidate(rct_window *w) { rct_widget *widgets; - int isMusicActivated; + sint32 isMusicActivated; colour_scheme_update(w); @@ -5025,7 +5025,7 @@ static void window_ride_measurements_close(rct_window *w) * * rct2: 0x006AD478 */ -static void window_ride_measurements_mouseup(rct_window *w, int widgetIndex) +static void window_ride_measurements_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -5071,7 +5071,7 @@ static void window_ride_measurements_resize(rct_window *w) * * rct2: 0x006AD4AB */ -static void window_ride_measurements_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_measurements_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { if (widgetIndex != WIDX_SAVE_TRACK_DESIGN) return; @@ -5096,7 +5096,7 @@ static void window_ride_measurements_mousedown(int widgetIndex, rct_window *w, r * * rct2: 0x006AD4B2 */ -static void window_ride_measurements_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_measurements_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_SAVE_TRACK_DESIGN) return; @@ -5125,11 +5125,11 @@ static void window_ride_measurements_update(rct_window *w) * * rct2: 0x006D2AE7 */ -static void window_ride_measurements_tooldown(rct_window *w, int widgetIndex, int x, int y) +static void window_ride_measurements_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { rct_map_element *mapElement; sint16 mapX, mapY; - int interactionType; + sint32 interactionType; get_map_coordinates_from_pos(x, y, 0xFCCF, &mapX, &mapY, &interactionType, &mapElement, NULL); switch (interactionType) { @@ -5146,7 +5146,7 @@ static void window_ride_measurements_tooldown(rct_window *w, int widgetIndex, in * * rct2: 0x006AD4DA */ -static void window_ride_measurements_toolabort(rct_window *w, int widgetIndex) +static void window_ride_measurements_toolabort(rct_window *w, sint32 widgetIndex) { window_ride_measurements_design_cancel(); } @@ -5217,8 +5217,8 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi if (window_ride_measurements_widgets[WIDX_SAVE_DESIGN].type == WWT_DROPDOWN_BUTTON) { rct_widget *widget = &window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND]; - int x = w->x + (widget->right - widget->left) / 2; - int y = w->y + widget->top + 40; + sint32 x = w->x + (widget->right - widget->left) / 2; + sint32 y = w->y + widget->top + 40; gfx_draw_string_centred_wrapped(dpi, NULL, x, y, w->width - 8, STR_CLICK_ITEMS_OF_SCENERY_TO_SELECT, COLOUR_BLACK); x = w->x + 4; @@ -5226,8 +5226,8 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi gfx_fill_rect_inset(dpi, x, y, w->x + 312, y + 1, w->colours[1], INSET_RECT_FLAG_BORDER_INSET); } else { rct_ride *ride = get_ride(w->number); - int x = w->x + window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].left + 4; - int y = w->y + window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].top + 4; + sint32 x = w->x + window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].left + 4; + sint32 y = w->y + window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].top + 4; if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) { // Excitement @@ -5278,8 +5278,8 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi y += 10; // Ride time - int numTimes = 0; - for (int i = 0; i < ride->num_stations; i++) { + sint32 numTimes = 0; + for (sint32 i = 0; i < ride->num_stations; i++) { time = ride->time[numTimes]; if (time != 0) { set_format_arg(0 + (numTimes * 4), uint16, STR_RIDE_TIME_ENTRY_WITH_SEPARATOR); @@ -5305,8 +5305,8 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi } // Ride length - int numLengths = 0; - for (int i = 0; i < ride->num_stations; i++) { + sint32 numLengths = 0; + for (sint32 i = 0; i < ride->num_stations; i++) { length = ride->length[numLengths]; if (length != 0) { length >>= 16; @@ -5401,7 +5401,7 @@ enum { * * rct2: 0x006AE8A6 */ -static void window_ride_set_graph(rct_window *w, int type) +static void window_ride_set_graph(rct_window *w, sint32 type) { if ((w->list_information_type & 0xFF) == type) { w->list_information_type ^= 0x8000; @@ -5416,7 +5416,7 @@ static void window_ride_set_graph(rct_window *w, int type) * * rct2: 0x006AE85D */ -static void window_ride_graphs_mouseup(rct_window *w, int widgetIndex) +static void window_ride_graphs_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -5450,7 +5450,7 @@ static void window_ride_graphs_resize(rct_window *w) * * rct2: 0x006AE878 */ -static void window_ride_graphs_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_graphs_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_GRAPH_VELOCITY: @@ -5476,7 +5476,7 @@ static void window_ride_graphs_update(rct_window *w) { rct_widget *widget; rct_ride_measurement *measurement; - int x; + sint32 x; w->frame_no++; window_event_invalidate_call(w); @@ -5501,7 +5501,7 @@ static void window_ride_graphs_update(rct_window *w) * * rct2: 0x006AEA75 */ -static void window_ride_graphs_scrollgetheight(rct_window *w, int scrollIndex, int *width, int *height) +static void window_ride_graphs_scrollgetheight(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { rct_ride_measurement *measurement; @@ -5520,7 +5520,7 @@ static void window_ride_graphs_scrollgetheight(rct_window *w, int scrollIndex, i * * rct2: 0x006AE953 */ -static void window_ride_graphs_15(rct_window *w, int scrollIndex, int scrollAreaType) +static void window_ride_graphs_15(rct_window *w, sint32 scrollIndex, sint32 scrollAreaType) { w->list_information_type |= 0x8000; } @@ -5529,7 +5529,7 @@ static void window_ride_graphs_15(rct_window *w, int scrollIndex, int scrollArea * * rct2: 0x006AEA05 */ -static void window_ride_graphs_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_ride_graphs_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { if (widgetIndex == WIDX_GRAPH) { set_format_arg(0, rct_string_id, STR_GRAPH); @@ -5555,7 +5555,7 @@ static void window_ride_graphs_invalidate(rct_window *w) { rct_widget *widgets; rct_ride *ride; - int x, y; + sint32 x, y; colour_scheme_update(w); @@ -5623,7 +5623,7 @@ static void window_ride_graphs_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006AE4C7 */ -static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { gfx_clear(dpi, ColourMapA[COLOUR_SATURATED_GREEN].darker); @@ -5632,9 +5632,9 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi rct_ride_measurement *measurement = ride_get_measurement(w->number, &stringId); if (measurement == NULL) { // No measurement message - int x = (widget->right - widget->left) / 2; - int y = (widget->bottom - widget->top) / 2 - 5; - int width = widget->right - widget->left - 2; + sint32 x = (widget->right - widget->left) / 2; + sint32 y = (widget->bottom - widget->top) / 2 - 5; + sint32 width = widget->right - widget->left - 2; gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, width, stringId, COLOUR_BLACK); return; } @@ -5643,8 +5643,8 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi const uint8 lightColour = ColourMapA[COLOUR_SATURATED_GREEN].mid_light; const uint8 darkColour = ColourMapA[COLOUR_SATURATED_GREEN].mid_dark; - int time = 0; - for (int x = 0; x < dpi->x + dpi->width; x += 80) { + sint32 time = 0; + for (sint32 x = 0; x < dpi->x + dpi->width; x += 80) { if (x + 80 >= dpi->x) { gfx_fill_rect(dpi, x + 0, dpi->y, x + 0, dpi->y + dpi->height - 1, lightColour); gfx_fill_rect(dpi, x + 16, dpi->y, x + 16, dpi->y + dpi->height - 1, darkColour); @@ -5656,20 +5656,20 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi } // Horizontal grid lines - int listType = w->list_information_type & 0xFF; - short yUnit = window_graphs_y_axi[listType].unit; + sint32 listType = w->list_information_type & 0xFF; + sint16 yUnit = window_graphs_y_axi[listType].unit; rct_string_id stringID = window_graphs_y_axi[listType].label; - short yUnitInterval = window_graphs_y_axi[listType].unit_interval; - short yInterval = window_graphs_y_axi[listType].interval; + sint16 yUnitInterval = window_graphs_y_axi[listType].unit_interval; + sint16 yInterval = window_graphs_y_axi[listType].interval; // Scale modifier if (listType == GRAPH_ALTITUDE) { yUnit -= gMapBaseZ * 3; } - for (int y = widget->bottom - widget->top - 13; y >= 8; y -= yInterval, yUnit += yUnitInterval) { + for (sint32 y = widget->bottom - widget->top - 13; y >= 8; y -= yInterval, yUnit += yUnitInterval) { // Minor / major line - int colour = yUnit == 0 ? lightColour : darkColour; + sint32 colour = yUnit == 0 ? lightColour : darkColour; gfx_fill_rect(dpi, dpi->x, y, dpi->x + dpi->width - 1, y, colour); sint16 scaled_yUnit = yUnit; @@ -5682,16 +5682,16 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi // Time marks time = 0; - for (int x = 0; x < dpi->x + dpi->width; x += 80) { + for (sint32 x = 0; x < dpi->x + dpi->width; x += 80) { if (x + 80 >= dpi->x) gfx_draw_string_left(dpi, STR_RIDE_STATS_TIME, &time, COLOUR_BLACK, x + 2, 1); time += 5; } // Plot - int x = dpi->x; - int top, bottom; - for (int width = 0; width < dpi->width; width++, x++) { + sint32 x = dpi->x; + sint32 top, bottom; + for (sint32 width = 0; width < dpi->width; width++, x++) { if (x < 0 || x >= measurement->num_items - 1) continue; @@ -5720,7 +5720,7 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi top = widget->bottom - widget->top - top - 13; bottom = widget->bottom - widget->top - bottom - 13; if (top > bottom) { - int tmp = top; + sint32 tmp = top; top = bottom; bottom = tmp; } @@ -5902,7 +5902,7 @@ static void window_ride_income_decrease_secondary_price(rct_window *w) * * rct2: 0x006ADEA9 */ -static void window_ride_income_mouseup(rct_window *w, int widgetIndex) +static void window_ride_income_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -5942,7 +5942,7 @@ static void window_ride_income_resize(rct_window *w) * * rct2: 0x006ADED4 */ -static void window_ride_income_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_income_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { switch (widgetIndex) { case WIDX_PRIMARY_PRICE_INCREASE: @@ -5987,7 +5987,7 @@ static void window_ride_income_invalidate(rct_window *w) { rct_widget *widgets; rct_ride_entry *rideEntry; - int primaryItem, secondaryItem; + sint32 primaryItem, secondaryItem; colour_scheme_update(w); @@ -6085,7 +6085,7 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_ride_entry *rideEntry; rct_string_id stringId; money32 profit, costPerHour; - int x, y, primaryItem, secondaryItem; + sint32 x, y, primaryItem, secondaryItem; window_draw_widgets(w, dpi); window_ride_draw_tab_images(dpi, w); @@ -6162,7 +6162,7 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006AD986 */ -static void window_ride_customer_mouseup(rct_window *w, int widgetIndex) +static void window_ride_customer_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -6266,7 +6266,7 @@ static void window_ride_customer_invalidate(rct_window *w) static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi) { rct_ride *ride; - int x, y; + sint32 x, y; uint8 shopItem; sint16 popularity, satisfaction, queueTime, age; sint32 customersPerHour; diff --git a/src/openrct2/windows/ride_construction.c b/src/openrct2/windows/ride_construction.c index 688e937a8e..763061de25 100644 --- a/src/openrct2/windows/ride_construction.c +++ b/src/openrct2/windows/ride_construction.c @@ -134,13 +134,13 @@ static rct_widget window_ride_construction_widgets[] = { #pragma region Events static void window_ride_construction_close(rct_window *w); -static void window_ride_construction_mouseup(rct_window *w, int widgetIndex); +static void window_ride_construction_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_construction_resize(rct_window *w); -static void window_ride_construction_mousedown(int widgetIndex, rct_window *w, rct_widget *widget); -static void window_ride_construction_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget); +static void window_ride_construction_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_construction_update(rct_window *w); -static void window_ride_construction_toolupdate(rct_window* w, int widgetIndex, int x, int y); -static void window_ride_construction_tooldown(rct_window* w, int widgetIndex, int x, int y); +static void window_ride_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_ride_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); static void window_ride_construction_invalidate(rct_window *w); static void window_ride_construction_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -454,12 +454,12 @@ assert_struct_size(_enabledRidePieces, 8); #pragma pack(pop) static bool _trackPlaceCtrlState; -static int _trackPlaceCtrlZ; +static sint32 _trackPlaceCtrlZ; static bool _trackPlaceShiftState; -static int _trackPlaceShiftStartScreenX; -static int _trackPlaceShiftStartScreenY; -static int _trackPlaceShiftZ; -static int _trackPlaceZ; +static sint32 _trackPlaceShiftStartScreenX; +static sint32 _trackPlaceShiftStartScreenY; +static sint32 _trackPlaceShiftZ; +static sint32 _trackPlaceZ; static money32 _trackPlaceCost; static bool _autoOpeningShop; static uint8 _rideConstructionState2; @@ -479,25 +479,25 @@ static void window_ride_construction_exit_click(rct_window *w); static void window_ride_construction_draw_track_piece( rct_window *w, rct_drawpixelinfo *dpi, - int rideIndex, int trackType, int trackRotation, int unknown, - int width, int height + sint32 rideIndex, sint32 trackType, sint32 trackRotation, sint32 unknown, + sint32 width, sint32 height ); static void window_ride_construction_update_enabled_track_pieces(); -bool sub_6CA2DF(int *trackType, int *trackDirection, int *rideIndex, int *edxRS16, int *x, int *y, int *z, int *properties); +bool sub_6CA2DF(sint32 *trackType, sint32 *trackDirection, sint32 *rideIndex, sint32 *edxRS16, sint32 *x, sint32 *y, sint32 *z, sint32 *properties); static void sub_6CBCE2( - int rideIndex, int trackType, int trackDirection, int edx, - int originX, int originY, int originZ + sint32 rideIndex, sint32 trackType, sint32 trackDirection, sint32 edx, + sint32 originX, sint32 originY, sint32 originZ ); static void window_ride_construction_update_map_selection(); static void window_ride_construction_update_possible_ride_configurations(); static void window_ride_construction_update_widgets(rct_window *w); -static void window_ride_construction_select_map_tiles(rct_ride *ride, int trackType, int trackDirection, int x, int y); -money32 sub_6CA162(int rideIndex, int trackType, int trackDirection, int edxRS16, int x, int y, int z); +static void window_ride_construction_select_map_tiles(rct_ride *ride, sint32 trackType, sint32 trackDirection, sint32 x, sint32 y); +money32 sub_6CA162(sint32 rideIndex, sint32 trackType, sint32 trackDirection, sint32 edxRS16, sint32 x, sint32 y, sint32 z); static void window_ride_construction_show_special_track_dropdown(rct_window *w, rct_widget *widget); -static void ride_selected_track_set_seat_rotation(int seatRotation); -static void loc_6C7502(int al); -static void ride_construction_set_brakes_speed(int brakesSpeed); -static void ride_construction_tooldown_entrance_exit(int screenX, int screenY); +static void ride_selected_track_set_seat_rotation(sint32 seatRotation); +static void loc_6C7502(sint32 al); +static void ride_construction_set_brakes_speed(sint32 brakesSpeed); +static void ride_construction_tooldown_entrance_exit(sint32 screenX, sint32 screenY); static uint8 _currentPossibleRideConfigurations[32]; @@ -520,12 +520,12 @@ static const rct_string_id RideConstructionSeatAngleRotationStrings[] = { STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_495, }; -static bool is_track_enabled(int trackFlagIndex) +static bool is_track_enabled(sint32 trackFlagIndex) { return _enabledRidePieces.ab & (1ULL << trackFlagIndex); } -static int ride_get_alternative_type(rct_ride *ride) +static sint32 ride_get_alternative_type(rct_ride *ride) { return (_currentTrackCovered & 2) ? RideData4[ride->type].alternate_type : @@ -538,7 +538,7 @@ static int ride_get_alternative_type(rct_ride *ride) */ rct_window *window_ride_construction_open() { - int rideIndex = _currentRideIndex; + sint32 rideIndex = _currentRideIndex; sub_6B2FA9(rideIndex); rct_window *w; @@ -639,7 +639,7 @@ static void window_ride_construction_close(rct_window *w) window_ride_main_open(rideIndex); } else { - int eax = gGamePaused; + sint32 eax = gGamePaused; gGamePaused = 0; game_do_command(0, 9, 0, rideIndex, GAME_COMMAND_DEMOLISH_RIDE, 0, 0); @@ -652,7 +652,7 @@ static void window_ride_construction_close(rct_window *w) * * rct2: 0x006C6E14 */ -static void window_ride_construction_mouseup(rct_window *w, int widgetIndex) +static void window_ride_construction_mouseup(rct_window *w, sint32 widgetIndex) { window_ride_construction_update_enabled_track_pieces(); switch (widgetIndex){ @@ -698,7 +698,7 @@ static void window_ride_construction_resize(rct_window *w) } rct_ride *ride = get_ride(_currentRideIndex); - int rideType = ride_get_alternative_type(ride); + sint32 rideType = ride_get_alternative_type(ride); uint64 disabledWidgets = 0; @@ -1254,7 +1254,7 @@ static void window_ride_construction_resize(rct_window *w) if (currentDisabledWidgets == disabledWidgets) return; - for (int i = 0; i < 64; i++) { + for (sint32 i = 0; i < 64; i++) { if ((disabledWidgets & (1ULL << i)) != (currentDisabledWidgets & (1ULL << i))) { widget_invalidate(w, i); } @@ -1266,7 +1266,7 @@ static void window_ride_construction_resize(rct_window *w) * * rct2: 0x006C6E6A */ -static void window_ride_construction_mousedown(int widgetIndex, rct_window *w, rct_widget *widget) +static void window_ride_construction_mousedown(sint32 widgetIndex, rct_window *w, rct_widget *widget) { rct_ride *ride = get_ride(_currentRideIndex); @@ -1590,7 +1590,7 @@ static void window_ride_construction_mousedown(int widgetIndex, rct_window *w, r * * rct2: 0x006C78CD */ -static void window_ride_construction_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_construction_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_SPECIAL_TRACK_DROPDOWN) return; @@ -1599,7 +1599,7 @@ static void window_ride_construction_dropdown(rct_window *w, int widgetIndex, in sub_6C9627(); _currentTrackPrice = MONEY32_UNDEFINED; - int trackPiece = _currentPossibleRideConfigurations[dropdownIndex]; + sint32 trackPiece = _currentPossibleRideConfigurations[dropdownIndex]; switch (trackPiece) { case TRACK_ELEM_END_STATION: case TRACK_ELEM_S_BEND_LEFT: @@ -1622,7 +1622,7 @@ static void window_ride_construction_dropdown(rct_window *w, int widgetIndex, in */ static void window_ride_construction_construct(rct_window *w) { - int trackType, trackDirection, rideIndex, edxRS16, x, y, z, properties; + sint32 trackType, trackDirection, rideIndex, edxRS16, x, y, z, properties; track_begin_end trackBeginEnd; _currentTrackPrice = MONEY32_UNDEFINED; @@ -1740,7 +1740,7 @@ static void window_ride_construction_construct(rct_window *w) */ static void window_ride_construction_mouseup_demolish(rct_window* w) { - int x, y, z, direction, type; + sint32 x, y, z, direction, type; rct_map_element *mapElement; rct_xy_element inputElement, outputElement; track_begin_end trackBeginEnd; @@ -1837,7 +1837,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w) } } -void window_ride_construction_mouseup_demolish_next_piece(int x, int y, int z, int direction, int type) +void window_ride_construction_mouseup_demolish_next_piece(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type) { if (gGotoStartPlacementMode) { z &= 0xFFF0; @@ -1846,13 +1846,13 @@ void window_ride_construction_mouseup_demolish_next_piece(int x, int y, int z, i _currentTrackSelectionFlags = 0; _rideConstructionArrowPulseTime = 0; direction = _currentTrackPieceDirection; - int slope = _currentTrackCurve; - int slopeEnd = _previousTrackSlopeEnd; - int b2 = _currentTrackSlopeEnd; - int bankEnd = _previousTrackBankEnd; - int bankStart = _currentTrackBankEnd; - int b5 = _currentTrackCovered; - int b4 = _currentTrackLiftHill; + sint32 slope = _currentTrackCurve; + sint32 slopeEnd = _previousTrackSlopeEnd; + sint32 b2 = _currentTrackSlopeEnd; + sint32 bankEnd = _previousTrackBankEnd; + sint32 bankStart = _currentTrackBankEnd; + sint32 b5 = _currentTrackCovered; + sint32 b4 = _currentTrackLiftHill; ride_construction_set_default_next_piece(); sub_6C84CE(); if (!ride_try_get_origin_element(_currentRideIndex, NULL)) { @@ -2023,10 +2023,10 @@ static void window_ride_construction_update(rct_window *w) * * rct2: 0x006CC538 */ -static bool ride_get_place_position_from_screen_position(int screenX, int screenY, int *outX, int *outY) +static bool ride_get_place_position_from_screen_position(sint32 screenX, sint32 screenY, sint32 *outX, sint32 *outY) { - short mapX, mapY, mapZ; - int interactionType, direction; + sint16 mapX, mapY, mapZ; + sint32 interactionType, direction; rct_map_element *mapElement; rct_viewport *viewport; @@ -2095,7 +2095,7 @@ static bool ride_get_place_position_from_screen_position(int screenX, int screen * * rct2: 0x006C8229 */ -static void window_ride_construction_toolupdate(rct_window* w, int widgetIndex, int x, int y) +static void window_ride_construction_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_CONSTRUCT: @@ -2112,7 +2112,7 @@ static void window_ride_construction_toolupdate(rct_window* w, int widgetIndex, * * rct2: 0x006C8248 */ -static void window_ride_construction_tooldown(rct_window* w, int widgetIndex, int x, int y) +static void window_ride_construction_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_CONSTRUCT: @@ -2172,7 +2172,7 @@ static void window_ride_construction_paint(rct_window *w, rct_drawpixelinfo *dpi { rct_drawpixelinfo clipdpi; rct_widget *widget; - int x, y, width, height; + sint32 x, y, width, height; window_draw_widgets(w, dpi); @@ -2180,7 +2180,7 @@ static void window_ride_construction_paint(rct_window *w, rct_drawpixelinfo *dpi if (widget->type == WWT_EMPTY) return; - int trackType, trackDirection, rideIndex, edxRS16; + sint32 trackType, trackDirection, rideIndex, edxRS16; if (sub_6CA2DF(&trackType, &trackDirection, &rideIndex, &edxRS16, NULL, NULL, NULL, NULL)) return; @@ -2210,8 +2210,8 @@ static void window_ride_construction_paint(rct_window *w, rct_drawpixelinfo *dpi static void window_ride_construction_draw_track_piece( rct_window *w, rct_drawpixelinfo *dpi, - int rideIndex, int trackType, int trackDirection, int unknown, - int width, int height + sint32 rideIndex, sint32 trackType, sint32 trackDirection, sint32 unknown, + sint32 width, sint32 height ) { const rct_preview_track *trackBlock; rct_ride *ride; @@ -2222,15 +2222,15 @@ static void window_ride_construction_draw_track_piece( while ((trackBlock + 1)->index != 0xFF) trackBlock++; - short x = trackBlock->x; - short z = trackBlock->z; - short y = trackBlock->y; + sint16 x = trackBlock->x; + sint16 z = trackBlock->z; + sint16 y = trackBlock->y; if (trackBlock->var_09 & 2) { x = 0; y = 0; } - short tmp; + sint16 tmp; switch (trackDirection & 3) { case 1: tmp = x; @@ -2254,12 +2254,12 @@ static void window_ride_construction_draw_track_piece( y = 4112 + (y / 2); z = 1024 + z; - short previewZOffset = ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? + sint16 previewZOffset = ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? FlatRideTrackDefinitions[trackType].preview_z_offset : TrackDefinitions[trackType].preview_z_offset; z -= previewZOffset; - int start_x = x; + sint32 start_x = x; switch (get_current_rotation()) { case 0: x = y - x; @@ -2300,13 +2300,13 @@ static rct_map_element *_backupMapElementArrays[5]; * dh: trackType */ static void sub_6CBCE2( - int rideIndex, int trackType, int trackDirection, int edx, - int originX, int originY, int originZ + sint32 rideIndex, sint32 trackType, sint32 trackDirection, sint32 edx, + sint32 originX, sint32 originY, sint32 originZ ) { rct_ride *ride; const rct_preview_track *trackBlock; - int preserve_current_viewport_flags; - int offsetX, offsetY; + sint32 preserve_current_viewport_flags; + sint32 offsetX, offsetY; preserve_current_viewport_flags = gCurrentViewportFlags; gCurrentViewportFlags = 0; @@ -2328,8 +2328,8 @@ static void sub_6CBCE2( trackBlock = get_track_def_from_ride(ride, trackType); while (trackBlock->index != 255) { - int bl = trackBlock->var_08; - int bh; + sint32 bl = trackBlock->var_08; + sint32 bh; switch (trackDirection) { default: case 0: @@ -2367,13 +2367,13 @@ static void sub_6CBCE2( bl |= bh; break; } - int x = originX + offsetX; - int y = originY + offsetY; - int baseZ = (originZ + trackBlock->z) >> 3; - int clearanceZ = ((trackBlock->var_07 + RideData5[ride->type].clearance_height) >> 3) + baseZ + 4; + sint32 x = originX + offsetX; + sint32 y = originY + offsetY; + sint32 baseZ = (originZ + trackBlock->z) >> 3; + sint32 clearanceZ = ((trackBlock->var_07 + RideData5[ride->type].clearance_height) >> 3) + baseZ + 4; - int tileX = x >> 5; - int tileY = y >> 5; + sint32 tileX = x >> 5; + sint32 tileY = y >> 5; // Replace map elements with temporary ones containing track _backupMapElementArrays[0] = map_get_first_element_at(tileX + 0, tileY + 0); @@ -2439,9 +2439,9 @@ void sub_6C84CE() _selectedTrackType = 255; if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) { - int x = _currentTrackBeginX; - int y = _currentTrackBeginY; - int z = _currentTrackBeginZ; + sint32 x = _currentTrackBeginX; + sint32 y = _currentTrackBeginY; + sint32 z = _currentTrackBeginZ; if (!sub_6C683D(&x, &y, &z, _currentTrackPieceDirection & 3, _currentTrackPieceType, 0, &mapElement, 0)) { _selectedTrackType = mapElement->properties.track.type; if (mapElement->properties.track.type == TRACK_ELEM_BRAKES || mapElement->properties.track.type == TRACK_ELEM_BOOSTER) @@ -2482,7 +2482,7 @@ static bool sub_6CA2DF_get_track_element(uint8 *trackElement) { } if (curve <= 8) { - for (int i = 0; i < countof(gTrackDescriptors); i++) { + for (sint32 i = 0; i < countof(gTrackDescriptors); i++) { track_descriptor trackDescriptor = gTrackDescriptors[i]; if (trackDescriptor.track_curve != curve) continue; if (trackDescriptor.starts_diagonal != startsDiagonal) continue; @@ -2549,7 +2549,7 @@ static bool sub_6CA2DF_get_track_element(uint8 *trackElement) { * @param[out] _properties (edirs16) * @return (CF) */ -bool sub_6CA2DF(int *_trackType, int *_trackDirection, int *_rideIndex, int *_edxRS16, int *_x, int *_y, int *_z, int *_properties) { +bool sub_6CA2DF(sint32 *_trackType, sint32 *_trackDirection, sint32 *_rideIndex, sint32 *_edxRS16, sint32 *_x, sint32 *_y, sint32 *_z, sint32 *_properties) { uint8 trackType, trackDirection, rideIndex; uint16 z, x, y, edxRS16, properties; @@ -2700,7 +2700,7 @@ static void window_ride_construction_update_enabled_track_pieces() if (rideEntry == NULL) return; - int rideType = (_currentTrackCovered & 2) ? RideData4[ride->type].alternate_type : ride->type; + sint32 rideType = (_currentTrackCovered & 2) ? RideData4[ride->type].alternate_type : ride->type; _enabledRidePieces.a = rideEntry->enabledTrackPiecesA & gResearchedTrackTypesA[rideType]; _enabledRidePieces.b = rideEntry->enabledTrackPiecesB & gResearchedTrackTypesB[rideType]; } @@ -2709,7 +2709,7 @@ static void window_ride_construction_update_enabled_track_pieces() * * rct2: 0x006CA162 */ -money32 sub_6CA162(int rideIndex, int trackType, int trackDirection, int edxRS16, int x, int y, int z) +money32 sub_6CA162(sint32 rideIndex, sint32 trackType, sint32 trackDirection, sint32 edxRS16, sint32 x, sint32 y, sint32 z) { rct_ride *ride; money32 result; @@ -2759,7 +2759,7 @@ money32 sub_6CA162(int rideIndex, int trackType, int trackDirection, int edxRS16 */ void sub_6C94D8() { - int x, y, z, direction, type, rideIndex, edxRS16; + sint32 x, y, z, direction, type, rideIndex, edxRS16; // Recheck if area is fine for new track. // Set by footpath placement @@ -2859,7 +2859,7 @@ void sub_6C94D8() static void window_ride_construction_update_map_selection() { rct_ride *ride; - int trackType, trackDirection, x, y; + sint32 trackType, trackDirection, x, y; map_invalidate_map_selection_tiles(); gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_CONSTRUCT; @@ -2900,8 +2900,8 @@ static void window_ride_construction_update_map_selection() static void window_ride_construction_update_possible_ride_configurations() { rct_ride *ride; - int trackType; - int edi; + sint32 trackType; + sint32 edi; ride = get_ride(_currentRideIndex); @@ -2911,10 +2911,10 @@ static void window_ride_construction_update_possible_ride_configurations() else edi = ride->type; - int currentPossibleRideConfigurationIndex = 0; + sint32 currentPossibleRideConfigurationIndex = 0; _numCurrentPossibleSpecialTrackPieces = 0; for (trackType = 0; trackType < 256; trackType++) { - int edx = ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? + sint32 edx = ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE) ? FlatRideTrackDefinitions[trackType].type : TrackDefinitions[trackType].type; @@ -2929,7 +2929,7 @@ static void window_ride_construction_update_possible_ride_configurations() continue; } - int slope, bank; + sint32 slope, bank; if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_FRONT || _rideConstructionState == RIDE_CONSTRUCTION_STATE_PLACE) { if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { slope = FlatRideTrackDefinitions[trackType].vangle_start; @@ -2992,7 +2992,7 @@ static void window_ride_construction_update_widgets(rct_window *w) { uint8 rideIndex = _currentRideIndex; rct_ride *ride = get_ride(rideIndex); - int rideType = ride_get_alternative_type(ride); + sint32 rideType = ride_get_alternative_type(ride); w->hold_down_widgets = 0; if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_IS_SHOP) || !_stationConstructed) { @@ -3105,7 +3105,7 @@ static void window_ride_construction_update_widgets(rct_window *w) window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].type = WWT_FLATBTN; } - int x; + sint32 x; if ((is_track_enabled(TRACK_LIFT_HILL) && _currentTrackCurve < 256) || (gCheatsEnableChainLiftOnAllTrack && ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK))) { window_ride_construction_widgets[WIDX_CHAIN_LIFT].type = WWT_FLATBTN; x = 9; @@ -3114,7 +3114,7 @@ static void window_ride_construction_update_widgets(rct_window *w) x = 23; } - for (int i = WIDX_SLOPE_DOWN_STEEP; i <= WIDX_SLOPE_UP_STEEP; i++) { + for (sint32 i = WIDX_SLOPE_DOWN_STEEP; i <= WIDX_SLOPE_UP_STEEP; i++) { window_ride_construction_widgets[i].left = x; window_ride_construction_widgets[i].right = x + 23; x += 24; @@ -3126,9 +3126,9 @@ static void window_ride_construction_update_widgets(rct_window *w) window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].tooltip = STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP; if (is_track_enabled(TRACK_SLOPE_VERTICAL)) { if (_previousTrackSlopeEnd == TRACK_SLOPE_UP_60 || _previousTrackSlopeEnd == TRACK_SLOPE_UP_90) { - int originalSlopeUpSteepLeft = window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].left; - int originalSlopeUpSteepRight = window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].right; - for (int i = WIDX_SLOPE_UP_STEEP; i > WIDX_SLOPE_DOWN_STEEP; i--) { + sint32 originalSlopeUpSteepLeft = window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].left; + sint32 originalSlopeUpSteepRight = window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].right; + for (sint32 i = WIDX_SLOPE_UP_STEEP; i > WIDX_SLOPE_DOWN_STEEP; i--) { window_ride_construction_widgets[i].left = window_ride_construction_widgets[i - 1].left; window_ride_construction_widgets[i].right = window_ride_construction_widgets[i - 1].right; } @@ -3137,9 +3137,9 @@ static void window_ride_construction_update_widgets(rct_window *w) window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].image = SPR_RIDE_CONSTRUCTION_VERTICAL_RISE; window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].tooltip = STR_RIDE_CONSTRUCTION_VERTICAL_RISE_TIP; } else if (_previousTrackSlopeEnd == TRACK_SLOPE_DOWN_60 || _previousTrackSlopeEnd == TRACK_SLOPE_DOWN_90) { - int originalSlopeDownSteepLeft = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left; - int originalSlopeDownSteepRight = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].right; - for (int i = WIDX_SLOPE_DOWN_STEEP; i < WIDX_SLOPE_UP_STEEP; i++) { + sint32 originalSlopeDownSteepLeft = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left; + sint32 originalSlopeDownSteepRight = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].right; + for (sint32 i = WIDX_SLOPE_DOWN_STEEP; i < WIDX_SLOPE_UP_STEEP; i++) { window_ride_construction_widgets[i].left = window_ride_construction_widgets[i + 1].left; window_ride_construction_widgets[i].right = window_ride_construction_widgets[i + 1].right; } @@ -3161,7 +3161,7 @@ static void window_ride_construction_update_widgets(rct_window *w) window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].image = SPR_RIDE_CONSTRUCTION_HELIX_UP; window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].tooltip = STR_RIDE_CONSTRUCTION_HELIX_UP_TIP; - int tmp = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left; + sint32 tmp = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left; window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left = window_ride_construction_widgets[WIDX_SLOPE_DOWN].left; window_ride_construction_widgets[WIDX_SLOPE_DOWN].left = tmp; @@ -3189,7 +3189,7 @@ static void window_ride_construction_update_widgets(rct_window *w) window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].image = SPR_RIDE_CONSTRUCTION_HELIX_UP; window_ride_construction_widgets[WIDX_SLOPE_UP_STEEP].tooltip = STR_RIDE_CONSTRUCTION_HELIX_UP_TIP; - int tmp = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left; + sint32 tmp = window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left; window_ride_construction_widgets[WIDX_SLOPE_DOWN_STEEP].left = window_ride_construction_widgets[WIDX_SLOPE_DOWN].left; window_ride_construction_widgets[WIDX_SLOPE_DOWN].left = tmp; @@ -3308,7 +3308,7 @@ static void window_ride_construction_update_widgets(rct_window *w) window_ride_construction_widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN].type = WWT_DROPDOWN_BUTTON; window_ride_construction_widgets[WIDX_BANKING_GROUPBOX].right = 92; if (window_ride_construction_widgets[WIDX_BANK_LEFT].type != WWT_SPINNER) { - for (int i = WIDX_BANK_LEFT; i <= WIDX_BANK_RIGHT; i++) { + for (sint32 i = WIDX_BANK_LEFT; i <= WIDX_BANK_RIGHT; i++) { window_ride_construction_widgets[i].left -= 36; window_ride_construction_widgets[i].right -= 36; } @@ -3369,7 +3369,7 @@ static void window_ride_construction_update_widgets(rct_window *w) return; } - int widgetIndex; + sint32 widgetIndex; switch (_currentTrackCurve) { case TRACK_CURVE_NONE: widgetIndex = WIDX_STRAIGHT; @@ -3454,14 +3454,14 @@ static void window_ride_construction_update_widgets(rct_window *w) window_invalidate(w); } -static void window_ride_construction_select_map_tiles(rct_ride *ride, int trackType, int trackDirection, int x, int y) +static void window_ride_construction_select_map_tiles(rct_ride *ride, sint32 trackType, sint32 trackDirection, sint32 x, sint32 y) { const rct_preview_track *trackBlock; - int offsetX, offsetY; + sint32 offsetX, offsetY; trackBlock = get_track_def_from_ride(ride, trackType); trackDirection &= 3; - int selectionTileIndex = 0; + sint32 selectionTileIndex = 0; while (trackBlock->index != 255) { switch (trackDirection) { default: @@ -3497,8 +3497,8 @@ static void window_ride_construction_select_map_tiles(rct_ride *ride, int trackT */ static void window_ride_construction_show_special_track_dropdown(rct_window *w, rct_widget *widget) { - int defaultIndex = -1; - for (int i = 0; i < _numCurrentPossibleRideConfigurations; i++) { + sint32 defaultIndex = -1; + for (sint32 i = 0; i < _numCurrentPossibleRideConfigurations; i++) { uint8 trackPiece = _currentPossibleRideConfigurations[i]; rct_string_id trackPieceStringId = RideConfigurationStringIds[trackPiece]; if (trackPieceStringId == STR_RAPIDS) { @@ -3536,9 +3536,9 @@ static void window_ride_construction_show_special_track_dropdown(rct_window *w, * * rct2: 0x006C7630 */ -static void ride_selected_track_set_seat_rotation(int seatRotation) +static void ride_selected_track_set_seat_rotation(sint32 seatRotation) { - int x, y, z; + sint32 x, y, z; x = _currentTrackBeginX; y = _currentTrackBeginY; z = _currentTrackBeginZ; @@ -3550,7 +3550,7 @@ static void ride_selected_track_set_seat_rotation(int seatRotation) * * rct2: 0x006C7502 */ -static void loc_6C7502(int al) +static void loc_6C7502(sint32 al) { _currentTrackSlopeEnd = al; _currentTrackPrice = MONEY32_UNDEFINED; @@ -3566,10 +3566,10 @@ static void loc_6C7502(int al) * * rct2: 0x006C76E9 */ -static void ride_construction_set_brakes_speed(int brakesSpeed) +static void ride_construction_set_brakes_speed(sint32 brakesSpeed) { rct_map_element *mapElement; - int x, y, z; + sint32 x, y, z; x = _currentTrackBeginX; y = _currentTrackBeginY; @@ -3592,9 +3592,9 @@ static void ride_construction_set_brakes_speed(int brakesSpeed) * * rct2: 0x006CC6A8 */ -void ride_construction_toolupdate_construct(int screenX, int screenY) +void ride_construction_toolupdate_construct(sint32 screenX, sint32 screenY) { - int x, y, z; + sint32 x, y, z; rct_ride *ride; const rct_preview_track *trackBlock; @@ -3624,7 +3624,7 @@ void ride_construction_toolupdate_construct(int screenX, int screenY) gMapSelectionTiles[1].x = -1; gMapSelectionTiles[1].y = -1; - int trackType, trackDirection, rideIndex, edxRS16; + sint32 trackType, trackDirection, rideIndex, edxRS16; if (sub_6CA2DF(&trackType, &trackDirection, &rideIndex, &edxRS16, NULL, NULL, NULL, NULL)) { sub_6C9627(); map_invalidate_map_selection_tiles(); @@ -3642,7 +3642,7 @@ void ride_construction_toolupdate_construct(int screenX, int screenY) if (_trackPlaceZ == 0) { // Raise z above all slopes and water if (gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_CONSTRUCT) { - int highestZ = 0; + sint32 highestZ = 0; rct_xy16 *selectedTile = gMapSelectionTiles; while (selectedTile->x != -1) { if (selectedTile->x < (256 * 32) && selectedTile->y < (256 * 32)) { @@ -3658,7 +3658,7 @@ void ride_construction_toolupdate_construct(int screenX, int screenY) } // loc_6CC91B: trackBlock = get_track_def_from_ride(ride, trackType); - int bx = 0; + sint32 bx = 0; do { bx = min(bx, trackBlock->z); trackBlock++; @@ -3733,9 +3733,9 @@ void ride_construction_toolupdate_construct(int screenX, int screenY) * * rct2: 0x006CD354 */ -void ride_construction_toolupdate_entrance_exit(int screenX, int screenY) +void ride_construction_toolupdate_entrance_exit(sint32 screenX, sint32 screenY) { - int x, y, direction; + sint32 x, y, direction; uint8 unk; map_invalidate_selection_rect(); @@ -3781,9 +3781,9 @@ void ride_construction_toolupdate_entrance_exit(int screenX, int screenY) * * rct2: 0x006CCA73 */ -void ride_construction_tooldown_construct(int screenX, int screenY) +void ride_construction_tooldown_construct(sint32 screenX, sint32 screenY) { - int trackType, trackDirection, rideIndex, edxRS16, x, y, z, properties, highestZ; + sint32 trackType, trackDirection, rideIndex, edxRS16, x, y, z, properties, highestZ; rct_window *w; map_invalidate_map_selection_tiles(); @@ -3825,7 +3825,7 @@ void ride_construction_tooldown_construct(int screenX, int screenY) rct_ride *ride = get_ride(_currentRideIndex); if (_trackPlaceZ == 0) { const rct_preview_track *trackBlock = get_track_def_from_ride(ride, _currentTrackPieceType); - int bx = 0; + sint32 bx = 0; do { bx = min(bx, trackBlock->z); trackBlock++; @@ -3841,7 +3841,7 @@ void ride_construction_tooldown_construct(int screenX, int screenY) } if (ride->type == RIDE_TYPE_MAZE) { - for (int zAttempts = 41; zAttempts >= 0; zAttempts--) { + for (sint32 zAttempts = 41; zAttempts >= 0; zAttempts--) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_MAZE_BUILD; _currentTrackBeginX = x; _currentTrackBeginY = y; @@ -3904,7 +3904,7 @@ void ride_construction_tooldown_construct(int screenX, int screenY) return; } - for (int zAttempts = 41; zAttempts >= 0; zAttempts--) { + for (sint32 zAttempts = 41; zAttempts >= 0; zAttempts--) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_FRONT; _currentTrackBeginX = x; _currentTrackBeginY = y; @@ -3932,14 +3932,14 @@ void ride_construction_tooldown_construct(int screenX, int screenY) zAttempts == 0 || z < 0 ) { - int saveTrackDirection = _currentTrackPieceDirection; - int saveCurrentTrackCurve = _currentTrackCurve; - int savePreviousTrackSlopeEnd = _previousTrackSlopeEnd; - int saveCurrentTrackSlopeEnd = _currentTrackSlopeEnd; - int savePreviousTrackBankEnd = _previousTrackBankEnd; - int saveCurrentTrackBankEnd = _currentTrackBankEnd; - int saveCurrentTrackCovered = _currentTrackCovered; - int saveCurrentTrackLiftHill = _currentTrackLiftHill; + sint32 saveTrackDirection = _currentTrackPieceDirection; + sint32 saveCurrentTrackCurve = _currentTrackCurve; + sint32 savePreviousTrackSlopeEnd = _previousTrackSlopeEnd; + sint32 saveCurrentTrackSlopeEnd = _currentTrackSlopeEnd; + sint32 savePreviousTrackBankEnd = _previousTrackBankEnd; + sint32 saveCurrentTrackBankEnd = _currentTrackBankEnd; + sint32 saveCurrentTrackCovered = _currentTrackCovered; + sint32 saveCurrentTrackLiftHill = _currentTrackLiftHill; sub_6CC3FB(_currentRideIndex); @@ -3981,14 +3981,14 @@ void ride_construction_tooldown_construct(int screenX, int screenY) * * rct2: 0x006CCA73 */ -static void ride_construction_tooldown_entrance_exit(int screenX, int screenY) +static void ride_construction_tooldown_entrance_exit(sint32 screenX, sint32 screenY) { sub_6C9627(); map_invalidate_selection_rect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - int mapX, mapY, direction; + sint32 mapX, mapY, direction; ride_get_entrance_or_exit_position_from_screen_position(screenX, screenY, &mapX, &mapY, &direction); if (gRideEntranceExitPlaceDirection == 255) return; @@ -4009,7 +4009,7 @@ static void ride_construction_tooldown_entrance_exit(int screenX, int screenY) ); } -void game_command_callback_place_ride_entrance_or_exit(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_place_ride_entrance_or_exit(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { audio_play_sound_at_location( SOUND_PLACE_ITEM, diff --git a/src/openrct2/windows/ride_list.c b/src/openrct2/windows/ride_list.c index 03003b625c..6016f18a85 100644 --- a/src/openrct2/windows/ride_list.c +++ b/src/openrct2/windows/ride_list.c @@ -69,18 +69,18 @@ static rct_widget window_ride_list_widgets[] = { { WIDGETS_END }, }; -static void window_ride_list_mouseup(rct_window *w, int widgetIndex); +static void window_ride_list_mouseup(rct_window *w, sint32 widgetIndex); static void window_ride_list_resize(rct_window *w); -static void window_ride_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_ride_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_ride_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_ride_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_ride_list_update(rct_window *w); -static void window_ride_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_ride_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_ride_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_ride_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_ride_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_ride_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_ride_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_ride_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_ride_list_invalidate(rct_window *w); static void window_ride_list_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_ride_list_events = { NULL, @@ -180,7 +180,7 @@ static const rct_string_id page_names[] = { STR_RESTROOMS_AND_INFORMATION_KIOSKS, }; -static int _window_ride_list_information_type; +static sint32 _window_ride_list_information_type; static void window_ride_list_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); static void window_ride_list_refresh_list(rct_window *w); @@ -229,7 +229,7 @@ void window_ride_list_open() * * rct2: 0x006B3511 */ -static void window_ride_list_mouseup(rct_window *w, int widgetIndex) +static void window_ride_list_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -287,7 +287,7 @@ static void window_ride_list_resize(rct_window *w) * * rct2: 0x006B3532 */ -static void window_ride_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_ride_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { if (widgetIndex == WIDX_OPEN_CLOSE_ALL) { gDropdownItemsFormat[0] = STR_CLOSE_ALL; @@ -296,15 +296,15 @@ static void window_ride_list_mousedown(int widgetIndex, rct_window*w, rct_widget } else if (widgetIndex == WIDX_INFORMATION_TYPE_DROPDOWN) { widget--; - int lastType; + sint32 lastType; if (w->page == PAGE_RIDES) lastType = INFORMATION_TYPE_GUESTS_FAVOURITE; else lastType = INFORMATION_TYPE_RUNNING_COST; - int numItems = 0; - int selectedIndex = -1; - for (int type = INFORMATION_TYPE_STATUS; type <= lastType; type++) { + sint32 numItems = 0; + sint32 selectedIndex = -1; + for (sint32 type = INFORMATION_TYPE_STATUS; type <= lastType; type++) { if ((gParkFlags & PARK_FLAGS_NO_MONEY)) { if (ride_info_type_money_mapping[type]) { continue; @@ -339,7 +339,7 @@ static void window_ride_list_mousedown(int widgetIndex, rct_window*w, rct_widget * * rct2: 0x006B3547 */ -static void window_ride_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_ride_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex == WIDX_OPEN_CLOSE_ALL) { if (dropdownIndex == 0) @@ -350,9 +350,9 @@ static void window_ride_list_dropdown(rct_window *w, int widgetIndex, int dropdo if (dropdownIndex == -1) return; - int informationType = INFORMATION_TYPE_STATUS; + sint32 informationType = INFORMATION_TYPE_STATUS; uint32 arg = (uint32)gDropdownItemsArgs[dropdownIndex]; - for (int i = 0; i < countof(ride_info_type_string_mapping); i++) { + for (sint32 i = 0; i < countof(ride_info_type_string_mapping); i++) { if (arg == ride_info_type_string_mapping[i]) { informationType = i; } @@ -379,9 +379,9 @@ static void window_ride_list_update(rct_window *w) * * rct2: 0x006B35A1 */ -static void window_ride_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_ride_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int top; + sint32 top; *height = w->no_list_items * 10; if (w->selected_list_item != -1) { @@ -402,9 +402,9 @@ static void window_ride_list_scrollgetsize(rct_window *w, int scrollIndex, int * * * rct2: 0x006B361F */ -static void window_ride_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_ride_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) @@ -418,9 +418,9 @@ static void window_ride_list_scrollmousedown(rct_window *w, int scrollIndex, int * * rct2: 0x006B35EF */ -static void window_ride_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_ride_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index; + sint32 index; index = y / 10; if (index >= w->no_list_items) @@ -434,7 +434,7 @@ static void window_ride_list_scrollmouseover(rct_window *w, int scrollIndex, int * * rct2: 0x006B3861 */ -static void window_ride_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_ride_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -451,7 +451,7 @@ static void window_ride_list_invalidate(rct_window *w) window_ride_list_widgets[WIDX_CURRENT_INFORMATION_TYPE].text = ride_info_type_string_mapping[_window_ride_list_information_type]; // Set correct active tab - for (int i = 0; i < 3; i++) + for (sint32 i = 0; i < 3; i++) w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); @@ -480,7 +480,7 @@ static void window_ride_list_invalidate(rct_window *w) sint8 allClosed = -1; sint8 allOpen = -1; - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { if (w->page != gRideClassifications[ride->type]) @@ -521,9 +521,9 @@ static void window_ride_list_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006B3240 */ -static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int i, y, argument; + sint32 i, y, argument; rct_string_id format, formatSecondary; rct_ride *ride; @@ -668,7 +668,7 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, */ static void window_ride_list_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) { - int sprite_idx; + sint32 sprite_idx; // Rides tab sprite_idx = SPR_TAB_RIDE_0; @@ -697,7 +697,7 @@ static void window_ride_list_draw_tab_images(rct_drawpixelinfo *dpi, rct_window */ static void window_ride_list_refresh_list(rct_window *w) { - int i, countA, countB; + sint32 i, countA, countB; rct_ride *ride, *otherRide; char bufferA[128], bufferB[128]; @@ -720,13 +720,13 @@ static void window_ride_list_refresh_list(rct_window *w) return; w->no_list_items = countA; - int list_index = 0; + sint32 list_index = 0; FOR_ALL_RIDES(i, ride) { if (w->page != gRideClassifications[ride->type]) continue; w->list_item_positions[list_index] = i; - int current_list_position = list_index; + sint32 current_list_position = list_index; switch (w->list_information_type) { case INFORMATION_TYPE_STATUS: format_string_to_upper(bufferA, 128, ride->name, &ride->name_arguments); @@ -876,7 +876,7 @@ static void window_ride_list_refresh_list(rct_window *w) static void window_ride_list_close_all(rct_window *w) { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { @@ -895,7 +895,7 @@ static void window_ride_list_close_all(rct_window *w) static void window_ride_list_open_all(rct_window *w) { - int i; + sint32 i; rct_ride *ride; FOR_ALL_RIDES(i, ride) { diff --git a/src/openrct2/windows/save_prompt.c b/src/openrct2/windows/save_prompt.c index 9677d0f057..7e2a8bfabd 100644 --- a/src/openrct2/windows/save_prompt.c +++ b/src/openrct2/windows/save_prompt.c @@ -71,10 +71,10 @@ static const rct_string_id window_save_prompt_labels[][2] = { static void window_save_prompt_close(rct_window *w); -static void window_save_prompt_mouseup(rct_window *w, int widgetIndex); +static void window_save_prompt_mouseup(rct_window *w, sint32 widgetIndex); static void window_save_prompt_invalidate(rct_window *w); static void window_save_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_save_prompt_callback(int result, const utf8 * path); +static void window_save_prompt_callback(sint32 result, const utf8 * path); static rct_window_event_list window_save_prompt_events = { window_save_prompt_close, @@ -113,7 +113,7 @@ static rct_window_event_list window_save_prompt_events = { */ void window_save_prompt_open() { - int width, height; + sint32 width, height; rct_string_id stringId; rct_window* window; uint8 prompt_mode; @@ -214,7 +214,7 @@ static void window_save_prompt_close(rct_window *w) * * rct2: 0x0066DDF2 */ -static void window_save_prompt_mouseup(rct_window *w, int widgetIndex) +static void window_save_prompt_mouseup(rct_window *w, sint32 widgetIndex) { if (gScreenFlags & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { switch (widgetIndex) { @@ -259,7 +259,7 @@ static void window_save_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); } -static void window_save_prompt_callback(int result, const utf8 * path) +static void window_save_prompt_callback(sint32 result, const utf8 * path) { if (result == MODAL_RESULT_OK) { game_load_or_quit_no_save_prompt(); diff --git a/src/openrct2/windows/scenery.c b/src/openrct2/windows/scenery.c index 1f0d843699..c12bea6f27 100644 --- a/src/openrct2/windows/scenery.c +++ b/src/openrct2/windows/scenery.c @@ -62,19 +62,19 @@ enum { }; static void window_scenery_close(rct_window *w); -static void window_scenery_mouseup(rct_window *w, int widgetIndex); +static void window_scenery_mouseup(rct_window *w, sint32 widgetIndex); static void window_scenery_resize(rct_window *w); -static void window_scenery_mousedown(int widgetIndex, rct_window* w, rct_widget* widget); -static void window_scenery_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_scenery_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget); +static void window_scenery_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_scenery_update(rct_window *w); static void window_scenery_event_07(rct_window *w); -static void window_scenery_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_scenery_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_scenery_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_scenery_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_scenery_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_scenery_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_scenery_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_scenery_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_scenery_invalidate(rct_window *w); static void window_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_scenery_events = { window_scenery_close, @@ -186,11 +186,11 @@ void window_scenery_update_scroll(rct_window *w); * Was part of 0x006DFA00 * The same code repeated five times for every scenery entry type */ -static void init_scenery_entry(rct_scenery_entry *sceneryEntry, int index, uint8 sceneryTabId) +static void init_scenery_entry(rct_scenery_entry *sceneryEntry, sint32 index, uint8 sceneryTabId) { if (scenery_is_invented(index)) { if (sceneryTabId != 0xFF) { - for (int i = 0; i < SCENERY_ENTRIES_BY_TAB; i++) { + for (sint32 i = 0; i < SCENERY_ENTRIES_BY_TAB; i++) { if (window_scenery_tab_entries[sceneryTabId][i] == -1) { window_scenery_tab_entries[sceneryTabId][i] = index; @@ -200,8 +200,8 @@ static void init_scenery_entry(rct_scenery_entry *sceneryEntry, int index, uint8 } } - for (int i = 0; i < 19; i++) { - int counter = 0; + for (sint32 i = 0; i < 19; i++) { + sint32 counter = 0; while (window_scenery_tab_entries[i][counter] != -1) { @@ -213,7 +213,7 @@ static void init_scenery_entry(rct_scenery_entry *sceneryEntry, int index, uint8 } } - for (int i = 0; i < SCENERY_ENTRIES_BY_TAB; i++) { + for (sint32 i = 0; i < SCENERY_ENTRIES_BY_TAB; i++) { if (window_scenery_tab_entries[19][i] == -1) { window_scenery_tab_entries[19][i] = index; @@ -232,7 +232,7 @@ void init_scenery() { bool enabledScenerySets[20] = { false }; - for (int scenerySetIndex = 0; scenerySetIndex < 20; scenerySetIndex++) { + for (sint32 scenerySetIndex = 0; scenerySetIndex < 20; scenerySetIndex++) { window_scenery_tab_entries[scenerySetIndex][0] = -1; if (scenerySetIndex == 19) continue; @@ -241,8 +241,8 @@ void init_scenery() if (scenerySetEntry == (rct_scenery_set_entry *)-1) continue; - int sceneryTabEntryCount = 0; - for (int i = 0; i < scenerySetEntry->entry_count; i++) { + sint32 sceneryTabEntryCount = 0; + for (sint32 i = 0; i < scenerySetEntry->entry_count; i++) { uint16 sceneryEntryId = scenerySetEntry->scenery_entries[i]; if (scenery_is_invented(sceneryEntryId)) { window_scenery_tab_entries[scenerySetIndex][sceneryTabEntryCount] = sceneryEntryId; @@ -263,8 +263,8 @@ void init_scenery() } // large scenery - for (int sceneryId = 0x300; sceneryId < 0x380; sceneryId++) { - int largeSceneryIndex = sceneryId - 0x300; + for (sint32 sceneryId = 0x300; sceneryId < 0x380; sceneryId++) { + sint32 largeSceneryIndex = sceneryId - 0x300; if (get_large_scenery_entry(largeSceneryIndex) == (rct_scenery_entry *)-1) continue; @@ -274,8 +274,8 @@ void init_scenery() } // walls - for (int sceneryId = 0x200; sceneryId < 0x280; sceneryId++) { - int wallSceneryIndex = sceneryId - 0x200; + for (sint32 sceneryId = 0x200; sceneryId < 0x280; sceneryId++) { + sint32 wallSceneryIndex = sceneryId - 0x200; if (get_wall_entry(wallSceneryIndex) == (rct_scenery_entry *)-1) continue; @@ -285,8 +285,8 @@ void init_scenery() } // banners - for (int sceneryId = 0x400; sceneryId < 0x420; sceneryId++) { - int bannerIndex = sceneryId - 0x400; + for (sint32 sceneryId = 0x400; sceneryId < 0x420; sceneryId++) { + sint32 bannerIndex = sceneryId - 0x400; if (get_banner_entry(bannerIndex) == (rct_scenery_entry *)-1) continue; @@ -296,8 +296,8 @@ void init_scenery() } // path bits - for (int sceneryId = 0x100; sceneryId < 0x10F; sceneryId++) { - int pathBitIndex = sceneryId - 0x100; + for (sint32 sceneryId = 0x100; sceneryId < 0x10F; sceneryId++) { + sint32 pathBitIndex = sceneryId - 0x100; if (get_footpath_item_entry(pathBitIndex) == (rct_scenery_entry *)-1) continue; @@ -306,14 +306,14 @@ void init_scenery() init_scenery_entry(sceneryEntry, sceneryId, sceneryEntry->path_bit.scenery_tab_id); } - for (int widgetIndex = WIDX_SCENERY_TAB_1; widgetIndex < WIDX_SCENERY_LIST; widgetIndex++) + for (sint32 widgetIndex = WIDX_SCENERY_TAB_1; widgetIndex < WIDX_SCENERY_LIST; widgetIndex++) window_scenery_widgets[widgetIndex].type = WWT_EMPTY; uint8 tabIndexes[20]; uint8 order[20]; - int usedValues = 0; + sint32 usedValues = 0; - for (int scenerySetId = 0; scenerySetId < 19; scenerySetId++) { + for (sint32 scenerySetId = 0; scenerySetId < 19; scenerySetId++) { rct_scenery_set_entry* sceneryEntry = get_scenery_group_entry(scenerySetId); if (sceneryEntry == (rct_scenery_set_entry *)-1) continue; @@ -326,7 +326,7 @@ void init_scenery() while (true) { bool finished = true; - for (int i = 1; i < usedValues; i++) { + for (sint32 i = 1; i < usedValues; i++) { if (order[i - 1] > order[i]) { uint8 tmp = tabIndexes[i - 1]; tabIndexes[i - 1] = tabIndexes[i]; @@ -346,7 +346,7 @@ void init_scenery() usedValues++; uint16 left = 3; - for (int i = 0; i < usedValues; i ++) { + for (sint32 i = 0; i < usedValues; i ++) { uint32 tabIndex = tabIndexes[i]; rct_widget* tabWidget = &window_scenery_widgets[tabIndex + WIDX_SCENERY_TAB_1]; @@ -384,17 +384,17 @@ void scenery_set_default_placement_configuration() gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN; init_scenery(); - for (int i = 0; i < 20; i++) + for (sint32 i = 0; i < 20; i++) gWindowSceneryTabSelections[i] = -1; - for (int i = 0; i < 20; i++) { + for (sint32 i = 0; i < 20; i++) { if (window_scenery_tab_entries[i][0] != -1) { gWindowSceneryActiveTabIndex = i; return; } } - for (int i = 0; i < 16; i++) { + for (sint32 i = 0; i < 16; i++) { rct_widget *tabWidget = &window_scenery_widgets[WIDX_SCENERY_TAB_1 + i]; if (tabWidget->type != WWT_EMPTY) { gWindowSceneryActiveTabIndex = i; @@ -484,8 +484,8 @@ void window_scenery_open() * rct2: 0x0066DB3D */ static bool window_scenery_is_scenery_tool_active() { - int toolWindowClassification = gCurrentToolWidget.window_classification; - int toolWidgetIndex = gCurrentToolWidget.widget_index; + sint32 toolWindowClassification = gCurrentToolWidget.window_classification; + sint32 toolWidgetIndex = gCurrentToolWidget.widget_index; if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) if (toolWindowClassification == WC_TOP_TOOLBAR && toolWidgetIndex == 9) // 9 is WIDX_SCENERY @@ -509,22 +509,22 @@ void window_scenery_close(rct_window *w) tool_cancel(); } -static int count_rows(int items){ - int rows = items / 9; +static sint32 count_rows(sint32 items){ + sint32 rows = items / 9; return rows; } typedef struct scenery_item { - int allRows; - int selected_item; + sint32 allRows; + sint32 selected_item; sint16 sceneryId; } scenery_item; -static scenery_item window_scenery_count_rows_with_selected_item(int tabIndex) +static scenery_item window_scenery_count_rows_with_selected_item(sint32 tabIndex) { scenery_item sceneryItem = { 0, 0, -1 }; - int totalItems = 0; + sint32 totalItems = 0; sint16 id = 0; sint16 sceneryId = gWindowSceneryTabSelections[tabIndex]; @@ -539,25 +539,25 @@ static scenery_item window_scenery_count_rows_with_selected_item(int tabIndex) return sceneryItem; } -static int window_scenery_count_rows() +static sint32 window_scenery_count_rows() { - int tabIndex = gWindowSceneryActiveTabIndex; - int totalItems = 0; + sint32 tabIndex = gWindowSceneryActiveTabIndex; + sint32 totalItems = 0; while (window_scenery_tab_entries[tabIndex][totalItems] != -1){ totalItems++; } - int rows = count_rows(totalItems + 8); + sint32 rows = count_rows(totalItems + 8); return rows; } -static int window_scenery_rows_height(int rows) +static sint32 window_scenery_rows_height(sint32 rows) { return rows * SCENERY_BUTTON_HEIGHT; } -static int rows_on_page(int height) +static sint32 rows_on_page(sint32 height) { return height / 90; } @@ -566,7 +566,7 @@ static int rows_on_page(int height) * * rct2: 0x006BD94C */ -static void window_scenery_mouseup(rct_window *w, int widgetIndex) +static void window_scenery_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_SCENERY_CLOSE: @@ -603,13 +603,13 @@ static void window_scenery_mouseup(rct_window *w, int widgetIndex) */ void window_scenery_update_scroll(rct_window *w) { - int tabIndex = gWindowSceneryActiveTabIndex; + sint32 tabIndex = gWindowSceneryActiveTabIndex; scenery_item sceneryItem = window_scenery_count_rows_with_selected_item(tabIndex); w->scrolls[0].v_bottom = window_scenery_rows_height(sceneryItem.allRows) + 1; - int rowsOnPage = rows_on_page(w->height); - int rowSelected = count_rows(sceneryItem.selected_item); + sint32 rowsOnPage = rows_on_page(w->height); + sint32 rowSelected = count_rows(sceneryItem.selected_item); if (sceneryItem.allRows - rowSelected <= rowsOnPage){ rowSelected = sceneryItem.allRows - rowsOnPage; @@ -667,7 +667,7 @@ static void window_scenery_resize(rct_window *w) * * rct2: 0x006E1A25 */ -static void window_scenery_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) { +static void window_scenery_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { switch (widgetIndex) { case WIDX_SCENERY_PRIMARY_COLOUR_BUTTON: window_dropdown_show_colour(w, widget, w->colours[1], gWindowSceneryPrimaryColour); @@ -694,7 +694,7 @@ static void window_scenery_mousedown(int widgetIndex, rct_window* w, rct_widget* * * rct2: 0x006E1A54 */ -static void window_scenery_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_scenery_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -731,11 +731,11 @@ static void window_scenery_update(rct_window *w) { rct_window *other = window_find_from_point(gCursorState.x, gCursorState.y); if (other == w) { - int window_x = gCursorState.x - w->x + 26; - int window_y = gCursorState.y - w->y; + sint32 window_x = gCursorState.x - w->x + 26; + sint32 window_y = gCursorState.y - w->y; if (window_y < 44 || window_x <= w->width) { - int widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y); + sint32 widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y); if (widgetIndex >= WIDX_SCENERY_TAB_CONTENT_PANEL) { w->scenery.hover_counter++; if (w->scenery.hover_counter < 8) { @@ -746,7 +746,7 @@ static void window_scenery_update(rct_window *w) w->max_height = WINDOW_SCENERY_HEIGHT; } } else { - int windowHeight = min(463, w->scrolls[0].v_bottom + 62); + sint32 windowHeight = min(463, w->scrolls[0].v_bottom + 62); if (gScreenHeight < 600) windowHeight = min(374, windowHeight); @@ -800,18 +800,18 @@ static void window_scenery_update(rct_window *w) * * rct2: 0x006E1A91 */ -void window_scenery_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +void window_scenery_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int rows = window_scenery_count_rows(); + sint32 rows = window_scenery_count_rows(); *height = window_scenery_rows_height(rows); } -static short get_scenery_id_by_cursor_pos(short x, short y) +static sint16 get_scenery_id_by_cursor_pos(sint16 x, sint16 y) { - int tabSceneryIndex = x / SCENERY_BUTTON_WIDTH + (y / SCENERY_BUTTON_HEIGHT) * 9; + sint32 tabSceneryIndex = x / SCENERY_BUTTON_WIDTH + (y / SCENERY_BUTTON_HEIGHT) * 9; uint8 tabIndex = gWindowSceneryActiveTabIndex; - int itemCounter = 0; + sint32 itemCounter = 0; sint16 sceneryId = 0; while (itemCounter <= tabSceneryIndex) { sceneryId = window_scenery_tab_entries[tabIndex][itemCounter]; @@ -828,9 +828,9 @@ static short get_scenery_id_by_cursor_pos(short x, short y) * * rct2: 0x006E1C4A */ -void window_scenery_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +void window_scenery_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - short sceneryId = get_scenery_id_by_cursor_pos(x, y); + sint16 sceneryId = get_scenery_id_by_cursor_pos(x, y); if (sceneryId == -1) return; @@ -848,9 +848,9 @@ void window_scenery_scrollmousedown(rct_window *w, int scrollIndex, int x, int y * * rct2: 0x006E1BB8 */ -void window_scenery_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +void window_scenery_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - short sceneryId = get_scenery_id_by_cursor_pos(x, y); + sint16 sceneryId = get_scenery_id_by_cursor_pos(x, y); if (sceneryId != -1) { w->scenery.selected_scenery_id = sceneryId; window_invalidate(w); @@ -861,7 +861,7 @@ void window_scenery_scrollmouseover(rct_window *w, int scrollIndex, int x, int y * * rct2: 0x006E1C05 */ -void window_scenery_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +void window_scenery_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { switch (widgetIndex) { case WIDX_SCENERY_LIST: @@ -1087,13 +1087,13 @@ void window_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006E15ED */ -void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +void window_scenery_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { gfx_clear(dpi, ColourMapA[w->colours[1]].mid_light); uint8 tabIndex = gWindowSceneryActiveTabIndex; - int sceneryTabItemIndex = 0; + sint32 sceneryTabItemIndex = 0; sint16 currentSceneryGlobalId = -1; sint16 left = 0, top = 0; diff --git a/src/openrct2/windows/server_list.c b/src/openrct2/windows/server_list.c index ae120eae94..8bbc7a876f 100644 --- a/src/openrct2/windows/server_list.c +++ b/src/openrct2/windows/server_list.c @@ -47,7 +47,7 @@ typedef struct server_entry { static char _playerName[32 + 1]; static server_entry *_serverEntries = NULL; -static int _numServerEntries = 0; +static sint32 _numServerEntries = 0; static SDL_mutex *_mutex = 0; static uint32 _numPlayersOnline = 0; @@ -80,17 +80,17 @@ static rct_widget window_server_list_widgets[] = { }; static void window_server_list_close(rct_window *w); -static void window_server_list_mouseup(rct_window *w, int widgetIndex); +static void window_server_list_mouseup(rct_window *w, sint32 widgetIndex); static void window_server_list_resize(rct_window *w); -static void window_server_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_server_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_server_list_update(rct_window *w); -static void window_server_list_scroll_getsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_server_list_scroll_mousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_server_list_scroll_mouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_server_list_textinput(rct_window *w, int widgetIndex, char *text); +static void window_server_list_scroll_getsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_server_list_scroll_mousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_server_list_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_server_list_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_server_list_invalidate(rct_window *w); static void window_server_list_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_server_list_events = { window_server_list_close, @@ -128,15 +128,15 @@ enum { DDIDX_FAVOURITE }; -static int _hoverButtonIndex = -1; +static sint32 _hoverButtonIndex = -1; -static void server_list_get_item_button(int buttonIndex, int x, int y, int width, int *outX, int *outY); +static void server_list_get_item_button(sint32 buttonIndex, sint32 x, sint32 y, sint32 width, sint32 *outX, sint32 *outY); static void server_list_load_server_entries(); static void server_list_save_server_entries(); static void dispose_server_entry_list(); static void dispose_server_entry(server_entry *serverInfo); static server_entry* add_server_entry(char *address); -static void remove_server_entry(int index); +static void remove_server_entry(sint32 index); static void sort_servers(); static void join_server(char *address); static void fetch_servers(); @@ -203,7 +203,7 @@ static void window_server_list_close(rct_window *w) } } -static void window_server_list_mouseup(rct_window *w, int widgetIndex) +static void window_server_list_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -213,7 +213,7 @@ static void window_server_list_mouseup(rct_window *w, int widgetIndex) window_start_textbox(w, widgetIndex, STR_STRING, _playerName, 63); break; case WIDX_LIST:{ - int serverIndex = w->selected_list_item; + sint32 serverIndex = w->selected_list_item; if (serverIndex >= 0 && serverIndex < _numServerEntries) { if (strcmp(_serverEntries[serverIndex].version, NETWORK_STREAM_ID) != 0 && strcmp(_serverEntries[serverIndex].version, "") != 0) { set_format_arg(0, void *, _serverEntries[serverIndex].version); @@ -241,9 +241,9 @@ static void window_server_list_resize(rct_window *w) window_set_resize(w, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX); } -static void window_server_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_server_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { - int serverIndex = w->selected_list_item; + sint32 serverIndex = w->selected_list_item; if (serverIndex < 0) return; if (serverIndex >= _numServerEntries) return; @@ -273,21 +273,21 @@ static void window_server_list_update(rct_window *w) } } -static void window_server_list_scroll_getsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_server_list_scroll_getsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *width = 0; *height = w->no_list_items * ITEM_HEIGHT; } -static void window_server_list_scroll_mousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_server_list_scroll_mousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int serverIndex = w->selected_list_item; + sint32 serverIndex = w->selected_list_item; if (serverIndex < 0) return; if (serverIndex >= _numServerEntries) return; rct_widget *listWidget = &w->widgets[WIDX_LIST]; - int ddx = w->x + listWidget->left + x + 2 - w->scrolls[0].h_left; - int ddy = w->y + listWidget->top + y + 2 - w->scrolls[0].v_top; + sint32 ddx = w->x + listWidget->left + x + 2 - w->scrolls[0].h_left; + sint32 ddy = w->y + listWidget->top + y + 2 - w->scrolls[0].v_top; gDropdownItemsFormat[0] = STR_JOIN_GAME; if (_serverEntries[serverIndex].favourite) { @@ -300,20 +300,20 @@ static void window_server_list_scroll_mousedown(rct_window *w, int scrollIndex, char *gVersion = NULL; -static void window_server_list_scroll_mouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_server_list_scroll_mouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { // Item - int index = y / ITEM_HEIGHT; + sint32 index = y / ITEM_HEIGHT; if (index < 0 || index >= w->no_list_items) { index = -1; } - int hoverButtonIndex = -1; + sint32 hoverButtonIndex = -1; if (index != -1) { - int width = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; - int sy = index * ITEM_HEIGHT; - for (int i = 0; i < 2; i++) { - int bx, by; + sint32 width = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; + sint32 sy = index * ITEM_HEIGHT; + for (sint32 i = 0; i < 2; i++) { + sint32 bx, by; server_list_get_item_button(i, 0, sy, width, &bx, &by); if (x >= bx && y >= by && x < bx + 24 && y < by + 24) { @@ -323,8 +323,8 @@ static void window_server_list_scroll_mouseover(rct_window *w, int scrollIndex, } } - int width = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; - int right = width - 3 - 14 - 10; + sint32 width = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; + sint32 right = width - 3 - 14 - 10; if (x < right) { w->widgets[WIDX_LIST].tooltip = STR_NONE; @@ -339,7 +339,7 @@ static void window_server_list_scroll_mouseover(rct_window *w, int scrollIndex, } } -static void window_server_list_textinput(rct_window *w, int widgetIndex, char *text) +static void window_server_list_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (text == NULL || text[0] == 0) return; @@ -384,11 +384,11 @@ static void window_server_list_invalidate(rct_window *w) window_server_list_widgets[WIDX_CLOSE].left = w->width - 2 - 11; window_server_list_widgets[WIDX_CLOSE].right = w->width - 2 - 11 + 10; - int margin = 6; - int buttonHeight = 11; - int buttonTop = w->height - margin - buttonHeight - 13; - int buttonBottom = buttonTop + buttonHeight; - int listBottom = buttonTop - margin; + sint32 margin = 6; + sint32 buttonHeight = 11; + sint32 buttonTop = w->height - margin - buttonHeight - 13; + sint32 buttonBottom = buttonTop + buttonHeight; + sint32 listBottom = buttonTop - margin; window_server_list_widgets[WIDX_PLAYER_NAME_INPUT].right = w->width - 6; window_server_list_widgets[WIDX_LIST].left = 6; @@ -415,16 +415,16 @@ static void window_server_list_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_X_PLAYERS_ONLINE, (void*)&_numPlayersOnline, COLOUR_WHITE, w->x + 8, w->y + w->height - 15); } -static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { uint8 paletteIndex = ColourMapA[w->colours[1]].mid_light; gfx_clear(dpi, paletteIndex); - int width = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; + sint32 width = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; - int y = 0; + sint32 y = 0; w->widgets[WIDX_LIST].tooltip = STR_NONE; - for (int i = 0; i < w->no_list_items; i++) { + for (sint32 i = 0; i < w->no_list_items; i++) { if (y >= dpi->y + dpi->height) continue; // if (y + ITEM_HEIGHT < dpi->y) continue; @@ -438,7 +438,7 @@ static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi w->widgets[WIDX_LIST].tooltip = STR_NETWORK_VERSION_TIP; } - int colour = w->colours[1]; + sint32 colour = w->colours[1]; if (serverDetails->favourite) { colour = COLOUR_YELLOW; } @@ -450,11 +450,11 @@ static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi gfx_draw_string(dpi, serverDetails->name, colour, 3, y + 3); } - int right = width - 3 - 14; + sint32 right = width - 3 - 14; // Draw compatibility icon right -= 10; - int compatibilitySpriteId; + sint32 compatibilitySpriteId; if (str_is_null_or_empty(serverDetails->version)) { // Server not online... compatibilitySpriteId = SPR_G2_RCT1_CLOSE_BUTTON_0; @@ -479,14 +479,14 @@ static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi if (serverDetails->maxplayers > 0) { snprintf(players, 32, "%d/%d", serverDetails->players, serverDetails->maxplayers); } - int numPlayersStringWidth = gfx_get_string_width(players); + sint32 numPlayersStringWidth = gfx_get_string_width(players); gfx_draw_string(dpi, players, w->colours[1], right - numPlayersStringWidth, y + 3); y += ITEM_HEIGHT; } } -static void server_list_get_item_button(int buttonIndex, int x, int y, int width, int *outX, int *outY) +static void server_list_get_item_button(sint32 buttonIndex, sint32 x, sint32 y, sint32 width, sint32 *outX, sint32 *outY) { *outX = width - 3 - 36 - (30 * buttonIndex); *outY = y + 2; @@ -494,11 +494,11 @@ static void server_list_get_item_button(int buttonIndex, int x, int y, int width static char *freadstralloc(SDL_RWops *file) { - int capacity = 64; + sint32 capacity = 64; char *buffer = malloc(capacity); - int length = 0; - int c; + sint32 length = 0; + sint32 c; for (;;) { c = 0; if (SDL_RWread(file, &c, 1, 1) != 1) break; @@ -548,7 +548,7 @@ static void server_list_load_server_entries() _serverEntries = malloc(_numServerEntries * sizeof(server_entry)); // Load each server entry - for (int i = 0; i < _numServerEntries; i++) { + for (sint32 i = 0; i < _numServerEntries; i++) { server_entry *serverInfo = &_serverEntries[i]; serverInfo->address = freadstralloc(file); @@ -581,8 +581,8 @@ static void server_list_save_server_entries() } SDL_LockMutex(_mutex); - int count = 0; - for (int i = 0; i < _numServerEntries; i++) { + sint32 count = 0; + for (sint32 i = 0; i < _numServerEntries; i++) { server_entry *serverInfo = &_serverEntries[i]; if (serverInfo->favourite) { count++; @@ -592,7 +592,7 @@ static void server_list_save_server_entries() SDL_RWwrite(file, &count, sizeof(uint32), 1); // Write each server entry - for (int i = 0; i < _numServerEntries; i++) { + for (sint32 i = 0; i < _numServerEntries; i++) { server_entry *serverInfo = &_serverEntries[i]; if (serverInfo->favourite) { SDL_RWwrite(file, serverInfo->address, strlen(serverInfo->address) + 1, 1); @@ -609,7 +609,7 @@ static void dispose_server_entry_list() { SDL_LockMutex(_mutex); if (_serverEntries != NULL) { - for (int i = 0; i < _numServerEntries; i++) { + for (sint32 i = 0; i < _numServerEntries; i++) { dispose_server_entry(&_serverEntries[i]); } free(_serverEntries); @@ -630,7 +630,7 @@ static void dispose_server_entry(server_entry *serverInfo) static server_entry* add_server_entry(char *address) { SDL_LockMutex(_mutex); - for (int i = 0; i < _numServerEntries; i++) { + for (sint32 i = 0; i < _numServerEntries; i++) { if (strcmp(_serverEntries[i].address, address) == 0) { SDL_UnlockMutex(_mutex); return &_serverEntries[i]; @@ -644,7 +644,7 @@ static server_entry* add_server_entry(char *address) _serverEntries = realloc(_serverEntries, _numServerEntries * sizeof(server_entry)); } - int index = _numServerEntries - 1; + sint32 index = _numServerEntries - 1; server_entry* newserver = &_serverEntries[index]; newserver->address = _strdup(address); newserver->name = _strdup(address); @@ -658,11 +658,11 @@ static server_entry* add_server_entry(char *address) return newserver; } -static void remove_server_entry(int index) +static void remove_server_entry(sint32 index) { SDL_LockMutex(_mutex); if (_numServerEntries > index) { - int serversToMove = _numServerEntries - index - 1; + sint32 serversToMove = _numServerEntries - index - 1; memmove(&_serverEntries[index], &_serverEntries[index + 1], serversToMove * sizeof(server_entry)); _numServerEntries--; @@ -671,7 +671,7 @@ static void remove_server_entry(int index) SDL_UnlockMutex(_mutex); } -static int server_compare(const void *a, const void *b) +static sint32 server_compare(const void *a, const void *b) { const server_entry *serverA = (const server_entry*)a; const server_entry *serverB = (const server_entry*)b; @@ -708,7 +708,7 @@ static void sort_servers() qsort(_serverEntries, _numServerEntries, sizeof(server_entry), server_compare); } -static char *substr(char *start, int length) +static char *substr(char *start, sint32 length) { char *result = malloc(length + 1); memcpy(result, start, length); @@ -718,7 +718,7 @@ static char *substr(char *start, int length) static void join_server(char *address) { - int port = gConfigNetwork.default_port; + sint32 port = gConfigNetwork.default_port; bool addresscopied = false; @@ -728,13 +728,13 @@ static void join_server(char *address) char *colon = strrchr(address, ':'); if (colon != NULL && (endbracket != NULL || dot != NULL)) { - address = substr(address, (int)(colon - address)); + address = substr(address, (sint32)(colon - address)); sscanf(colon + 1, "%d", &port); addresscopied = true; } if (startbracket && endbracket) { - address = substr(startbracket + 1, (int)(endbracket - startbracket - 1)); + address = substr(startbracket + 1, (sint32)(endbracket - startbracket - 1)); addresscopied = true; } @@ -750,7 +750,7 @@ static void join_server(char *address) static uint32 get_total_player_count() { uint32 numPlayers = 0; - for (int i = 0; i < _numServerEntries; i++) { + for (sint32 i = 0; i < _numServerEntries; i++) { server_entry *serverDetails = &_serverEntries[i]; numPlayers += serverDetails->players; } @@ -766,7 +766,7 @@ static void fetch_servers() } SDL_LockMutex(_mutex); - for (int i = 0; i < _numServerEntries; i++) { + for (sint32 i = 0; i < _numServerEntries; i++) { if (!_serverEntries[i].favourite) { remove_server_entry(i); i = 0; @@ -799,7 +799,7 @@ static void fetch_servers_callback(http_response_t* response) return; } - int status = (int)json_integer_value(jsonStatus); + sint32 status = (sint32)json_integer_value(jsonStatus); if (status != 200) { http_request_dispose(response); log_warning("Master server failed to return servers"); @@ -813,8 +813,8 @@ static void fetch_servers_callback(http_response_t* response) return; } - int count = (int)json_array_size(jsonServers); - for (int i = 0; i < count; i++) { + sint32 count = (sint32)json_array_size(jsonServers); + for (sint32 i = 0; i < count; i++) { json_t *server = json_array_get(jsonServers, i); if (!json_is_object(server)) { continue; @@ -838,7 +838,7 @@ static void fetch_servers_callback(http_response_t* response) } char address[256]; - snprintf(address, sizeof(address), "%s:%d", json_string_value(addressIp), (int)json_integer_value(port)); + snprintf(address, sizeof(address), "%s:%d", json_string_value(addressIp), (sint32)json_integer_value(port)); SDL_LockMutex(_mutex); server_entry* newserver = add_server_entry(address); diff --git a/src/openrct2/windows/server_start.c b/src/openrct2/windows/server_start.c index f9e6ecb0e9..5ccb8d112a 100644 --- a/src/openrct2/windows/server_start.c +++ b/src/openrct2/windows/server_start.c @@ -64,9 +64,9 @@ static rct_widget window_server_start_widgets[] = { }; static void window_server_start_close(rct_window *w); -static void window_server_start_mouseup(rct_window *w, int widgetIndex); +static void window_server_start_mouseup(rct_window *w, sint32 widgetIndex); static void window_server_start_update(rct_window *w); -static void window_server_start_textinput(rct_window *w, int widgetIndex, char *text); +static void window_server_start_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_server_start_invalidate(rct_window *w); static void window_server_start_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -159,14 +159,14 @@ static void window_server_start_scenarioselect_callback(const utf8 *path) } } -static void window_server_start_loadsave_callback(int result, const utf8 * path) +static void window_server_start_loadsave_callback(sint32 result, const utf8 * path) { if (result == MODAL_RESULT_OK && game_load_save_or_scenario(path)) { network_begin_server(gConfigNetwork.default_port); } } -static void window_server_start_mouseup(rct_window *w, int widgetIndex) +static void window_server_start_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -220,7 +220,7 @@ static void window_server_start_update(rct_window *w) } } -static void window_server_start_textinput(rct_window *w, int widgetIndex, char *text) +static void window_server_start_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (text == NULL) return; diff --git a/src/openrct2/windows/shortcut_key_change.c b/src/openrct2/windows/shortcut_key_change.c index 26a44ecbe4..90f0f753ab 100644 --- a/src/openrct2/windows/shortcut_key_change.c +++ b/src/openrct2/windows/shortcut_key_change.c @@ -40,7 +40,7 @@ static rct_widget window_shortcut_change_widgets[] = { { WIDGETS_END } }; -static void window_shortcut_change_mouseup(rct_window *w, int widgetIndex); +static void window_shortcut_change_mouseup(rct_window *w, sint32 widgetIndex); static void window_shortcut_change_invalidate(rct_window *w); static void window_shortcut_change_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -76,7 +76,7 @@ static rct_window_event_list window_shortcut_change_events = { NULL }; -void window_shortcut_change_open(int selected_key){ +void window_shortcut_change_open(sint32 selected_key){ // Move this to window_shortcut_change_open window_close_by_class(WC_CHANGE_KEYBOARD_SHORTCUT); // Save the item we are selecting for new window @@ -92,7 +92,7 @@ void window_shortcut_change_open(int selected_key){ * * rct2: 0x006E3AE0 */ -static void window_shortcut_change_mouseup(rct_window *w, int widgetIndex) +static void window_shortcut_change_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex){ case WIDX_CLOSE: @@ -114,8 +114,8 @@ static void window_shortcut_change_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); - int x = w->x + 125; - int y = w->y + 30; + sint32 x = w->x + 125; + sint32 y = w->y + 30; set_format_arg(0, rct_string_id, ShortcutStringIds[gKeyboardShortcutChangeId]); gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, 242, STR_SHORTCUT_CHANGE_PROMPT, COLOUR_BLACK); diff --git a/src/openrct2/windows/shortcut_keys.c b/src/openrct2/windows/shortcut_keys.c index 14f8aedee6..b361c557d7 100644 --- a/src/openrct2/windows/shortcut_keys.c +++ b/src/openrct2/windows/shortcut_keys.c @@ -43,14 +43,14 @@ static rct_widget window_shortcut_widgets[] = { { WIDGETS_END } }; -static void window_shortcut_mouseup(rct_window *w, int widgetIndex); +static void window_shortcut_mouseup(rct_window *w, sint32 widgetIndex); static void window_shortcut_invalidate(rct_window *w); static void window_shortcut_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_shortcut_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); -static void window_shortcut_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_shortcut_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_shortcut_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_shortcut_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_shortcut_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); +static void window_shortcut_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_shortcut_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_shortcut_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_shortcut_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_shortcut_events = { NULL, @@ -162,7 +162,7 @@ void window_shortcut_keys_open() * * rct2: 0x006E39E4 */ -static void window_shortcut_mouseup(rct_window *w, int widgetIndex) +static void window_shortcut_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex){ case WIDX_CLOSE: @@ -194,7 +194,7 @@ static void window_shortcut_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006E3A0C */ -static void window_shortcut_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_shortcut_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -203,7 +203,7 @@ static void window_shortcut_tooltip(rct_window* w, int widgetIndex, rct_string_i * * rct2: 0x006E3A07 */ -static void window_shortcut_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_shortcut_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *height = w->no_list_items * 10; } @@ -212,9 +212,9 @@ static void window_shortcut_scrollgetsize(rct_window *w, int scrollIndex, int *w * * rct2: 0x006E3A3E */ -static void window_shortcut_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_shortcut_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int selected_item = y / 10; + sint32 selected_item = y / 10; if (selected_item >= w->no_list_items) return; @@ -225,9 +225,9 @@ static void window_shortcut_scrollmousedown(rct_window *w, int scrollIndex, int * * rct2: 0x006E3A16 */ -static void window_shortcut_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_shortcut_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int selected_item = y / 10; + sint32 selected_item = y / 10; if (selected_item >= w->no_list_items) return; @@ -240,17 +240,17 @@ static void window_shortcut_scrollmouseover(rct_window *w, int scrollIndex, int * * rct2: 0x006E38E6 */ -static void window_shortcut_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_shortcut_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); - for (int i = 0; i < w->no_list_items; ++i) { - int y = i * 10; + for (sint32 i = 0; i < w->no_list_items; ++i) { + sint32 y = i * 10; if (y > dpi->y + dpi->height) break; if (y + 10 < dpi->y)continue; - int format = STR_BLACK_STRING; + sint32 format = STR_BLACK_STRING; if (i == w->selected_list_item) { format = STR_WINDOW_COLOUR_2_STRINGID; gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1); diff --git a/src/openrct2/windows/sign.c b/src/openrct2/windows/sign.c index c57d62def3..78da7285d7 100644 --- a/src/openrct2/windows/sign.c +++ b/src/openrct2/windows/sign.c @@ -57,10 +57,10 @@ rct_widget window_sign_widgets[] = { { WIDGETS_END }, }; -static void window_sign_mouseup(rct_window *w, int widgetIndex); -static void window_sign_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_sign_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void window_sign_textinput(rct_window *w, int widgetIndex, char *text); +static void window_sign_mouseup(rct_window *w, sint32 widgetIndex); +static void window_sign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_sign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void window_sign_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_sign_unknown_14(rct_window *w); static void window_sign_invalidate(rct_window *w); static void window_sign_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -98,8 +98,8 @@ static rct_window_event_list window_sign_events = { NULL }; -static void window_sign_small_mouseup(rct_window *w, int widgetIndex); -static void window_sign_small_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_sign_small_mouseup(rct_window *w, sint32 widgetIndex); +static void window_sign_small_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_sign_small_invalidate(rct_window *w); // 0x9A410C @@ -161,8 +161,8 @@ void window_sign_open(rct_windownumber number) w->number = number; window_init_scroll_widgets(w); - int view_x = gBanners[w->number].x << 5; - int view_y = gBanners[w->number].y << 5; + sint32 view_x = gBanners[w->number].x << 5; + sint32 view_y = gBanners[w->number].y << 5; rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32); @@ -170,7 +170,7 @@ void window_sign_open(rct_windownumber number) if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { rct_scenery_entry* scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); if (scenery_entry->large_scenery.var_11 != 0xFF){ - int id = (map_element->type & 0xC0) | + sint32 id = (map_element->type & 0xC0) | ((map_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | ((map_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5); if (id == w->number) @@ -180,7 +180,7 @@ void window_sign_open(rct_windownumber number) map_element++; } - int view_z = map_element->base_height << 3; + sint32 view_z = map_element->base_height << 3; w->frame_no = view_z; w->list_information_type = map_element->properties.scenerymultiple.colour[0] & 0x1F; @@ -214,11 +214,11 @@ void window_sign_open(rct_windownumber number) * * rct2: 0x6B9765 */ -static void window_sign_mouseup(rct_window *w, int widgetIndex) +static void window_sign_mouseup(rct_window *w, sint32 widgetIndex) { rct_banner* banner = &gBanners[w->number]; - int x = banner->x << 5; - int y = banner->y << 5; + sint32 x = banner->x << 5; + sint32 y = banner->y << 5; rct_string_id string_id; @@ -233,7 +233,7 @@ static void window_sign_mouseup(rct_window *w, int widgetIndex) if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { rct_scenery_entry* scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); if (scenery_entry->large_scenery.var_11 != 0xFF){ - int id = (map_element->type & 0xC0) | + sint32 id = (map_element->type & 0xC0) | ((map_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | ((map_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5); if (id == w->number) @@ -270,7 +270,7 @@ static void window_sign_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x6B9784 & 0x6E6164 */ -static void window_sign_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_sign_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { switch (widgetIndex) { case WIDX_MAIN_COLOUR: @@ -286,7 +286,7 @@ static void window_sign_mousedown(int widgetIndex, rct_window*w, rct_widget* wid * * rct2: 0x6B979C */ -static void window_sign_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_sign_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { switch (widgetIndex){ case WIDX_MAIN_COLOUR: @@ -310,12 +310,12 @@ static void window_sign_dropdown(rct_window *w, int widgetIndex, int dropdownInd * * rct2: 0x6B9791, 0x6E6171 */ -static void window_sign_textinput(rct_window *w, int widgetIndex, char *text) +static void window_sign_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex == WIDX_SIGN_TEXT && text != NULL) { - game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 0)), GAME_COMMAND_SET_SIGN_NAME, *((int*)(text + 8)), *((int*)(text + 4))); - game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 12)), GAME_COMMAND_SET_SIGN_NAME, *((int*)(text + 20)), *((int*)(text + 16))); - game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 24)), GAME_COMMAND_SET_SIGN_NAME, *((int*)(text + 32)), *((int*)(text + 28))); + game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_SET_SIGN_NAME, *((sint32*)(text + 8)), *((sint32*)(text + 4))); + game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 12)), GAME_COMMAND_SET_SIGN_NAME, *((sint32*)(text + 20)), *((sint32*)(text + 16))); + game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 24)), GAME_COMMAND_SET_SIGN_NAME, *((sint32*)(text + 32)), *((sint32*)(text + 28))); } } @@ -374,9 +374,9 @@ static void window_sign_unknown_14(rct_window *w) rct_banner* banner = &gBanners[w->number]; - int view_x = (banner->x << 5) + 16; - int view_y = (banner->y << 5) + 16; - int view_z = w->frame_no; + sint32 view_x = (banner->x << 5) + 16; + sint32 view_y = (banner->y << 5) + 16; + sint32 view_z = w->frame_no; // Create viewport rct_widget* viewportWidget = &window_sign_widgets[WIDX_VIEWPORT]; @@ -428,8 +428,8 @@ void window_sign_small_open(rct_windownumber number){ w->colours[1] = COLOUR_DARK_BROWN; w->colours[2] = COLOUR_DARK_BROWN; - int view_x = gBanners[w->number].x << 5; - int view_y = gBanners[w->number].y << 5; + sint32 view_x = gBanners[w->number].x << 5; + sint32 view_y = gBanners[w->number].y << 5; rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32); @@ -444,7 +444,7 @@ void window_sign_small_open(rct_windownumber number){ map_element++; } - int view_z = map_element->base_height << 3; + sint32 view_z = map_element->base_height << 3; w->frame_no = view_z; w->list_information_type = map_element->properties.fence.item[1] & 0x1F; @@ -480,11 +480,11 @@ void window_sign_small_open(rct_windownumber number){ * * rct2: 0x6E6145 */ -static void window_sign_small_mouseup(rct_window *w, int widgetIndex) +static void window_sign_small_mouseup(rct_window *w, sint32 widgetIndex) { rct_banner* banner = &gBanners[w->number]; - int x = banner->x << 5; - int y = banner->y << 5; + sint32 x = banner->x << 5; + sint32 y = banner->y << 5; rct_string_id string_id; @@ -534,7 +534,7 @@ static void window_sign_small_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x6E617C */ -static void window_sign_small_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_sign_small_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { switch (widgetIndex){ case WIDX_MAIN_COLOUR: diff --git a/src/openrct2/windows/staff.c b/src/openrct2/windows/staff.c index ed5476d649..4f8a3313c1 100644 --- a/src/openrct2/windows/staff.c +++ b/src/openrct2/windows/staff.c @@ -122,35 +122,35 @@ rct_widget *window_staff_page_widgets[] = { window_staff_stats_widgets }; -void window_staff_set_page(rct_window* w, int page); +void window_staff_set_page(rct_window* w, sint32 page); void window_staff_disable_widgets(rct_window* w); void window_staff_unknown_05(rct_window *w); void window_staff_viewport_init(rct_window* w); void window_staff_overview_close(rct_window *w); -void window_staff_overview_mouseup(rct_window *w, int widgetIndex); +void window_staff_overview_mouseup(rct_window *w, sint32 widgetIndex); void window_staff_overview_resize(rct_window *w); -void window_staff_overview_mousedown(int widgetIndex, rct_window* w, rct_widget* widget); -void window_staff_overview_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +void window_staff_overview_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget); +void window_staff_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); void window_staff_overview_update(rct_window* w); void window_staff_overview_invalidate(rct_window *w); void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi); void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi); -void window_staff_overview_tool_update(rct_window* w, int widgetIndex, int x, int y); -void window_staff_overview_tool_down(rct_window* w, int widgetIndex, int x, int y); -void window_staff_overview_tool_abort(rct_window *w, int widgetIndex); -void window_staff_overview_text_input(rct_window *w, int widgetIndex, char *text); +void window_staff_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_staff_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +void window_staff_overview_tool_abort(rct_window *w, sint32 widgetIndex); +void window_staff_overview_text_input(rct_window *w, sint32 widgetIndex, char *text); void window_staff_overview_unknown_14(rct_window *w); -void window_staff_options_mouseup(rct_window *w, int widgetIndex); +void window_staff_options_mouseup(rct_window *w, sint32 widgetIndex); void window_staff_options_update(rct_window* w); void window_staff_options_invalidate(rct_window *w); void window_staff_options_paint(rct_window *w, rct_drawpixelinfo *dpi); void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi); -void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget* widget); -void window_staff_options_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +void window_staff_options_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget); +void window_staff_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); -void window_staff_stats_mouseup(rct_window *w, int widgetIndex); +void window_staff_stats_mouseup(rct_window *w, sint32 widgetIndex); void window_staff_stats_resize(rct_window *w); void window_staff_stats_update(rct_window* w); void window_staff_stats_invalidate(rct_window *w); @@ -389,7 +389,7 @@ void window_staff_overview_close(rct_window *w) * Mostly similar to window_peep_set_page. * rct2: 0x006BE023 */ -void window_staff_set_page(rct_window* w, int page) +void window_staff_set_page(rct_window* w, sint32 page) { if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE) { @@ -399,7 +399,7 @@ void window_staff_set_page(rct_window* w, int page) } - int listen = 0; + sint32 listen = 0; if (page == WINDOW_STAFF_OVERVIEW && w->page == WINDOW_STAFF_OVERVIEW && w->viewport){ if (!(w->viewport->flags & VIEWPORT_FLAG_SOUND_ON)) listen = 1; @@ -433,11 +433,11 @@ void window_staff_set_page(rct_window* w, int page) if (listen && w->viewport) w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON; } -void game_command_callback_pickup_staff(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_pickup_staff(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { switch(ecx){ case 0:{ - int peepnum = eax; + sint32 peepnum = eax; rct_window* w = window_find_by_number(WC_PEEP, peepnum); if (w) { tool_set(w, WIDX_PICKUP, 7); @@ -456,7 +456,7 @@ void game_command_callback_pickup_staff(int eax, int ebx, int ecx, int edx, int * * rct2: 0x006BDF55 */ -void window_staff_overview_mouseup(rct_window *w, int widgetIndex) +void window_staff_overview_mouseup(rct_window *w, sint32 widgetIndex) { rct_peep* peep = GET_PEEP(w->number); @@ -475,7 +475,7 @@ void window_staff_overview_mouseup(rct_window *w, int widgetIndex) case WIDX_PICKUP: { // this is called in callback when hiring staff, setting nestlevel to 0 so that command is sent separately - int oldNestLevel = gGameCommandNestLevel; + sint32 oldNestLevel = gGameCommandNestLevel; gGameCommandNestLevel = 0; game_command_callback = game_command_callback_pickup_staff; w->picked_peep_old_x = peep->x; @@ -528,8 +528,8 @@ void window_staff_overview_resize(rct_window *w) rct_viewport* viewport = w->viewport; if (viewport) { - int new_width = w->width - 30; - int new_height = w->height - 62; + sint32 new_width = w->width - 30; + sint32 new_height = w->height - 62; // Update the viewport size if (viewport->width != new_width || viewport->height != new_height) { @@ -547,7 +547,7 @@ void window_staff_overview_resize(rct_window *w) * Handle the dropdown of patrol button. * rct2: 0x006BDF98 */ -void window_staff_overview_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +void window_staff_overview_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { if (widgetIndex != WIDX_PATROL) { return; @@ -557,9 +557,9 @@ void window_staff_overview_mousedown(int widgetIndex, rct_window* w, rct_widget* gDropdownItemsFormat[0] = STR_SET_PATROL_AREA; gDropdownItemsFormat[1] = STR_CLEAR_PATROL_AREA; - int x = widget->left + w->x; - int y = widget->top + w->y; - int extray = widget->bottom - widget->top + 1; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; + sint32 extray = widget->bottom - widget->top + 1; window_dropdown_show_text(x, y, extray, w->colours[1], 0, 2); gDropdownDefaultIndex = 0; @@ -575,7 +575,7 @@ void window_staff_overview_mousedown(int widgetIndex, rct_window* w, rct_widget* * * rct2: 0x006BDFA3 */ -void window_staff_overview_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +void window_staff_overview_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_PATROL) { return; @@ -585,7 +585,7 @@ void window_staff_overview_dropdown(rct_window *w, int widgetIndex, int dropdown if (dropdownIndex == 1) { rct_peep* peep = GET_PEEP(w->number); uint32 *addr = (uint32*)((uintptr_t)gStaffPatrolAreas + (peep->staff_id * 512)); - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { addr[i] = 0; } gStaffModes[peep->staff_id] &= ~2; @@ -608,7 +608,7 @@ void window_staff_overview_dropdown(rct_window *w, int widgetIndex, int dropdown */ void window_staff_overview_update(rct_window* w) { - int var_496 = w->var_496; + sint32 var_496 = w->var_496; var_496++; if (var_496 >= 24) { var_496 = 0; @@ -621,12 +621,12 @@ void window_staff_overview_update(rct_window* w) * * rct2: 0x006BE814 */ -static void window_staff_set_order(rct_window* w, int order_id) +static void window_staff_set_order(rct_window* w, sint32 order_id) { rct_peep* peep = GET_PEEP(w->number); - int ax = peep->staff_orders ^ (1 << order_id); - int flags = (ax << 8) | 1; + sint32 ax = peep->staff_orders ^ (1 << order_id); + sint32 flags = (ax << 8) | 1; game_do_command(peep->x, flags, peep->y, w->number, GAME_COMMAND_SET_STAFF_ORDER, 0, 0); } @@ -635,7 +635,7 @@ static void window_staff_set_order(rct_window* w, int order_id) * * rct2: 0x006BE7DB */ -void window_staff_options_mouseup(rct_window *w, int widgetIndex) +void window_staff_options_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -669,7 +669,7 @@ void window_staff_options_update(rct_window* w) * * rct2: 0x006BEBCF */ -void window_staff_stats_mouseup(rct_window *w, int widgetIndex) +void window_staff_stats_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -934,9 +934,9 @@ void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) set_format_arg(0, uint32, argument1); set_format_arg(4, uint32, argument2); rct_widget* widget = &w->widgets[WIDX_BTM_LABEL]; - int x = (widget->left + widget->right) / 2 + w->x; - int y = w->y + widget->top; - int width = widget->right - widget->left; + sint32 x = (widget->left + widget->right) / 2 + w->x; + sint32 y = w->y + widget->top; + sint32 width = widget->right - widget->left; gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, x, y, width); } @@ -949,10 +949,10 @@ void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi) if (w->disabled_widgets & (1 << WIDX_TAB_2)) return; rct_widget* widget = &w->widgets[WIDX_TAB_2]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; - int image_id = SPR_TAB_STAFF_OPTIONS_0; + sint32 image_id = SPR_TAB_STAFF_OPTIONS_0; if (w->page == WINDOW_STAFF_OPTIONS){ image_id += (w->frame_no / 2) % 7; @@ -970,10 +970,10 @@ void window_staff_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi) if (w->disabled_widgets & (1 << WIDX_TAB_3)) return; rct_widget* widget = &w->widgets[WIDX_TAB_3]; - int x = widget->left + w->x; - int y = widget->top + w->y; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; - int image_id = SPR_TAB_STATS_0; + sint32 image_id = SPR_TAB_STATS_0; if (w->page == WINDOW_STAFF_STATISTICS){ image_id += (w->frame_no / 4) % 7; @@ -991,10 +991,10 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi) return; rct_widget* widget = &w->widgets[WIDX_TAB_1]; - int width = widget->right - widget->left - 1; - int height = widget->bottom - widget->top - 1; - int x = widget->left + 1 + w->x; - int y = widget->top + 1 + w->y; + sint32 width = widget->right - widget->left - 1; + sint32 height = widget->bottom - widget->top - 1; + sint32 x = widget->left + 1 + w->x; + sint32 y = widget->top + 1 + w->y; if (w->page == WINDOW_STAFF_OVERVIEW) height++; rct_drawpixelinfo clip_dpi; @@ -1010,9 +1010,9 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi) if (peep->type == PEEP_TYPE_STAFF && peep->staff_type == STAFF_TYPE_ENTERTAINER) y++; - int ebx = g_sprite_entries[peep->sprite_type].sprite_image->base_image + 1; + sint32 ebx = g_sprite_entries[peep->sprite_type].sprite_image->base_image + 1; - int eax = 0; + sint32 eax = 0; if (w->page == WINDOW_STAFF_OVERVIEW){ eax = w->highlighted_item >> 16; @@ -1020,7 +1020,7 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi) } ebx += eax; - int sprite_id = ebx | (peep->tshirt_colour << 19) | (peep->trousers_colour << 24) | 0xA0000000; + sint32 sprite_id = ebx | (peep->tshirt_colour << 19) | (peep->trousers_colour << 24) | 0xA0000000; gfx_draw_sprite(&clip_dpi, sprite_id, x, y, 0); // If holding a balloon @@ -1070,8 +1070,8 @@ void window_staff_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_peep* peep = GET_PEEP(w->number); - int x = w->x + window_staff_stats_widgets[WIDX_RESIZE].left + 4; - int y = w->y + window_staff_stats_widgets[WIDX_RESIZE].top + 4; + sint32 x = w->x + window_staff_stats_widgets[WIDX_RESIZE].left + 4; + sint32 y = w->y + window_staff_stats_widgets[WIDX_RESIZE].top + 4; if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) { set_format_arg(0, money32, wage_table[peep->staff_type]); @@ -1104,7 +1104,7 @@ void window_staff_stats_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006BDFD8 */ -void window_staff_overview_tool_update(rct_window* w, int widgetIndex, int x, int y) +void window_staff_overview_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex != WIDX_PICKUP) return; @@ -1113,7 +1113,7 @@ void window_staff_overview_tool_update(rct_window* w, int widgetIndex, int x, in gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; - int map_x, map_y; + sint32 map_x, map_y; footpath_get_coordinates_from_pos(x, y + 16, &map_x, &map_y, NULL, NULL); if (map_x != MAP_LOCATION_NULL) { gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE; @@ -1127,7 +1127,7 @@ void window_staff_overview_tool_update(rct_window* w, int widgetIndex, int x, in gPickupPeepImage = UINT32_MAX; - int interactionType; + sint32 interactionType; get_map_coordinates_from_pos(x, y, VIEWPORT_INTERACTION_MASK_NONE, NULL, NULL, &interactionType, NULL, NULL); if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE) return; @@ -1155,10 +1155,10 @@ void window_staff_overview_tool_update(rct_window* w, int widgetIndex, int x, in * * rct2: 0x006BDFC3 */ -void window_staff_overview_tool_down(rct_window* w, int widgetIndex, int x, int y) +void window_staff_overview_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_PICKUP) { - int dest_x, dest_y; + sint32 dest_x, dest_y; rct_map_element* mapElement; footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, NULL, &mapElement); @@ -1169,7 +1169,7 @@ void window_staff_overview_tool_down(rct_window* w, int widgetIndex, int x, int game_do_command(w->number, GAME_COMMAND_FLAG_APPLY, 2, mapElement->base_height, GAME_COMMAND_PICKUP_STAFF, dest_x, dest_y); } else if (widgetIndex == WIDX_PATROL){ - int dest_x, dest_y; + sint32 dest_x, dest_y; footpath_get_coordinates_from_pos(x, y, &dest_x, &dest_y, NULL, NULL); if (dest_x == MAP_LOCATION_NULL) return; @@ -1182,7 +1182,7 @@ void window_staff_overview_tool_down(rct_window* w, int widgetIndex, int x, int * * rct2: 0x6BDFAE */ -void window_staff_overview_tool_abort(rct_window *w, int widgetIndex) +void window_staff_overview_tool_abort(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_PICKUP) { game_do_command(w->number, GAME_COMMAND_FLAG_APPLY, 1, 0, GAME_COMMAND_PICKUP_STAFF, w->picked_peep_old_x, 0); @@ -1195,7 +1195,7 @@ void window_staff_overview_tool_abort(rct_window *w, int widgetIndex) } /* rct2: 0x6BDFED */ -void window_staff_overview_text_input(rct_window *w, int widgetIndex, char *text) +void window_staff_overview_text_input(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_RENAME) return; @@ -1204,9 +1204,9 @@ void window_staff_overview_text_input(rct_window *w, int widgetIndex, char *text return; gGameCommandErrorTitle = STR_STAFF_ERROR_CANT_NAME_STAFF_MEMBER; - game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 0)), GAME_COMMAND_SET_STAFF_NAME, *((int*)(text + 8)), *((int*)(text + 4))); - game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 12)), GAME_COMMAND_SET_STAFF_NAME, *((int*)(text + 20)), *((int*)(text + 16))); - game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((int*)(text + 24)), GAME_COMMAND_SET_STAFF_NAME, *((int*)(text + 32)), *((int*)(text + 28))); + game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 0)), GAME_COMMAND_SET_STAFF_NAME, *((sint32*)(text + 8)), *((sint32*)(text + 4))); + game_do_command(2, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 12)), GAME_COMMAND_SET_STAFF_NAME, *((sint32*)(text + 20)), *((sint32*)(text + 16))); + game_do_command(0, GAME_COMMAND_FLAG_APPLY, w->number, *((sint32*)(text + 24)), GAME_COMMAND_SET_STAFF_NAME, *((sint32*)(text + 32)), *((sint32*)(text + 28))); } /** @@ -1270,10 +1270,10 @@ void window_staff_viewport_init(rct_window* w){ if (!(w->viewport)){ rct_widget* view_widget = &w->widgets[WIDX_VIEWPORT]; - int x = view_widget->left + 1 + w->x; - int y = view_widget->top + 1 + w->y; - int width = view_widget->right - view_widget->left - 1; - int height = view_widget->bottom - view_widget->top - 1; + sint32 x = view_widget->left + 1 + w->x; + sint32 y = view_widget->top + 1 + w->y; + sint32 width = view_widget->right - view_widget->left - 1; + sint32 height = view_widget->bottom - view_widget->top - 1; viewport_create(w, x, y, width, height, 0, 0, 0, 0, focus.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite_id); w->flags |= WF_NO_SCROLLING; @@ -1290,7 +1290,7 @@ void window_staff_viewport_init(rct_window* w){ * Handle the costume of staff member. * rct2: 0x006BE802 */ -void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +void window_staff_options_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { if (widgetIndex != WIDX_COSTUME_BTN) { return; @@ -1299,7 +1299,7 @@ void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget* init_scenery(); uint32 entertainerCostumes = 0; - for (int i = 0; i < 19; i++) { + for (sint32 i = 0; i < 19; i++) { if (window_scenery_tab_entries[i][0] != -1) { rct_scenery_set_entry* scenery_entry = get_scenery_group_entry(i); entertainerCostumes |= scenery_entry->entertainer_costumes; @@ -1317,11 +1317,11 @@ void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget* } rct_peep* peep = GET_PEEP(w->number); - int itemsChecked = 0; + sint32 itemsChecked = 0; //This will be moved below where Items Checked is when all //of dropdown related functions are finished. This prevents //the dropdown from not working on first click. - for (int i = 0; i < numCostumes; ++i){ + for (sint32 i = 0; i < numCostumes; ++i){ uint8 costume = _availableCostumes[i]; if (costume == peep->sprite_type) { itemsChecked = 1 << i; @@ -1333,10 +1333,10 @@ void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget* //Get the dropdown box widget instead of button. widget--; - int x = widget->left + w->x; - int y = widget->top + w->y; - int extray = widget->bottom - widget->top + 1; - int width = widget->right - widget->left - 3; + sint32 x = widget->left + w->x; + sint32 y = widget->top + w->y; + sint32 extray = widget->bottom - widget->top + 1; + sint32 width = widget->right - widget->left - 3; window_dropdown_show_text_custom_width(x, y, extray, w->colours[1], DROPDOWN_FLAG_STAY_OPEN, numCostumes, width); // See above note. @@ -1347,7 +1347,7 @@ void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget* * * rct2: 0x6BE809 */ -void window_staff_options_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +void window_staff_options_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex != WIDX_COSTUME_BTN) { return; @@ -1357,6 +1357,6 @@ void window_staff_options_dropdown(rct_window *w, int widgetIndex, int dropdownI return; rct_peep* peep = GET_PEEP(w->number); - int costume = _availableCostumes[dropdownIndex] | 0x80; + sint32 costume = _availableCostumes[dropdownIndex] | 0x80; game_do_command(peep->x, (costume << 8) | 1, peep->y, w->number, GAME_COMMAND_SET_STAFF_ORDER, 0, 0); } diff --git a/src/openrct2/windows/staff_fire_prompt.c b/src/openrct2/windows/staff_fire_prompt.c index 456c824249..fcc891476d 100644 --- a/src/openrct2/windows/staff_fire_prompt.c +++ b/src/openrct2/windows/staff_fire_prompt.c @@ -45,7 +45,7 @@ static rct_widget window_staff_fire_widgets[] = { { WIDGETS_END } }; -static void window_staff_fire_mouseup(rct_window *w, int widgetIndex); +static void window_staff_fire_mouseup(rct_window *w, sint32 widgetIndex); static void window_staff_fire_invalidate(rct_window *w); static void window_staff_fire_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -104,7 +104,7 @@ void window_staff_fire_prompt_open(rct_peep* peep) * * rct2: 0x006C0B40 */ -static void window_staff_fire_mouseup(rct_window *w, int widgetIndex) +static void window_staff_fire_mouseup(rct_window *w, sint32 widgetIndex) { rct_peep* peep = &get_sprite(w->number)->peep; @@ -136,8 +136,8 @@ static void window_staff_fire_paint(rct_window *w, rct_drawpixelinfo *dpi) set_format_arg(0, rct_string_id, peep->name_string_idx); set_format_arg(2, uint32, peep->id); - int x = w->x + WW / 2; - int y = w->y + (WH / 2) - 3; + sint32 x = w->x + WW / 2; + sint32 y = w->y + (WH / 2) - 3; gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, WW - 4, STR_FIRE_STAFF_ID, COLOUR_BLACK); } diff --git a/src/openrct2/windows/staff_list.c b/src/openrct2/windows/staff_list.c index 739c51c961..8a9516608a 100644 --- a/src/openrct2/windows/staff_list.c +++ b/src/openrct2/windows/staff_list.c @@ -42,20 +42,20 @@ enum { bool _quick_fire_mode = false; static void window_staff_list_close(rct_window *w); -static void window_staff_list_mouseup(rct_window *w, int widgetIndex); +static void window_staff_list_mouseup(rct_window *w, sint32 widgetIndex); static void window_staff_list_resize(rct_window *w); -static void window_staff_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_staff_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_staff_list_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_staff_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_staff_list_update(rct_window *w); -static void window_staff_list_tooldown(rct_window *w, int widgetIndex, int x, int y); -static void window_staff_list_toolabort(rct_window *w, int widgetIndex); -static void window_staff_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_staff_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_staff_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_staff_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_staff_list_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_staff_list_toolabort(rct_window *w, sint32 widgetIndex); +static void window_staff_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_staff_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_staff_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_staff_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_staff_list_invalidate(rct_window *w); static void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_staff_list_events = { window_staff_list_close, @@ -129,8 +129,8 @@ static rct_widget window_staff_list_widgets[] = { }; static uint16 _window_staff_list_selected_type_count = 0; -static int _windowStaffListHighlightedIndex; -static int _windowStaffListSelectedTab; +static sint32 _windowStaffListHighlightedIndex; +static sint32 _windowStaffListSelectedTab; typedef struct staff_naming_convention { @@ -210,7 +210,7 @@ void window_staff_list_close(rct_window *w) * * rct2: 0x006BD94C */ -static void window_staff_list_mouseup(rct_window *w, int widgetIndex) +static void window_staff_list_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_STAFF_LIST_CLOSE: @@ -259,9 +259,9 @@ static void window_staff_list_resize(rct_window *w) * * rct2: 0x006BD971 */ -static void window_staff_list_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +static void window_staff_list_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { - short newSelectedTab; + sint16 newSelectedTab; switch (widgetIndex) { case WIDX_STAFF_LIST_HANDYMEN_TAB: @@ -288,7 +288,7 @@ static void window_staff_list_mousedown(int widgetIndex, rct_window* w, rct_widg * * rct2: 0x006BD9A6 */ -static void window_staff_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_staff_list_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex == WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER && dropdownIndex != -1) { update_staff_colour(_windowStaffListSelectedTab, dropdownIndex); @@ -305,7 +305,7 @@ void window_staff_list_update(rct_window *w) if (w->list_information_type >= 24) { w->list_information_type = 0; } else { - int spriteIndex; + sint32 spriteIndex; rct_peep *peep; widget_invalidate(w, WIDX_STAFF_LIST_HANDYMEN_TAB + _windowStaffListSelectedTab); gWindowMapFlashingFlags |= (1 << 2); @@ -323,12 +323,12 @@ void window_staff_list_update(rct_window *w) * * rct2: 0x006BD990 */ -static void window_staff_list_tooldown(rct_window *w, int widgetIndex, int x, int y) +static void window_staff_list_tooldown(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y) { if (widgetIndex == WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) { - int selectedPeepType = _windowStaffListSelectedTab; + sint32 selectedPeepType = _windowStaffListSelectedTab; - int direction; + sint32 direction; rct_map_element *mapElement; footpath_get_coordinates_from_pos(x, y, &x, &y, &direction, &mapElement); if (x == 0x8000) @@ -338,7 +338,7 @@ static void window_staff_list_tooldown(rct_window *w, int widgetIndex, int x, in uint16 spriteIndex; rct_peep *peep, *closestPeep = NULL; - int closestPeepDistance = INT_MAX; + sint32 closestPeepDistance = INT_MAX; FOR_ALL_STAFF(spriteIndex, peep) { if (peep->staff_type != selectedPeepType) continue; @@ -356,7 +356,7 @@ static void window_staff_list_tooldown(rct_window *w, int widgetIndex, int x, in continue; } - int distance = abs(x - peep->x) + abs(y - peep->y); + sint32 distance = abs(x - peep->x) + abs(y - peep->y); if (distance < closestPeepDistance) { closestPeepDistance = distance; closestPeep = peep; @@ -378,7 +378,7 @@ static void window_staff_list_tooldown(rct_window *w, int widgetIndex, int x, in * * rct2: 0x006BD99B */ -void window_staff_list_toolabort(rct_window *w, int widgetIndex) +void window_staff_list_toolabort(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) { hide_gridlines(); @@ -392,9 +392,9 @@ void window_staff_list_toolabort(rct_window *w, int widgetIndex) * * rct2: 0x006BDBE6 */ -void window_staff_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +void window_staff_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int i, spriteIndex; + sint32 i, spriteIndex; rct_peep *peep; uint16 staffCount = 0; @@ -426,9 +426,9 @@ void window_staff_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, * * rct2: 0x006BDC9A */ -void window_staff_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +void window_staff_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int i, spriteIndex; + sint32 i, spriteIndex; rct_peep *peep; i = y / 10; @@ -452,9 +452,9 @@ void window_staff_list_scrollmousedown(rct_window *w, int scrollIndex, int x, in * * rct2: 0x006BDC6B */ -void window_staff_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +void window_staff_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int i; + sint32 i; i = y / 10; if (i != _windowStaffListHighlightedIndex) { @@ -467,7 +467,7 @@ void window_staff_list_scrollmouseover(rct_window *w, int scrollIndex, int x, in * * rct2: 0x006BDC90 */ -void window_staff_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +void window_staff_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -480,7 +480,7 @@ void window_staff_list_invalidate(rct_window *w) { colour_scheme_update(w); - int pressed_widgets = w->pressed_widgets & 0xFFFFFF0F; + sint32 pressed_widgets = w->pressed_widgets & 0xFFFFFF0F; uint8 tabIndex = _windowStaffListSelectedTab; uint8 widgetIndex = tabIndex + 4; @@ -523,7 +523,7 @@ void window_staff_list_invalidate(rct_window *w) */ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i; + sint32 i; uint8 selectedTab; // Widgets @@ -591,7 +591,7 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_UNIFORM_COLOUR, w, COLOUR_BLACK, w->x + 6, window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].top + w->y + 1); } - int staffTypeStringId = StaffNamingConvention[selectedTab].plural; + sint32 staffTypeStringId = StaffNamingConvention[selectedTab].plural; // If the number of staff for a given type is 1, we use the singular forms of the names if (_window_staff_list_selected_type_count == 1) { staffTypeStringId = StaffNamingConvention[selectedTab].singular; @@ -629,9 +629,9 @@ static const uint32 staffCostumeSprites[] = { * * rct2: 0x006BD785 */ -void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int spriteIndex, y, i, staffOrderIcon_x, staffOrders, staffOrderSprite; + sint32 spriteIndex, y, i, staffOrderIcon_x, staffOrders, staffOrderSprite; uint32 argument_1, argument_2; uint8 selectedTab; rct_peep *peep; @@ -648,7 +648,7 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc } if (y + 11 >= dpi->y) { - int format = (_quick_fire_mode ? STR_RED_STRINGID : STR_BLACK_STRING); + sint32 format = (_quick_fire_mode ? STR_RED_STRINGID : STR_BLACK_STRING); if (i == _windowStaffListHighlightedIndex) { gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1); diff --git a/src/openrct2/windows/text_input.c b/src/openrct2/windows/text_input.c index c3b1ccf670..c3da45c745 100644 --- a/src/openrct2/windows/text_input.c +++ b/src/openrct2/windows/text_input.c @@ -50,9 +50,9 @@ static rct_widget window_text_input_widgets[] = { }; static void window_text_input_close(rct_window *w); -static void window_text_input_mouseup(rct_window *w, int widgetIndex); +static void window_text_input_mouseup(rct_window *w, sint32 widgetIndex); static void window_text_input_update7(rct_window *w); -static void window_text_input_text(int key, rct_window* w); +static void window_text_input_text(sint32 key, rct_window* w); static void window_text_input_invalidate(rct_window *w); static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi); static void draw_ime_composition(rct_drawpixelinfo * dpi, int cursorX, int cursorY); @@ -93,10 +93,10 @@ rct_string_id input_text_description; char text_input[512] = { 0 }; rct_windowclass calling_class = 0; rct_windownumber calling_number = 0; -int calling_widget = 0; -int _maxInputLength; +sint32 calling_widget = 0; +sint32 _maxInputLength; -void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, int maxLength) +void window_text_input_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength) { _maxInputLength = maxLength; @@ -119,13 +119,13 @@ void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id t char wrapped_string[512]; safe_strcpy(wrapped_string, text_input, 512); - int no_lines = 0, font_height = 0; + sint32 no_lines = 0, font_height = 0; // String length needs to add 12 either side of box // +13 for cursor when max length. gfx_wrap_string(wrapped_string, WW - (24 + 13), &no_lines, &font_height); - int height = no_lines * 10 + WH; + sint32 height = no_lines * 10 + WH; // Window will be in the center of the screen rct_window* w = window_create_centred( @@ -155,7 +155,7 @@ void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id t w->colours[2] = call_w->colours[2]; } -void window_text_input_raw_open(rct_window* call_w, int call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, int maxLength) +void window_text_input_raw_open(rct_window* call_w, sint32 call_widget, rct_string_id title, rct_string_id description, utf8string existing_text, sint32 maxLength) { _maxInputLength = maxLength; @@ -180,13 +180,13 @@ void window_text_input_raw_open(rct_window* call_w, int call_widget, rct_string_ char wrapped_string[512]; safe_strcpy(wrapped_string, text_input, 512); - int no_lines = 0, font_height = 0; + sint32 no_lines = 0, font_height = 0; // String length needs to add 12 either side of box // +13 for cursor when max length. gfx_wrap_string(wrapped_string, WW - (24 + 13), &no_lines, &font_height); - int height = no_lines * 10 + WH; + sint32 height = no_lines * 10 + WH; // Window will be in the center of the screen rct_window* w = window_create_centred( @@ -219,7 +219,7 @@ void window_text_input_raw_open(rct_window* call_w, int call_widget, rct_string_ /** * */ -static void window_text_input_mouseup(rct_window *w, int widgetIndex) +static void window_text_input_mouseup(rct_window *w, sint32 widgetIndex) { rct_window *calling_w; @@ -251,10 +251,10 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); - int y = w->y + 25; + sint32 y = w->y + 25; - int no_lines = 0; - int font_height = 0; + sint32 no_lines = 0; + sint32 font_height = 0; gfx_draw_string_centred(dpi, input_text_description, w->x + WW / 2, y, w->colours[1], &TextInputDescriptionArgs); @@ -279,8 +279,8 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi) size_t char_count = 0; uint8 cur_drawn = 0; - int cursorX = 0, cursorY = 0; - for (int line = 0; line <= no_lines; line++) { + sint32 cursorX = 0, cursorY = 0; + for (sint32 line = 0; line <= no_lines; line++) { gfx_draw_string(dpi, wrap_pointer, w->colours[1], w->x + 12, y); size_t string_length = get_string_size(wrap_pointer) - 1; @@ -292,7 +292,7 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi) cursorX = w->x + 13 + gfx_get_string_width(temp_string); cursorY = y; - int width = 6; + sint32 width = 6; if (gTextInput.selection_offset < strlen(text_input)){ // Make a 1 utf8-character wide string for measuring the width // of the currently selected character. @@ -329,7 +329,7 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi) } } -void window_text_input_key(rct_window* w, int key) +void window_text_input_key(rct_window* w, sint32 key) { char new_char = platform_scancode_to_rct_keycode(0xFF&key); @@ -375,13 +375,13 @@ static void window_text_input_invalidate(rct_window *w) char wrapped_string[512]; safe_strcpy(wrapped_string, text_input, 512); - int no_lines = 0, font_height = 0; + sint32 no_lines = 0, font_height = 0; // String length needs to add 12 either side of box // +13 for cursor when max length. gfx_wrap_string(wrapped_string, WW - (24 + 13), &no_lines, &font_height); - int height = no_lines * 10 + WH; + sint32 height = no_lines * 10 + WH; // Change window size if required. if (height != w->height) { diff --git a/src/openrct2/windows/themes.c b/src/openrct2/windows/themes.c index b715bd84d0..9c206d6f13 100644 --- a/src/openrct2/windows/themes.c +++ b/src/openrct2/windows/themes.c @@ -44,19 +44,19 @@ enum { WINDOW_THEMES_TAB_COUNT } WINDOW_THEMES_TAB; -static void window_themes_mouseup(rct_window *w, int widgetIndex); +static void window_themes_mouseup(rct_window *w, sint32 widgetIndex); static void window_themes_resize(rct_window *w); -static void window_themes_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_themes_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_themes_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_themes_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_themes_update(rct_window *w); -static void window_themes_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_themes_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_themes_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_themes_textinput(rct_window *w, int widgetIndex, char *text); -static void window_themes_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_themes_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_themes_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_themes_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_themes_textinput(rct_window *w, sint32 widgetIndex, char *text); +static void window_themes_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_themes_invalidate(rct_window *w); static void window_themes_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static void window_themes_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); static rct_window_event_list window_themes_events = { @@ -143,7 +143,7 @@ static rct_widget window_themes_widgets[] = { { WIDGETS_END }, }; -static int window_themes_tab_animation_loops[] = { +static sint32 window_themes_tab_animation_loops[] = { 32, 32, 1, @@ -154,7 +154,7 @@ static int window_themes_tab_animation_loops[] = { 14, 38 }; -static int window_themes_tab_animation_divisor[] = { +static sint32 window_themes_tab_animation_divisor[] = { 4, 4, 1, @@ -165,7 +165,7 @@ static int window_themes_tab_animation_divisor[] = { 2, 2 }; -static int window_themes_tab_sprites[] = { +static sint32 window_themes_tab_sprites[] = { SPR_TAB_PAINT_0, SPR_TAB_KIOSKS_AND_FACILITIES_0, SPR_TAB_PARK_ENTRANCE, @@ -280,13 +280,13 @@ static void window_themes_init_vars() _selected_tab = WINDOW_THEMES_TAB_SETTINGS; } -static rct_windowclass get_window_class_tab_index(int index) +static rct_windowclass get_window_class_tab_index(sint32 index) { rct_windowclass * classes = window_themes_tab_classes[_selected_tab]; return classes[index]; } -static int get_colour_scheme_tab_count() +static sint32 get_colour_scheme_tab_count() { switch (_selected_tab) { case 1: return sizeof(window_themes_tab_1_classes); @@ -302,8 +302,8 @@ static int get_colour_scheme_tab_count() static void window_themes_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) { - for (int i = 0; i < WINDOW_THEMES_TAB_COUNT; i++) { - int sprite_idx = window_themes_tab_sprites[i]; + for (sint32 i = 0; i < WINDOW_THEMES_TAB_COUNT; i++) { + sint32 sprite_idx = window_themes_tab_sprites[i]; if (_selected_tab == i) sprite_idx += w->frame_no / window_themes_tab_animation_divisor[_selected_tab]; gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_THEMES_SETTINGS_TAB + i].left, w->y + w->widgets[WIDX_THEMES_SETTINGS_TAB + i].top, 0); @@ -354,7 +354,7 @@ void window_themes_open() window->max_height = 107; } -static void window_themes_mouseup(rct_window *w, int widgetIndex) +static void window_themes_mouseup(rct_window *w, sint32 widgetIndex) { size_t activeAvailableThemeIndex; const utf8 * activeThemeName; @@ -460,10 +460,10 @@ static void window_themes_resize(rct_window *w) } } -static void window_themes_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +static void window_themes_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { - short newSelectedTab; - int num_items; + sint16 newSelectedTab; + sint32 num_items; switch (widgetIndex) { case WIDX_THEMES_SETTINGS_TAB: @@ -486,10 +486,10 @@ static void window_themes_mousedown(int widgetIndex, rct_window* w, rct_widget* break; case WIDX_THEMES_PRESETS_DROPDOWN: theme_manager_load_available_themes(); - num_items = (int)theme_manager_get_num_available_themes(); + num_items = (sint32)theme_manager_get_num_available_themes(); widget--; - for (int i = 0; i < num_items; i++) { + for (sint32 i = 0; i < num_items; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)theme_manager_get_available_theme_name(i); } @@ -504,7 +504,7 @@ static void window_themes_mousedown(int widgetIndex, rct_window* w, rct_widget* widget->right - widget->left - 3 ); - dropdown_set_checked((int)theme_manager_get_active_available_theme_index(), true); + dropdown_set_checked((sint32)theme_manager_get_active_available_theme_index(), true); break; case WIDX_THEMES_RCT1_RIDE_LIGHTS: if (theme_get_flags() & UITHEME_FLAG_PREDEFINED) { @@ -536,7 +536,7 @@ static void window_themes_mousedown(int widgetIndex, rct_window* w, rct_widget* } } -static void window_themes_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_themes_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { switch (widgetIndex) { case WIDX_THEMES_LIST: @@ -572,13 +572,13 @@ void window_themes_update(rct_window *w) } -void window_themes_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +void window_themes_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS || _selected_tab == WINDOW_THEMES_TAB_FEATURES) return; - int scrollHeight = get_colour_scheme_tab_count() * _row_height; - int i = scrollHeight - window_themes_widgets[WIDX_THEMES_LIST].bottom + window_themes_widgets[WIDX_THEMES_LIST].top + 21; + sint32 scrollHeight = get_colour_scheme_tab_count() * _row_height; + sint32 i = scrollHeight - window_themes_widgets[WIDX_THEMES_LIST].bottom + window_themes_widgets[WIDX_THEMES_LIST].top + 21; if (i < 0) i = 0; if (i < w->scrolls[0].v_top) { @@ -590,15 +590,15 @@ void window_themes_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height = scrollHeight; } -void window_themes_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +void window_themes_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { if (y / _row_height < get_colour_scheme_tab_count()) { - int y2 = y % _row_height; + sint32 y2 = y % _row_height; _colour_index_1 = y / _row_height; _colour_index_2 = ((x - _button_offset_x) / 12); rct_windowclass wc = get_window_class_tab_index(_colour_index_1); - int numColours = theme_desc_get_num_colours(wc); + sint32 numColours = theme_desc_get_num_colours(wc); if (_colour_index_2 < numColours) { if (x >= _button_offset_x && x < _button_offset_x + 12 * 6 && y2 >= _button_offset_y && y2 < _button_offset_y + 11) { if (theme_get_flags() & UITHEME_FLAG_PREDEFINED) { @@ -633,13 +633,13 @@ void window_themes_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) } } -void window_themes_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +void window_themes_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { //if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS) // return; } -static void window_themes_textinput(rct_window *w, int widgetIndex, char *text) +static void window_themes_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (text == NULL || text[0] == 0) return; @@ -649,8 +649,8 @@ static void window_themes_textinput(rct_window *w, int widgetIndex, char *text) case WIDX_THEMES_RENAME_BUTTON: if (filename_valid_characters(text)) { bool nameTaken = false; - int numAvailableThemes = (int)theme_manager_get_num_available_themes(); - for (int i = 0; i < numAvailableThemes; i++) { + sint32 numAvailableThemes = (sint32)theme_manager_get_num_available_themes(); + for (sint32 i = 0; i < numAvailableThemes; i++) { const utf8 * themeName = theme_manager_get_available_theme_name(i); if (strcmp(themeName, text) == 0) { if (widgetIndex != WIDX_THEMES_RENAME_BUTTON) { @@ -675,7 +675,7 @@ static void window_themes_textinput(rct_window *w, int widgetIndex, char *text) } } -void window_themes_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +void window_themes_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -684,7 +684,7 @@ void window_themes_invalidate(rct_window *w) { colour_scheme_update(w); - int pressed_widgets = w->pressed_widgets & 0xFFFFE00F; + sint32 pressed_widgets = w->pressed_widgets & 0xFFFFE00F; uint8 widgetIndex = _selected_tab + 4; w->pressed_widgets = pressed_widgets | (1 << widgetIndex); @@ -789,9 +789,9 @@ void window_themes_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006BD785 */ -void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int y; + sint32 y; if (_selected_tab == WINDOW_THEMES_TAB_SETTINGS || _selected_tab == WINDOW_THEMES_TAB_FEATURES) return; @@ -800,13 +800,13 @@ void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scroll //gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); gfx_clear(dpi, ColourMapA[w->colours[1]].mid_light); y = 0; - for (int i = 0; i < get_colour_scheme_tab_count(); i++) { + for (sint32 i = 0; i < get_colour_scheme_tab_count(); i++) { if (y > dpi->y + dpi->height) { break; } if (y + _row_height >= dpi->y) { if (i + 1 < get_colour_scheme_tab_count()) { - int colour = w->colours[1]; + sint32 colour = w->colours[1]; if (colour & COLOUR_FLAG_TRANSLUCENT) { translucent_window_palette windowPalette = TranslucentWindowPalettes[BASE_COLOUR(colour)]; @@ -822,7 +822,7 @@ void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scroll } rct_windowclass wc = get_window_class_tab_index(i); - int numColours = theme_desc_get_num_colours(wc); + sint32 numColours = theme_desc_get_num_colours(wc); for (uint8 j = 0; j < numColours; j++) { gfx_draw_string_left(dpi, theme_desc_get_name(wc), NULL, w->colours[1], 2, y + 4); diff --git a/src/openrct2/windows/tile_inspector.c b/src/openrct2/windows/tile_inspector.c index 84d62fd124..57ede3ac4b 100644 --- a/src/openrct2/windows/tile_inspector.c +++ b/src/openrct2/windows/tile_inspector.c @@ -460,7 +460,7 @@ static sint32 windowTileInspectorToolMouseX = 0; static sint32 windowTileInspectorToolMouseY = 0; static sint32 windowTileInspectorToolMapX = 0; static sint32 windowTileInspectorToolMapY = 0; -static int windowTileInspectorElementCount = 0; +static sint32 windowTileInspectorElementCount = 0; static bool windowTileInspectorApplyToAll = false; static bool windowTileInspectorElementCopied = false; static rct_map_element tileInspectorCopiedElement; @@ -469,32 +469,32 @@ static rct_map_element* window_tile_inspector_get_selected_element(rct_window *w static void window_tile_inspector_load_tile(rct_window* w); static void window_tile_inspector_insert_corrupt_element(rct_window *w); static void window_tile_inspector_swap_elements(sint16 first, sint16 second); -static void window_tile_inspector_remove_element(int index); -static void window_tile_inspector_rotate_element(int index); +static void window_tile_inspector_remove_element(sint32 index); +static void window_tile_inspector_rotate_element(sint32 index); static void window_tile_inspector_sort_elements(rct_window *w); static void window_tile_inspector_copy_element(rct_window *w); static void window_tile_inspector_paste_element(rct_window *w); -static void window_tile_inspector_surface_toggle_corner(rct_map_element *mapElement, int cornerIndex); +static void window_tile_inspector_surface_toggle_corner(rct_map_element *mapElement, sint32 cornerIndex); static void window_tile_inspector_track_block_height_offset(rct_map_element *mapElement, uint8 offset); static void window_tile_inspector_track_block_set_lift(rct_map_element *mapElement, bool chain); -static void window_tile_inspector_quarter_tile_set(rct_map_element *const mapElement, const int index); +static void window_tile_inspector_quarter_tile_set(rct_map_element *const mapElement, const sint32 index); -static void window_tile_inspector_mouseup(rct_window *w, int widgetIndex); +static void window_tile_inspector_mouseup(rct_window *w, sint32 widgetIndex); static void window_tile_inspector_resize(rct_window *w); -static void window_tile_inspector_mousedown(int widgetIndex, rct_window *w, rct_widget* widget); +static void window_tile_inspector_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget); static void window_tile_inspector_update(rct_window *w); -static void window_tile_inspector_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void window_tile_inspector_tool_update(rct_window* w, int widgetIndex, int x, int y); -static void window_tile_inspector_update_selected_tile(rct_window *w, int x, int y); -static void window_tile_inspector_tool_down(rct_window* w, int widgetIndex, int x, int y); -static void window_tile_inspector_tool_drag(rct_window* w, int widgetIndex, int x, int y); -static void window_tile_inspector_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_tile_inspector_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_tile_inspector_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); +static void window_tile_inspector_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void window_tile_inspector_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_tile_inspector_update_selected_tile(rct_window *w, sint32 x, sint32 y); +static void window_tile_inspector_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_tile_inspector_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_tile_inspector_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_tile_inspector_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_tile_inspector_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); static void window_tile_inspector_invalidate(rct_window *w); static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); -static void window_tile_inspector_set_page(rct_window *w, const int page); +static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); +static void window_tile_inspector_set_page(rct_window *w, const sint32 page); static void window_tile_inspector_auto_set_buttons(rct_window *w); static rct_window_event_list windowTileInspectorEvents = { @@ -601,7 +601,7 @@ static rct_map_element* window_tile_inspector_get_selected_element(rct_window *w static void window_tile_inspector_load_tile(rct_window* w) { rct_map_element *element = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); - int numItems = 0; + sint32 numItems = 0; do { numItems++; } while (!map_element_is_last_for_tile(element++)); @@ -633,14 +633,14 @@ static void window_tile_inspector_insert_corrupt_element(rct_window *w) // Move the corrupt element up until the selected list item is reached // this way it's placed under the selected element, even when there are multiple elements with the same base height - for (int i = 0; i < w->selected_list_item; i++) { + for (sint32 i = 0; i < w->selected_list_item; i++) { window_tile_inspector_swap_elements(i, i + 1); } map_invalidate_tile_full(windowTileInspectorTileX << 5, windowTileInspectorTileY << 5); } -static void window_tile_inspector_remove_element(int index) +static void window_tile_inspector_remove_element(sint32 index) { assert(index < windowTileInspectorElementCount); rct_map_element *const mapElement = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY) + index; @@ -649,7 +649,7 @@ static void window_tile_inspector_remove_element(int index) map_invalidate_tile_full(windowTileInspectorTileX << 5, windowTileInspectorTileY << 5); } -static void window_tile_inspector_rotate_element(int index) +static void window_tile_inspector_rotate_element(sint32 index) { uint8 newRotation, pathEdges, pathCorners; @@ -722,8 +722,8 @@ static void window_tile_inspector_sort_elements(rct_window *w) const rct_map_element *const firstElement = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); // Bubble sort - for (int loopStart = 1; loopStart < windowTileInspectorElementCount; loopStart++) { - int currentId = loopStart; + for (sint32 loopStart = 1; loopStart < windowTileInspectorElementCount; loopStart++) { + sint32 currentId = loopStart; const rct_map_element *currentElement = firstElement + currentId; const rct_map_element *otherElement = currentElement - 1; @@ -766,7 +766,7 @@ static void window_tile_inspector_paste_element(rct_window *w) w->selected_list_item = (sint16)(pastedElement - mapElement); } -static void window_tile_inspector_surface_toggle_corner(rct_map_element *mapElement, int cornerIndex) +static void window_tile_inspector_surface_toggle_corner(rct_map_element *mapElement, sint32 cornerIndex) { const uint8 originalSlope = mapElement->properties.surface.slope; const bool diagonal = (originalSlope & 0x10) >> 4; @@ -1002,12 +1002,12 @@ static void window_tile_inspector_track_block_set_lift(rct_map_element *mapEleme } } -static void window_tile_inspector_quarter_tile_set(rct_map_element *const mapElement, const int index) +static void window_tile_inspector_quarter_tile_set(rct_map_element *const mapElement, const sint32 index) { // index is widget index relative to WIDX_SCENERY_CHECK_QUARTER_N, so a value from 0-3 assert(index >= 0 && index < 4); - const int clickedDirection = (index - get_current_rotation()) & 3; + const sint32 clickedDirection = (index - get_current_rotation()) & 3; // Set quadrant index mapElement->type &= ~MAP_ELEMENT_QUADRANT_MASK; @@ -1020,7 +1020,7 @@ static void window_tile_inspector_quarter_tile_set(rct_map_element *const mapEle map_invalidate_tile_full(windowTileInspectorTileX << 5, windowTileInspectorTileY << 5); } -static void window_tile_inspector_mouseup(rct_window *w, int widgetIndex) +static void window_tile_inspector_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -1374,7 +1374,7 @@ static void window_tile_inspector_resize(rct_window *w) } } -static void window_tile_inspector_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +static void window_tile_inspector_mousedown(sint32 widgetIndex, rct_window *w, rct_widget* widget) { switch (w->page) { case PAGE_FENCE: @@ -1421,7 +1421,7 @@ static void window_tile_inspector_update(rct_window *w) window_close(w); } -static void window_tile_inspector_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_tile_inspector_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) { return; @@ -1450,15 +1450,15 @@ static void window_tile_inspector_dropdown(rct_window *w, int widgetIndex, int d } } -static void window_tile_inspector_tool_update(rct_window* w, int widgetIndex, int x, int y) +static void window_tile_inspector_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { map_invalidate_selection_rect(); gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE; - short mapX = x; - short mapY = y; - int direction; + sint16 mapX = x; + sint16 mapY = y; + sint32 direction; screen_pos_to_map_pos(&mapX, &mapY, &direction); if (mapX != MAP_LOCATION_NULL) { gMapSelectPositionA.x = gMapSelectPositionB.x = mapX; @@ -1476,7 +1476,7 @@ static void window_tile_inspector_tool_update(rct_window* w, int widgetIndex, in map_invalidate_selection_rect(); } -static void window_tile_inspector_update_selected_tile(rct_window *w, int x, int y) +static void window_tile_inspector_update_selected_tile(rct_window *w, sint32 x, sint32 y) { //if call matches previous mouse coordinates, do not continue. if (x == windowTileInspectorToolMouseX && y == windowTileInspectorToolMouseY) { @@ -1485,9 +1485,9 @@ static void window_tile_inspector_update_selected_tile(rct_window *w, int x, int windowTileInspectorToolMouseX = x; windowTileInspectorToolMouseY = y; - short mapX = x; - short mapY = y; - int direction; + sint32 mapX = x; + sint32 mapY = y; + sint32 direction; screen_pos_to_map_pos(&mapX, &mapY, &direction); if (mapX == MAP_LOCATION_NULL) { return; @@ -1508,23 +1508,23 @@ static void window_tile_inspector_update_selected_tile(rct_window *w, int x, int window_tile_inspector_auto_set_buttons(w); } -static void window_tile_inspector_tool_down(rct_window* w, int widgetIndex, int x, int y) +static void window_tile_inspector_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { window_tile_inspector_update_selected_tile(w, x, y); } -static void window_tile_inspector_tool_drag(rct_window* w, int widgetIndex, int x, int y) +static void window_tile_inspector_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { window_tile_inspector_update_selected_tile(w, x, y); } -static void window_tile_inspector_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_tile_inspector_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { *width = WW - 30; *height = windowTileInspectorElementCount * LIST_ITEM_HEIGHT; } -static void window_tile_inspector_set_page(rct_window *w, const int page) +static void window_tile_inspector_set_page(rct_window *w, const sint32 page) { w->page = page; w->widgets = tileInspectorWidgets[page]; @@ -1576,11 +1576,11 @@ static void window_tile_inspector_auto_set_buttons(rct_window *w) } // switch page } -static void window_tile_inspector_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_tile_inspector_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { // Because the list items are displayed in reverse order, subtract the calculated index from the amount of elements const sint16 index = windowTileInspectorElementCount - (y - 1) / LIST_ITEM_HEIGHT - 1; - int page; + sint32 page; if (index < 0 || index >= windowTileInspectorElementCount) { w->selected_list_item = -1; page = 0; @@ -1600,7 +1600,7 @@ static void window_tile_inspector_scrollmousedown(rct_window *w, int scrollIndex window_invalidate(w); } -static void window_tile_inspector_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_tile_inspector_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { sint16 index = windowTileInspectorElementCount - (y - 1) / LIST_ITEM_HEIGHT - 1; if (index < 0 || index >= windowTileInspectorElementCount) @@ -1640,7 +1640,7 @@ static void window_tile_inspector_invalidate(rct_window *w) // Using a switch, because I don't think giving each page their own callbacks is // needed here, as only the mouseup and invalidate functions are different. - const int propertiesAnchor = w->widgets[WIDX_GROUPBOX_PROPERTIES].top; + const sint32 propertiesAnchor = w->widgets[WIDX_GROUPBOX_PROPERTIES].top; rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); switch (w->page) { @@ -1859,8 +1859,8 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) if (w->selected_list_item != -1) { // X and Y of first element in detail box - int x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; - int y = w->y + w->widgets[WIDX_GROUPBOX_DETAILS].top + 14; + sint32 x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; + sint32 y = w->y + w->widgets[WIDX_GROUPBOX_DETAILS].top + 14; // Get map element rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); @@ -1873,7 +1873,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_TERAIN, &terrainNameId, COLOUR_DARK_GREEN, x, y); // Edge texture name - int idx = map_element_get_terrain_edge(mapElement); + sint32 idx = map_element_get_terrain_edge(mapElement); openrct2_assert(idx < countof(terrainEdgeTypeStringIds), "Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx); rct_string_id terrainEdgeNameId = terrainEdgeTypeStringIds[map_element_get_terrain_edge(mapElement)]; gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, COLOUR_DARK_GREEN, x, y + 11); @@ -1888,7 +1888,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_OWNERSHIP, &landOwnership, COLOUR_DARK_GREEN, x, y + 22); // Water level - int waterLevel = mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + sint32 waterLevel = mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, &waterLevel, COLOUR_DARK_GREEN, x, y + 33); // Properties @@ -1899,7 +1899,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_SURFACE_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Raised corners @@ -1932,7 +1932,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_PATH_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Path connections @@ -1966,7 +1966,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_TRACK_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -2000,7 +2000,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_SCENERY_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Quarter tile @@ -2022,8 +2022,8 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) if (mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE) { // Park entrance ID - int middleX = windowTileInspectorTileX << 5; - int middleY = windowTileInspectorTileY << 5; + sint32 middleX = windowTileInspectorTileX << 5; + sint32 middleY = windowTileInspectorTileY << 5; // TODO: Make this work with Left/Right park entrance parts sint16 parkEntranceIndex = park_get_entrance_index(middleX, middleY, mapElement->base_height * 8); gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, &parkEntranceIndex, COLOUR_DARK_GREEN, x, y + 11); @@ -2058,7 +2058,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_ENTRANCE_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -2085,7 +2085,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_FENCE_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Slope label @@ -2109,7 +2109,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Banner info rct_scenery_entry *largeSceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); if (largeSceneryEntry->large_scenery.var_11 != 0xFF) { - const int bannerIndex = (mapElement->type & 0xC0) | + const sint32 bannerIndex = (mapElement->type & 0xC0) | ((mapElement->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | ((mapElement->properties.scenerymultiple.colour[1] & 0xE0) >> 5); //window_sign_open(bannerIndex); @@ -2126,7 +2126,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_LARGE_SCENERY_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -2151,7 +2151,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Blocked paths @@ -2170,7 +2170,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Current base height x = w->x + w->widgets[WIDX_CORRUPT_SPINNER_HEIGHT].left + 3; - int baseHeight = mapElement->base_height; + sint32 baseHeight = mapElement->base_height; gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -2178,10 +2178,10 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) } } -static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int y = LIST_ITEM_HEIGHT * (windowTileInspectorElementCount - 1); - int i = 0; + sint32 y = LIST_ITEM_HEIGHT * (windowTileInspectorElementCount - 1); + sint32 i = 0; char buffer[256]; if (!windowTileInspectorTileSelected) @@ -2191,13 +2191,13 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; do { - int type = map_element_get_type(mapElement); + sint32 type = map_element_get_type(mapElement); char *typeName; - int baseHeight = mapElement->base_height; - int clearanceHeight = mapElement->clearance_height; + sint32 baseHeight = mapElement->base_height; + sint32 clearanceHeight = mapElement->clearance_height; // Fill colour for current list element - const int listWidth = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; + const sint32 listWidth = w->widgets[WIDX_LIST].right - w->widgets[WIDX_LIST].left; if (i == w->selected_list_item) // Currently selected element gfx_fill_rect(dpi, 0, y, listWidth, y + LIST_ITEM_HEIGHT - 1, ColourMapA[w->colours[1]].darker | 0x1000000); else if (i == windowTileInspectorHighlightedIndex) // Hovering @@ -2253,7 +2253,7 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * } // Undo relative scroll offset, but keep the 3 pixel padding - int x = -w->widgets[WIDX_LIST].left; + sint32 x = -w->widgets[WIDX_LIST].left; const bool ghost = (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) != 0; const bool broken = (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) != 0; const bool last = (mapElement->flags & MAP_ELEMENT_FLAG_LAST_TILE) != 0; diff --git a/src/openrct2/windows/title_command_editor.c b/src/openrct2/windows/title_command_editor.c index c5a1908be0..5be4b73e97 100644 --- a/src/openrct2/windows/title_command_editor.c +++ b/src/openrct2/windows/title_command_editor.c @@ -72,7 +72,7 @@ enum WINDOW_WATER_WIDGET_IDX { #define WHA ((WW-WS*2)/2) static bool _window_title_command_editor_insert; -static int _window_title_command_editor_index; +static sint32 _window_title_command_editor_index; #define BUF_SIZE 50 static char textbox1Buffer[BUF_SIZE]; static char textbox2Buffer[BUF_SIZE]; @@ -101,16 +101,16 @@ static rct_widget window_title_command_editor_widgets[] = { { WIDGETS_END }, }; -static void window_title_command_editor_mouseup(rct_window *w, int widgetIndex); -static void window_title_command_editor_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_title_command_editor_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_title_command_editor_mouseup(rct_window *w, sint32 widgetIndex); +static void window_title_command_editor_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_title_command_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_title_command_editor_update(rct_window *w); static void window_title_command_editor_invalidate(rct_window *w); static void window_title_command_editor_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_title_command_editor_textinput(rct_window *w, int widgetIndex, char *text); +static void window_title_command_editor_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_title_command_editor_inputsize(rct_window *w); -static int get_command_info_index(int index); -static TITLE_COMMAND_ORDER get_command_info(int index); +static sint32 get_command_info_index(sint32 index); +static TITLE_COMMAND_ORDER get_command_info(sint32 index); static rct_xy16 get_location(); static uint8 get_zoom(); @@ -145,18 +145,18 @@ static rct_window_event_list window_title_command_editor_events = { NULL }; -static int get_command_info_index(int index) +static sint32 get_command_info_index(sint32 index) { - for (int i = 0; i < NUM_COMMANDS; i++) { + for (sint32 i = 0; i < NUM_COMMANDS; i++) { if (window_title_command_editor_orders[i].command == index) return i; } return 0; } -static TITLE_COMMAND_ORDER get_command_info(int index) +static TITLE_COMMAND_ORDER get_command_info(sint32 index) { - for (int i = 0; i < NUM_COMMANDS; i++) { + for (sint32 i = 0; i < NUM_COMMANDS; i++) { if (window_title_command_editor_orders[i].command == index) return window_title_command_editor_orders[i]; } @@ -168,7 +168,7 @@ static rct_xy16 get_location() rct_xy16 mapCoord = { 0 }; rct_window *w = window_get_main(); if (w != NULL) { - int interactionType; + sint32 interactionType; rct_map_element *mapElement; get_map_coordinates_from_pos(w->viewport->view_width / 2, w->viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, &interactionType, &mapElement, NULL); @@ -192,7 +192,7 @@ static uint8 get_zoom() return zoom; } -void window_title_command_editor_open(TitleSequence * sequence, int index, bool insert) +void window_title_command_editor_open(TitleSequence * sequence, sint32 index, bool insert) { _sequence = sequence; @@ -248,7 +248,7 @@ void window_title_command_editor_open(TitleSequence * sequence, int index, bool } } -static void window_title_command_editor_mouseup(rct_window *w, int widgetIndex) +static void window_title_command_editor_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -302,14 +302,14 @@ static void window_title_command_editor_mouseup(rct_window *w, int widgetIndex) } } -static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +static void window_title_command_editor_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { widget--; switch (widgetIndex) { case WIDX_COMMAND_DROPDOWN: { - int numItems = NUM_COMMANDS; - for (int i = 0; i < numItems; i++) { + sint32 numItems = NUM_COMMANDS; + for (sint32 i = 0; i < numItems; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = window_title_command_editor_orders[i].nameStringId; } @@ -328,8 +328,8 @@ static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w } case WIDX_INPUT_DROPDOWN: if (command.Type == TITLE_SCRIPT_SPEED) { - int numItems = 4; - for (int i = 0; i < numItems; i++) { + sint32 numItems = 4; + for (sint32 i = 0; i < numItems; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = SpeedNames[i]; } @@ -345,8 +345,8 @@ static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w dropdown_set_checked(command.Speed - 1, true); } else if (command.Type == TITLE_SCRIPT_LOAD) { - int numItems = (int)_sequence->NumSaves; - for (int i = 0; i < numItems; i++) { + sint32 numItems = (sint32)_sequence->NumSaves; + for (sint32 i = 0; i < numItems; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)_sequence->Saves[i]; } @@ -366,7 +366,7 @@ static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w } } -static void window_title_command_editor_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_title_command_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -430,10 +430,10 @@ static void window_title_command_editor_dropdown(rct_window *w, int widgetIndex, } } -static void window_title_command_editor_textinput(rct_window * w, int widgetIndex, char * text) +static void window_title_command_editor_textinput(rct_window * w, sint32 widgetIndex, char * text) { char * end; - int value = strtol(widgetIndex != WIDX_TEXTBOX_Y ? textbox1Buffer : textbox2Buffer, &end, 10); + sint32 value = strtol(widgetIndex != WIDX_TEXTBOX_Y ? textbox1Buffer : textbox2Buffer, &end, 10); if (value < 0) value = 0; if (value > 255) value = 255; switch (widgetIndex) { diff --git a/src/openrct2/windows/title_editor.c b/src/openrct2/windows/title_editor.c index 96ad35f162..29ff185bf1 100644 --- a/src/openrct2/windows/title_editor.c +++ b/src/openrct2/windows/title_editor.c @@ -45,26 +45,26 @@ enum WINDOW_TITLE_EDITOR_TAB { }; static void window_title_editor_close(rct_window *w); -static void window_title_editor_mouseup(rct_window *w, int widgetIndex); +static void window_title_editor_mouseup(rct_window *w, sint32 widgetIndex); static void window_title_editor_resize(rct_window *w); -static void window_title_editor_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_title_editor_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); +static void window_title_editor_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_title_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); static void window_title_editor_update(rct_window *w); -static void window_title_editor_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_title_editor_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_title_editor_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_title_editor_textinput(rct_window *w, int widgetIndex, char *text); -static void window_title_editor_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_title_editor_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_title_editor_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_title_editor_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_title_editor_textinput(rct_window *w, sint32 widgetIndex, char *text); +static void window_title_editor_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_title_editor_invalidate(rct_window *w); static void window_title_editor_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static void window_title_editor_scrollpaint_saves(rct_window *w, rct_drawpixelinfo *dpi); static void window_title_editor_scrollpaint_commands(rct_window *w, rct_drawpixelinfo *dpi); static void window_title_editor_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); static void window_title_editor_load_sequence(size_t index); static ITitleSequencePlayer * window_title_editor_get_player(); static bool window_title_editor_check_can_edit(); -static void window_title_editor_add_park_callback(int result, const utf8 * path); +static void window_title_editor_add_park_callback(sint32 result, const utf8 * path); static void window_title_editor_rename_park(size_t index, const utf8 * name); static rct_window_event_list window_title_editor_events = { @@ -203,23 +203,23 @@ static utf8 * _renameSavePath = NULL; static sint16 _window_title_editor_highlighted_index; -static int window_title_editor_tab_animation_loops[] = { +static sint32 window_title_editor_tab_animation_loops[] = { 64, 1, 28 }; -static int window_title_editor_tab_animation_divisor[] = { +static sint32 window_title_editor_tab_animation_divisor[] = { 4, 1, 4 }; -static int window_title_editor_tab_sprites[] = { +static sint32 window_title_editor_tab_sprites[] = { SPR_TAB_RIDE_0, SPR_FLOPPY, SPR_TAB_STATS_0 }; -void window_title_editor_open(int tab) +void window_title_editor_open(sint32 tab) { rct_window* window; @@ -295,7 +295,7 @@ static void window_title_editor_close(rct_window *w) _renameSavePath = NULL; } -static void window_title_editor_mouseup(rct_window *w, int widgetIndex) +static void window_title_editor_mouseup(rct_window *w, sint32 widgetIndex) { bool commandEditorOpen = (window_find_by_class(WC_TITLE_COMMAND_EDITOR) != NULL); switch (widgetIndex) { @@ -378,7 +378,7 @@ static void window_title_editor_mouseup(rct_window *w, int widgetIndex) if (w->selected_list_item != -1) { window_title_command_editor_open(_editingTitleSequence, w->selected_list_item + 1, true); } else { - window_title_command_editor_open(_editingTitleSequence, (int)_editingTitleSequence->NumCommands, true); + window_title_command_editor_open(_editingTitleSequence, (sint32)_editingTitleSequence->NumCommands, true); } } break; @@ -392,7 +392,7 @@ static void window_title_editor_mouseup(rct_window *w, int widgetIndex) case WIDX_TITLE_EDITOR_DELETE: if (window_title_editor_check_can_edit()) { if (w->selected_list_item != -1 && w->selected_list_item < (sint16)_editingTitleSequence->NumCommands) { - for (int i = w->selected_list_item; i < (sint16)_editingTitleSequence->NumCommands - 1; i++) { + for (sint32 i = w->selected_list_item; i < (sint16)_editingTitleSequence->NumCommands - 1; i++) { _editingTitleSequence->Commands[i] = _editingTitleSequence->Commands[i + 1]; } _editingTitleSequence->NumCommands--; @@ -481,14 +481,14 @@ static void window_title_editor_resize(rct_window *w) } } -static void window_title_editor_mousedown(int widgetIndex, rct_window* w, rct_widget* widget) +static void window_title_editor_mousedown(sint32 widgetIndex, rct_window* w, rct_widget* widget) { switch (widgetIndex) { case WIDX_TITLE_EDITOR_PRESETS_TAB: case WIDX_TITLE_EDITOR_SAVES_TAB: case WIDX_TITLE_EDITOR_SCRIPT_TAB: { - int newSelectedTab = widgetIndex - WIDX_TITLE_EDITOR_PRESETS_TAB; + sint32 newSelectedTab = widgetIndex - WIDX_TITLE_EDITOR_PRESETS_TAB; if (w->selected_tab != newSelectedTab) { w->selected_tab = newSelectedTab; w->selected_list_item = -1; @@ -504,8 +504,8 @@ static void window_title_editor_mousedown(int widgetIndex, rct_window* w, rct_wi if (window_find_by_class(WC_TITLE_COMMAND_EDITOR) != NULL) { window_error_open(STR_TITLE_EDITOR_ERR_CANT_CHANGE_WHILE_EDITOR_IS_OPEN, STR_NONE); } else { - int numItems = (int)title_sequence_manager_get_count(); - for (int i = 0; i < numItems; i++) { + sint32 numItems = (sint32)title_sequence_manager_get_count(); + for (sint32 i = 0; i < numItems; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)title_sequence_manager_get_name(i); } @@ -519,13 +519,13 @@ static void window_title_editor_mousedown(int widgetIndex, rct_window* w, rct_wi DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3); - dropdown_set_checked((int)_selectedTitleSequence, true); + dropdown_set_checked((sint32)_selectedTitleSequence, true); } break; } } -static void window_title_editor_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_title_editor_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (dropdownIndex == -1) return; @@ -551,7 +551,7 @@ static void window_title_editor_update(rct_window *w) widget_invalidate(w, WIDX_TITLE_EDITOR_PRESETS_TAB + w->selected_tab); } -static void window_title_editor_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_title_editor_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { size_t lineCount = 1; if (w->selected_tab == WINDOW_TITLE_EDITOR_TAB_SAVES) { @@ -560,8 +560,8 @@ static void window_title_editor_scrollgetsize(rct_window *w, int scrollIndex, in lineCount = _editingTitleSequence->NumCommands; } - *height = (int)(lineCount * ROW_HEIGHT); - int i = *height - window_title_editor_widgets[WIDX_TITLE_EDITOR_LIST].bottom + window_title_editor_widgets[WIDX_TITLE_EDITOR_LIST].top + 21; + *height = (sint32)(lineCount * ROW_HEIGHT); + sint32 i = *height - window_title_editor_widgets[WIDX_TITLE_EDITOR_LIST].bottom + window_title_editor_widgets[WIDX_TITLE_EDITOR_LIST].top + 21; if (i < 0) { i = 0; } @@ -573,19 +573,19 @@ static void window_title_editor_scrollgetsize(rct_window *w, int scrollIndex, in *width = SCROLL_WIDTH; } -static void window_title_editor_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_title_editor_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index = y / ROW_HEIGHT; + sint32 index = y / ROW_HEIGHT; w->selected_list_item = -1; switch (w->selected_tab) { case WINDOW_TITLE_EDITOR_TAB_SAVES: - if (index < (int)_editingTitleSequence->NumSaves) { + if (index < (sint32)_editingTitleSequence->NumSaves) { w->selected_list_item = index; widget_invalidate(w, WIDX_TITLE_EDITOR_LIST); } break; case WINDOW_TITLE_EDITOR_TAB_SCRIPT: - if (index < (int)_editingTitleSequence->NumCommands) { + if (index < (sint32)_editingTitleSequence->NumCommands) { w->selected_list_item = index; widget_invalidate(w, WIDX_TITLE_EDITOR_LIST); } @@ -593,23 +593,23 @@ static void window_title_editor_scrollmousedown(rct_window *w, int scrollIndex, } } -static void window_title_editor_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_title_editor_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { - int index = y / ROW_HEIGHT; + sint32 index = y / ROW_HEIGHT; switch (w->selected_tab) { case WINDOW_TITLE_EDITOR_TAB_SAVES: - if (index < (int)_editingTitleSequence->NumSaves) + if (index < (sint32)_editingTitleSequence->NumSaves) _window_title_editor_highlighted_index = (sint16)index; break; case WINDOW_TITLE_EDITOR_TAB_SCRIPT: - if (index < (int)_editingTitleSequence->NumCommands) + if (index < (sint32)_editingTitleSequence->NumCommands) _window_title_editor_highlighted_index = (sint16)index; break; } widget_invalidate(w, WIDX_TITLE_EDITOR_LIST); } -static void window_title_editor_textinput(rct_window *w, int widgetIndex, char *text) +static void window_title_editor_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (str_is_null_or_empty(text)) { return; @@ -646,7 +646,7 @@ static void window_title_editor_textinput(rct_window *w, int widgetIndex, char * } } -static void window_title_editor_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_title_editor_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -655,7 +655,7 @@ static void window_title_editor_invalidate(rct_window *w) { colour_scheme_update(w); - int pressed_widgets = w->pressed_widgets & 0xFFFFFF8F; + sint32 pressed_widgets = w->pressed_widgets & 0xFFFFFF8F; uint8 widgetIndex = w->selected_tab + 4; w->pressed_widgets = pressed_widgets | (1 << widgetIndex); @@ -780,7 +780,7 @@ static void window_title_editor_paint(rct_window *w, rct_drawpixelinfo *dpi) } } -static void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); switch (w->selected_tab) { @@ -800,9 +800,9 @@ static void window_title_editor_scrollpaint_saves(rct_window *w, rct_drawpixelin // sint32 position = title_sequence_player_get_current_position(player); // const TitleCommand * command = &_editingTitleSequence->Commands[position]; - int x = 0; - int y = 0; - for (int i = 0; i < (int)_editingTitleSequence->NumSaves; i++, y += ROW_HEIGHT) { + sint32 x = 0; + sint32 y = 0; + for (sint32 i = 0; i < (sint32)_editingTitleSequence->NumSaves; i++, y += ROW_HEIGHT) { bool selected = false; bool hover = false; if (i == w->selected_list_item) { @@ -836,9 +836,9 @@ static void window_title_editor_scrollpaint_commands(rct_window *w, rct_drawpixe position = title_sequence_player_get_current_position(player); } - int x = 0; - int y = 0; - for (int i = 0; i < (int)_editingTitleSequence->NumCommands; i++, y += ROW_HEIGHT) { + sint32 x = 0; + sint32 y = 0; + for (sint32 i = 0; i < (sint32)_editingTitleSequence->NumCommands; i++, y += ROW_HEIGHT) { TitleCommand * command = &_editingTitleSequence->Commands[i]; bool selected = false; bool hover = false; @@ -846,7 +846,7 @@ static void window_title_editor_scrollpaint_commands(rct_window *w, rct_drawpixe if (i == w->selected_list_item) { selected = true; gfx_fill_rect(dpi, x, y, x + SCROLL_WIDTH + 100, y + ROW_HEIGHT - 1, ColourMapA[w->colours[1]].dark); - } else if (i == (int)_window_title_editor_highlighted_index || i == position) { + } else if (i == (sint32)_window_title_editor_highlighted_index || i == position) { hover = true; gfx_fill_rect(dpi, x, y, x + SCROLL_WIDTH + 100, y + ROW_HEIGHT - 1, ColourMapA[w->colours[1]].mid_dark); } else if (i & 1) { @@ -922,10 +922,10 @@ static void window_title_editor_scrollpaint_commands(rct_window *w, rct_drawpixe static void window_title_editor_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) { - for (int i = 0; i < WINDOW_TITLE_EDITOR_TAB_COUNT; i++) { - int x = 0; - int y = 0; - int spriteId = window_title_editor_tab_sprites[i]; + for (sint32 i = 0; i < WINDOW_TITLE_EDITOR_TAB_COUNT; i++) { + sint32 x = 0; + sint32 y = 0; + sint32 spriteId = window_title_editor_tab_sprites[i]; if (w->selected_tab == i) { spriteId += w->frame_no / window_title_editor_tab_animation_divisor[w->selected_tab]; } @@ -992,7 +992,7 @@ static bool save_filename_exists(const utf8 * filename) return false; } -static void window_title_editor_add_park_callback(int result, const utf8 * path) +static void window_title_editor_add_park_callback(sint32 result, const utf8 * path) { uint32 extension = get_file_extension_type(path); if (extension != FILE_EXTENSION_SV4 && extension != FILE_EXTENSION_SV6) { diff --git a/src/openrct2/windows/title_exit.c b/src/openrct2/windows/title_exit.c index 66360bd3ee..ac7823f0c5 100644 --- a/src/openrct2/windows/title_exit.c +++ b/src/openrct2/windows/title_exit.c @@ -30,7 +30,7 @@ static rct_widget window_title_exit_widgets[] = { }; static void window_title_exit_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_title_exit_mouseup(rct_window *w, int widgetIndex); +static void window_title_exit_mouseup(rct_window *w, sint32 widgetIndex); static void window_title_exit_invalidate(rct_window *w); static rct_window_event_list window_title_exit_events = { @@ -88,7 +88,7 @@ void window_title_exit_open() * * rct2: 0x0066B83C */ -static void window_title_exit_mouseup(rct_window *w, int widgetIndex) +static void window_title_exit_mouseup(rct_window *w, sint32 widgetIndex) { if (gIntroState != INTRO_STATE_NONE) return; diff --git a/src/openrct2/windows/title_logo.c b/src/openrct2/windows/title_logo.c index c033b1996d..5a5e27d5cc 100644 --- a/src/openrct2/windows/title_logo.c +++ b/src/openrct2/windows/title_logo.c @@ -76,8 +76,8 @@ void window_title_logo_open() */ static void window_title_logo_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x = 2; - int y = 2; + sint32 x = 2; + sint32 y = 2; gfx_draw_sprite(dpi, SPR_G2_LOGO, w->x + x, w->y + y, 0); gfx_draw_sprite(dpi, SPR_G2_TITLE, w->x + x + 104, w->y + y + 18, 0); } diff --git a/src/openrct2/windows/title_menu.c b/src/openrct2/windows/title_menu.c index a1dd008f24..cd82e98a43 100644 --- a/src/openrct2/windows/title_menu.c +++ b/src/openrct2/windows/title_menu.c @@ -43,10 +43,10 @@ static rct_widget window_title_menu_widgets[] = { { WIDGETS_END }, }; -static void window_title_menu_mouseup(rct_window *w, int widgetIndex); -static void window_title_menu_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_title_menu_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void window_title_menu_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId); +static void window_title_menu_mouseup(rct_window *w, sint32 widgetIndex); +static void window_title_menu_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_title_menu_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void window_title_menu_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId); static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_title_menu_invalidate(rct_window *w); @@ -108,8 +108,8 @@ void window_title_menu_open() (1 << WIDX_GAME_TOOLS) ); - int i = 0; - int x = 0; + sint32 i = 0; + sint32 x = 0; for (rct_widget *widget = window->widgets; widget->type != WWT_LAST; widget++) { if (widget_is_enabled(window, i)) { widget->left = x; @@ -134,7 +134,7 @@ static void window_title_menu_scenarioselect_callback(const utf8 *path) } } -static void window_title_menu_mouseup(rct_window *w, int widgetIndex) +static void window_title_menu_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_START_NEW_GAME: @@ -149,7 +149,7 @@ static void window_title_menu_mouseup(rct_window *w, int widgetIndex) } } -static void window_title_menu_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_title_menu_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { if (widgetIndex == WIDX_GAME_TOOLS) { gDropdownItemsFormat[0] = STR_SCENARIO_EDITOR; @@ -167,7 +167,7 @@ static void window_title_menu_mousedown(int widgetIndex, rct_window*w, rct_widge } } -static void window_title_menu_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_title_menu_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { if (widgetIndex == WIDX_GAME_TOOLS) { switch (dropdownIndex) { @@ -187,7 +187,7 @@ static void window_title_menu_dropdown(rct_window *w, int widgetIndex, int dropd } } -static void window_title_menu_cursor(rct_window *w, int widgetIndex, int x, int y, int *cursorId) +static void window_title_menu_cursor(rct_window *w, sint32 widgetIndex, sint32 x, sint32 y, sint32 *cursorId) { gTooltipTimeout = 2000; } diff --git a/src/openrct2/windows/title_options.c b/src/openrct2/windows/title_options.c index a6992a7d39..3471b43c97 100644 --- a/src/openrct2/windows/title_options.c +++ b/src/openrct2/windows/title_options.c @@ -28,7 +28,7 @@ static rct_widget window_title_options_widgets[] = { { WIDGETS_END }, }; -static void window_title_options_mouseup(rct_window *w, int widgetIndex); +static void window_title_options_mouseup(rct_window *w, sint32 widgetIndex); static void window_title_options_invalidate(rct_window *w); static void window_title_options_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -82,7 +82,7 @@ void window_title_options_open() window_init_scroll_widgets(window); } -static void window_title_options_mouseup(rct_window *w, int widgetIndex) +static void window_title_options_mouseup(rct_window *w, sint32 widgetIndex) { if (gIntroState != INTRO_STATE_NONE) return; diff --git a/src/openrct2/windows/title_scenarioselect.c b/src/openrct2/windows/title_scenarioselect.c index bcd2f8e7f5..38b9d018ab 100644 --- a/src/openrct2/windows/title_scenarioselect.c +++ b/src/openrct2/windows/title_scenarioselect.c @@ -96,14 +96,14 @@ static const rct_string_id ScenarioOriginStringIds[] = { static void window_scenarioselect_init_tabs(rct_window *w); static void window_scenarioselect_close(rct_window *w); -static void window_scenarioselect_mouseup(rct_window *w, int widgetIndex); -static void window_scenarioselect_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_scenarioselect_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_scenarioselect_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_scenarioselect_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); +static void window_scenarioselect_mouseup(rct_window *w, sint32 widgetIndex); +static void window_scenarioselect_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_scenarioselect_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_scenarioselect_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_scenarioselect_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); static void window_scenarioselect_invalidate(rct_window *w); static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_scenarioselect_events = { window_scenarioselect_close, @@ -136,7 +136,7 @@ static rct_window_event_list window_scenarioselect_events = { window_scenarioselect_scrollpaint }; -static void draw_category_heading(rct_window *w, rct_drawpixelinfo *dpi, int left, int right, int y, rct_string_id stringId); +static void draw_category_heading(rct_window *w, rct_drawpixelinfo *dpi, sint32 left, sint32 right, sint32 y, rct_string_id stringId); static void initialise_list_items(rct_window *w); static bool is_scenario_visible(rct_window *w, const scenario_index_entry *scenario); static bool is_locking_enabled(rct_window *w); @@ -151,8 +151,8 @@ static bool _showLockedInformation = false; void window_scenarioselect_open(scenarioselect_callback callback) { rct_window* window; - int windowWidth; - int windowHeight = 334; + sint32 windowWidth; + sint32 windowHeight = 334; _callback = callback; @@ -195,14 +195,14 @@ void window_scenarioselect_open(scenarioselect_callback callback) */ static void window_scenarioselect_init_tabs(rct_window *w) { - int showPages = 0; + sint32 showPages = 0; size_t numScenarios = scenario_repository_get_count(); for (size_t i = 0; i < numScenarios; i++) { const scenario_index_entry *scenario = scenario_repository_get_by_index(i); if (gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN) { showPages |= 1 << scenario->source_game; } else { - int category = scenario->category; + sint32 category = scenario->category; if (category > SCENARIO_CATEGORY_OTHER) { category = SCENARIO_CATEGORY_OTHER; } @@ -210,13 +210,13 @@ static void window_scenarioselect_init_tabs(rct_window *w) } } - int firstPage = bitscanforward(showPages); + sint32 firstPage = bitscanforward(showPages); if (firstPage != -1) { w->selected_tab = firstPage; } - int x = 3; - for (int i = 0; i < 8; i++) { + sint32 x = 3; + for (sint32 i = 0; i < 8; i++) { rct_widget* widget = &w->widgets[i + 4]; if (!(showPages & (1 << i))) { widget->type = WWT_EMPTY; @@ -235,14 +235,14 @@ static void window_scenarioselect_close(rct_window *w) SafeFree(_listItems); } -static void window_scenarioselect_mouseup(rct_window *w, int widgetIndex) +static void window_scenarioselect_mouseup(rct_window *w, sint32 widgetIndex) { if (widgetIndex == WIDX_CLOSE) { window_close(w); } } -static void window_scenarioselect_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_scenarioselect_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB8) { w->selected_tab = widgetIndex - 4; @@ -256,9 +256,9 @@ static void window_scenarioselect_mousedown(int widgetIndex, rct_window*w, rct_w } } -static void window_scenarioselect_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_scenarioselect_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { - int y = 0; + sint32 y = 0; for (sc_list_item *listItem = _listItems; listItem->type != LIST_ITEM_TYPE_END; listItem++) { switch (listItem->type) { case LIST_ITEM_TYPE_HEADING: @@ -276,7 +276,7 @@ static void window_scenarioselect_scrollgetsize(rct_window *w, int scrollIndex, * * rct2: 0x6780FE */ -static void window_scenarioselect_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_scenarioselect_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { for (sc_list_item *listItem = _listItems; listItem->type != LIST_ITEM_TYPE_END; listItem++) { switch (listItem->type) { @@ -301,7 +301,7 @@ static void window_scenarioselect_scrollmousedown(rct_window *w, int scrollIndex * * rct2: 0x678162 */ -static void window_scenarioselect_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_scenarioselect_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { bool originalShowLockedInformation = _showLockedInformation; _showLockedInformation = false; @@ -345,7 +345,7 @@ static void window_scenarioselect_invalidate(rct_window *w) w->pressed_widgets |= 1LL << (w->selected_tab + 4); - int windowWidth = w->width; + sint32 windowWidth = w->width; window_scenarioselect_widgets[WIDX_BACKGROUND].right = windowWidth - 1; window_scenarioselect_widgets[WIDX_TITLEBAR].right = windowWidth - 2; window_scenarioselect_widgets[WIDX_CLOSE].left = windowWidth - 13; @@ -353,17 +353,17 @@ static void window_scenarioselect_invalidate(rct_window *w) window_scenarioselect_widgets[WIDX_TABCONTENT].right = windowWidth - 1; window_scenarioselect_widgets[WIDX_SCENARIOLIST].right = windowWidth - 179; - int windowHeight = w->height; + sint32 windowHeight = w->height; window_scenarioselect_widgets[WIDX_BACKGROUND].bottom = windowHeight - 1; window_scenarioselect_widgets[WIDX_TABCONTENT].bottom = windowHeight - 1; - const int bottomMargin = gConfigGeneral.debugging_tools ? 17 : 5; + const sint32 bottomMargin = gConfigGeneral.debugging_tools ? 17 : 5; window_scenarioselect_widgets[WIDX_SCENARIOLIST].bottom = windowHeight - bottomMargin; } static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int format; + sint32 format; const scenario_index_entry *scenario; window_draw_widgets(w, dpi); @@ -371,13 +371,13 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? STR_SMALL_WINDOW_COLOUR_2_STRINGID : STR_WINDOW_COLOUR_2_STRINGID; // Text for each tab - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { rct_widget *widget = &window_scenarioselect_widgets[WIDX_TAB1 + i]; if (widget->type == WWT_EMPTY) continue; - int x = (widget->left + widget->right) / 2 + w->x; - int y = (widget->top + widget->bottom) / 2 + w->y - 3; + sint32 x = (widget->left + widget->right) / 2 + w->x; + sint32 y = (widget->top + widget->bottom) / 2 + w->y - 3; if (gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN) { set_format_arg(0, rct_string_id, ScenarioOriginStringIds[i]); @@ -392,8 +392,8 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) if (scenario == NULL) { if (_showLockedInformation) { // Show locked information - int x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4; - int y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5; + sint32 x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4; + sint32 y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5; gfx_draw_string_centred_clipped(dpi, STR_SCENARIO_LOCKED, NULL, COLOUR_BLACK, x + 85, y, 170); y += 15; y += gfx_draw_string_left_wrapped(dpi, NULL, x, y, 170, STR_SCENARIO_LOCKED_DESC, COLOUR_BLACK) + 5; @@ -413,8 +413,8 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) } // Scenario name - int x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4; - int y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5; + sint32 x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4; + sint32 y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5; set_format_arg(0, rct_string_id, STR_STRING); set_format_arg(2, const char *, scenario->name); gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x + 85, y, 170); @@ -427,9 +427,9 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) // Scenario objective set_format_arg(0, rct_string_id, ObjectiveNames[scenario->objective_type]); - set_format_arg(2, short, scenario->objective_arg_3); - set_format_arg(4, short, date_get_total_months(MONTH_OCTOBER, scenario->objective_arg_1)); - set_format_arg(6, int, scenario->objective_arg_2); + set_format_arg(2, sint16, scenario->objective_arg_3); + set_format_arg(4, sint16, date_get_total_months(MONTH_OCTOBER, scenario->objective_arg_1)); + set_format_arg(6, sint32, scenario->objective_arg_2); y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_OBJECTIVE, COLOUR_BLACK) + 5; // Scenario score @@ -446,9 +446,9 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) } } -static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { - int colour; + sint32 colour; uint8 paletteIndex = ColourMapA[w->colours[1]].mid_light; gfx_clear(dpi, paletteIndex); @@ -459,9 +459,9 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo * bool wide = gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN; rct_widget *listWidget = &w->widgets[WIDX_SCENARIOLIST]; - int listWidth = listWidget->right - listWidget->left - 12; + sint32 listWidth = listWidget->right - listWidget->left - 12; - int y = 0; + sint32 y = 0; for (sc_list_item *listItem = _listItems; listItem->type != LIST_ITEM_TYPE_END; listItem++) { if (y > dpi->y + dpi->height) { continue; @@ -469,7 +469,7 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo * switch (listItem->type) { case LIST_ITEM_TYPE_HEADING:; - const int horizontalRuleMargin = 4; + const sint32 horizontalRuleMargin = 4; draw_category_heading(w, dpi, horizontalRuleMargin, listWidth - horizontalRuleMargin, y + 2, listItem->heading.string_id); y += 18; break; @@ -519,25 +519,25 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo * } } -static void draw_category_heading(rct_window *w, rct_drawpixelinfo *dpi, int left, int right, int y, rct_string_id stringId) +static void draw_category_heading(rct_window *w, rct_drawpixelinfo *dpi, sint32 left, sint32 right, sint32 y, rct_string_id stringId) { uint8 baseColour = w->colours[1]; uint8 lightColour = ColourMapA[baseColour].lighter; uint8 darkColour = ColourMapA[baseColour].mid_dark; // Draw string - int centreX = (left + right) / 2; + sint32 centreX = (left + right) / 2; gfx_draw_string_centred(dpi, stringId, centreX, y, baseColour, NULL); // Get string dimensions utf8 *buffer = gCommonStringFormatBuffer; format_string(buffer, 256, stringId, NULL); - int categoryStringHalfWidth = (gfx_get_string_width(buffer) / 2) + 4; - int strLeft = centreX - categoryStringHalfWidth; - int strRight = centreX + categoryStringHalfWidth; + sint32 categoryStringHalfWidth = (gfx_get_string_width(buffer) / 2) + 4; + sint32 strLeft = centreX - categoryStringHalfWidth; + sint32 strRight = centreX + categoryStringHalfWidth; // Draw light horizontal rule - int lineY = y + 4; + sint32 lineY = y + 4; gfx_draw_line(dpi, left, lineY, strLeft, lineY, lightColour); gfx_draw_line(dpi, strRight, lineY, right, lineY, lightColour); @@ -561,7 +561,7 @@ static void initialise_list_items(rct_window *w) uint32 rct1CompletedScenarios = 0; size_t megaParkListItemIndex = SIZE_MAX; - int numUnlocks = INITIAL_NUM_UNLOCKED_SCENARIOS; + sint32 numUnlocks = INITIAL_NUM_UNLOCKED_SCENARIOS; uint8 currentHeading = UINT8_MAX; for (size_t i = 0; i < numScenarios; i++) { const scenario_index_entry *scenario = scenario_repository_get_by_index(i); @@ -585,7 +585,7 @@ static void initialise_list_items(rct_window *w) headingStringId = ScenarioOriginStringIds[currentHeading]; } } else if (w->selected_tab == SCENARIO_CATEGORY_OTHER) { - int category = scenario->category; + sint32 category = scenario->category; if (category <= SCENARIO_CATEGORY_REAL) { category = SCENARIO_CATEGORY_OTHER; } @@ -652,7 +652,7 @@ static void initialise_list_items(rct_window *w) memmove(&_listItems[megaParkListItemIndex], &_listItems[megaParkListItemIndex + 1], remainingItems); // Remove empty headings - int i = 0; + sint32 i = 0; for (sc_list_item *listItem = _listItems; listItem->type != LIST_ITEM_TYPE_END; listItem++) { if (listItem->type == LIST_ITEM_TYPE_HEADING && (listItem + 1)->type != LIST_ITEM_TYPE_SCENARIO) { remainingItems = length - i - 1; @@ -673,7 +673,7 @@ static bool is_scenario_visible(rct_window *w, const scenario_index_entry *scena return false; } } else { - int category = scenario->category; + sint32 category = scenario->category; if (category > SCENARIO_CATEGORY_OTHER) { category = SCENARIO_CATEGORY_OTHER; } diff --git a/src/openrct2/windows/tooltip.c b/src/openrct2/windows/tooltip.c index b9f1d8d821..ddd3fbdc51 100644 --- a/src/openrct2/windows/tooltip.c +++ b/src/openrct2/windows/tooltip.c @@ -68,7 +68,7 @@ static rct_window_event_list window_tooltip_events = { static utf8 _tooltipText[sizeof(gCommonStringFormatBuffer)]; static sint16 _tooltipNumLines; -void window_tooltip_reset(int x, int y) +void window_tooltip_reset(sint32 x, sint32 y) { gTooltipCursorX = x; gTooltipCursorY = y; @@ -78,10 +78,10 @@ void window_tooltip_reset(int x, int y) gInputFlags &= ~INPUT_FLAG_4; } -void window_tooltip_show(rct_string_id id, int x, int y) +void window_tooltip_show(rct_string_id id, sint32 x, sint32 y) { rct_window *w; - int width, height; + sint32 width, height; w = window_find_by_class(WC_ERROR); if (w != NULL) @@ -92,14 +92,14 @@ void window_tooltip_show(rct_string_id id, int x, int y) format_string(buffer, 256, id, gCommonFormatArgs); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - int tooltip_text_width; + sint32 tooltip_text_width; tooltip_text_width = gfx_get_string_width_new_lined(buffer); buffer = gCommonStringFormatBuffer; tooltip_text_width = min(tooltip_text_width, 196); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - int numLines, fontSpriteBase; + sint32 numLines, fontSpriteBase; tooltip_text_width = gfx_wrap_string(buffer, tooltip_text_width + 1, &numLines, &fontSpriteBase); _tooltipNumLines = numLines; @@ -115,7 +115,7 @@ void window_tooltip_show(rct_string_id id, int x, int y) // TODO The cursor size will be relative to the window DPI. // The amount to offset the y should be adjusted. - int max_y = gScreenHeight - height; + sint32 max_y = gScreenHeight - height; y += 26; // Normally, we'd display the tooltip 26 lower if (y > max_y) // If y is too large, the tooltip could be forced below the cursor if we'd just clamped y, @@ -141,7 +141,7 @@ void window_tooltip_show(rct_string_id id, int x, int y) * * rct2: 0x006EA10D */ -void window_tooltip_open(rct_window *widgetWindow, int widgetIndex, int x, int y) +void window_tooltip_open(rct_window *widgetWindow, sint32 widgetIndex, sint32 x, sint32 y) { rct_widget *widget; @@ -189,10 +189,10 @@ static void window_tooltip_update(rct_window *w) */ static void window_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int left = w->x; - int top = w->y; - int right = w->x + w->width - 1; - int bottom = w->y + w->height - 1; + sint32 left = w->x; + sint32 top = w->y; + sint32 right = w->x + w->width - 1; + sint32 bottom = w->y + w->height - 1; // Background gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, PALETTE_45); diff --git a/src/openrct2/windows/tooltip.h b/src/openrct2/windows/tooltip.h index db11aba392..9005016e43 100644 --- a/src/openrct2/windows/tooltip.h +++ b/src/openrct2/windows/tooltip.h @@ -19,9 +19,9 @@ #include "../interface/window.h" -void window_tooltip_reset(int x, int y); -void window_tooltip_show(rct_string_id id, int x, int y); -void window_tooltip_open(rct_window *widgetWindow, int widgetIndex, int x, int y); +void window_tooltip_reset(sint32 x, sint32 y); +void window_tooltip_show(rct_string_id id, sint32 x, sint32 y); +void window_tooltip_open(rct_window *widgetWindow, sint32 widgetIndex, sint32 x, sint32 y); void window_tooltip_close(); #endif diff --git a/src/openrct2/windows/top_toolbar.c b/src/openrct2/windows/top_toolbar.c index 0e4fcc2826..4843cc1b5b 100644 --- a/src/openrct2/windows/top_toolbar.c +++ b/src/openrct2/windows/top_toolbar.c @@ -135,7 +135,7 @@ enum { #pragma region Toolbar_widget_ordering // from left to right -static const int left_aligned_widgets_order[] = { +static const sint32 left_aligned_widgets_order[] = { WIDX_PAUSE, WIDX_FASTFORWARD, WIDX_FILE_MENU, @@ -153,7 +153,7 @@ static const int left_aligned_widgets_order[] = { }; // from right to left -static const int right_aligned_widgets_order[] = { +static const sint32 right_aligned_widgets_order[] = { WIDX_NEWS, WIDX_GUESTS, WIDX_STAFF, @@ -206,14 +206,14 @@ static rct_widget window_top_toolbar_widgets[] = { { WIDGETS_END }, }; -static void window_top_toolbar_mouseup(rct_window *w, int widgetIndex); -static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_top_toolbar_dropdown(rct_window *w, int widgetIndex, int dropdownIndex); -static void window_top_toolbar_tool_update(rct_window* w, int widgetIndex, int x, int y); -static void window_top_toolbar_tool_down(rct_window* w, int widgetIndex, int x, int y); -static void window_top_toolbar_tool_drag(rct_window* w, int widgetIndex, int x, int y); -static void window_top_toolbar_tool_up(rct_window* w, int widgetIndex, int x, int y); -static void window_top_toolbar_tool_abort(rct_window *w, int widgetIndex); +static void window_top_toolbar_mouseup(rct_window *w, sint32 widgetIndex); +static void window_top_toolbar_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget); +static void window_top_toolbar_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex); +static void window_top_toolbar_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_top_toolbar_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_top_toolbar_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_top_toolbar_tool_up(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_top_toolbar_tool_abort(rct_window *w, sint32 widgetIndex); static void window_top_toolbar_invalidate(rct_window *w); static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -249,20 +249,20 @@ static rct_window_event_list window_top_toolbar_events = { }; void top_toolbar_init_view_menu(rct_window *window, rct_widget *widget); -void top_toolbar_view_menu_dropdown(short dropdownIndex); +void top_toolbar_view_menu_dropdown(sint16 dropdownIndex); void top_toolbar_init_fastforward_menu(rct_window *window, rct_widget *widget); -void top_toolbar_fastforward_menu_dropdown(short dropdownIndex); +void top_toolbar_fastforward_menu_dropdown(sint16 dropdownIndex); void top_toolbar_init_rotate_menu(rct_window *window, rct_widget *widget); -void top_toolbar_rotate_menu_dropdown(short dropdownIndex); +void top_toolbar_rotate_menu_dropdown(sint16 dropdownIndex); void top_toolbar_init_debug_menu(rct_window *window, rct_widget *widget); -void top_toolbar_debug_menu_dropdown(short dropdownIndex); +void top_toolbar_debug_menu_dropdown(sint16 dropdownIndex); void top_toolbar_init_network_menu(rct_window *window, rct_widget *widget); -void top_toolbar_network_menu_dropdown(short dropdownIndex); +void top_toolbar_network_menu_dropdown(sint16 dropdownIndex); void toggle_footpath_window(); -void toggle_land_window(rct_window *topToolbar, int widgetIndex); -void toggle_clear_scenery_window(rct_window *topToolbar, int widgetIndex); -void toggle_water_window(rct_window *topToolbar, int widgetIndex); +void toggle_land_window(rct_window *topToolbar, sint32 widgetIndex); +void toggle_clear_scenery_window(rct_window *topToolbar, sint32 widgetIndex); +void toggle_water_window(rct_window *topToolbar, sint32 widgetIndex); money32 selection_lower_land(uint8 flags); money32 selection_raise_land(uint8 flags); @@ -296,7 +296,7 @@ void window_top_toolbar_open() * * rct2: 0x0066C957 */ -static void window_top_toolbar_mouseup(rct_window *w, int widgetIndex) +static void window_top_toolbar_mouseup(rct_window *w, sint32 widgetIndex) { rct_window *mainWindow; @@ -363,9 +363,9 @@ static void window_top_toolbar_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x0066CA3B */ -static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_top_toolbar_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - int numItems; + sint32 numItems; switch (widgetIndex) { case WIDX_FILE_MENU: @@ -513,7 +513,7 @@ static void window_top_toolbar_scenarioselect_callback(const utf8 *path) * * rct2: 0x0066C9EA */ -static void window_top_toolbar_dropdown(rct_window *w, int widgetIndex, int dropdownIndex) +static void window_top_toolbar_dropdown(rct_window *w, sint32 widgetIndex, sint32 dropdownIndex) { switch (widgetIndex) { case WIDX_FILE_MENU: @@ -630,7 +630,7 @@ static void window_top_toolbar_dropdown(rct_window *w, int widgetIndex, int drop */ static void window_top_toolbar_invalidate(rct_window *w) { - int x, enabledWidgets, widgetIndex, widgetWidth, firstAlignment; + sint32 x, enabledWidgets, widgetIndex, widgetWidth, firstAlignment; rct_widget *widget; colour_scheme_update(w); @@ -729,7 +729,7 @@ static void window_top_toolbar_invalidate(rct_window *w) // Align left hand side toolbar buttons firstAlignment = 1; x = 0; - for (int i = 0; i < countof(left_aligned_widgets_order); ++i) { + for (sint32 i = 0; i < countof(left_aligned_widgets_order); ++i) { widgetIndex = left_aligned_widgets_order[i]; widget = &window_top_toolbar_widgets[widgetIndex]; if (widget->type == WWT_EMPTY && widgetIndex != WIDX_SEPARATOR) @@ -749,7 +749,7 @@ static void window_top_toolbar_invalidate(rct_window *w) // Align right hand side toolbar buttons firstAlignment = 1; x = max(640, gScreenWidth); - for (int i = 0; i < countof(right_aligned_widgets_order); ++i) { + for (sint32 i = 0; i < countof(right_aligned_widgets_order); ++i) { widgetIndex = right_aligned_widgets_order[i]; widget = &window_top_toolbar_widgets[widgetIndex]; if (widget->type == WWT_EMPTY && widgetIndex != WIDX_SEPARATOR) @@ -793,7 +793,7 @@ static void window_top_toolbar_invalidate(rct_window *w) */ static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y, imgId; + sint32 x, y, imgId; window_draw_widgets(w, dpi); @@ -818,10 +818,10 @@ static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_sprite(dpi, imgId, x + 6, y + 3, 0); - for (int i = 0; i < gGameSpeed && gGameSpeed <= 4; i++) { + for (sint32 i = 0; i < gGameSpeed && gGameSpeed <= 4; i++) { gfx_draw_sprite(dpi, SPR_G2_SPEED_ARROW, x + 5 + i * 5, y + 15, 0); } - for (int i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++) { + for (sint32 i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++) { gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROW, x + 5 + i * 6, y + 15, 0); } } @@ -894,7 +894,7 @@ static void window_top_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){ // ax, cx, bl sint16 grid_x, grid_y; - int type; + sint32 type; // edx rct_map_element* map_element; uint16 flags = @@ -1046,7 +1046,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_WALL & VIEWPORT_INTERACTION_MASK_LARGE_SCENERY; - int interaction_type; + sint32 interaction_type; get_map_coordinates_from_pos(x, y, flags, NULL, NULL, &interaction_type, &map_element, NULL); if (interaction_type != VIEWPORT_INTERACTION_ITEM_NONE){ @@ -1162,7 +1162,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid uint16 flags = VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER; - int interaction_type = 0; + sint32 interaction_type = 0; rct_map_element* map_element; get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &map_element, NULL); @@ -1241,7 +1241,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid uint16 flags = VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_FOOTPATH_ITEM; - int interaction_type = 0; + sint32 interaction_type = 0; rct_map_element* map_element; get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &map_element, NULL); @@ -1388,7 +1388,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid uint16 flags = VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_FOOTPATH_ITEM; - int interaction_type = 0; + sint32 interaction_type = 0; rct_map_element* map_element; get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &map_element, NULL); @@ -1422,10 +1422,10 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid } } -void game_command_callback_place_banner(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp) +void game_command_callback_place_banner(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp) { if (ebx != MONEY32_UNDEFINED) { - int bannerId = edi; + sint32 bannerId = edi; audio_play_sound_at_location(SOUND_PLACE_ITEM, gCommandPosition.x, gCommandPosition.y, gCommandPosition.z); window_banner_open(bannerId); @@ -1435,7 +1435,7 @@ void game_command_callback_place_banner(int eax, int ebx, int ecx, int edx, int * * rct2: 0x006E2CC6 */ -static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w, short widgetIndex) +static void window_top_toolbar_scenery_tool_down(sint16 x, sint16 y, rct_window *w, sint16 widgetIndex) { scenery_remove_ghost_tool_placement(); if (gWindowSceneryPaintEnabled & 1) { @@ -1443,7 +1443,7 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w return; } - int selectedTab = gWindowSceneryTabSelections[gWindowSceneryActiveTabIndex]; + sint32 selectedTab = gWindowSceneryTabSelections[gWindowSceneryActiveTabIndex]; uint8 sceneryType = (selectedTab & 0xFF00) >> 8; if (selectedTab == -1) return; @@ -1458,14 +1458,14 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w switch (sceneryType){ case SCENERY_TYPE_SMALL: { - int quantity = 1; + sint32 quantity = 1; bool isCluster = gWindowSceneryClusterEnabled && (network_get_mode() != NETWORK_MODE_CLIENT || network_can_perform_command(network_get_current_player_group_index(), -2)); if (isCluster) { quantity = 35; } - int successfulPlacements = 0; - for (int q = 0; q < quantity; q++) { - int zCoordinate = gSceneryPlaceZ; + sint32 successfulPlacements = 0; + for (sint32 q = 0; q < quantity; q++) { + sint32 zCoordinate = gSceneryPlaceZ; rct_scenery_entry* scenery = get_small_scenery_entry((parameter_1 >> 8) & 0xFF); sint16 cur_grid_x = gridX; @@ -1495,11 +1495,11 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w bool success = false; for (; zAttemptRange != 0; zAttemptRange--){ - int flags = GAME_COMMAND_FLAG_APPLY | (parameter_1 & 0xFF00); + sint32 flags = GAME_COMMAND_FLAG_APPLY | (parameter_1 & 0xFF00); gDisableErrorWindowSound = true; gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE; - int cost = game_do_command( + sint32 cost = game_do_command( cur_grid_x, flags, cur_grid_y, @@ -1546,10 +1546,10 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w } case SCENERY_TYPE_PATH_ITEM: { - int flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_7 | (parameter_1 & 0xFF00); + sint32 flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_7 | (parameter_1 & 0xFF00); gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE; - int cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_PATH, parameter_3, 0); + sint32 cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_PATH, parameter_3, 0); if (cost != MONEY32_UNDEFINED) { audio_play_sound_at_location(SOUND_PLACE_ITEM, gCommandPosition.x, gCommandPosition.y, gCommandPosition.z); } @@ -1566,11 +1566,11 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w } for (; zAttemptRange != 0; zAttemptRange--) { - int flags = (parameter_1 & 0xFF00) | GAME_COMMAND_FLAG_APPLY; + sint32 flags = (parameter_1 & 0xFF00) | GAME_COMMAND_FLAG_APPLY; gDisableErrorWindowSound = true; gGameCommandErrorTitle = STR_CANT_BUILD_PARK_ENTRANCE_HERE; - int cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_FENCE, gSceneryPlaceZ, _unkF64F15); + sint32 cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_FENCE, gSceneryPlaceZ, _unkF64F15); gDisableErrorWindowSound = false; if (cost != MONEY32_UNDEFINED){ @@ -1603,11 +1603,11 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w } for (; zAttemptRange != 0; zAttemptRange--) { - int flags = (parameter_1 & 0xFF00) | GAME_COMMAND_FLAG_APPLY; + sint32 flags = (parameter_1 & 0xFF00) | GAME_COMMAND_FLAG_APPLY; gDisableErrorWindowSound = true; gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE; - int cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_LARGE_SCENERY, parameter_3, gSceneryPlaceZ); + sint32 cost = game_do_command(gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_LARGE_SCENERY, parameter_3, gSceneryPlaceZ); gDisableErrorWindowSound = false; if (cost != MONEY32_UNDEFINED){ @@ -1631,7 +1631,7 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w } case SCENERY_TYPE_BANNER: { - int flags = (parameter_1 & 0xFF00) | GAME_COMMAND_FLAG_APPLY; + sint32 flags = (parameter_1 & 0xFF00) | GAME_COMMAND_FLAG_APPLY; gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE; game_command_callback = game_command_callback_place_banner; @@ -1711,11 +1711,11 @@ static void top_toolbar_tool_update_scenery_clear(sint16 x, sint16 y){ if (!state_changed) return; - int eax = gMapSelectPositionA.x; - int ecx = gMapSelectPositionA.y; - int edi = gMapSelectPositionB.x; - int ebp = gMapSelectPositionB.y; - int clear = (gClearSmallScenery << 0) | (gClearLargeScenery << 1) | (gClearFootpath << 2); + sint32 eax = gMapSelectPositionA.x; + sint32 ecx = gMapSelectPositionA.y; + sint32 edi = gMapSelectPositionB.x; + sint32 ebp = gMapSelectPositionB.y; + sint32 clear = (gClearSmallScenery << 0) | (gClearLargeScenery << 1) | (gClearFootpath << 2); money32 cost = game_do_command(eax, 0, ecx, clear, GAME_COMMAND_CLEAR_SCENERY, edi, ebp); if (gClearSceneryCost != cost) { @@ -1820,7 +1820,7 @@ static void top_toolbar_tool_update_land(sint16 x, sint16 y){ gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; if (tool_size == 1){ - int direction; + sint32 direction; screen_pos_to_map_pos(&mapTile.x, &mapTile.y, &direction); if (mapTile.x == MAP_LOCATION_NULL) { @@ -1998,7 +1998,7 @@ static void top_toolbar_tool_update_water(sint16 x, sint16 y){ gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; rct_xy16 mapTile = { 0 }; - int interaction_type = 0; + sint32 interaction_type = 0; get_map_coordinates_from_pos( x, y, @@ -2528,7 +2528,7 @@ static void top_toolbar_tool_update_scenery(sint16 x, sint16 y){ * * rct2: 0x0066CB25 */ -static void window_top_toolbar_tool_update(rct_window* w, int widgetIndex, int x, int y) +static void window_top_toolbar_tool_update(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_CLEAR_SCENERY: @@ -2553,7 +2553,7 @@ static void window_top_toolbar_tool_update(rct_window* w, int widgetIndex, int x * * rct2: 0x0066CB73 */ -static void window_top_toolbar_tool_down(rct_window* w, int widgetIndex, int x, int y) +static void window_top_toolbar_tool_down(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex){ case WIDX_CLEAR_SCENERY: @@ -2605,8 +2605,8 @@ static void window_top_toolbar_tool_down(rct_window* w, int widgetIndex, int x, */ money32 selection_raise_land(uint8 flags) { - int centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2; - int centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2; + sint32 centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2; + sint32 centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2; centreX += 16; centreY += 16; @@ -2627,8 +2627,8 @@ money32 selection_raise_land(uint8 flags) */ money32 selection_lower_land(uint8 flags) { - int centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2; - int centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2; + sint32 centreX = (gMapSelectPositionA.x + gMapSelectPositionB.x) / 2; + sint32 centreY = (gMapSelectPositionA.y + gMapSelectPositionB.y) / 2; centreX += 16; centreY += 16; @@ -2647,12 +2647,12 @@ money32 selection_lower_land(uint8 flags) * part of window_top_toolbar_tool_drag(0x0066CB4E) * rct2: 0x00664454 */ -static void window_top_toolbar_land_tool_drag(short x, short y) +static void window_top_toolbar_land_tool_drag(sint16 x, sint16 y) { rct_window *window = window_find_from_point(x, y); if (!window) return; - int widget_index = window_find_widget_from_point(window, x, y); + sint32 widget_index = window_find_widget_from_point(window, x, y); if (widget_index == 0xFFFF) return; rct_widget *widget = &window->widgets[widget_index]; @@ -2664,7 +2664,7 @@ static void window_top_toolbar_land_tool_drag(short x, short y) sint16 tile_height = -16 / (1 << viewport->zoom); - int y_diff = y - gInputDragLastY; + sint32 y_diff = y - gInputDragLastY; if (y_diff <= tile_height) { gInputDragLastY += tile_height; @@ -2686,12 +2686,12 @@ static void window_top_toolbar_land_tool_drag(short x, short y) * part of window_top_toolbar_tool_drag(0x0066CB4E) * rct2: 0x006E6D4B */ -static void window_top_toolbar_water_tool_drag(short x, short y) +static void window_top_toolbar_water_tool_drag(sint16 x, sint16 y) { rct_window *window = window_find_from_point(x, y); if (!window) return; - int widget_index = window_find_widget_from_point(window, x, y); + sint32 widget_index = window_find_widget_from_point(window, x, y); if (widget_index == 0xFFFF) return; rct_widget *widget = &window->widgets[widget_index]; @@ -2753,7 +2753,7 @@ static void window_top_toolbar_water_tool_drag(short x, short y) * * rct2: 0x0066CB4E */ -static void window_top_toolbar_tool_drag(rct_window* w, int widgetIndex, int x, int y) +static void window_top_toolbar_tool_drag(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex){ case WIDX_CLEAR_SCENERY: @@ -2811,7 +2811,7 @@ static void window_top_toolbar_tool_drag(rct_window* w, int widgetIndex, int x, * * rct2: 0x0066CC5B */ -static void window_top_toolbar_tool_up(rct_window* w, int widgetIndex, int x, int y) +static void window_top_toolbar_tool_up(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { switch (widgetIndex) { case WIDX_LAND: @@ -2836,7 +2836,7 @@ static void window_top_toolbar_tool_up(rct_window* w, int widgetIndex, int x, in * * rct2: 0x0066CA58 */ -static void window_top_toolbar_tool_abort(rct_window *w, int widgetIndex) +static void window_top_toolbar_tool_abort(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_LAND: @@ -2848,7 +2848,7 @@ static void window_top_toolbar_tool_abort(rct_window *w, int widgetIndex) } void top_toolbar_init_fastforward_menu(rct_window* w, rct_widget* widget) { - int num_items = 4; + sint32 num_items = 4; gDropdownItemsFormat[0] = STR_TOGGLE_OPTION; gDropdownItemsFormat[1] = STR_TOGGLE_OPTION; gDropdownItemsFormat[2] = STR_TOGGLE_OPTION; @@ -2893,7 +2893,7 @@ void top_toolbar_init_fastforward_menu(rct_window* w, rct_widget* widget) { } } -void top_toolbar_fastforward_menu_dropdown(short dropdownIndex) +void top_toolbar_fastforward_menu_dropdown(sint16 dropdownIndex) { rct_window* w = window_get_main(); if (w) { @@ -2923,7 +2923,7 @@ void top_toolbar_init_rotate_menu(rct_window* w, rct_widget* widget) gDropdownDefaultIndex = DDIDX_ROTATE_CLOCKWISE; } -void top_toolbar_rotate_menu_dropdown(short dropdownIndex) +void top_toolbar_rotate_menu_dropdown(sint16 dropdownIndex) { rct_window* w = window_get_main(); if (w) { @@ -2982,7 +2982,7 @@ void top_toolbar_init_network_menu(rct_window* w, rct_widget* widget) gDropdownDefaultIndex = DDIDX_MULTIPLAYER; } -void top_toolbar_debug_menu_dropdown(short dropdownIndex) +void top_toolbar_debug_menu_dropdown(sint16 dropdownIndex) { rct_window* w = window_get_main(); if (w) { @@ -3014,7 +3014,7 @@ void top_toolbar_debug_menu_dropdown(short dropdownIndex) } } -void top_toolbar_network_menu_dropdown(short dropdownIndex) +void top_toolbar_network_menu_dropdown(sint16 dropdownIndex) { rct_window* w = window_get_main(); if (w) { @@ -3098,7 +3098,7 @@ void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { * * rct2: 0x0066CF8A */ -void top_toolbar_view_menu_dropdown(short dropdownIndex) +void top_toolbar_view_menu_dropdown(sint16 dropdownIndex) { rct_window* w = window_get_main(); if (w) { @@ -3161,7 +3161,7 @@ void toggle_footpath_window() * * rct2: 0x0066CD54 */ -void toggle_land_window(rct_window *topToolbar, int widgetIndex) +void toggle_land_window(rct_window *topToolbar, sint32 widgetIndex) { if ((gInputFlags & INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR && gCurrentToolWidget.widget_index == 7) { tool_cancel(); @@ -3178,7 +3178,7 @@ void toggle_land_window(rct_window *topToolbar, int widgetIndex) * * rct2: 0x0066CD0C */ -void toggle_clear_scenery_window(rct_window *topToolbar, int widgetIndex) +void toggle_clear_scenery_window(rct_window *topToolbar, sint32 widgetIndex) { if ((gInputFlags & INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR && gCurrentToolWidget.widget_index == 16) { tool_cancel(); @@ -3195,7 +3195,7 @@ void toggle_clear_scenery_window(rct_window *topToolbar, int widgetIndex) * * rct2: 0x0066CD9C */ -void toggle_water_window(rct_window *topToolbar, int widgetIndex) +void toggle_water_window(rct_window *topToolbar, sint32 widgetIndex) { if ((gInputFlags & INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WC_TOP_TOOLBAR && gCurrentToolWidget.widget_index == 8) { tool_cancel(); diff --git a/src/openrct2/windows/track_list.c b/src/openrct2/windows/track_list.c index 50ccba6e78..1b9de01bd3 100644 --- a/src/openrct2/windows/track_list.c +++ b/src/openrct2/windows/track_list.c @@ -53,15 +53,15 @@ static rct_widget window_track_list_widgets[] = { }; static void window_track_list_close(rct_window *w); -static void window_track_list_mouseup(rct_window *w, int widgetIndex); +static void window_track_list_mouseup(rct_window *w, sint32 widgetIndex); static void window_track_list_update(rct_window *w); -static void window_track_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height); -static void window_track_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y); -static void window_track_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y); -static void window_track_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId); +static void window_track_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); +static void window_track_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_track_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); +static void window_track_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId); static void window_track_list_invalidate(rct_window *w); static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex); +static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); static rct_window_event_list window_track_list_events = { window_track_list_close, @@ -117,7 +117,7 @@ void window_track_list_open(ride_list_item item) _window_track_list_item = item; track_list_load_designs(item); - int x, y; + sint32 x, y; if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { x = gScreenWidth / 2 - 300; y = max(28, gScreenHeight / 2 - 200); @@ -178,7 +178,7 @@ static void window_track_list_close(rct_window *w) * * rct2: 0x006CFB82 */ -static void window_track_list_select(rct_window *w, int index) +static void window_track_list_select(rct_window *w, sint32 index) { w->track_list.var_480 = index; @@ -215,15 +215,15 @@ static void window_track_list_select(rct_window *w, int index) } } -static int window_track_list_get_list_item_index_from_position(int x, int y) +static sint32 window_track_list_get_list_item_index_from_position(sint32 x, sint32 y) { - int maxItems = (int)_trackDesignsCount; + sint32 maxItems = (sint32)_trackDesignsCount; if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)) { // Extra item: custom design maxItems++; } - int index = y / 10; + sint32 index = y / 10; if (index < 0 || index >= maxItems) { index = -1; } @@ -234,7 +234,7 @@ static int window_track_list_get_list_item_index_from_position(int x, int y) * * rct2: 0x006CFA31 */ -static void window_track_list_mouseup(rct_window *w, int widgetIndex) +static void window_track_list_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -272,7 +272,7 @@ static void window_track_list_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x006CFAB0 */ -static void window_track_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height) +static void window_track_list_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height) { size_t numItems = _trackDesignsCount; if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)) { @@ -280,17 +280,17 @@ static void window_track_list_scrollgetsize(rct_window *w, int scrollIndex, int numItems++; } - *height = (int)(numItems * 10); + *height = (sint32)(numItems * 10); } /** * * rct2: 0x006CFB39 */ -static void window_track_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y) +static void window_track_list_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { if (!(w->track_list.var_484 & 1)) { - int i = window_track_list_get_list_item_index_from_position(x, y); + sint32 i = window_track_list_get_list_item_index_from_position(x, y); if (i != -1) { window_track_list_select(w, i); } @@ -301,10 +301,10 @@ static void window_track_list_scrollmousedown(rct_window *w, int scrollIndex, in * * rct2: 0x006CFAD7 */ -static void window_track_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y) +static void window_track_list_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y) { if (!(w->track_list.var_484 & 1)) { - int i = window_track_list_get_list_item_index_from_position(x, y); + sint32 i = window_track_list_get_list_item_index_from_position(x, y); if (i != -1 && w->selected_list_item != i) { w->selected_list_item = i; window_invalidate(w); @@ -316,7 +316,7 @@ static void window_track_list_scrollmouseover(rct_window *w, int scrollIndex, in * * rct2: 0x006CFD6C */ -static void window_track_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) +static void window_track_list_tooltip(rct_window* w, sint32 widgetIndex, rct_string_id *stringId) { set_format_arg(0, rct_string_id, STR_LIST); } @@ -381,7 +381,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); - int trackIndex = w->selected_list_item; + sint32 trackIndex = w->selected_list_item; if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { if (_trackDesignsCount == 0 || trackIndex == -1) { return; @@ -391,7 +391,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) } // Track preview - int x, y, colour; + sint32 x, y, colour; rct_widget *widget = &window_track_list_widgets[WIDX_TRACK_PREVIEW]; x = w->x + widget->left + 1; y = w->y + widget->top + 1; @@ -490,7 +490,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) if (ride_type_has_flag(td6->type, RIDE_TYPE_FLAG_HAS_G_FORCES)) { // Maximum positive vertical Gs - int gForces = td6->max_positive_vertical_g * 32; + sint32 gForces = td6->max_positive_vertical_g * 32; gfx_draw_string_left(dpi, STR_MAX_POSITIVE_VERTICAL_G, &gForces, COLOUR_BLACK, x, y); y += 10; @@ -508,7 +508,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) if (td6->version_and_colour_scheme / 4 >= 2) { if (td6->total_air_time != 0) { // Total air time - int airTime = td6->total_air_time * 25; + sint32 airTime = td6->total_air_time * 25; gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &airTime, COLOUR_BLACK, x, y); y += 10; } @@ -553,13 +553,13 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x006CF8CD */ -static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) +static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex) { uint8 paletteIndex = ColourMapA[w->colours[0]].mid_light; gfx_clear(dpi, paletteIndex); - int x = 0; - int y = 0; + sint32 x = 0; + sint32 y = 0; size_t listIndex = 0; if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { if (_trackDesignsCount == 0) { diff --git a/src/openrct2/windows/track_manage.c b/src/openrct2/windows/track_manage.c index 5862da15d6..fcba9c0061 100644 --- a/src/openrct2/windows/track_manage.c +++ b/src/openrct2/windows/track_manage.c @@ -62,12 +62,12 @@ static rct_widget window_track_delete_prompt_widgets[] = { #pragma region Events static void window_track_manage_close(rct_window *w); -static void window_track_manage_mouseup(rct_window *w, int widgetIndex); -static void window_track_manage_textinput(rct_window *w, int widgetIndex, char *text); +static void window_track_manage_mouseup(rct_window *w, sint32 widgetIndex); +static void window_track_manage_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_track_manage_invalidate(rct_window *w); static void window_track_manage_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_track_delete_prompt_mouseup(rct_window *w, int widgetIndex); +static void window_track_delete_prompt_mouseup(rct_window *w, sint32 widgetIndex); static void window_track_delete_prompt_invalidate(rct_window *w); static void window_track_delete_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -188,7 +188,7 @@ static void window_track_manage_close(rct_window *w) * * rct2: 0x006D3523 */ -static void window_track_manage_mouseup(rct_window *w, int widgetIndex) +static void window_track_manage_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -214,7 +214,7 @@ static void window_track_manage_mouseup(rct_window *w, int widgetIndex) * * rct2: 0x006D3523 */ -static void window_track_manage_textinput(rct_window *w, int widgetIndex, char *text) +static void window_track_manage_textinput(rct_window *w, sint32 widgetIndex, char *text) { if (widgetIndex != WIDX_RENAME || str_is_null_or_empty(text)) { return; @@ -286,7 +286,7 @@ static void window_track_delete_prompt_open() * * rct2: 0x006D3823 */ -static void window_track_delete_prompt_mouseup(rct_window *w, int widgetIndex) +static void window_track_delete_prompt_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: diff --git a/src/openrct2/windows/track_place.c b/src/openrct2/windows/track_place.c index c1206f6d37..8c46fb8aa6 100644 --- a/src/openrct2/windows/track_place.c +++ b/src/openrct2/windows/track_place.c @@ -60,11 +60,11 @@ static rct_widget window_track_place_widgets[] = { }; static void window_track_place_close(rct_window *w); -static void window_track_place_mouseup(rct_window *w, int widgetIndex); +static void window_track_place_mouseup(rct_window *w, sint32 widgetIndex); static void window_track_place_update(rct_window *w); -static void window_track_place_toolupdate(rct_window* w, int widgetIndex, int x, int y); -static void window_track_place_tooldown(rct_window* w, int widgetIndex, int x, int y); -static void window_track_place_toolabort(rct_window *w, int widgetIndex); +static void window_track_place_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_track_place_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y); +static void window_track_place_toolabort(rct_window *w, sint32 widgetIndex); static void window_track_place_unknown14(rct_window *w); static void window_track_place_invalidate(rct_window *w); static void window_track_place_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -114,13 +114,13 @@ static money32 _window_track_place_last_cost; static rct_track_td6 *_trackDesign; static void window_track_place_clear_provisional(); -static int window_track_place_get_base_z(int x, int y); -static void window_track_place_attempt_placement(rct_track_td6 *td6, int x, int y, int z, int bl, money32 *cost, uint8 *rideIndex); +static sint32 window_track_place_get_base_z(sint32 x, sint32 y); +static void window_track_place_attempt_placement(rct_track_td6 *td6, sint32 x, sint32 y, sint32 z, sint32 bl, money32 *cost, uint8 *rideIndex); static void window_track_place_clear_mini_preview(); static void window_track_place_draw_mini_preview(rct_track_td6 *td6); -static void window_track_place_draw_mini_preview_track(rct_track_td6 *td6, int pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max); -static void window_track_place_draw_mini_preview_maze(rct_track_td6 *td6, int pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max); +static void window_track_place_draw_mini_preview_track(rct_track_td6 *td6, sint32 pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max); +static void window_track_place_draw_mini_preview_maze(rct_track_td6 *td6, sint32 pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max); static rct_xy16 draw_mini_preview_get_pixel_position(sint16 x, sint16 y); static bool draw_mini_preview_is_pixel_in_bounds(rct_xy16 pixel); static uint8 *draw_mini_preview_get_pixel_ptr(rct_xy16 pixel); @@ -201,7 +201,7 @@ static void window_track_place_close(rct_window *w) * * rct2: 0x006CFEAC */ -static void window_track_place_mouseup(rct_window *w, int widgetIndex) +static void window_track_place_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -243,9 +243,9 @@ static void window_track_place_update(rct_window *w) * * rct2: 0x006CFF2D */ -static void window_track_place_toolupdate(rct_window* w, int widgetIndex, int x, int y) +static void window_track_place_toolupdate(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { - short mapX, mapY, mapZ; + sint16 mapX, mapY, mapZ; map_invalidate_map_selection_tiles(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; @@ -273,7 +273,7 @@ static void window_track_place_toolupdate(rct_window* w, int widgetIndex, int x, window_track_place_clear_provisional(); // Try increasing Z until a feasible placement is found - for (int i = 0; i < 7; i++) { + for (sint32 i = 0; i < 7; i++) { uint8 rideIndex; window_track_place_attempt_placement(_trackDesign, mapX, mapY, mapZ, 105, &cost, &rideIndex); if (cost != MONEY32_UNDEFINED) { @@ -302,10 +302,10 @@ static void window_track_place_toolupdate(rct_window* w, int widgetIndex, int x, * * rct2: 0x006CFF34 */ -static void window_track_place_tooldown(rct_window* w, int widgetIndex, int x, int y) +static void window_track_place_tooldown(rct_window* w, sint32 widgetIndex, sint32 x, sint32 y) { - int i; - short mapX, mapY, mapZ; + sint32 i; + sint16 mapX, mapY, mapZ; money32 cost; uint8 rideIndex; @@ -357,7 +357,7 @@ static void window_track_place_tooldown(rct_window* w, int widgetIndex, int x, i * * rct2: 0x006D015C */ -static void window_track_place_toolabort(rct_window *w, int widgetIndex) +static void window_track_place_toolabort(rct_window *w, sint32 widgetIndex) { window_track_place_clear_provisional(); } @@ -400,10 +400,10 @@ static void window_track_place_clear_provisional() * * rct2: 0x006D17C6 */ -static int window_track_place_get_base_z(int x, int y) +static sint32 window_track_place_get_base_z(sint32 x, sint32 y) { rct_map_element *mapElement; - int z; + sint32 z; mapElement = map_get_surface_element_at(x >> 5, y >> 5); z = mapElement->base_height * 8; @@ -424,9 +424,9 @@ static int window_track_place_get_base_z(int x, int y) return z + sub_6D01B3(_trackDesign, PTD_OPERATION_GET_PLACE_Z, 0, x, y, z); } -static void window_track_place_attempt_placement(rct_track_td6 *td6, int x, int y, int z, int bl, money32 *cost, uint8 *rideIndex) +static void window_track_place_attempt_placement(rct_track_td6 *td6, sint32 x, sint32 y, sint32 z, sint32 bl, money32 *cost, uint8 *rideIndex) { - int eax, ebx, ecx, edx, esi, edi, ebp; + sint32 eax, ebx, ecx, edx, esi, edi, ebp; money32 result; edx = esi = ebp = 0; @@ -484,7 +484,7 @@ static void window_track_place_draw_mini_preview(rct_track_td6 *td6) // First pass is used to determine the width and height of the image so it can centre it rct_xy16 min = { 0, 0 }; rct_xy16 max = { 0, 0 }; - for (int pass = 0; pass < 2; pass++) { + for (sint32 pass = 0; pass < 2; pass++) { rct_xy16 origin = { 0, 0 }; if (pass == 1) { origin.x -= ((max.x + min.x) >> 6) << 5; @@ -499,12 +499,12 @@ static void window_track_place_draw_mini_preview(rct_track_td6 *td6) } } -static void window_track_place_draw_mini_preview_track(rct_track_td6 *td6, int pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max) +static void window_track_place_draw_mini_preview_track(rct_track_td6 *td6, sint32 pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max) { uint8 rotation = (_currentTrackPieceDirection + get_current_rotation()) & 3; rct_td6_track_element *trackElement = td6->track_elements; while (trackElement->type != 255) { - int trackType = trackElement->type; + sint32 trackType = trackElement->type; if (trackType == TRACK_ELEM_INVERTED_90_DEG_UP_TO_FLAT_QUARTER_LOOP) { trackType = 255; } @@ -532,7 +532,7 @@ static void window_track_place_draw_mini_preview_track(rct_track_td6 *td6, int p // Station track is a lighter colour uint8 colour = (TrackSequenceProperties[trackType][0] & TRACK_SEQUENCE_FLAG_ORIGIN) ? PALETTE_INDEX_PRIMARY_LIGHTEST : PALETTE_INDEX_PRIMARY_MID_DARK; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (bits & 1) pixel[338 + i] = colour; // x + 2, y + 2 if (bits & 2) pixel[168 + i] = colour; // y + 1 if (bits & 4) pixel[ 2 + i] = colour; // x + 2 @@ -562,7 +562,7 @@ static void window_track_place_draw_mini_preview_track(rct_track_td6 *td6, int p } } -static void window_track_place_draw_mini_preview_maze(rct_track_td6 *td6, int pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max) +static void window_track_place_draw_mini_preview_maze(rct_track_td6 *td6, sint32 pass, rct_xy16 origin, rct_xy16 *min, rct_xy16 *max) { uint8 rotation = (_currentTrackPieceDirection + get_current_rotation()) & 3; rct_td6_maze_element *mazeElement = td6->maze_elements; @@ -587,7 +587,7 @@ static void window_track_place_draw_mini_preview_maze(rct_track_td6 *td6, int pa // Entrance or exit is a lighter colour uint8 colour = mazeElement->type == 8 || mazeElement->type == 128 ? PALETTE_INDEX_PRIMARY_LIGHTEST : PALETTE_INDEX_PRIMARY_MID_DARK; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { pixel[338 + i] = colour; // x + 2, y + 2 pixel[168 + i] = colour; // y + 1 pixel[ 2 + i] = colour; // x + 2 diff --git a/src/openrct2/windows/viewport.c b/src/openrct2/windows/viewport.c index 4cf99a89f9..0c3742b44e 100644 --- a/src/openrct2/windows/viewport.c +++ b/src/openrct2/windows/viewport.c @@ -52,7 +52,7 @@ static rct_widget window_viewport_widgets[] = { { WIDGETS_END }, }; -static void window_viewport_mouseup(rct_window *w, int widgetIndex); +static void window_viewport_mouseup(rct_window *w, sint32 widgetIndex); static void window_viewport_resize(rct_window *w); static void window_viewport_update(rct_window *w); static void window_viewport_invalidate(rct_window *w); @@ -89,7 +89,7 @@ static rct_window_event_list window_viewport_events = { NULL }; -static int _viewportNumber = 1; +static sint32 _viewportNumber = 1; /** * Creates a custom viewport window. @@ -115,8 +115,8 @@ void window_viewport_open() rct_window *mainWindow = window_get_main(); if (mainWindow != NULL) { rct_viewport *mainViewport = mainWindow->viewport; - int x = mainViewport->view_x + (mainViewport->view_width / 2); - int y = mainViewport->view_y + (mainViewport->view_height / 2); + sint32 x = mainViewport->view_x + (mainViewport->view_width / 2); + sint32 y = mainViewport->view_y + (mainViewport->view_height / 2); w->saved_view_x = x - (w->viewport->view_width / 2); w->saved_view_y = y - (w->viewport->view_height / 2); } @@ -135,7 +135,7 @@ static void window_viewport_anchor_border_widgets(rct_window *w) w->widgets[WIDX_CLOSE].right = w->width - 3; } -static void window_viewport_mouseup(rct_window *w, int widgetIndex) +static void window_viewport_mouseup(rct_window *w, sint32 widgetIndex) { rct_window *mainWindow; sint16 x, y; @@ -193,7 +193,7 @@ static void window_viewport_invalidate(rct_window *w) { rct_widget *viewportWidget; rct_viewport *viewport; - int i; + sint32 i; colour_scheme_update(w); diff --git a/src/openrct2/windows/water.c b/src/openrct2/windows/water.c index 57e02a18ad..e8920105aa 100644 --- a/src/openrct2/windows/water.c +++ b/src/openrct2/windows/water.c @@ -45,14 +45,14 @@ static rct_widget window_water_widgets[] = { { WIDGETS_END }, }; -static int window_water_should_close(); +static sint32 window_water_should_close(); static void window_water_close(rct_window *w); -static void window_water_mouseup(rct_window *w, int widgetIndex); +static void window_water_mouseup(rct_window *w, sint32 widgetIndex); static void window_water_update(rct_window *w); static void window_water_invalidate(rct_window *w); static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_water_textinput(rct_window *w, int widgetIndex, char *text); +static void window_water_textinput(rct_window *w, sint32 widgetIndex, char *text); static void window_water_inputsize(rct_window *w); static rct_window_event_list window_water_events = { @@ -131,7 +131,7 @@ static void window_water_close(rct_window *w) * * rct2: 0x006E6B4E */ -static void window_water_mouseup(rct_window *w, int widgetIndex) +static void window_water_mouseup(rct_window *w, sint32 widgetIndex) { switch (widgetIndex) { case WIDX_CLOSE: @@ -157,9 +157,9 @@ static void window_water_mouseup(rct_window *w, int widgetIndex) } } -static void window_water_textinput(rct_window *w, int widgetIndex, char *text) +static void window_water_textinput(rct_window *w, sint32 widgetIndex, char *text) { - int size; + sint32 size; char* end; if (widgetIndex != WIDX_PREVIEW || text == NULL) @@ -219,7 +219,7 @@ static void window_water_invalidate(rct_window *w) */ static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int x, y; + sint32 x, y; x = w->x + (window_water_widgets[WIDX_PREVIEW].left + window_water_widgets[WIDX_PREVIEW].right) / 2; y = w->y + (window_water_widgets[WIDX_PREVIEW].top + window_water_widgets[WIDX_PREVIEW].bottom) / 2; @@ -248,7 +248,7 @@ static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x0066D125 */ -static int window_water_should_close() +static sint32 window_water_should_close() { if (!(gInputFlags & INPUT_FLAG_TOOL_ACTIVE)) return 1; diff --git a/src/openrct2/world/balloon.c b/src/openrct2/world/balloon.c index 1cf33b574a..f6bfde7315 100644 --- a/src/openrct2/world/balloon.c +++ b/src/openrct2/world/balloon.c @@ -24,7 +24,7 @@ * * rct2: 0x006736C7 */ -void create_balloon(int x, int y, int z, int colour, uint8 bl) +void create_balloon(sint32 x, sint32 y, sint32 z, sint32 colour, uint8 bl) { rct_sprite* sprite = create_sprite(2); if (sprite != NULL) { @@ -62,7 +62,7 @@ void balloon_update(rct_balloon *balloon) return; } - int original_var26a = balloon->var_26a; + sint32 original_var26a = balloon->var_26a; balloon->var_26a += 85; if (original_var26a < 255 - 85) return; @@ -70,7 +70,7 @@ void balloon_update(rct_balloon *balloon) balloon->var_26b++; sprite_move(balloon->x, balloon->y, balloon->z + 1, (rct_sprite*)balloon); - int maxZ = 1967 - ((balloon->x ^ balloon->y) & 31); + sint32 maxZ = 1967 - ((balloon->x ^ balloon->y) & 31); if (balloon->z < maxZ) return; @@ -100,10 +100,10 @@ static void balloon_press(rct_balloon *balloon) ); } -void game_command_balloon_press(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_balloon_press(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - unsigned int balloon_num = *eax; - int flags = *ebx; + uint32 balloon_num = *eax; + sint32 flags = *ebx; *ebx = 0; if (!(flags & GAME_COMMAND_FLAG_APPLY)) { return; diff --git a/src/openrct2/world/banner.c b/src/openrct2/world/banner.c index fe70800b88..43b664bd20 100644 --- a/src/openrct2/world/banner.c +++ b/src/openrct2/world/banner.c @@ -28,7 +28,7 @@ rct_banner gBanners[MAX_BANNERS]; */ void banner_init() { - for (int i = 0; i < MAX_BANNERS; i++) { + for (sint32 i = 0; i < MAX_BANNERS; i++) { gBanners[i].type = BANNER_NULL; } } @@ -41,9 +41,9 @@ void banner_init() * * rct2: 0x006BA278 */ -int create_new_banner(uint8 flags) +sint32 create_new_banner(uint8 flags) { - int banner_index = 0; + sint32 banner_index = 0; for (; banner_index < MAX_BANNERS; banner_index++){ if (gBanners[banner_index].type == BANNER_NULL){ break; @@ -67,7 +67,7 @@ int create_new_banner(uint8 flags) return banner_index; } -rct_map_element *banner_get_map_element(int bannerIndex) +rct_map_element *banner_get_map_element(sint32 bannerIndex) { rct_banner *banner = &gBanners[bannerIndex]; rct_map_element *mapElement = map_get_first_element_at(banner->x, banner->y); @@ -83,11 +83,11 @@ rct_map_element *banner_get_map_element(int bannerIndex) * * rct2: 0x006B7EAB */ -static int banner_get_ride_index_at(int x, int y, int z) +static sint32 banner_get_ride_index_at(sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement; rct_ride *ride; - int rideIndex, resultRideIndex; + sint32 rideIndex, resultRideIndex; resultRideIndex = -1; mapElement = map_get_first_element_at(x >> 5, y >> 5); @@ -113,9 +113,9 @@ static int banner_get_ride_index_at(int x, int y, int z) * * rct2: 0x006B7D86 */ -int banner_get_closest_ride_index(int x, int y, int z) +sint32 banner_get_closest_ride_index(sint32 x, sint32 y, sint32 z) { - int i, rideIndex; + sint32 i, rideIndex; rct_ride *ride; static const rct_xy16 NeighbourCheckOrder[] = { @@ -138,7 +138,7 @@ int banner_get_closest_ride_index(int x, int y, int z) } rideIndex = -1; - int resultDistance = INT_MAX; + sint32 resultDistance = INT_MAX; FOR_ALL_RIDES(i, ride) { if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) continue; @@ -147,9 +147,9 @@ int banner_get_closest_ride_index(int x, int y, int z) if (xy == 0xFFFF) continue; - int rideX = (xy & 0xFF) * 32; - int rideY = (xy >> 8) * 32; - int distance = abs(x - rideX) + abs(y - rideY); + sint32 rideX = (xy & 0xFF) * 32; + sint32 rideY = (xy >> 8) * 32; + sint32 distance = abs(x - rideX) + abs(y - rideY); if (distance < resultDistance) { resultDistance = distance; rideIndex = i; @@ -161,7 +161,7 @@ int banner_get_closest_ride_index(int x, int y, int z) void fix_banner_count() { - for (int banner_index = 0; banner_index < MAX_BANNERS; banner_index++){ + for (sint32 banner_index = 0; banner_index < MAX_BANNERS; banner_index++){ rct_map_element *map_element = banner_get_map_element(banner_index); if(map_element==NULL) gBanners[banner_index].type = BANNER_NULL; diff --git a/src/openrct2/world/banner.h b/src/openrct2/world/banner.h index 45af706f27..492b61d431 100644 --- a/src/openrct2/world/banner.h +++ b/src/openrct2/world/banner.h @@ -45,10 +45,10 @@ enum{ extern rct_banner gBanners[MAX_BANNERS]; void banner_init(); -int create_new_banner(uint8 flags); -rct_map_element *banner_get_map_element(int bannerIndex); -int banner_get_closest_ride_index(int x, int y, int z); +sint32 create_new_banner(uint8 flags); +rct_map_element *banner_get_map_element(sint32 bannerIndex); +sint32 banner_get_closest_ride_index(sint32 x, sint32 y, sint32 z); void fix_banner_count(); -void game_command_callback_place_banner(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp); +void game_command_callback_place_banner(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); #endif diff --git a/src/openrct2/world/climate.c b/src/openrct2/world/climate.c index 9ea6940f0e..2d4ab772cb 100644 --- a/src/openrct2/world/climate.c +++ b/src/openrct2/world/climate.c @@ -62,23 +62,23 @@ uint16 gClimateLightningFlash; static const rct_weather_transition* climate_transitions[4]; // Sound data -static int _rainVolume = 1; -static unsigned int _lightningTimer, _thunderTimer; +static sint32 _rainVolume = 1; +static uint32 _lightningTimer, _thunderTimer; static void* _thunderSoundChannels[MAX_THUNDER_INSTANCES]; -static int _thunderStatus[MAX_THUNDER_INSTANCES] = { THUNDER_STATUS_NULL, THUNDER_STATUS_NULL }; -static unsigned int _thunderSoundId; -static int _thunderVolume; -static int _thunderStereoEcho = 0; +static sint32 _thunderStatus[MAX_THUNDER_INSTANCES] = { THUNDER_STATUS_NULL, THUNDER_STATUS_NULL }; +static uint32 _thunderSoundId; +static sint32 _thunderVolume; +static sint32 _thunderStereoEcho = 0; -static void climate_determine_future_weather(int randomDistribution); +static void climate_determine_future_weather(sint32 randomDistribution); static void climate_update_rain_sound(); static void climate_update_thunder_sound(); static void climate_update_lightning(); static void climate_update_thunder(); -static int climate_play_thunder(int instanceIndex, int soundId, int volume, int pan); +static sint32 climate_play_thunder(sint32 instanceIndex, sint32 soundId, sint32 volume, sint32 pan); -int climate_celsius_to_fahrenheit(int celsius) +sint32 climate_celsius_to_fahrenheit(sint32 celsius) { return (celsius * 29) / 16 + 32; } @@ -87,7 +87,7 @@ int climate_celsius_to_fahrenheit(int celsius) * Set climate and determine start weather. * rct2: 0x006C45ED */ -void climate_reset(int climate) +void climate_reset(sint32 climate) { gClimate = climate; @@ -177,7 +177,7 @@ void climate_update() climate_update_thunder(); } else if (gClimateCurrentWeatherEffect == 2) { // Create new thunder and lightning - unsigned int randomNumber = util_rand(); + uint32 randomNumber = util_rand(); if ((randomNumber & 0xFFFF) <= 0x1B4) { randomNumber >>= 16; _thunderTimer = 43 + (randomNumber % 64); @@ -207,7 +207,7 @@ void climate_force_weather(uint8 weather){ * * rct2: 0x006C461C */ -static void climate_determine_future_weather(int randomDistribution) +static void climate_determine_future_weather(sint32 randomDistribution) { sint8 climate = gClimate; const rct_weather_transition* climate_table = climate_transitions[climate]; @@ -284,7 +284,7 @@ static void climate_update_thunder_sound() } // Stop thunder sounds if they have finished - for (int i = 0; i < MAX_THUNDER_INSTANCES; i++) { + for (sint32 i = 0; i < MAX_THUNDER_INSTANCES; i++) { if (_thunderStatus[i] == THUNDER_STATUS_NULL) continue; @@ -313,12 +313,12 @@ static void climate_update_thunder() if (_thunderTimer != 0) return; - unsigned int randomNumber = util_rand(); + uint32 randomNumber = util_rand(); if (randomNumber & 0x10000) { if (_thunderStatus[0] == THUNDER_STATUS_NULL && _thunderStatus[1] == THUNDER_STATUS_NULL) { // Play thunder on left side _thunderSoundId = (randomNumber & 0x20000) ? SOUND_THUNDER_1 : SOUND_THUNDER_2; - _thunderVolume = (-((int)((randomNumber >> 18) & 0xFF))) * 8; + _thunderVolume = (-((sint32)((randomNumber >> 18) & 0xFF))) * 8; climate_play_thunder(0, _thunderSoundId, _thunderVolume, -10000); // Let thunder play on right side @@ -327,13 +327,13 @@ static void climate_update_thunder() } else { if (_thunderStatus[0] == THUNDER_STATUS_NULL){ _thunderSoundId = (randomNumber & 0x20000) ? SOUND_THUNDER_1 : SOUND_THUNDER_2; - int pan = (((randomNumber >> 18) & 0xFF) - 128) * 16; + sint32 pan = (((randomNumber >> 18) & 0xFF) - 128) * 16; climate_play_thunder(0, _thunderSoundId, 0, pan); } } } -static int climate_play_thunder(int instanceIndex, int soundId, int volume, int pan) +static sint32 climate_play_thunder(sint32 instanceIndex, sint32 soundId, sint32 volume, sint32 pan) { _thunderSoundChannels[instanceIndex] = Mixer_Play_Effect(soundId, MIXER_LOOP_NONE, DStoMixerVolume(volume), DStoMixerPan(pan), 1, 0); if (_thunderSoundChannels[instanceIndex]) { diff --git a/src/openrct2/world/climate.h b/src/openrct2/world/climate.h index 0e6d5a1531..c9558d7436 100644 --- a/src/openrct2/world/climate.h +++ b/src/openrct2/world/climate.h @@ -65,8 +65,8 @@ extern uint16 gClimateLightningFlash; extern const rct_weather climate_weather_data[6]; extern const FILTER_PALETTE_ID ClimateWeatherGloomColours[4]; -int climate_celsius_to_fahrenheit(int celsius); -void climate_reset(int climate); +sint32 climate_celsius_to_fahrenheit(sint32 celsius); +void climate_reset(sint32 climate); void climate_update(); void climate_update_sound(); void climate_force_weather(uint8 weather); diff --git a/src/openrct2/world/duck.c b/src/openrct2/world/duck.c index 0e6fda99fe..33c7428320 100644 --- a/src/openrct2/world/duck.c +++ b/src/openrct2/world/duck.c @@ -81,7 +81,7 @@ const uint8 * duck_animations[] = { * * rct2: 0x0067440F */ -void create_duck(int targetX, int targetY) +void create_duck(sint32 targetX, sint32 targetY) { rct_sprite* sprite = create_sprite(2); if (sprite != NULL) { @@ -90,7 +90,7 @@ void create_duck(int targetX, int targetY) sprite->duck.var_14 = 9; sprite->duck.var_09 = 0xC; sprite->duck.var_15 = 9; - int offset_xy = scenario_rand() & 0x1E; + sint32 offset_xy = scenario_rand() & 0x1E; targetX += offset_xy; targetY += offset_xy; sprite->duck.target_x = targetX; @@ -161,21 +161,21 @@ static void duck_update_fly_to_water(rct_duck *duck) duck->frame = 0; duck_invalidate(duck); - int manhattanDistance = abs(duck->target_x - duck->x) + abs(duck->target_y - duck->y); - int direction = duck->sprite_direction >> 3; - int x = duck->x + duck_move_offset[direction].x; - int y = duck->y + duck_move_offset[direction].y; - int manhattanDistanceN = abs(duck->target_x - x) + abs(duck->target_y - y); + sint32 manhattanDistance = abs(duck->target_x - duck->x) + abs(duck->target_y - duck->y); + sint32 direction = duck->sprite_direction >> 3; + sint32 x = duck->x + duck_move_offset[direction].x; + sint32 y = duck->y + duck_move_offset[direction].y; + sint32 manhattanDistanceN = abs(duck->target_x - x) + abs(duck->target_y - y); rct_map_element *mapElement = map_get_surface_element_at(duck->target_x >> 5, duck->target_y >> 5); - int waterHeight = mapElement->properties.surface.terrain & 0x1F; + sint32 waterHeight = mapElement->properties.surface.terrain & 0x1F; if (waterHeight == 0) { duck->state = DUCK_STATE_FLY_AWAY; duck_update_fly_away(duck); return; } waterHeight <<= 4; - int z = abs(duck->z - waterHeight); + sint32 z = abs(duck->z - waterHeight); if (manhattanDistanceN <= manhattanDistance) { if (z > manhattanDistanceN) { @@ -224,7 +224,7 @@ static void duck_update_swim(rct_duck *duck) return; } - int currentMonth = date_get_month(gDateMonthsElapsed); + sint32 currentMonth = date_get_month(gDateMonthsElapsed); if (currentMonth >= MONTH_SEPTEMBER && (randomNumber >> 16) < 218) { duck->state = DUCK_STATE_FLY_AWAY; duck_update_fly_away(duck); @@ -232,8 +232,8 @@ static void duck_update_swim(rct_duck *duck) } duck_invalidate(duck); - int landZ = map_element_height(duck->x, duck->y); - int waterZ = (landZ >> 16) & 0xFFFF; + sint32 landZ = map_element_height(duck->x, duck->y); + sint32 waterZ = (landZ >> 16) & 0xFFFF; landZ &= 0xFFFF; if (duck->z < landZ || waterZ == 0) { @@ -249,9 +249,9 @@ static void duck_update_swim(rct_duck *duck) duck->sprite_direction = randomNumber & 0x18; } - int direction = duck->sprite_direction >> 3; - int x = duck->x + duck_move_offset[direction].x; - int y = duck->y + duck_move_offset[direction].y; + sint32 direction = duck->sprite_direction >> 3; + sint32 x = duck->x + duck_move_offset[direction].x; + sint32 y = duck->y + duck_move_offset[direction].y; landZ = map_element_height(x, y); waterZ = (landZ >> 16) & 0xFFFF; landZ &= 0xFFFF; @@ -309,15 +309,15 @@ static void duck_update_fly_away(rct_duck *duck) duck->frame = 0; duck_invalidate(duck); - int direction = duck->sprite_direction >> 3; - int x = duck->x + (duck_move_offset[direction].x * 2); - int y = duck->y + (duck_move_offset[direction].y * 2); + sint32 direction = duck->sprite_direction >> 3; + sint32 x = duck->x + (duck_move_offset[direction].x * 2); + sint32 y = duck->y + (duck_move_offset[direction].y * 2); if (x < 0 || y < 0 || x >= (32 * 256) || y >= (32 * 256)) { sprite_remove((rct_sprite*)duck); return; } - int z = min(duck->z + 2, 496); + sint32 z = min(duck->z + 2, 496); sprite_move(x, y, z, (rct_sprite*)duck); duck_invalidate(duck); } diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 7e9b2870a3..62e32daa00 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -24,8 +24,8 @@ #include "../ride/track_data.h" #include "../util/util.h" -void footpath_interrupt_peeps(int x, int y, int z); -void sub_6A7642(int x, int y, rct_map_element *mapElement); +void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z); +void sub_6A7642(sint32 x, sint32 y, rct_map_element *mapElement); uint8 gFootpathProvisionalFlags; rct_xyz16 gFootpathProvisionalPosition; @@ -79,14 +79,14 @@ static const uint8 connected_path_count[] = { 4, // 0b1111 }; -int entrance_get_directions(rct_map_element *mapElement) +sint32 entrance_get_directions(rct_map_element *mapElement) { uint8 entranceType = mapElement->properties.entrance.type; uint8 sequence = mapElement->properties.entrance.index & 0x0F; return EntranceDirections[(entranceType * 8) + sequence]; } -static bool entrance_has_direction(rct_map_element *mapElement, int direction) +static bool entrance_has_direction(rct_map_element *mapElement, sint32 direction) { return entrance_get_directions(mapElement) & (1 << direction); } @@ -95,9 +95,9 @@ static bool entrance_has_direction(rct_map_element *mapElement, int direction) * * rct2: 0x006A65AD */ -static void automatically_set_peep_spawn(int x, int y, int z) +static void automatically_set_peep_spawn(sint32 x, sint32 y, sint32 z) { - int direction = 0; + sint32 direction = 0; if (x != 32) { direction++; if (y != gMapSizeUnits - 32) { @@ -117,7 +117,7 @@ static void automatically_set_peep_spawn(int x, int y, int z) peepSpawn->z = z; } -static rct_map_element *map_get_footpath_element(int x, int y, int z) +static rct_map_element *map_get_footpath_element(sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement; @@ -130,7 +130,7 @@ static rct_map_element *map_get_footpath_element(int x, int y, int z) return NULL; } -static rct_map_element *map_get_footpath_element_slope(int x, int y, int z, int slope) +static rct_map_element *map_get_footpath_element_slope(sint32 x, sint32 y, sint32 z, sint32 slope) { rct_map_element *mapElement; @@ -148,11 +148,11 @@ static rct_map_element *map_get_footpath_element_slope(int x, int y, int z, int return NULL; } -static void loc_6A6620(int flags, int x, int y, rct_map_element *mapElement) +static void loc_6A6620(sint32 flags, sint32 x, sint32 y, rct_map_element *mapElement) { if ((mapElement->properties.path.type & 4) && !(flags & GAME_COMMAND_FLAG_GHOST)) { - int direction = mapElement->properties.path.type & 3; - int z = mapElement->base_height; + sint32 direction = mapElement->properties.path.type & 3; + sint32 z = mapElement->base_height; map_remove_intersecting_walls(x, y, z, z + 6, direction ^ 2); map_remove_intersecting_walls(x, y, z, z + 6, direction); mapElement = map_get_footpath_element(x / 32, y / 32, z); @@ -170,10 +170,10 @@ static const uint8 byte_98D7EC[] = { 207, 159, 63, 111 }; -static money32 footpath_element_insert(int type, int x, int y, int z, int slope, int flags, uint8 pathItemType) +static money32 footpath_element_insert(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 flags, uint8 pathItemType) { rct_map_element *mapElement; - int bl, zHigh; + sint32 bl, zHigh; if (!map_check_free_elements_and_reorganise(1)) return MONEY32_UNDEFINED; @@ -202,7 +202,7 @@ static money32 footpath_element_insert(int type, int x, int y, int z, int slope, mapElement = map_get_surface_element_at((x / 32), (y / 32)); - int supportHeight = z - mapElement->base_height; + sint32 supportHeight = z - mapElement->base_height; gFootpathPrice += supportHeight < 0 ? MONEY(20, 00) : (supportHeight / 2) * MONEY(5, 00); if (flags & GAME_COMMAND_FLAG_APPLY) { @@ -231,7 +231,7 @@ static money32 footpath_element_insert(int type, int x, int y, int z, int slope, return gParkFlags & PARK_FLAGS_NO_MONEY ? 0 : gFootpathPrice; } -static money32 footpath_element_update(int x, int y, rct_map_element *mapElement, int type, int flags, uint8 pathItemType) +static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapElement, sint32 type, sint32 flags, uint8 pathItemType) { if ((mapElement->properties.path.type >> 4) != (type & 0x0F) || (mapElement->type & 1) != (type >> 7)) { gFootpathPrice += MONEY(6, 00); @@ -332,7 +332,7 @@ static money32 footpath_element_update(int x, int y, rct_map_element *mapElement return gParkFlags & PARK_FLAGS_NO_MONEY ? 0 : gFootpathPrice; } -static money32 footpath_place_real(int type, int x, int y, int z, int slope, int flags, uint8 pathItemType) +static money32 footpath_place_real(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 flags, uint8 pathItemType) { rct_map_element *mapElement; @@ -399,7 +399,7 @@ static money32 footpath_place_real(int type, int x, int y, int z, int slope, int * * rct2: 0x006BA23E */ -static void remove_banners_at_element(int x, int y, rct_map_element* mapElement){ +static void remove_banners_at_element(sint32 x, sint32 y, rct_map_element* mapElement){ while (!map_element_is_last_for_tile(mapElement++)){ if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH)return; else if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_BANNER)continue; @@ -409,7 +409,7 @@ static void remove_banners_at_element(int x, int y, rct_map_element* mapElement) } } -money32 footpath_remove_real(int x, int y, int z, int flags) +money32 footpath_remove_real(sint32 x, sint32 y, sint32 z, sint32 flags) { rct_map_element *mapElement; @@ -456,7 +456,7 @@ money32 footpath_remove_real(int x, int y, int z, int flags) * * rct2: 0x006A61DE */ -void game_command_place_footpath(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_place_footpath(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = footpath_place_real( (*edx >> 8) & 0xFF, @@ -469,7 +469,7 @@ void game_command_place_footpath(int *eax, int *ebx, int *ecx, int *edx, int *es ); } -static money32 footpath_place_from_track(int type, int x, int y, int z, int slope, int edges, int flags) +static money32 footpath_place_from_track(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 edges, sint32 flags) { rct_map_element *mapElement; @@ -514,7 +514,7 @@ static money32 footpath_place_from_track(int type, int x, int y, int z, int slop gFootpathPrice += 120; uint8 bl = 15; - int zHigh = z + 4; + sint32 zHigh = z + 4; if (slope & 4) { bl = byte_98D7EC[slope & 3]; zHigh += 2; @@ -531,7 +531,7 @@ static money32 footpath_place_from_track(int type, int x, int y, int z, int slop mapElement = map_get_surface_element_at((x / 32), (y / 32)); - int supportHeight = z - mapElement->base_height; + sint32 supportHeight = z - mapElement->base_height; gFootpathPrice += supportHeight < 0 ? MONEY(20, 00) : (supportHeight / 2) * MONEY(5, 00); if (flags & GAME_COMMAND_FLAG_APPLY) { @@ -565,7 +565,7 @@ static money32 footpath_place_from_track(int type, int x, int y, int z, int slop * * rct2: 0x006A68AE */ -void game_command_place_footpath_from_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_place_footpath_from_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = footpath_place_from_track( (*edx >> 8) & 0xFF, @@ -582,17 +582,17 @@ void game_command_place_footpath_from_track(int *eax, int *ebx, int *ecx, int *e * * rct2: 0x006A67C0 */ -void game_command_remove_footpath(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_remove_footpath(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = footpath_remove_real((*eax & 0xFFFF), (*ecx & 0xFFFF), (*edx & 0xFF), (*ebx & 0xFF)); } -money32 footpath_place(int type, int x, int y, int z, int slope, int flags) +money32 footpath_place(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 flags) { return game_do_command(x, (slope << 8) | flags, y, (type << 8) | z, GAME_COMMAND_PLACE_PATH, 0, 0); } -void footpath_remove(int x, int y, int z, int flags) +void footpath_remove(sint32 x, sint32 y, sint32 z, sint32 flags) { game_do_command(x, flags, y, z, GAME_COMMAND_REMOVE_PATH, 0, 0); } @@ -601,7 +601,7 @@ void footpath_remove(int x, int y, int z, int flags) * * rct2: 0x006A76FF */ -money32 footpath_provisional_set(int type, int x, int y, int z, int slope) +money32 footpath_provisional_set(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope) { money32 cost; @@ -676,9 +676,9 @@ void footpath_provisional_update() * direction: ecx * mapElement: edx */ -void footpath_get_coordinates_from_pos(int screenX, int screenY, int *x, int *y, int *direction, rct_map_element **mapElement) +void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement) { - int z = 0, interactionType; + sint32 z = 0, interactionType; rct_map_element *myMapElement; rct_viewport *viewport; rct_xy16 position = { 0 }; @@ -707,7 +707,7 @@ void footpath_get_coordinates_from_pos(int screenX, int screenY, int *x, int *y, rct_xy16 start_vp_pos = screen_coord_to_viewport_coord(viewport, screenX, screenY); - for (int i = 0; i < 5; i++) { + for (sint32 i = 0; i < 5; i++) { if (interactionType != VIEWPORT_INTERACTION_ITEM_FOOTPATH) { z = map_element_height(position.x, position.y); } @@ -718,7 +718,7 @@ void footpath_get_coordinates_from_pos(int screenX, int screenY, int *x, int *y, // Determine to which edge the cursor is closest uint32 myDirection; - int mod_x = position.x & 0x1F, mod_y = position.y & 0x1F; + sint32 mod_x = position.x & 0x1F, mod_y = position.y & 0x1F; if (mod_x < mod_y) { if (mod_x + mod_y < 32) { myDirection = 0; @@ -749,10 +749,10 @@ void footpath_get_coordinates_from_pos(int screenX, int screenY, int *x, int *y, * direction: cl * mapElement: edx */ -void footpath_bridge_get_info_from_pos(int screenX, int screenY, int *x, int *y, int *direction, rct_map_element **mapElement) +void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement) { // First check if we point at an entrance or exit. In that case, we would want the path coming from the entrance/exit. - int interactionType; + sint32 interactionType; rct_viewport *viewport; rct_xy16 map_pos = { 0 }; @@ -764,9 +764,9 @@ void footpath_bridge_get_info_from_pos(int screenX, int screenY, int *x, int *y, && viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL) && map_element_get_type(*mapElement) == MAP_ELEMENT_TYPE_ENTRANCE ) { - int directions = entrance_get_directions(*mapElement); + sint32 directions = entrance_get_directions(*mapElement); if (directions & 0x0F) { - int bx = bitscanforward(directions); + sint32 bx = bitscanforward(directions); bx += (*mapElement)->type; bx &= 3; if (direction != NULL) *direction = bx; @@ -778,9 +778,9 @@ void footpath_bridge_get_info_from_pos(int screenX, int screenY, int *x, int *y, *x = map_pos.x; *y = map_pos.y; if (interactionType == VIEWPORT_INTERACTION_ITEM_RIDE && map_element_get_type(*mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) { - int directions = entrance_get_directions(*mapElement); + sint32 directions = entrance_get_directions(*mapElement); if (directions & 0x0F) { - int bx = bitscanforward(directions); + sint32 bx = bitscanforward(directions); bx += (*mapElement)->type; // First two bits seem to contain the direction of entrance/exit bx &= 3; if (direction != NULL) *direction = bx; @@ -796,14 +796,14 @@ void footpath_bridge_get_info_from_pos(int screenX, int screenY, int *x, int *y, * * rct2: 0x00673883 */ -void footpath_remove_litter(int x, int y, int z) +void footpath_remove_litter(sint32 x, sint32 y, sint32 z) { uint16 spriteIndex = sprite_get_first_in_quadrant(x, y); while (spriteIndex != SPRITE_INDEX_NULL) { rct_litter *sprite = &get_sprite(spriteIndex)->litter; uint16 nextSpriteIndex = sprite->next_in_quadrant; if (sprite->linked_list_type_offset == SPRITE_LIST_LITTER * 2) { - int distanceZ = abs(sprite->z - z); + sint32 distanceZ = abs(sprite->z - z); if (distanceZ <= 32) { invalidate_sprite_0((rct_sprite*)sprite); sprite_remove((rct_sprite*)sprite); @@ -817,7 +817,7 @@ void footpath_remove_litter(int x, int y, int z) * * rct2: 0x0069A48B */ -void footpath_interrupt_peeps(int x, int y, int z) +void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z) { uint16 spriteIndex = sprite_get_first_in_quadrant(x, y); while (spriteIndex != SPRITE_INDEX_NULL) { @@ -844,7 +844,7 @@ void footpath_interrupt_peeps(int x, int y, int z) * * rct2: 0x006E59DC */ -bool fence_in_the_way(int x, int y, int z0, int z1, int direction) +bool fence_in_the_way(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) { rct_map_element *mapElement; @@ -868,7 +868,7 @@ bool fence_in_the_way(int x, int y, int z0, int z1, int direction) return false; } -static bool map_is_edge(int x, int y) +static bool map_is_edge(sint32 x, sint32 y) { return ( x < 32 || @@ -878,7 +878,7 @@ static bool map_is_edge(int x, int y) ); } -static rct_map_element *footpath_connect_corners_get_neighbour(int x, int y, int z, int requireEdges) +static rct_map_element *footpath_connect_corners_get_neighbour(sint32 x, sint32 y, sint32 z, sint32 requireEdges) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -904,7 +904,7 @@ static rct_map_element *footpath_connect_corners_get_neighbour(int x, int y, int * * rct2: 0x006A70EB */ -static void footpath_connect_corners(int initialX, int initialY, rct_map_element *initialMapElement) +static void footpath_connect_corners(sint32 initialX, sint32 initialY, rct_map_element *initialMapElement) { rct_map_element *mapElement[4]; @@ -914,11 +914,11 @@ static void footpath_connect_corners(int initialX, int initialY, rct_map_element return; mapElement[0] = initialMapElement; - int z = initialMapElement->base_height; - for (int initialDirection = 0; initialDirection < 4; initialDirection++) { - int x = initialX; - int y = initialY; - int direction = initialDirection; + sint32 z = initialMapElement->base_height; + for (sint32 initialDirection = 0; initialDirection < 4; initialDirection++) { + sint32 x = initialX; + sint32 y = initialY; + sint32 direction = initialDirection; x += TileDirectionDelta[direction].x; y += TileDirectionDelta[direction].y; @@ -972,10 +972,10 @@ typedef struct rct_neighbour { typedef struct rct_neighbour_list { rct_neighbour items[8]; - int count; + sint32 count; } rct_neighbour_list; -static int rct_neighbour_compare(const void *a, const void *b) +static sint32 rct_neighbour_compare(const void *a, const void *b) { uint8 va = ((rct_neighbour*)a)->order; uint8 vb = ((rct_neighbour*)b)->order; @@ -995,7 +995,7 @@ static void neighbour_list_init(rct_neighbour_list *neighbourList) neighbourList->count = 0; } -static void neighbour_list_push(rct_neighbour_list *neighbourList, int order, int direction, uint8 rideIndex, uint8 entrance_index) +static void neighbour_list_push(rct_neighbour_list *neighbourList, sint32 order, sint32 direction, uint8 rideIndex, uint8 entrance_index) { neighbourList->items[neighbourList->count].order = order; neighbourList->items[neighbourList->count].direction = direction; @@ -1010,15 +1010,15 @@ static bool neighbour_list_pop(rct_neighbour_list *neighbourList, rct_neighbour return false; *outNeighbour = neighbourList->items[0]; - for (int i = 0; i < neighbourList->count - 1; i++) + for (sint32 i = 0; i < neighbourList->count - 1; i++) neighbourList->items[i] = neighbourList->items[i + 1]; neighbourList->count--; return true; } -static void neighbour_list_remove(rct_neighbour_list *neighbourList, int index) +static void neighbour_list_remove(rct_neighbour_list *neighbourList, sint32 index) { - int itemsRemaining = neighbourList->count - index - 1; + sint32 itemsRemaining = neighbourList->count - index - 1; if (itemsRemaining > 0) { memmove(&neighbourList->items[index], &neighbourList->items[index + 1], sizeof(rct_neighbour) * itemsRemaining); } @@ -1030,10 +1030,10 @@ static void neighbour_list_sort(rct_neighbour_list *neighbourList) qsort(neighbourList->items, neighbourList->count, sizeof(rct_neighbour), rct_neighbour_compare); } -static rct_map_element *footpath_get_element(int x, int y, int z0, int z1, int direction) +static rct_map_element *footpath_get_element(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) { rct_map_element *mapElement; - int slope; + sint32 slope; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -1062,15 +1062,15 @@ static rct_map_element *footpath_get_element(int x, int y, int z0, int z1, int d return NULL; } -static bool sub_footpath_disconnect_queue_from_path(int x, int y, rct_map_element *mapElement, int action, int direction) { +static bool sub_footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_element *mapElement, sint32 action, sint32 direction) { if (((mapElement->properties.path.edges & (1 << direction)) == 0) ^ (action < 0)) return false; if ((action < 0) && fence_in_the_way(x, y, mapElement->base_height, mapElement->clearance_height, direction)) return false; - int x1 = x + TileDirectionDelta[direction].x; - int y1 = y + TileDirectionDelta[direction].y; - int z = mapElement->base_height; + sint32 x1 = x + TileDirectionDelta[direction].x; + sint32 y1 = y + TileDirectionDelta[direction].y; + sint32 z = mapElement->base_height; rct_map_element *otherMapElement = footpath_get_element(x1, y1, z - 2, z, direction); if (otherMapElement != NULL && !footpath_element_is_queue(otherMapElement)) { mapElement->properties.path.type &= 0xFC; @@ -1089,7 +1089,7 @@ static bool sub_footpath_disconnect_queue_from_path(int x, int y, rct_map_elemen return false; } -static bool footpath_disconnect_queue_from_path(int x, int y, rct_map_element *mapElement, int action) { +static bool footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_element *mapElement, sint32 action) { if (!footpath_element_is_queue(mapElement)) return false; if (footpath_element_is_sloped(mapElement)) return false; @@ -1102,7 +1102,7 @@ static bool footpath_disconnect_queue_from_path(int x, int y, rct_map_element *m return true; } - for (int direction = 0; direction < 4; direction++) { + for (sint32 direction = 0; direction < 4; direction++) { if ((action < 0) && (direction == (mapElement->properties.path.type & 3))) continue; if (sub_footpath_disconnect_queue_from_path(x, y, mapElement, action, direction)) return true; @@ -1111,7 +1111,7 @@ static bool footpath_disconnect_queue_from_path(int x, int y, rct_map_element *m return false; } -static bool footpath_is_queue_connected_to_path(int x, int y, rct_map_element *mapElement, int direction) +static bool footpath_is_queue_connected_to_path(sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction) { if (!footpath_element_is_queue(mapElement)) return false; if (!(mapElement->properties.path.edges & (1 << direction))) return false; @@ -1130,11 +1130,11 @@ static bool footpath_is_queue_connected_to_path(int x, int y, rct_map_element *m * rct2: 0x006A6D7E */ static void loc_6A6D7E( - int initialX, int initialY, int z, int direction, rct_map_element *initialMapElement, - int flags, bool query, rct_neighbour_list *neighbourList + sint32 initialX, sint32 initialY, sint32 z, sint32 direction, rct_map_element *initialMapElement, + sint32 flags, bool query, rct_neighbour_list *neighbourList ) { - int x = initialX + TileDirectionDelta[direction].x; - int y = initialY + TileDirectionDelta[direction].y; + sint32 x = initialX + TileDirectionDelta[direction].x; + sint32 y = initialY + TileDirectionDelta[direction].y; if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode) && map_is_edge(x, y)) { if (query) { neighbour_list_push(neighbourList, 7, direction, 255, 255); @@ -1240,8 +1240,8 @@ loc_6A6FD2: } static void loc_6A6C85( - int x, int y, int direction, rct_map_element *mapElement, - int flags, bool query, rct_neighbour_list *neighbourList + sint32 x, sint32 y, sint32 direction, rct_map_element *mapElement, + sint32 flags, bool query, rct_neighbour_list *neighbourList ) { if (query && fence_in_the_way(x, y, mapElement->base_height, mapElement->clearance_height, direction)) return; @@ -1268,7 +1268,7 @@ static void loc_6A6C85( } } - int z = mapElement->base_height; + sint32 z = mapElement->base_height; if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { if (footpath_element_is_sloped(mapElement)) { if ((footpath_element_get_slope_direction(mapElement) - direction) & 1) { @@ -1287,7 +1287,7 @@ static void loc_6A6C85( * * rct2: 0x006A6C66 */ -void footpath_connect_edges(int x, int y, rct_map_element *mapElement, int flags) +void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sint32 flags) { rct_neighbour_list neighbourList; rct_neighbour neighbour; @@ -1297,16 +1297,16 @@ void footpath_connect_edges(int x, int y, rct_map_element *mapElement, int flags neighbour_list_init(&neighbourList); sub_6A7642(x, y, mapElement); - for (int direction = 0; direction < 4; direction++) { + for (sint32 direction = 0; direction < 4; direction++) { loc_6A6C85(x, y, direction, mapElement, flags, true, &neighbourList); } neighbour_list_sort(&neighbourList); if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH && footpath_element_is_queue(mapElement)) { - int rideIndex = -1; + sint32 rideIndex = -1; uint8 entranceIndex = 255; - for (int i = 0; i < neighbourList.count; i++) { + for (sint32 i = 0; i < neighbourList.count; i++) { if (neighbourList.items[i].ride_index != 255) { if (rideIndex == -1) { rideIndex = neighbourList.items[i].ride_index; @@ -1337,14 +1337,14 @@ void footpath_connect_edges(int x, int y, rct_map_element *mapElement, int flags * * rct2: 0x006A742F */ -void footpath_chain_ride_queue(int rideIndex, int entranceIndex, int x, int y, rct_map_element *mapElement, int direction) +void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction) { rct_map_element *lastPathElement, *lastQueuePathElement; - int lastPathX = x, lastPathY = y, lastPathDirection = direction; + sint32 lastPathX = x, lastPathY = y, lastPathDirection = direction; lastPathElement = NULL; lastQueuePathElement = NULL; - int z = mapElement->base_height; + sint32 z = mapElement->base_height; for (;;) { if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { lastPathElement = mapElement; @@ -1390,10 +1390,10 @@ void footpath_chain_ride_queue(int rideIndex, int entranceIndex, int x, int y, r if (footpath_element_is_queue(mapElement)) { // Fix #2051: Stop queue paths that are already connected to two other tiles // from connecting to the tile we are coming from. - int edges = mapElement->properties.path.edges; - int numEdges = bitcount(edges); + sint32 edges = mapElement->properties.path.edges; + sint32 numEdges = bitcount(edges); if (numEdges >= 2) { - int requiredEdgeMask = 1 << (direction ^ 2); + sint32 requiredEdgeMask = 1 << (direction ^ 2); if (!(edges & requiredEdgeMask)) { break; } @@ -1473,7 +1473,7 @@ void sub_6A759F() continue; } - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { if (ride->entrances[i] == 0xFFFF) { continue; } @@ -1499,14 +1499,14 @@ void sub_6A759F() * * rct2: 0x0069ADBD */ -static void footpath_unown(int x, int y, rct_map_element *pathElement) +static void footpath_unown(sint32 x, sint32 y, rct_map_element *pathElement) { map_buy_land_rights(x, y, x, y, 6, 1); } -static bool get_next_direction(int edges, int *direction) +static bool get_next_direction(sint32 edges, sint32 *direction) { - int index = bitscanforward(edges); + sint32 index = bitscanforward(edges); if (index == -1) return false; @@ -1521,12 +1521,12 @@ static bool get_next_direction(int edges, int *direction) * (1 << 5): Unown * (1 << 7): Ignore no entry signs */ -static int footpath_is_connected_to_map_edge_recurse( - int x, int y, int z, int direction, int flags, - int level, int distanceFromJunction, int junctionTolerance +static sint32 footpath_is_connected_to_map_edge_recurse( + sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags, + sint32 level, sint32 distanceFromJunction, sint32 junctionTolerance ) { rct_map_element *mapElement; - int edges, slopeDirection; + sint32 edges, slopeDirection; x += TileDirectionDelta[direction].x; y += TileDirectionDelta[direction].y; @@ -1567,14 +1567,14 @@ static int footpath_is_connected_to_map_edge_recurse( direction ^= 2; if (!(flags & (1 << 7))) { if (mapElement[1].type == MAP_ELEMENT_TYPE_BANNER) { - for (int i = 1; i < 4; i++) { + for (sint32 i = 1; i < 4; i++) { if (map_element_is_last_for_tile(&mapElement[i - 1])) break; if (mapElement[i].type != MAP_ELEMENT_TYPE_BANNER) break; edges &= mapElement[i].properties.banner.flags; } } if (mapElement[2].type == MAP_ELEMENT_TYPE_BANNER && mapElement[1].type != MAP_ELEMENT_TYPE_PATH) { - for (int i = 1; i < 6; i++) { + for (sint32 i = 1; i < 6; i++) { if (map_element_is_last_for_tile(&mapElement[i - 1])) break; if (mapElement[i].type != MAP_ELEMENT_TYPE_BANNER) break; edges &= mapElement[i].properties.banner.flags; @@ -1620,7 +1620,7 @@ searchFromFootpath: if (footpath_element_is_sloped(mapElement) && footpath_element_get_slope_direction(mapElement) == direction) { z += 2; } - int result = footpath_is_connected_to_map_edge_recurse(x, y, z, direction, flags, level, 0, junctionTolerance); + sint32 result = footpath_is_connected_to_map_edge_recurse(x, y, z, direction, flags, level, 0, junctionTolerance); if (result == FOOTPATH_SEARCH_SUCCESS) { return result; } @@ -1630,7 +1630,7 @@ searchFromFootpath: } } -int footpath_is_connected_to_map_edge(int x, int y, int z, int direction, int flags) +sint32 footpath_is_connected_to_map_edge(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags) { flags |= (1 << 0); return footpath_is_connected_to_map_edge_recurse(x, y, z, direction, flags, 0, 0, 16); @@ -1701,7 +1701,7 @@ uint8 footpath_element_get_type(rct_map_element *mapElement) * clears the wide footpath flag for all footpaths * at location */ -static void footpath_clear_wide(int x, int y) +static void footpath_clear_wide(sint32 x, sint32 y) { rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { @@ -1717,7 +1717,7 @@ static void footpath_clear_wide(int x, int y) * returns footpath element if it can be made wide * returns NULL if it can not be made wide */ -static rct_map_element* footpath_can_be_wide(int x, int y, uint8 height) +static rct_map_element* footpath_can_be_wide(sint32 x, sint32 y, uint8 height) { rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { @@ -1740,7 +1740,7 @@ static rct_map_element* footpath_can_be_wide(int x, int y, uint8 height) * * rct2: 0x006A87BB */ -void footpath_update_path_wide_flags(int x, int y) +void footpath_update_path_wide_flags(sint32 x, sint32 y) { if (x < 0x20) return; @@ -1930,14 +1930,14 @@ void footpath_update_path_wide_flags(int x, int y) * * rct2: 0x006A7642 */ -void sub_6A7642(int x, int y, rct_map_element *mapElement) +void sub_6A7642(sint32 x, sint32 y, rct_map_element *mapElement) { - int elementType = map_element_get_type(mapElement); + sint32 elementType = map_element_get_type(mapElement); switch (elementType) { case MAP_ELEMENT_TYPE_PATH: if (footpath_element_is_queue(mapElement)) { footpath_queue_chain_push(mapElement->properties.path.ride_index); - for (int direction = 0; direction < 4; direction++) { + for (sint32 direction = 0; direction < 4; direction++) { if (mapElement->properties.path.edges & (1 << direction)) { footpath_chain_ride_queue(255, 0, x, y, mapElement, direction); } @@ -1958,9 +1958,9 @@ void sub_6A7642(int x, int y, rct_map_element *mapElement) * * rct2: 0x006A6B7F */ -static void footpath_remove_edges_towards_here(int x, int y, int z, int direction, rct_map_element *mapElement, bool isQueue) +static void footpath_remove_edges_towards_here(sint32 x, sint32 y, sint32 z, sint32 direction, rct_map_element *mapElement, bool isQueue) { - int d; + sint32 d; if (footpath_element_is_queue(mapElement)) { footpath_queue_chain_push(mapElement->properties.path.ride_index); @@ -2001,10 +2001,10 @@ static void footpath_remove_edges_towards_here(int x, int y, int z, int directio * * rct2: 0x006A6B14 */ -static void footpath_remove_edges_towards(int x, int y, int z0, int z1, int direction, bool isQueue) +static void footpath_remove_edges_towards(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction, bool isQueue) { rct_map_element *mapElement; - int slope; + sint32 slope; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -2040,10 +2040,10 @@ static void footpath_remove_edges_towards(int x, int y, int z0, int z1, int dire * @param x x-coordinate in units (not tiles) * @param y y-coordinate in units (not tiles) */ -void footpath_remove_edges_at(int x, int y, rct_map_element *mapElement) +void footpath_remove_edges_at(sint32 x, sint32 y, rct_map_element *mapElement) { if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) { - int rideIndex = mapElement->properties.track.ride_index; + sint32 rideIndex = mapElement->properties.track.ride_index; rct_ride *ride = get_ride(rideIndex); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) return; @@ -2051,18 +2051,18 @@ void footpath_remove_edges_at(int x, int y, rct_map_element *mapElement) sub_6A7642(x, y, mapElement); - for (int direction = 0; direction < 4; direction++) { - int z1 = mapElement->base_height; + for (sint32 direction = 0; direction < 4; direction++) { + sint32 z1 = mapElement->base_height; if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { if (footpath_element_is_sloped(mapElement)) { - int slope = footpath_element_get_slope_direction(mapElement); + sint32 slope = footpath_element_get_slope_direction(mapElement); if ((slope - direction) & 1) continue; z1 += slope == direction ? 2 : 0; } } - int z0 = z1 - 2; + sint32 z0 = z1 - 2; footpath_remove_edges_towards(x + TileDirectionDelta[direction].x, y + TileDirectionDelta[direction].y, z0, z1, direction, footpath_element_is_queue(mapElement)); } @@ -2071,7 +2071,7 @@ void footpath_remove_edges_at(int x, int y, rct_map_element *mapElement) mapElement->properties.path.edges = 0; } -rct_footpath_entry *get_footpath_entry(int entryIndex) +rct_footpath_entry *get_footpath_entry(sint32 entryIndex) { return gFootpathEntries[entryIndex]; } diff --git a/src/openrct2/world/footpath.h b/src/openrct2/world/footpath.h index 2d64958350..79c36c4ba3 100644 --- a/src/openrct2/world/footpath.h +++ b/src/openrct2/world/footpath.h @@ -67,25 +67,25 @@ extern uint8 gFootpathGroundFlags; extern const rct_xy16 word_981D6C[4]; -money32 footpath_remove_real(int x, int y, int z, int flags); -void game_command_place_footpath(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_place_footpath_from_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_remove_footpath(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -money32 footpath_place(int type, int x, int y, int z, int slope, int flags); -void footpath_remove(int x, int y, int z, int flags); -money32 footpath_provisional_set(int type, int x, int y, int z, int slope); +money32 footpath_remove_real(sint32 x, sint32 y, sint32 z, sint32 flags); +void game_command_place_footpath(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_place_footpath_from_track(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_remove_footpath(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +money32 footpath_place(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 flags); +void footpath_remove(sint32 x, sint32 y, sint32 z, sint32 flags); +money32 footpath_provisional_set(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope); void footpath_provisional_remove(); void footpath_provisional_update(); -void footpath_get_coordinates_from_pos(int screenX, int screenY, int *x, int *y, int *direction, rct_map_element **mapElement); -void footpath_bridge_get_info_from_pos(int screenX, int screenY, int *x, int *y, int *direction, rct_map_element **mapElement); -void footpath_remove_litter(int x, int y, int z); -void footpath_connect_edges(int x, int y, rct_map_element *mapElement, int flags); +void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement); +void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement); +void footpath_remove_litter(sint32 x, sint32 y, sint32 z); +void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sint32 flags); void sub_6A759F(); -bool fence_in_the_way(int x, int y, int z0, int z1, int direction); -void footpath_chain_ride_queue(int rideIndex, int entranceIndex, int x, int y, rct_map_element *mapElement, int direction); -void footpath_update_path_wide_flags(int x, int y); +bool fence_in_the_way(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction); +void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction); +void footpath_update_path_wide_flags(sint32 x, sint32 y); -int footpath_is_connected_to_map_edge(int x, int y, int z, int direction, int flags); +sint32 footpath_is_connected_to_map_edge(sint32 x, sint32 y, insint32t z, sint32 direction, sint32 flags); bool footpath_element_is_sloped(rct_map_element *mapElement); uint8 footpath_element_get_slope_direction(rct_map_element *mapElement); bool footpath_element_is_queue(rct_map_element *mapElement); @@ -97,10 +97,10 @@ void footpath_element_set_path_scenery(rct_map_element *mapElement, uint8 pathSc uint8 footpath_element_get_path_scenery_index(rct_map_element *mapElement); bool footpath_element_path_scenery_is_ghost(rct_map_element *mapElement); void footpath_scenery_set_is_ghost(rct_map_element *mapElement, bool isGhost); -void footpath_remove_edges_at(int x, int y, rct_map_element *mapElement); -int entrance_get_directions(rct_map_element *mapElement); +void footpath_remove_edges_at(sint32 x, sint32 y, rct_map_element *mapElement); +sint32 entrance_get_directions(rct_map_element *mapElement); -rct_footpath_entry *get_footpath_entry(int entryIndex); +rct_footpath_entry *get_footpath_entry(sint32 entryIndex); void footpath_queue_chain_reset(); void footpath_queue_chain_push(uint8 rideIndex); diff --git a/src/openrct2/world/fountain.c b/src/openrct2/world/fountain.c index 5cd2b9bcd5..c7aeaeb61d 100644 --- a/src/openrct2/world/fountain.c +++ b/src/openrct2/world/fountain.c @@ -83,26 +83,26 @@ const uint8 _fountainPatternFlags[] = { }; static void jumping_fountain_continue(rct_jumping_fountain *jumpingFountain); -static bool is_jumping_fountain(int type, int x, int y, int z); +static bool is_jumping_fountain(sint32 type, sint32 x, sint32 y, sint32 z); -static void jumping_fountain_goto_edge(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections); -static void jumping_fountain_bounce(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections); -static void jumping_fountain_split(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections); -static void jumping_fountain_random(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections); -static void jumping_fountain_create_next(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int direction); +static void jumping_fountain_goto_edge(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections); +static void jumping_fountain_bounce(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections); +static void jumping_fountain_split(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections); +static void jumping_fountain_random(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections); +static void jumping_fountain_create_next(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 direction); /** * * rct2: 0x00673DBA (water) * rct2: 0x00673F51 (snow) */ -void jumping_fountain_begin(int type, int x, int y, rct_map_element *mapElement) +void jumping_fountain_begin(sint32 type, sint32 x, sint32 y, rct_map_element *mapElement) { - int i, randomIndex; - int z = mapElement->base_height * 8; + sint32 i, randomIndex; + sint32 z = mapElement->base_height * 8; // Change pattern approximately every 51 seconds - int pattern = (gCurrentTicks >> 11) & 7; + sint32 pattern = (gCurrentTicks >> 11) & 7; switch (pattern) { case PATTERN_CYCLIC_SQUARES: // 0, 1, 2, 3 @@ -178,7 +178,7 @@ void jumping_fountain_begin(int type, int x, int y, rct_map_element *mapElement) * rct2: 0x0067396A (water) * rct2: 0x006739A4 (snow) */ -void jumping_fountain_create(int type, int x, int y, int z, int direction, int flags, int iteration) +void jumping_fountain_create(sint32 type, sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags, sint32 iteration) { rct_jumping_fountain *jumpingFountain; @@ -208,7 +208,7 @@ void jumping_fountain_create(int type, int x, int y, int z, int direction, int f */ void jumping_fountain_update(rct_jumping_fountain *jumpingFountain) { - int original_var_26a = jumpingFountain->var_26a; + sint32 original_var_26a = jumpingFountain->var_26a; jumpingFountain->var_26a += 160; if (original_var_26a <= 255 - 160) return; @@ -241,17 +241,17 @@ void jumping_fountain_update(rct_jumping_fountain *jumpingFountain) */ static void jumping_fountain_continue(rct_jumping_fountain *jumpingFountain) { - int direction = (jumpingFountain->sprite_direction >> 3) & 7; - int x = jumpingFountain->x + TileDirectionDelta[direction].x; - int y = jumpingFountain->y + TileDirectionDelta[direction].y; - int z = jumpingFountain->z; + sint32 direction = (jumpingFountain->sprite_direction >> 3) & 7; + sint32 x = jumpingFountain->x + TileDirectionDelta[direction].x; + sint32 y = jumpingFountain->y + TileDirectionDelta[direction].y; + sint32 z = jumpingFountain->z; - int type = jumpingFountain->misc_identifier == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? + sint32 type = jumpingFountain->misc_identifier == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? JUMPING_FOUNTAIN_TYPE_SNOW : JUMPING_FOUNTAIN_TYPE_WATER; - int availableDirections = 0; - for (int i = 0; i < 8; i++) { + sint32 availableDirections = 0; + for (sint32 i = 0; i < 8; i++) { if (is_jumping_fountain(type, x + dword_97F000[i].x, y + dword_97F000[i].y, z)) availableDirections |= 1 << i; } @@ -280,11 +280,11 @@ static void jumping_fountain_continue(rct_jumping_fountain *jumpingFountain) jumping_fountain_random(jumpingFountain, x, y, z, availableDirections); } -static bool is_jumping_fountain(int type, int x, int y, int z) +static bool is_jumping_fountain(sint32 type, sint32 x, sint32 y, sint32 z) { z = z >> 3; - int pathBitFlagMask = type == JUMPING_FOUNTAIN_TYPE_SNOW ? + sint32 pathBitFlagMask = type == JUMPING_FOUNTAIN_TYPE_SNOW ? PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW : PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER; @@ -315,9 +315,9 @@ static bool is_jumping_fountain(int type, int x, int y, int z) * * rct2: 0x00673B6E */ -static void jumping_fountain_goto_edge(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections) +static void jumping_fountain_goto_edge(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections) { - int direction = (jumpingFountain->sprite_direction >> 3) << 1; + sint32 direction = (jumpingFountain->sprite_direction >> 3) << 1; if (availableDirections & (1 << direction)) { jumping_fountain_create_next(jumpingFountain, x, y, z, direction); return; @@ -349,13 +349,13 @@ static void jumping_fountain_goto_edge(rct_jumping_fountain *jumpingFountain, in * * rct2: 0x00673B45 */ -static void jumping_fountain_bounce(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections) +static void jumping_fountain_bounce(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections) { jumpingFountain->iteration++; if (jumpingFountain->iteration >= 8) return; - int direction = ((jumpingFountain->sprite_direction >> 3) ^ 2) << 1; + sint32 direction = ((jumpingFountain->sprite_direction >> 3) ^ 2) << 1; if (availableDirections & (1 << direction)) { jumping_fountain_create_next(jumpingFountain, x, y, z, direction); return; @@ -370,16 +370,16 @@ static void jumping_fountain_bounce(rct_jumping_fountain *jumpingFountain, int x * * rct2: 0x00673ACE */ -static void jumping_fountain_split(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections) +static void jumping_fountain_split(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections) { if (jumpingFountain->iteration >= 3) return; - int type = jumpingFountain->misc_identifier == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? + sint32 type = jumpingFountain->misc_identifier == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? JUMPING_FOUNTAIN_TYPE_SNOW : JUMPING_FOUNTAIN_TYPE_WATER; - int direction = ((jumpingFountain->sprite_direction >> 3) ^ 2) << 1; + sint32 direction = ((jumpingFountain->sprite_direction >> 3) ^ 2) << 1; availableDirections &= ~(1 << direction); direction++; availableDirections &= ~(1 << direction); @@ -411,13 +411,13 @@ static void jumping_fountain_split(rct_jumping_fountain *jumpingFountain, int x, * * rct2: 0x00673AAC */ -static void jumping_fountain_random(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int availableDirections) +static void jumping_fountain_random(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 availableDirections) { uint32 randomIndex = scenario_rand(); if ((randomIndex & 0xFFFF) < 0x2000) return; - int direction = randomIndex & 7; + sint32 direction = randomIndex & 7; while (!(availableDirections & (1 << direction))) direction = (direction + 1) & 7; @@ -428,13 +428,13 @@ static void jumping_fountain_random(rct_jumping_fountain *jumpingFountain, int x * * rct2: 0x00673B45 */ -static void jumping_fountain_create_next(rct_jumping_fountain *jumpingFountain, int x, int y, int z, int direction) +static void jumping_fountain_create_next(rct_jumping_fountain *jumpingFountain, sint32 x, sint32 y, sint32 z, sint32 direction) { - int flags = jumpingFountain->fountain_flags & ~FOUNTAIN_FLAG_7; + sint32 flags = jumpingFountain->fountain_flags & ~FOUNTAIN_FLAG_7; if (direction & 1) flags |= FOUNTAIN_FLAG_7; - int type = jumpingFountain->misc_identifier == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? + sint32 type = jumpingFountain->misc_identifier == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? JUMPING_FOUNTAIN_TYPE_SNOW : JUMPING_FOUNTAIN_TYPE_WATER; diff --git a/src/openrct2/world/fountain.h b/src/openrct2/world/fountain.h index 3f273515c5..fec3b242fe 100644 --- a/src/openrct2/world/fountain.h +++ b/src/openrct2/world/fountain.h @@ -26,8 +26,8 @@ enum { JUMPING_FOUNTAIN_TYPE_SNOW }; -void jumping_fountain_begin(int type, int x, int y, rct_map_element *mapElement); -void jumping_fountain_create(int type, int x, int y, int z, int direction, int flags, int iteration); +void jumping_fountain_begin(sint32 type, sint32 x, sint32 y, rct_map_element *mapElement); +void jumping_fountain_create(sint32 type, sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags, sint32 iteration); void jumping_fountain_update(rct_jumping_fountain *jumpingFountain); #endif diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index 3f8278e3ff..87b79f8c5a 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -129,15 +129,15 @@ uint8 gUnk9E2E28; static uint8 _unk141F725; -static void map_update_grass_length(int x, int y, rct_map_element *mapElement); -static void map_set_grass_length(int x, int y, rct_map_element *mapElement, int length); -static void clear_elements_at(int x, int y); -static void translate_3d_to_2d(int rotation, int *x, int *y); +static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElement); +static void map_set_grass_length(sint32 x, sint32 y, rct_map_element *mapElement, sint32 length); +static void clear_elements_at(sint32 x, sint32 y); +static void translate_3d_to_2d(sint32 rotation, sint32 *x, sint32 *y); static void map_obstruction_set_error_text(rct_map_element *mapElement); -void rotate_map_coordinates(sint16 *x, sint16 *y, int rotation) +void rotate_map_coordinates(sint16 *x, sint16 *y, sint32 rotation) { - int temp; + sint32 temp; switch (rotation) { case MAP_ELEMENT_DIRECTION_WEST: @@ -159,7 +159,7 @@ void rotate_map_coordinates(sint16 *x, sint16 *y, int rotation) } } -rct_xy16 coordinate_3d_to_2d(const rct_xyz16* coordinate_3d, int rotation){ +rct_xy16 coordinate_3d_to_2d(const rct_xyz16* coordinate_3d, sint32 rotation){ rct_xy16 coordinate_2d; switch (rotation){ @@ -191,7 +191,7 @@ void map_element_iterator_begin(map_element_iterator *it) it->element = map_get_first_element_at(0, 0); } -int map_element_iterator_next(map_element_iterator *it) +sint32 map_element_iterator_next(map_element_iterator *it) { if (it->element == NULL) { it->element = map_get_first_element_at(it->x, it->y); @@ -224,7 +224,7 @@ void map_element_iterator_restart_for_tile(map_element_iterator *it) it->element = NULL; } -rct_map_element *map_get_first_element_at(int x, int y) +rct_map_element *map_get_first_element_at(sint32 x, sint32 y) { if (x < 0 || y < 0 || x > 255 || y > 255) { log_error("Trying to access element outside of range"); @@ -233,7 +233,7 @@ rct_map_element *map_get_first_element_at(int x, int y) return gMapElementTilePointers[x + y * 256]; } -void map_set_tile_elements(int x, int y, rct_map_element *elements) +void map_set_tile_elements(sint32 x, sint32 y, rct_map_element *elements) { if (x < 0 || y < 0 || x > 255 || y > 255) { log_error("Trying to access element outside of range"); @@ -242,7 +242,7 @@ void map_set_tile_elements(int x, int y, rct_map_element *elements) gMapElementTilePointers[x + y * 256] = elements; } -int map_element_is_last_for_tile(const rct_map_element *element) +sint32 map_element_is_last_for_tile(const rct_map_element *element) { return element->flags & MAP_ELEMENT_FLAG_LAST_TILE; } @@ -252,33 +252,33 @@ uint8 map_element_get_scenery_quadrant(const rct_map_element *element) return (element->type & MAP_ELEMENT_QUADRANT_MASK) >> 6; } -int map_element_get_type(const rct_map_element *element) +sint32 map_element_get_type(const rct_map_element *element) { return element->type & MAP_ELEMENT_TYPE_MASK; } -int map_element_get_direction(const rct_map_element *element) +sint32 map_element_get_direction(const rct_map_element *element) { return element->type & MAP_ELEMENT_DIRECTION_MASK; } -int map_element_get_terrain(const rct_map_element *element) +sint32 map_element_get_terrain(const rct_map_element *element) { - int terrain = (element->properties.surface.terrain >> 5) & 7; + sint32 terrain = (element->properties.surface.terrain >> 5) & 7; if (element->type & 1) terrain |= (1 << 3); return terrain; } -int map_element_get_terrain_edge(const rct_map_element *element) +sint32 map_element_get_terrain_edge(const rct_map_element *element) { - int terrain_edge = (element->properties.surface.slope >> 5) & 7; + sint32 terrain_edge = (element->properties.surface.slope >> 5) & 7; if (element->type & 128) terrain_edge |= (1 << 3); return terrain_edge; } -void map_element_set_terrain(rct_map_element *element, int terrain) +void map_element_set_terrain(rct_map_element *element, sint32 terrain) { // Bit 3 for terrain is stored in element.type bit 0 if (terrain & 8) @@ -291,7 +291,7 @@ void map_element_set_terrain(rct_map_element *element, int terrain) element->properties.surface.terrain |= (terrain & 7) << 5; } -void map_element_set_terrain_edge(rct_map_element *element, int terrain) +void map_element_set_terrain_edge(rct_map_element *element, sint32 terrain) { // Bit 3 for terrain is stored in element.type bit 7 if (terrain & 8) @@ -304,7 +304,7 @@ void map_element_set_terrain_edge(rct_map_element *element, int terrain) element->properties.surface.slope |= (terrain & 7) << 5; } -rct_map_element *map_get_surface_element_at(int x, int y) +rct_map_element *map_get_surface_element_at(sint32 x, sint32 y) { rct_map_element *mapElement = map_get_first_element_at(x, y); @@ -322,7 +322,7 @@ rct_map_element *map_get_surface_element_at(int x, int y) return mapElement; } -rct_map_element* map_get_path_element_at(int x, int y, int z){ +rct_map_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z){ rct_map_element *mapElement = map_get_first_element_at(x, y); if (mapElement == NULL) @@ -341,7 +341,7 @@ rct_map_element* map_get_path_element_at(int x, int y, int z){ return NULL; } -rct_map_element* map_get_banner_element_at(int x, int y, int z, uint8 position) { +rct_map_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 position) { rct_map_element *mapElement = map_get_first_element_at(x, y); if (mapElement == NULL) @@ -366,13 +366,13 @@ rct_map_element* map_get_banner_element_at(int x, int y, int z, uint8 position) * * rct2: 0x0068AB4C */ -void map_init(int size) +void map_init(sint32 size) { date_reset(); gNumMapAnimations = 0; gNextFreeMapElementPointerIndex = 0; - for (int i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { + for (sint32 i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { rct_map_element *map_element = &gMapElements[i]; map_element->type = (MAP_ELEMENT_TYPE_SURFACE << 2); map_element->flags = MAP_ELEMENT_FLAG_LAST_TILE; @@ -410,8 +410,8 @@ void map_count_remaining_land_rights() gLandRemainingOwnershipSales = 0; gLandRemainingConstructionSales = 0; - for (int x = 0; x <= 255; x++) { - for (int y = 0; y <= 255; y++) { + for (sint32 x = 0; x <= 255; x++) { + for (sint32 y = 0; y <= 255; y++) { rct_map_element *element = map_get_surface_element_at(x, y); // Surface elements are sometimes hacked out to save some space for other map elements if (element == NULL) { @@ -435,7 +435,7 @@ void map_count_remaining_land_rights() */ void map_update_tile_pointers() { - int i, x, y; + sint32 i, x, y; for (i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { gMapElementTilePointers[i] = TILE_UNDEFINED_MAP_ELEMENT; @@ -461,7 +461,7 @@ void map_update_tile_pointers() * dx: return remember to & with 0xFFFF if you don't want water affecting results * rct2: 0x00662783 */ -int map_element_height(int x, int y) +sint32 map_element_height(sint32 x, sint32 y) { rct_map_element *mapElement; @@ -470,8 +470,8 @@ int map_element_height(int x, int y) return 16; // Truncate subtile coordinates - int x_tile = x & 0xFFFFFFE0; - int y_tile = y & 0xFFFFFFE0; + sint32 x_tile = x & 0xFFFFFFE0; + sint32 y_tile = y & 0xFFFFFFE0; // Get the surface element for the tile mapElement = map_get_surface_element_at(x_tile / 32, y_tile / 32); @@ -602,7 +602,7 @@ int map_element_height(int x, int y) */ void sub_68B089() { - int i; + sint32 i; rct_map_element *mapElementFirst, *mapElement; if (gTrackDesignSaveMode) @@ -649,7 +649,7 @@ void sub_68B089() * Checks if the tile at coordinate at height counts as connected. * @return 1 if connected, 0 otherwise */ -int map_coord_is_connected(int x, int y, int z, uint8 faceDirection) +sint32 map_coord_is_connected(sint32 x, sint32 y, sint32 z, uint8 faceDirection) { rct_map_element *mapElement = map_get_first_element_at(x, y); @@ -692,7 +692,7 @@ void map_update_path_wide_flags() // progress. A maximum of 128 calls is done per update. uint16 x = gWidePathTileLoopX; uint16 y = gWidePathTileLoopY; - for (int i = 0; i < 128; i++) { + for (sint32 i = 0; i < 128; i++) { footpath_update_path_wide_flags(x, y); // Next x, y tile @@ -713,7 +713,7 @@ void map_update_path_wide_flags() * * rct2: 0x006A7B84 */ -int map_height_from_slope(int x, int y, int slope) +sint32 map_height_from_slope(sint32 x, sint32 y, sint32 slope) { if (!(slope & 4)) return 0; @@ -731,7 +731,7 @@ int map_height_from_slope(int x, int y, int slope) return 0; } -bool map_is_location_valid(int x, int y) +bool map_is_location_valid(sint32 x, sint32 y) { if (x < (256 * 32) && x >= 0 && y < (256 * 32) && y >= 0) { return true; @@ -743,7 +743,7 @@ bool map_is_location_valid(int x, int y) * * rct2: 0x00664F72 */ -bool map_is_location_owned(int x, int y, int z) +bool map_is_location_owned(sint32 x, sint32 y, sint32 z) { // This check is to avoid throwing lots of messages in logs. if (map_is_location_valid(x, y)) { @@ -768,7 +768,7 @@ bool map_is_location_owned(int x, int y, int z) * * rct2: 0x00664F2C */ -bool map_is_location_in_park(int x, int y) +bool map_is_location_in_park(sint32 x, sint32 y) { if (map_is_location_valid(x, y)) { rct_map_element *mapElement = map_get_surface_element_at(x / 32, y / 32); @@ -782,7 +782,7 @@ bool map_is_location_in_park(int x, int y) return false; } -bool map_is_location_owned_or_has_rights(int x, int y) +bool map_is_location_owned_or_has_rights(sint32 x, sint32 y) { if (map_is_location_valid(x, y)) { rct_map_element *mapElement = map_get_surface_element_at(x / 32, y / 32); @@ -796,10 +796,10 @@ bool map_is_location_owned_or_has_rights(int x, int y) * * rct2: 0x006E0E01 */ -void game_command_remove_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_remove_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; if (!map_is_location_valid(x, y)) { *ebx = MONEY32_UNDEFINED; return; @@ -888,14 +888,14 @@ void game_command_remove_scenery(int* eax, int* ebx, int* ecx, int* edx, int* es * * rct2: 0x006B8E1B */ -void game_command_remove_large_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { uint8 base_height = *edx; uint8 tileIndex = *edx >> 8; uint8 map_element_direction = *ebx >> 8; - int x = *eax; - int y = *ecx; - int z = map_element_height(x, y); + sint32 x = *eax; + sint32 y = *ecx; + sint32 z = map_element_height(x, y); uint8 flags = *ebx & 0xFF; gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; @@ -959,7 +959,7 @@ void game_command_remove_large_scenery(int* eax, int* ebx, int* ecx, int* edx, i firstTile.y = y - firstTile.y; bool calculate_cost = true; - for (int i = 0; scenery_entry->large_scenery.tiles[i].x_offset != -1; i++){ + for (sint32 i = 0; scenery_entry->large_scenery.tiles[i].x_offset != -1; i++){ rct_xyz16 currentTile = { .x = scenery_entry->large_scenery.tiles[i].x_offset, @@ -1041,14 +1041,14 @@ void game_command_remove_large_scenery(int* eax, int* ebx, int* ecx, int* edx, i * * rct2: 0x006BA058 */ -void game_command_remove_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_remove_banner(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint8 base_height = *edx; uint8 banner_position = *edx >> 8; uint8 flags = *ebx & 0xFF; - int z = base_height * 8; + sint32 z = base_height * 8; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; @@ -1101,11 +1101,11 @@ void game_command_remove_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi * * rct2: 0x006E0F26 */ -void game_command_set_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint8 base_height = *edx; uint8 scenery_type = *edx >> 8; uint8 colour1 = *ebp; @@ -1113,7 +1113,7 @@ void game_command_set_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int uint8 flags = *ebx & 0xFF; // Note this function is passed type. uint8 quadrant = ((*ebx >> 8) & 0xFF) >> 6; - int z = base_height * 8; + sint32 z = base_height * 8; gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; gCommandPosition.z = z; @@ -1152,18 +1152,18 @@ void game_command_set_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int * * rct2: 0x006E56B5 */ -void game_command_set_fence_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_fence_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint8 map_element_direction = *edx; uint8 base_height = *edx >> 8; uint8 colour1 = *ebx >> 8; uint8 colour2 = *ebp; uint8 colour3 = *ebp >> 8; uint8 flags = *ebx & 0xFF; - int z = base_height * 8; + sint32 z = base_height * 8; gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; @@ -1211,18 +1211,18 @@ void game_command_set_fence_colour(int* eax, int* ebx, int* ecx, int* edx, int* * * rct2: 0x006B909A */ -void game_command_set_large_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint8 map_element_direction = *ebx >> 8; uint8 flags = *ebx & 0xFF; uint8 base_height = *edx; uint8 tileIndex = *edx >> 8; uint8 colour1 = *ebp; uint8 colour2 = *ebp >> 8; - int z = map_element_height(x, y); + sint32 z = map_element_height(x, y); gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; gCommandPosition.z = z; @@ -1251,7 +1251,7 @@ void game_command_set_large_scenery_colour(int* eax, int* ebx, int* ecx, int* ed baseTile.x = x - baseTile.x; baseTile.y = y - baseTile.y; - for (int i = 0; scenery_entry->large_scenery.tiles[i].x_offset != -1; ++i) { + for (sint32 i = 0; scenery_entry->large_scenery.tiles[i].x_offset != -1; ++i) { assert(i < 256); // Work out the current tile coordinates @@ -1295,15 +1295,15 @@ void game_command_set_large_scenery_colour(int* eax, int* ebx, int* ecx, int* ed * * rct2: 0x006BA16A */ -void game_command_set_banner_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_banner_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint8 base_height = *edx; uint8 banner_position = *edx >> 8; uint8 colour = *ebp; - int z = (base_height * 8); + sint32 z = (base_height * 8); gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; gCommandPosition.z = z; @@ -1354,9 +1354,9 @@ void game_command_set_banner_colour(int* eax, int* ebx, int* ecx, int* edx, int* * * rct2: 0x0068DFE4 */ -static money32 map_clear_scenery_from_tile(int x, int y, int clear, int flags) +static money32 map_clear_scenery_from_tile(sint32 x, sint32 y, sint32 clear, sint32 flags) { - int type; + sint32 type; money32 cost, totalCost; rct_map_element *mapElement; @@ -1369,11 +1369,11 @@ restart_from_beginning: switch (type) { case MAP_ELEMENT_TYPE_PATH: if (clear & (1 << 2)) { - int eax = x * 32; - int ebx = flags; - int ecx = y * 32; - int edx = mapElement->base_height; - int edi = 0, ebp = 0; + sint32 eax = x * 32; + sint32 ebx = flags; + sint32 ecx = y * 32; + sint32 edx = mapElement->base_height; + sint32 edi = 0, ebp = 0; cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_PATH, edi, ebp); if (cost == MONEY32_UNDEFINED) @@ -1385,11 +1385,11 @@ restart_from_beginning: } break; case MAP_ELEMENT_TYPE_SCENERY: if (clear & (1 << 0)) { - int eax = x * 32; - int ebx = (mapElement->type << 8) | flags; - int ecx = y * 32; - int edx = (mapElement->properties.scenery.type << 8) | (mapElement->base_height); - int edi = 0, ebp = 0; + sint32 eax = x * 32; + sint32 ebx = (mapElement->type << 8) | flags; + sint32 ecx = y * 32; + sint32 edx = (mapElement->properties.scenery.type << 8) | (mapElement->base_height); + sint32 edi = 0, ebp = 0; cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_SCENERY, edi, ebp); if (cost == MONEY32_UNDEFINED) @@ -1402,11 +1402,11 @@ restart_from_beginning: } break; case MAP_ELEMENT_TYPE_FENCE: if (clear & (1 << 0)) { - int eax = x * 32; - int ebx = flags; - int ecx = y * 32; - int edx = (mapElement->base_height << 8) | (mapElement->type & MAP_ELEMENT_DIRECTION_MASK); - int edi = 0, ebp = 0; + sint32 eax = x * 32; + sint32 ebx = flags; + sint32 ecx = y * 32; + sint32 edx = (mapElement->base_height << 8) | (mapElement->type & MAP_ELEMENT_DIRECTION_MASK); + sint32 edi = 0, ebp = 0; cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_FENCE, edi, ebp); if (cost == MONEY32_UNDEFINED) @@ -1419,11 +1419,11 @@ restart_from_beginning: } break; case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: if (clear & (1 << 1)) { - int eax = x * 32; - int ebx = flags | ((mapElement->type & MAP_ELEMENT_DIRECTION_MASK) << 8); - int ecx = y * 32; - int edx = mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8); - int edi = 0, ebp = 0; + sint32 eax = x * 32; + sint32 ebx = flags | ((mapElement->type & MAP_ELEMENT_DIRECTION_MASK) << 8); + sint32 ecx = y * 32; + sint32 edx = mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8); + sint32 edi = 0, ebp = 0; cost = game_do_command(eax, ebx | (1 << 7), ecx, edx, GAME_COMMAND_REMOVE_LARGE_SCENERY, edi, ebp); if (cost == MONEY32_UNDEFINED) @@ -1447,8 +1447,8 @@ restart_from_beginning: static void map_reset_clear_large_scenery_flag(){ rct_map_element* mapElement; // TODO: Improve efficiency of this - for (int y = 0; y <= 255; y++) { - for (int x = 0; x <= 255; x++) { + for (sint32 y = 0; y <= 255; y++) { + for (sint32 x = 0; x <= 255; x++) { mapElement = map_get_first_element_at(x, y); do { if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { @@ -1459,9 +1459,9 @@ static void map_reset_clear_large_scenery_flag(){ } } -money32 map_clear_scenery(int x0, int y0, int x1, int y1, int clear, int flags) +money32 map_clear_scenery(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 clear, sint32 flags) { - int x, y, z; + sint32 x, y, z; money32 totalCost, cost; bool noValidTiles; @@ -1514,7 +1514,7 @@ money32 map_clear_scenery(int x0, int y0, int x1, int y1, int clear, int flags) * * rct2: 0x0068DF91 */ -void game_command_clear_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_clear_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = map_clear_scenery( (sint16)(*eax & 0xFFFF), @@ -1530,7 +1530,7 @@ void game_command_clear_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi * * rct2: 0x00663CCD */ -static money32 map_change_surface_style(int x0, int y0, int x1, int y1, uint8 surfaceStyle, uint8 edgeStyle, uint8 flags) +static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 y1, uint8 surfaceStyle, uint8 edgeStyle, uint8 flags) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; @@ -1539,12 +1539,12 @@ static money32 map_change_surface_style(int x0, int y0, int x1, int y1, uint8 su x1 = min(x1, gMapSizeMaxXY); y1 = min(y1, gMapSizeMaxXY); - int xMid, yMid; + sint32 xMid, yMid; xMid = (x0 + x1) / 2 + 16; yMid = (y0 + y1) / 2 + 16; - int heightMid = map_element_height(xMid, yMid); + sint32 heightMid = map_element_height(xMid, yMid); gCommandPosition.x = xMid; gCommandPosition.y = yMid; @@ -1565,8 +1565,8 @@ static money32 map_change_surface_style(int x0, int y0, int x1, int y1, uint8 su money32 surfaceCost = 0; money32 edgeCost = 0; - for (int x = x0; x <= x1; x += 32) { - for (int y = y0; y <= y1; y += 32) { + for (sint32 x = x0; x <= x1; x += 32) { + for (sint32 y = y0; y <= y1; y += 32) { if (x > 0x1FFF) continue; if (y > 0x1FFF) continue; @@ -1655,7 +1655,7 @@ static money32 map_change_surface_style(int x0, int y0, int x1, int y1, uint8 su * * rct2: 0x00663CCD */ -void game_command_change_surface_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_change_surface_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = map_change_surface_style( (sint16)(*eax & 0xFFFF), @@ -1690,7 +1690,7 @@ const uint8 map_element_lower_styles[5][32] = { * * rct2: 0x00663CB9 */ -static int map_set_land_height_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) { +static sint32 map_set_land_height_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price) { if (map_element_get_type(*map_element) == MAP_ELEMENT_TYPE_SURFACE) return 0; @@ -1700,7 +1700,7 @@ static int map_set_land_height_clear_func(rct_map_element** map_element, int x, return 1; } -static money32 map_set_land_height(int flags, int x, int y, int height, int style, int selectionType) +static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 height, sint32 style, sint32 selectionType) { rct_map_element *mapElement; @@ -1784,11 +1784,11 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl do{ if(map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; - int rideIndex = mapElement->properties.track.ride_index; - int maxHeight = get_ride_entry_by_ride(get_ride(rideIndex))->max_height; + sint32 rideIndex = mapElement->properties.track.ride_index; + sint32 maxHeight = get_ride_entry_by_ride(get_ride(rideIndex))->max_height; if(maxHeight == 0) maxHeight = RideData5[get_ride(rideIndex)->type].max_height; - int zDelta = mapElement->clearance_height - height; + sint32 zDelta = mapElement->clearance_height - height; if(zDelta >= 0 && zDelta/2 > maxHeight) { gGameCommandErrorText = STR_SUPPORTS_CANT_BE_EXTENDED; @@ -1801,7 +1801,7 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl rct_map_element *surfaceElement = map_get_surface_element_at(x / 32, y / 32); if(surfaceElement->type & MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT) { - int waterHeight = surfaceElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + sint32 waterHeight = surfaceElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; if(waterHeight != 0) { if(style & 0x1F) @@ -1840,7 +1840,7 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl if (!gCheatsDisableClearanceChecks) { mapElement = map_get_first_element_at(x / 32, y / 32); do { - int elementType = map_element_get_type(mapElement); + sint32 elementType = map_element_get_type(mapElement); if (elementType == MAP_ELEMENT_TYPE_FENCE) continue; @@ -1882,7 +1882,7 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl surfaceElement->clearance_height = height; surfaceElement->properties.surface.slope &= MAP_ELEMENT_SLOPE_EDGE_STYLE_MASK; surfaceElement->properties.surface.slope |= style; - int slope = surfaceElement->properties.surface.terrain & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = surfaceElement->properties.surface.terrain & MAP_ELEMENT_SLOPE_MASK; if(slope != 0 && slope <= height / 2) surfaceElement->properties.surface.terrain &= MAP_ELEMENT_SURFACE_TERRAIN_MASK; map_invalidate_tile_full(x, y); @@ -1892,7 +1892,7 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl return cost; } -void game_command_set_land_height(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_land_height(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { *ebx = map_set_land_height( *ebx & 0xFF, @@ -1937,9 +1937,9 @@ static money32 map_set_land_ownership(uint8 flags, sint16 x1, sint16 y1, sint16 * * rct2: 0x006648E3 */ -void game_command_set_land_ownership(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_land_ownership(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { - int flags = *ebx & 0xFF; + sint32 flags = *ebx & 0xFF; *ebx = map_set_land_ownership( flags, @@ -1956,7 +1956,7 @@ void game_command_set_land_ownership(int *eax, int *ebx, int *ecx, int *edx, int } -static money32 raise_land(int flags, int x, int y, int z, int ax, int ay, int bx, int by, int selectionType) +static money32 raise_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, sint32 ay, sint32 bx, sint32 by, sint32 selectionType) { money32 cost = 0; @@ -1978,8 +1978,8 @@ static money32 raise_land(int flags, int x, int y, int z, int ax, int ay, int bx by = min(by, gMapSizeMaxXY); // find lowest map element in selection - for (int yi = ay; yi <= by; yi += 32) { - for (int xi = ax; xi <= bx; xi += 32) { + for (sint32 yi = ay; yi <= by; yi += 32) { + for (sint32 xi = ax; xi <= bx; xi += 32) { rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL && min_height > map_element->base_height) { min_height = map_element->base_height; @@ -1987,8 +1987,8 @@ static money32 raise_land(int flags, int x, int y, int z, int ax, int ay, int bx } } - for (int yi = ay; yi <= by; yi += 32) { - for (int xi = ax; xi <= bx; xi += 32) { + for (sint32 yi = ay; yi <= by; yi += 32) { + for (sint32 xi = ax; xi <= bx; xi += 32) { rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { uint8 height = map_element->base_height; @@ -2018,7 +2018,7 @@ static money32 raise_land(int flags, int x, int y, int z, int ax, int ay, int bx return cost; } -static money32 lower_land(int flags, int x, int y, int z, int ax, int ay, int bx, int by, int selectionType) +static money32 lower_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, sint32 ay, sint32 bx, sint32 by, sint32 selectionType) { money32 cost = 0; @@ -2040,8 +2040,8 @@ static money32 lower_land(int flags, int x, int y, int z, int ax, int ay, int bx by = min(by, gMapSizeMaxXY); // find highest map element in selection - for (int yi = ay; yi <= by; yi += 32) { - for (int xi = ax; xi <= bx; xi += 32) { + for (sint32 yi = ay; yi <= by; yi += 32) { + for (sint32 xi = ax; xi <= bx; xi += 32) { rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { uint8 base_height = map_element->base_height; @@ -2055,8 +2055,8 @@ static money32 lower_land(int flags, int x, int y, int z, int ax, int ay, int bx } } - for (int yi = ay; yi <= by; yi += 32) { - for (int xi = ax; xi <= bx; xi += 32) { + for (sint32 yi = ay; yi <= by; yi += 32) { + for (sint32 xi = ax; xi <= bx; xi += 32) { rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { uint8 height = map_element->base_height; @@ -2103,8 +2103,8 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) x1 = min(x1, gMapSizeMaxXY); y1 = min(y1, gMapSizeMaxXY); - for (int yi = y0; yi <= y1; yi += 32) { - for (int xi = x0; xi <= x1; xi += 32) { + for (sint32 yi = y0; yi <= y1; yi += 32) { + for (sint32 xi = x0; xi <= x1; xi += 32) { rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { uint8 height = map_element->base_height; @@ -2116,8 +2116,8 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) } } - for (int yi = y0; yi <= y1; yi += 32) { - for (int xi = x0; xi <= x1; xi += 32) { + for (sint32 yi = y0; yi <= y1; yi += 32) { + for (sint32 xi = x0; xi <= x1; xi += 32) { rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { if (map_element->base_height <= max_height){ @@ -2143,9 +2143,9 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) } if (flags & GAME_COMMAND_FLAG_APPLY) { - int x = ((x0 + x1) / 2) + 16; - int y = ((y0 + y1) / 2) + 16; - int z = map_element_height(x, y); + sint32 x = ((x0 + x1) / 2) + 16; + sint32 y = ((y0 + y1) / 2) + 16; + sint32 z = map_element_height(x, y); sint16 water_height_z = z >> 16; sint16 base_height_z = z; z = water_height_z; @@ -2184,8 +2184,8 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) x1 = min(x1, gMapSizeMaxXY); y1 = min(y1, gMapSizeMaxXY); - for (int yi = y0; yi <= y1; yi += 32){ - for (int xi = x0; xi <= x1; xi += 32){ + for (sint32 yi = y0; yi <= y1; yi += 32){ + for (sint32 xi = x0; xi <= x1; xi += 32){ rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { uint8 height = map_element->properties.surface.terrain & 0x1F; @@ -2198,8 +2198,8 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) } } - for (int yi = y0; yi <= y1; yi += 32) { - for (int xi = x0; xi <= x1; xi += 32) { + for (sint32 yi = y0; yi <= y1; yi += 32) { + for (sint32 xi = x0; xi <= x1; xi += 32) { rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); if (map_element != NULL) { uint8 height = (map_element->properties.surface.terrain & 0x1F); @@ -2208,7 +2208,7 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) if (height < min_height) continue; height -= 2; - int tileCost = game_do_command(xi, flags, yi, (min_height << 8) + height, GAME_COMMAND_SET_WATER_HEIGHT, 0, 0); + sint32 tileCost = game_do_command(xi, flags, yi, (min_height << 8) + height, GAME_COMMAND_SET_WATER_HEIGHT, 0, 0); if (tileCost == MONEY32_UNDEFINED) return MONEY32_UNDEFINED; cost += tileCost; @@ -2219,9 +2219,9 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) } if (flags & GAME_COMMAND_FLAG_APPLY) { - int x = ((x0 + x1) / 2) + 16; - int y = ((y0 + y1) / 2) + 16; - int z = map_element_height(x, y); + sint32 x = ((x0 + x1) / 2) + 16; + sint32 y = ((y0 + y1) / 2) + 16; + sint32 z = map_element_height(x, y); sint16 water_height_z = z >> 16; sint16 base_height_z = z; z = water_height_z; @@ -2252,7 +2252,7 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) * * rct2: 0x0068C542 */ -void game_command_raise_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_raise_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = raise_land( *ebx, @@ -2271,7 +2271,7 @@ void game_command_raise_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, i * * rct2: 0x0068C6D1 */ -void game_command_lower_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_lower_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = lower_land( *ebx, @@ -2286,10 +2286,10 @@ void game_command_lower_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, i ); } -static int map_element_get_corner_height(rct_map_element *mapElement, int direction) +static sint32 map_element_get_corner_height(rct_map_element *mapElement, sint32 direction) { - int z = mapElement->base_height; - int slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 z = mapElement->base_height; + sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; switch (direction) { case 0: if (slope & 1) { @@ -2334,7 +2334,7 @@ static int map_element_get_corner_height(rct_map_element *mapElement, int direct * rct2: 0x0068C222 slope 4, style 2 * rct2: 0x0068C2EA slope 8, style 3 */ -static money32 smooth_land_tile(int direction, uint8 flags, int x, int y, int targetBaseZ, int minBaseZ) +static money32 smooth_land_tile(sint32 direction, uint8 flags, sint32 x, sint32 y, sint32 targetBaseZ, sint32 minBaseZ) { // Check if inside map bounds if (!map_is_location_valid(x, y)) { @@ -2348,7 +2348,7 @@ static money32 smooth_land_tile(int direction, uint8 flags, int x, int y, int ta log_warning("Invalid coordinates for land smoothing, x = %d, y = %d", x, y); return MONEY32_UNDEFINED; } - int baseZ = map_element_get_corner_height(mapElement, direction); + sint32 baseZ = map_element_get_corner_height(mapElement, direction); // Check if tile is same height as target tile if (baseZ == targetBaseZ) { @@ -2363,7 +2363,7 @@ static money32 smooth_land_tile(int direction, uint8 flags, int x, int y, int ta return MONEY32_UNDEFINED; } targetBaseZ = mapElement->base_height; - int slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; style = map_element_lower_styles[direction][slope]; if (style & 0x20) { targetBaseZ -= 2; @@ -2375,7 +2375,7 @@ static money32 smooth_land_tile(int direction, uint8 flags, int x, int y, int ta return MONEY32_UNDEFINED; } targetBaseZ = mapElement->base_height; - int slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; style = map_element_raise_styles[direction][slope]; if ((style & 0x20) != 0) { targetBaseZ += 2; @@ -2386,7 +2386,7 @@ static money32 smooth_land_tile(int direction, uint8 flags, int x, int y, int ta return game_do_command(x, flags, y, targetBaseZ | (style << 8), GAME_COMMAND_SET_LAND_HEIGHT, 0, 0); } -static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int mapTop, int mapRight, int mapBottom, int command) +static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 mapLeft, sint32 mapTop, sint32 mapRight, sint32 mapBottom, sint32 command) { // Cap bounds to map mapLeft = max(mapLeft, 32); @@ -2394,10 +2394,10 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int mapRight = clamp(0, mapRight, 255 * 32); mapBottom = clamp(0, mapBottom, 255 * 32); - int commandType; - int centreZ = map_element_height(centreX, centreY); - int mapLeftRight = mapLeft | (mapRight << 16); - int mapTopBottom = mapTop | (mapBottom << 16); + sint32 commandType; + sint32 centreZ = map_element_height(centreX, centreY); + sint32 mapLeftRight = mapLeft | (mapRight << 16); + sint32 mapTopBottom = mapTop | (mapBottom << 16); bool fullTile = ((command & 0x7FFF) == MAP_SELECT_TYPE_FULL); // Play sound (only once) @@ -2432,7 +2432,7 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int // Flatten the edited part if (fullTile) { - int slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; if (slope != 0) { commandType = command > 0x7FFF ? GAME_COMMAND_RAISE_LAND : GAME_COMMAND_LOWER_LAND; result = game_do_command(centreX, flags, centreY, mapLeftRight, commandType, MAP_SELECT_TYPE_FULL, mapTopBottom); @@ -2442,22 +2442,22 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int } } - int x = mapLeft; - int y = mapTop; - int size = ((mapRight - mapLeft) >> 5) + 1; - int initialMinZ = -2; + sint32 x = mapLeft; + sint32 y = mapTop; + sint32 size = ((mapRight - mapLeft) >> 5) + 1; + sint32 initialMinZ = -2; // Then do the smoothing // The coords go in circles around the selected tile(s) for (; size <= 256; size += 2) { initialMinZ += 2; - int minZ = initialMinZ * 2; + sint32 minZ = initialMinZ * 2; x -= 32; y -= 32; // Corner (North-West) mapElement = map_get_surface_element_at(mapLeft >> 5, mapTop >> 5); - int z = map_element_get_corner_height(mapElement, 2); + sint32 z = map_element_get_corner_height(mapElement, 2); result = smooth_land_tile(0, flags, x, y, z, minZ); if (result != MONEY32_UNDEFINED) { totalCost += result; @@ -2465,8 +2465,8 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int y += 32; // Side (West) - for (int i = 0; i < size; i++) { - int y2 = clamp(mapTop, y, mapBottom); + for (sint32 i = 0; i < size; i++) { + sint32 y2 = clamp(mapTop, y, mapBottom); mapElement = map_get_surface_element_at(mapLeft >> 5, y2 >> 5); if (y >= mapTop) { z = map_element_get_corner_height(mapElement, 3); @@ -2503,8 +2503,8 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int x += 32; // Side (South) - for (int i = 0; i < size; i++) { - int x2 = clamp(mapLeft, x, mapRight); + for (sint32 i = 0; i < size; i++) { + sint32 x2 = clamp(mapLeft, x, mapRight); mapElement = map_get_surface_element_at(x2 >> 5, mapBottom >> 5); if (x >= mapLeft) { z = map_element_get_corner_height(mapElement, 0); @@ -2540,8 +2540,8 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int y -= 32; // Side (East) - for (int i = 0; i < size; i++) { - int y2 = clamp(mapTop, y, mapBottom); + for (sint32 i = 0; i < size; i++) { + sint32 y2 = clamp(mapTop, y, mapBottom); mapElement = map_get_surface_element_at(mapRight >> 5, y2 >> 5); if (y <= mapBottom) { z = map_element_get_corner_height(mapElement, 1); @@ -2578,8 +2578,8 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int x -= 32; // Side (North) - for (int i = 0; i < size; i++) { - int x2 = clamp(mapLeft, x, mapRight); + for (sint32 i = 0; i < size; i++) { + sint32 x2 = clamp(mapLeft, x, mapRight); mapElement = map_get_surface_element_at(x2 >> 5, mapTop >> 5); if (x <= mapRight) { z = map_element_get_corner_height(mapElement, 2); @@ -2618,16 +2618,16 @@ static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int * * rct2: 0x0068BC01 */ -void game_command_smooth_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_smooth_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int flags = *ebx & 0xFF; - int centreX = *eax & 0xFFFF; - int centreY = *ecx & 0xFFFF; - int mapLeft = (sint16)(*edx & 0xFFFF); - int mapTop = (sint16)(*ebp & 0xFFFF); - int mapRight = (sint16)(*edx >> 16); - int mapBottom = (sint16)(*ebp >> 16); - int command = *edi; + sint32 flags = *ebx & 0xFF; + sint32 centreX = *eax & 0xFFFF; + sint32 centreY = *ecx & 0xFFFF; + sint32 mapLeft = (sint16)(*edx & 0xFFFF); + sint32 mapTop = (sint16)(*ebp & 0xFFFF); + sint32 mapRight = (sint16)(*edx >> 16); + sint32 mapBottom = (sint16)(*ebp >> 16); + sint32 command = *edi; *ebx = smooth_land(flags, centreX, centreY, mapLeft, mapTop, mapRight, mapBottom, command); } @@ -2635,7 +2635,7 @@ void game_command_smooth_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, * * rct2: 0x006E66A0 */ -void game_command_raise_water(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_raise_water(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = raise_water( (sint16)(*eax & 0xFFFF), @@ -2650,7 +2650,7 @@ void game_command_raise_water(int* eax, int* ebx, int* ecx, int* edx, int* esi, * * rct2: 0x006E6878 */ -void game_command_lower_water(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_lower_water(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = lower_water( (sint16)(*eax & 0xFFFF), @@ -2665,10 +2665,10 @@ void game_command_lower_water(int* eax, int* ebx, int* ecx, int* edx, int* esi, * * rct2: 0x006E650F */ -void game_command_set_water_height(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_water_height(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; uint8 base_height = *edx; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; gCommandPosition.x = x + 16; @@ -2709,20 +2709,20 @@ void game_command_set_water_height(int* eax, int* ebx, int* ecx, int* edx, int* } if(*ebx & GAME_COMMAND_FLAG_APPLY){ - int element_height = map_element_height(x, y); + sint32 element_height = map_element_height(x, y); footpath_remove_litter(x, y, element_height); if(!gCheatsDisableClearanceChecks) map_remove_walls_at_z(x, y, element_height); } rct_map_element* map_element = map_get_surface_element_at(x / 32, y / 32); - int zHigh = map_element->base_height; - int zLow = base_height; + sint32 zHigh = map_element->base_height; + sint32 zLow = base_height; if(map_element->properties.surface.terrain & 0x1F){ zHigh = (map_element->properties.surface.terrain & 0x1F) * 2; } if(zLow > zHigh){ - int temp = zHigh; + sint32 temp = zHigh; zHigh = zLow; zLow = temp; } @@ -2734,7 +2734,7 @@ void game_command_set_water_height(int* eax, int* ebx, int* ecx, int* edx, int* return; } if(*ebx & GAME_COMMAND_FLAG_APPLY){ - int new_terrain = map_element->properties.surface.terrain & 0xE0; + sint32 new_terrain = map_element->properties.surface.terrain & 0xE0; if(base_height > map_element->base_height){ new_terrain |= (base_height / 2); } @@ -2754,10 +2754,10 @@ void game_command_set_water_height(int* eax, int* ebx, int* ecx, int* edx, int* * * rct2: 0x006E5597 */ -void game_command_remove_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_remove_fence(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int x = *eax; - int y = *ecx; + sint32 x = *eax; + sint32 y = *ecx; if (!map_is_location_valid(x, y)) { *ebx = MONEY32_UNDEFINED; return; @@ -2816,10 +2816,10 @@ void game_command_remove_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, * * rct2: 0x006B9E6D */ -void game_command_place_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_place_banner(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { - int x = (uint16)*eax; - int y = (uint16)*ecx; + sint32 x = (uint16)*eax; + sint32 y = (uint16)*ecx; uint8 base_height = *edx; uint8 edge = *edx >> 8; uint8 colour = *edi; @@ -2845,8 +2845,8 @@ void game_command_place_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, } rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); - int dl = base_height * 2; - int ch = (base_height - 1) * 2; + sint32 dl = base_height * 2; + sint32 ch = (base_height - 1) * 2; bool pathFound = false; do { @@ -2892,7 +2892,7 @@ void game_command_place_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, return; } while (!map_element_is_last_for_tile(map_element++)); - int banner_index = create_new_banner(*ebx); + sint32 banner_index = create_new_banner(*ebx); if(banner_index == BANNER_NULL){ *ebx = MONEY32_UNDEFINED; return; @@ -2936,7 +2936,7 @@ void game_command_place_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, * * rct2: 0x006E0D6E, 0x006B8D88 */ -static int map_place_scenery_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) { +static sint32 map_place_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price) { if (map_element_get_type(*map_element) != MAP_ELEMENT_TYPE_SCENERY) return 1; @@ -2971,7 +2971,7 @@ static int map_place_scenery_clear_func(rct_map_element** map_element, int x, in * * rct2: 0x006C5A4F, 0x006CDE57, 0x006A6733, 0x0066637E */ -int map_place_non_scenery_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) { +sint32 map_place_non_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price) { if (map_element_get_type(*map_element) != MAP_ELEMENT_TYPE_SCENERY) return 1; @@ -3003,11 +3003,11 @@ int map_place_non_scenery_clear_func(rct_map_element** map_element, int x, int y * * rct2: 0x006E08F4 */ -void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_place_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - int x = (uint16)*eax; - int y = (uint16)*ecx; + sint32 x = (uint16)*eax; + sint32 y = (uint16)*ecx; uint8 colour2 = *edi >> 16; uint8 rotation = *edi; uint8 scenery_type = *ebx >> 8; @@ -3016,12 +3016,12 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi uint8 colour1 = *edx >> 8; money32 clearCost = 0; bool isOnWater = false; - int targetHeight = *ebp; + sint32 targetHeight = *ebp; bool supportsRequired = false; if (targetHeight != 0) { supportsRequired = true; } - int base_height = map_element_height(x, y); + sint32 base_height = map_element_height(x, y); // If on water if(base_height & 0xFFFF0000){ base_height >>= 16; @@ -3061,8 +3061,8 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi } // Check if sub tile height is any different compared to actual surface tile height - int x2 = x; - int y2 = y; + sint32 x2 = x; + sint32 y2 = y; if(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE){ x2 += 16; y2 += 16; @@ -3101,7 +3101,7 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi rct_map_element* surface_element = map_get_surface_element_at(x / 32, y / 32); if(!gCheatsDisableClearanceChecks && (surface_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK)){ - int water_height = ((surface_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 16) - 1; + sint32 water_height = ((surface_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 16) - 1; if(water_height > targetHeight){ gGameCommandErrorText = STR_CANT_BUILD_THIS_UNDERWATER; *ebx = MONEY32_UNDEFINED; @@ -3156,8 +3156,8 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi } } - int zLow = targetHeight / 8; - int zHigh = zLow + ceil2(scenery_entry->small_scenery.height, 8) / 8; + sint32 zLow = targetHeight / 8; + sint32 zHigh = zLow + ceil2(scenery_entry->small_scenery.height, 8) / 8; uint8 collisionQuadrants = 0xF; uint8 unk_bl = 0; if(!(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE)){ @@ -3230,7 +3230,7 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi } } -static bool map_is_location_at_edge(int x, int y) +static bool map_is_location_at_edge(sint32 x, sint32 y) { return x < 32 || y < 32 || x >= ((256 - 1) * 32) || y >= ((256 - 1) * 32); } @@ -3239,13 +3239,13 @@ static bool map_is_location_at_edge(int x, int y) * * rct2: 0x006E5CBA */ -static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall, int x, int y, int z0, int z1, int edge, rct_map_element *trackElement) +static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall, sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 edge, rct_map_element *trackElement) { const rct_preview_track *trackBlock; - int z, direction; + sint32 z, direction; - int trackType = trackElement->properties.track.type; - int sequence = trackElement->properties.track.sequence & 0x0F; + sint32 trackType = trackElement->properties.track.type; + sint32 sequence = trackElement->properties.track.sequence & 0x0F; direction = (edge - trackElement->type) & 3; rct_ride *ride = get_ride(trackElement->properties.track.ride_index); @@ -3334,9 +3334,9 @@ static bool map_place_fence_check_obstruction_with_track(rct_scenery_entry *wall * * rct2: 0x006E5C1A */ -static bool map_place_fence_check_obstruction(rct_scenery_entry *wall, int x, int y, int z0, int z1, int edge) +static bool map_place_fence_check_obstruction(rct_scenery_entry *wall, sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 edge) { - int entryType, sequence; + sint32 entryType, sequence; rct_scenery_entry *entry; rct_large_scenery_tile *tile; @@ -3349,12 +3349,12 @@ static bool map_place_fence_check_obstruction(rct_scenery_entry *wall, int x, in rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { - int elementType = map_element_get_type(mapElement); + sint32 elementType = map_element_get_type(mapElement); if (elementType == MAP_ELEMENT_TYPE_SURFACE) continue; if (z0 >= mapElement->clearance_height) continue; if (z1 <= mapElement->base_height) continue; if (elementType == MAP_ELEMENT_TYPE_FENCE) { - int direction = mapElement->type & 3; + sint32 direction = mapElement->type & 3; if (edge == direction) { map_obstruction_set_error_text(mapElement); return false; @@ -3379,7 +3379,7 @@ static bool map_place_fence_check_obstruction(rct_scenery_entry *wall, int x, in entry = get_large_scenery_entry(entryType); tile = &entry->large_scenery.tiles[sequence]; - int direction = ((edge - mapElement->type) & 3) + 8; + sint32 direction = ((edge - mapElement->type) & 3) + 8; if (!(tile->var_7 & (1 << direction))) { map_obstruction_set_error_text(mapElement); return false; @@ -3454,7 +3454,7 @@ static const uint8 EdgeSlopes[][4] = { * * rct2: 0x006E519A */ -void game_command_place_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp){ +void game_command_place_fence(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp){ rct_xyz16 position = { .x = *eax & 0xFFFF, .y = *ecx & 0xFFFF, @@ -3592,7 +3592,7 @@ void game_command_place_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, } } } - int banner_index = 0xFF; + sint32 banner_index = 0xFF; rct_scenery_entry* fence = get_wall_entry(fence_type); // Have to check both -1 and NULL, as one can be a invalid object, // while the other can be invalid index @@ -3615,7 +3615,7 @@ void game_command_place_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, banner->x = position.x / 32; banner->y = position.y / 32; - int rideIndex = banner_get_closest_ride_index(position.x, position.y, position.z); + sint32 rideIndex = banner_get_closest_ride_index(position.x, position.y, position.z); if (rideIndex != -1) { banner->colour = rideIndex & 0xFF; banner->flags |= BANNER_FLAG_2; @@ -3698,9 +3698,9 @@ void game_command_place_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, } money32 map_place_fence( - int type, int x, int y, int z, int edge, int primaryColour, int secondaryColour, int tertiaryColour, int flags + sint32 type, sint32 x, sint32 y, sint32 z, sint32 edge, sint32 primaryColour, sint32 secondaryColour, sint32 tertiaryColour, sint32 flags ) { - int eax, ebx, ecx, edx, esi, edi, ebp; + sint32 eax, ebx, ecx, edx, esi, edi, ebp; eax = x; ebx = flags | (type << 8); @@ -3716,18 +3716,18 @@ money32 map_place_fence( * * rct2: 0x006B893C */ -void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; - int x = (sint16)*eax; - int y = (sint16)*ecx; - int z = (sint16)*ebp; + sint32 x = (sint16)*eax; + sint32 y = (sint16)*ecx; + sint32 z = (sint16)*ebp; uint8 colour1 = *edx; uint8 colour2 = *edx >> 8; uint8 flags = *ebx; uint8 rotation = *ebx >> 8; uint8 entry_index = *edi; - int base_height = map_element_height(x, y); + sint32 base_height = map_element_height(x, y); gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; gCommandPosition.z = base_height; @@ -3770,7 +3770,7 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in banner->x = x / 32; banner->y = y / 32; - int rideIndex = banner_get_closest_ride_index(x, y, z); + sint32 rideIndex = banner_get_closest_ride_index(x, y, z); if (rideIndex != -1) { banner->colour = rideIndex; banner->flags |= BANNER_FLAG_2; @@ -3801,7 +3801,7 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in rct_map_element* map_element = map_get_surface_element_at(curTile.x / 32, curTile.y / 32); if(map_element != NULL){ - int height = map_element->base_height * 8; + sint32 height = map_element->base_height * 8; if(map_element->properties.scenerymultiple.type & 0xF){ height += 16; @@ -3841,10 +3841,10 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in curTile.x += x; curTile.y += y; - int zLow = (tile->z_offset + maxHeight) / 8; - int zHigh = (tile->z_clearance / 8) + zLow; + sint32 zLow = (tile->z_offset + maxHeight) / 8; + sint32 zHigh = (tile->z_clearance / 8) + zLow; - int bx = tile->var_7 >> 12; + sint32 bx = tile->var_7 >> 12; bx <<= rotation; uint8 bl = bx; uint8 bh = bl >> 4; @@ -3862,7 +3862,7 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in return; } - int b = gMapGroundFlags & (ELEMENT_IS_1 | ELEMENT_IS_UNDERGROUND); + sint32 b = gMapGroundFlags & (ELEMENT_IS_1 | ELEMENT_IS_UNDERGROUND); if (!gCheatsDisableClearanceChecks) { if (gSceneryGroundFlags && !(gSceneryGroundFlags & b)) { gGameCommandErrorText = STR_CANT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_GROUND; @@ -3940,7 +3940,7 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in } } -int map_get_station(rct_map_element *mapElement) +sint32 map_get_station(rct_map_element *mapElement) { return (mapElement->properties.track.sequence & 0x70) >> 4; } @@ -4016,9 +4016,9 @@ void map_invalidate_map_selection_tiles() map_invalidate_tile_full(position->x, position->y); } -static void map_get_bounding_box(int ax, int ay, int bx, int by, int *left, int *top, int *right, int *bottom) +static void map_get_bounding_box(sint32 ax, sint32 ay, sint32 bx, sint32 by, sint32 *left, sint32 *top, sint32 *right, sint32 *bottom) { - int x, y; + sint32 x, y; x = ax; y = ay; uint32 rotation = get_current_rotation(); @@ -4056,7 +4056,7 @@ static void map_get_bounding_box(int ax, int ay, int bx, int by, int *left, int */ void map_invalidate_selection_rect() { - int x0, y0, x1, y1, left, right, top, bottom; + sint32 x0, y0, x1, y1, left, right, top, bottom; if (!(gMapSelectFlags & MAP_SELECT_FLAG_ENABLE)) return; @@ -4071,7 +4071,7 @@ void map_invalidate_selection_rect() bottom += 32; top -= 32 + 2080; - for (int i = 0; i < MAX_VIEWPORT_COUNT; i++) { + for (sint32 i = 0; i < MAX_VIEWPORT_COUNT; i++) { rct_viewport *viewport = &g_viewport_list[i]; if (viewport->width != 0) { viewport_invalidate(viewport, left, top, right, bottom); @@ -4097,8 +4097,8 @@ void map_reorganise_elements() uint32 num_elements; - for (int y = 0; y < 256; y++) { - for (int x = 0; x < 256; x++) { + for (sint32 y = 0; y < 256; y++) { + for (sint32 x = 0; x < 256; x++) { rct_map_element *startElement = map_get_first_element_at(x, y); rct_map_element *endElement = startElement; while (!map_element_is_last_for_tile(endElement++)); @@ -4124,12 +4124,12 @@ void map_reorganise_elements() * Returns true on space available for more elements * Reorganises the map elements to check for space */ -bool map_check_free_elements_and_reorganise(int num_elements) +bool map_check_free_elements_and_reorganise(sint32 num_elements) { if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_MAP_ELEMENTS) return true; - for (int i = 1000; i != 0; --i) + for (sint32 i = 1000; i != 0; --i) sub_68B089(); if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_MAP_ELEMENTS) @@ -4149,7 +4149,7 @@ bool map_check_free_elements_and_reorganise(int num_elements) * * rct2: 0x0068B1F6 */ -rct_map_element *map_element_insert(int x, int y, int z, int flags) +rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags) { rct_map_element *originalMapElement, *newMapElement, *insertedElement; @@ -4270,7 +4270,7 @@ static void map_obstruction_set_error_text(rct_map_element *mapElement) * ebp = clearFunc * bl = bl */ -int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUNC *clearFunc, uint8 bl, uint8 flags, money32 *price) +sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, CLEAR_FUNC *clearFunc, uint8 bl, uint8 flags, money32 *price) { gMapGroundFlags = ELEMENT_IS_1; if (x >= gMapSizeUnits || y >= gMapSizeUnits || x < 32 || y < 32) { @@ -4287,7 +4287,7 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUN } continue; } - int water_height = ((map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 2); + sint32 water_height = ((map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK) * 2); if (water_height && water_height > zLow && map_element->base_height < zHigh) { gMapGroundFlags |= ELEMENT_IS_UNDERWATER; if (water_height < zHigh) { @@ -4296,7 +4296,7 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUN } loc_68B9B7: if (gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION) { - int al = zHigh - map_element->base_height; + sint32 al = zHigh - map_element->base_height; if (al >= 0) { if (al > 18) { gGameCommandErrorText = STR_LOCAL_AUTHORITY_WONT_ALLOW_CONSTRUCTION_ABOVE_TREE_HEIGHT; @@ -4310,10 +4310,10 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUN gMapGroundFlags |= ELEMENT_IS_UNDERGROUND; gMapGroundFlags &= ~ELEMENT_IS_1; } else { - int al = map_element->base_height; - int ah = al; - int cl = al; - int ch = al; + sint32 al = map_element->base_height; + sint32 ah = al; + sint32 cl = al; + sint32 ch = al; uint8 slope = map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; if (slope & 1) { al += 2; @@ -4335,7 +4335,7 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUN if (slope == 0x1D) ch += 2; } - int bh = zLow + 4; + sint32 bh = zLow + 4; if ((!(bl & 1) || ((bl & 0x10 || zLow >= al) && bh >= al)) && (!(bl & 2) || ((bl & 0x20 || zLow >= ah) && bh >= ah)) && (!(bl & 4) || ((bl & 0x40 || zLow >= cl) && bh >= cl)) && @@ -4372,7 +4372,7 @@ int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUN * * rct2: 0x0068B93A */ -int map_can_construct_at(int x, int y, int zLow, int zHigh, uint8 bl) +sint32 map_can_construct_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, uint8 bl) { return map_can_construct_with_clear_at(x, y, zLow, zHigh, NULL, bl, 0, NULL); } @@ -4381,7 +4381,7 @@ int map_can_construct_at(int x, int y, int zLow, int zHigh, uint8 bl) * * rct2: 0x006E5935 */ -void map_remove_intersecting_walls(int x, int y, int z0, int z1, int direction) +void map_remove_intersecting_walls(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) { rct_map_element *mapElement; @@ -4410,17 +4410,17 @@ void map_remove_intersecting_walls(int x, int y, int z0, int z1, int direction) */ void map_update_tiles() { - int ignoreScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER; + sint32 ignoreScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER; if (gScreenFlags & ignoreScreenFlags) return; // Update 43 more tiles - for (int j = 0; j < 43; j++) { - int x = 0; - int y = 0; + for (sint32 j = 0; j < 43; j++) { + sint32 x = 0; + sint32 y = 0; uint16 interleaved_xy = gGrassSceneryTileLoopPosition; - for (int i = 0; i < 8; i++) { + for (sint32 i = 0; i < 8; i++) { x = (x << 1) | (interleaved_xy & 1); interleaved_xy >>= 1; y = (y << 1) | (interleaved_xy & 1); @@ -4442,16 +4442,16 @@ void map_update_tiles() * * rct2: 0x006647A1 */ -static void map_update_grass_length(int x, int y, rct_map_element *mapElement) +static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElement) { // Check if tile is grass if ((mapElement->properties.surface.terrain & 0xE0) && !(mapElement->type & 3)) return; - int grassLength = mapElement->properties.surface.grass_length & 7; + sint32 grassLength = mapElement->properties.surface.grass_length & 7; // Check if grass is underwater or outside park - int waterHeight = (mapElement->properties.surface.terrain & 0x1F) * 2; + sint32 waterHeight = (mapElement->properties.surface.terrain & 0x1F) * 2; if (waterHeight > mapElement->base_height || !map_is_location_in_park(x, y)) { if (grassLength != GRASS_LENGTH_CLEAR_0) map_set_grass_length(x, y, mapElement, GRASS_LENGTH_CLEAR_0); @@ -4462,8 +4462,8 @@ static void map_update_grass_length(int x, int y, rct_map_element *mapElement) // Grass can't grow any further than CLUMPS_2 but this code also cuts grass // if there is an object placed on top of it. - int z0 = mapElement->base_height; - int z1 = mapElement->base_height + 2; + sint32 z0 = mapElement->base_height; + sint32 z1 = mapElement->base_height + 2; if (mapElement->properties.surface.slope & 0x10) z1 += 2; @@ -4506,9 +4506,9 @@ static void map_update_grass_length(int x, int y, rct_map_element *mapElement) } } -static void map_set_grass_length(int x, int y, rct_map_element *mapElement, int length) +static void map_set_grass_length(sint32 x, sint32 y, rct_map_element *mapElement, sint32 length) { - int z0, z1; + sint32 z0, z1; mapElement->properties.surface.grass_length = length; z0 = mapElement->base_height * 8; @@ -4548,7 +4548,7 @@ void map_restore_provisional_elements() } } -int map_element_get_banner_index(rct_map_element *mapElement) +sint32 map_element_get_banner_index(rct_map_element *mapElement) { rct_scenery_entry* sceneryEntry; @@ -4577,7 +4577,7 @@ int map_element_get_banner_index(rct_map_element *mapElement) void map_element_remove_banner_entry(rct_map_element *mapElement) { - int bannerIndex = map_element_get_banner_index(mapElement); + sint32 bannerIndex = map_element_get_banner_index(mapElement); if (bannerIndex == -1) return; @@ -4595,10 +4595,10 @@ void map_element_remove_banner_entry(rct_map_element *mapElement) */ void map_remove_out_of_range_elements() { - int mapMaxXY = gMapSizeMaxXY; + sint32 mapMaxXY = gMapSizeMaxXY; - for (int y = 0; y < (256 * 32); y += 32) { - for (int x = 0; x < (256 * 32); x += 32) { + for (sint32 y = 0; y < (256 * 32); y += 32) { + for (sint32 x = 0; x < (256 * 32); x += 32) { if (x == 0 || y == 0 || x >= mapMaxXY || y >= mapMaxXY) { map_buy_land_rights(x, y, x, y, 1, GAME_COMMAND_FLAG_APPLY); clear_elements_at(x, y); @@ -4614,7 +4614,7 @@ void map_remove_out_of_range_elements() void map_extend_boundary_surface() { rct_map_element *existingMapElement, *newMapElement; - int x, y, z, slope; + sint32 x, y, z, slope; y = gMapSize - 2; for (x = 0; x < 256; x++) { @@ -4693,7 +4693,7 @@ void map_extend_boundary_surface() * Clears the provided element properly from a certain tile, and updates * the pointer (when needed) passed to this function to point to the next element. */ -static void clear_element_at(int x, int y, rct_map_element **elementPtr) +static void clear_element_at(sint32 x, sint32 y, rct_map_element **elementPtr) { rct_map_element *element = *elementPtr; switch (map_element_get_type(element)) { @@ -4757,10 +4757,10 @@ static void clear_element_at(int x, int y, rct_map_element **elementPtr) * Clears all elements properly from a certain tile. * rct2: 0x0068AE2A */ -static void clear_elements_at(int x, int y) +static void clear_elements_at(sint32 x, sint32 y) { // Remove the spawn point (if there is one in the current tile) - for (int i = 0; i < 2; i++) { + for (sint32 i = 0; i < 2; i++) { rct2_peep_spawn *peepSpawn = &gPeepSpawns[i]; if (floor2(peepSpawn->x, 32) == x && floor2(peepSpawn->y, 32) == y) { peepSpawn->x = UINT16_MAX; @@ -4777,10 +4777,10 @@ static void clear_elements_at(int x, int y) clear_element_at(x, y, &mapElement); } -int map_get_highest_z(int tileX, int tileY) +sint32 map_get_highest_z(sint32 tileX, sint32 tileY) { rct_map_element *mapElement; - int z; + sint32 z; mapElement = map_get_surface_element_at(tileX, tileY); if (mapElement == NULL) @@ -4808,7 +4808,7 @@ bool map_element_is_underground(rct_map_element *mapElement) return true; } -rct_map_element *map_get_large_scenery_segment(int x, int y, int z, int direction, int sequence) +rct_map_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement == NULL) @@ -4830,7 +4830,7 @@ rct_map_element *map_get_large_scenery_segment(int x, int y, int z, int directio return NULL; } -rct_map_element *map_get_fence_element_at(int x, int y, int z, int direction) +rct_map_element *map_get_fence_element_at(sint32 x, sint32 y, sint32 z, sint32 direction) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -4846,7 +4846,7 @@ rct_map_element *map_get_fence_element_at(int x, int y, int z, int direction) return NULL; } -rct_map_element *map_get_park_entrance_element_at(int x, int y, int z, bool ghost) +rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { rct_map_element* mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -4867,7 +4867,7 @@ rct_map_element *map_get_park_entrance_element_at(int x, int y, int z, bool ghos return NULL; } -rct_map_element *map_get_small_scenery_element_at(int x, int y, int z, int type, uint8 quadrant) +rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -4886,8 +4886,8 @@ rct_map_element *map_get_small_scenery_element_at(int x, int y, int z, int type, } bool map_large_scenery_get_origin( - int x, int y, int z, int direction, int sequence, - int *outX, int *outY, int *outZ, rct_map_element** outElement + sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, + sint32 *outX, sint32 *outY, sint32 *outZ, rct_map_element** outElement ) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; @@ -4917,13 +4917,13 @@ bool map_large_scenery_get_origin( * * rct2: 0x006B9B05 */ -bool sign_set_colour(int x, int y, int z, int direction, int sequence, uint8 mainColour, uint8 textColour) +bool sign_set_colour(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, uint8 mainColour, uint8 textColour) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; rct_large_scenery_tile *sceneryTiles, *tile; sint16 offsetX, offsetY; - int x0, y0, z0; + sint32 x0, y0, z0; if (!map_large_scenery_get_origin(x, y, z, direction, sequence, &x0, &y0, &z0, &mapElement)) { return false; @@ -4960,7 +4960,7 @@ bool sign_set_colour(int x, int y, int z, int direction, int sequence, uint8 mai * * rct2: 0x006E588E */ -void map_remove_walls_at(int x, int y, int z0, int z1) +void map_remove_walls_at(sint32 x, sint32 y, sint32 z0, sint32 z1) { rct_map_element *mapElement; @@ -4987,14 +4987,14 @@ repeat: * * rct2: 0x006E57E6 */ -void map_remove_walls_at_z(int x, int y, int z) +void map_remove_walls_at_z(sint32 x, sint32 y, sint32 z) { map_remove_walls_at(x, y, z, z + 48); } -static void translate_3d_to_2d(int rotation, int *x, int *y) +static void translate_3d_to_2d(sint32 rotation, sint32 *x, sint32 *y) { - int rx, ry; + sint32 rx, ry; switch (rotation & 3) { default: @@ -5046,11 +5046,11 @@ rct_xy32 translate_3d_to_2d_with_z(sint32 rotation, rct_xyz32 pos) return result; } -static void map_invalidate_tile_under_zoom(int x, int y, int z0, int z1, int maxZoom) +static void map_invalidate_tile_under_zoom(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 maxZoom) { if (gOpenRCT2Headless) return; - int x1, y1, x2, y2; + sint32 x1, y1, x2, y2; x += 16; y += 16; @@ -5061,7 +5061,7 @@ static void map_invalidate_tile_under_zoom(int x, int y, int z0, int z1, int max x2 = x + 32; y2 = y + 32 - z0; - for (int i = 0; i < MAX_VIEWPORT_COUNT; i++) { + for (sint32 i = 0; i < MAX_VIEWPORT_COUNT; i++) { rct_viewport *viewport = &g_viewport_list[i]; if (viewport->width != 0 && (maxZoom == -1 || viewport->zoom <= maxZoom)) { viewport_invalidate(viewport, x1, y1, x2, y2); @@ -5073,7 +5073,7 @@ static void map_invalidate_tile_under_zoom(int x, int y, int z0, int z1, int max * * rct2: 0x006EC847 */ -void map_invalidate_tile(int x, int y, int z0, int z1) +void map_invalidate_tile(sint32 x, sint32 y, sint32 z0, sint32 z1) { map_invalidate_tile_under_zoom(x, y, z0, z1, -1); } @@ -5082,7 +5082,7 @@ void map_invalidate_tile(int x, int y, int z0, int z1) * * rct2: 0x006ECB60 */ -void map_invalidate_tile_zoom1(int x, int y, int z0, int z1) +void map_invalidate_tile_zoom1(sint32 x, sint32 y, sint32 z0, sint32 z1) { map_invalidate_tile_under_zoom(x, y, z0, z1, 1); } @@ -5091,7 +5091,7 @@ void map_invalidate_tile_zoom1(int x, int y, int z0, int z1) * * rct2: 0x006EC9CE */ -void map_invalidate_tile_zoom0(int x, int y, int z0, int z1) +void map_invalidate_tile_zoom0(sint32 x, sint32 y, sint32 z0, sint32 z1) { map_invalidate_tile_under_zoom(x, y, z0, z1, 0); } @@ -5100,29 +5100,29 @@ void map_invalidate_tile_zoom0(int x, int y, int z0, int z1) * * rct2: 0x006EC6D7 */ -void map_invalidate_tile_full(int x, int y) +void map_invalidate_tile_full(sint32 x, sint32 y) { map_invalidate_tile(x, y, 0, 2080); } -void map_invalidate_element(int x, int y, rct_map_element *mapElement) +void map_invalidate_element(sint32 x, sint32 y, rct_map_element *mapElement) { map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } -int map_get_tile_side(int mapX, int mapY) +sint32 map_get_tile_side(sint32 mapX, sint32 mapY) { - int subMapX = mapX & (32 - 1); - int subMapY = mapY & (32 - 1); + sint32 subMapX = mapX & (32 - 1); + sint32 subMapY = mapY & (32 - 1); return (subMapX < subMapY) ? ((subMapX + subMapY) < 32 ? 0 : 1): ((subMapX + subMapY) < 32 ? 3 : 2); } -int map_get_tile_quadrant(int mapX, int mapY) +sint32 map_get_tile_quadrant(sint32 mapX, sint32 mapY) { - int subMapX = mapX & (32 - 1); - int subMapY = mapY & (32 - 1); + sint32 subMapX = mapX & (32 - 1); + sint32 subMapY = mapY & (32 - 1); return (subMapX > 16) ? (subMapY < 16 ? 1 : 0): (subMapY < 16 ? 2 : 3); @@ -5177,14 +5177,14 @@ bool map_surface_is_blocked(sint16 x, sint16 y){ /* Clears all map elements, to be used before generating a new map */ void map_clear_all_elements() { - for (int y = 0; y < (256 * 32); y += 32) { - for (int x = 0; x < (256 * 32); x += 32) { + for (sint32 y = 0; y < (256 * 32); y += 32) { + for (sint32 x = 0; x < (256 * 32); x += 32) { clear_elements_at(x, y); } } } -static money32 place_park_entrance(int flags, sint16 x, sint16 y, sint16 z, uint8 direction) { +static money32 place_park_entrance(sint32 flags, sint16 x, sint16 y, sint16 z, uint8 direction) { if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode) { return MONEY32_UNDEFINED; } @@ -5294,7 +5294,7 @@ static money32 place_park_entrance(int flags, sint16 x, sint16 y, sint16 z, uint * * rct2: 0x006666E7 */ -void game_command_place_park_entrance(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { +void game_command_place_park_entrance(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { *ebx = place_park_entrance( *ebx & 0xFF, *eax & 0xFFFF, @@ -5303,7 +5303,7 @@ void game_command_place_park_entrance(int* eax, int* ebx, int* ecx, int* edx, in (*ebx >> 8) & 0xFF); } -void game_command_set_banner_name(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { +void game_command_set_banner_name(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { static char newName[128]; if ((*ecx >= MAX_BANNERS) || (*ecx < 0)) @@ -5314,10 +5314,10 @@ void game_command_set_banner_name(int* eax, int* ebx, int* ecx, int* edx, int* e } rct_banner* banner = &gBanners[*ecx]; - int nameChunkIndex = *eax & 0xFFFF; + sint32 nameChunkIndex = *eax & 0xFFFF; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_RUNNING_COSTS; - int nameChunkOffset = nameChunkIndex - 1; + sint32 nameChunkOffset = nameChunkIndex - 1; if (nameChunkOffset < 0) nameChunkOffset = 2; nameChunkOffset *= 12; @@ -5359,7 +5359,7 @@ void game_command_set_banner_name(int* eax, int* ebx, int* ecx, int* edx, int* e *ebx = 0; } -void game_command_set_sign_name(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { +void game_command_set_sign_name(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { static char newName[128]; if ((*ecx >= MAX_BANNERS) || (*ecx < 0)) @@ -5369,13 +5369,13 @@ void game_command_set_sign_name(int* eax, int* ebx, int* ecx, int* edx, int* esi return; } rct_banner* banner = &gBanners[*ecx]; - int x = banner->x << 5; - int y = banner->y << 5; + sint32 x = banner->x << 5; + sint32 y = banner->y << 5; - int nameChunkIndex = *eax & 0xFFFF; + sint32 nameChunkIndex = *eax & 0xFFFF; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_RUNNING_COSTS; - int nameChunkOffset = nameChunkIndex - 1; + sint32 nameChunkOffset = nameChunkIndex - 1; if (nameChunkOffset < 0) nameChunkOffset = 2; nameChunkOffset *= 12; @@ -5410,7 +5410,7 @@ void game_command_set_sign_name(int* eax, int* ebx, int* ecx, int* edx, int* esi } } else{ - int rideIndex = banner_get_closest_ride_index(x, y, 16); + sint32 rideIndex = banner_get_closest_ride_index(x, y, 16); if (rideIndex == -1) { *ebx = 0; return; @@ -5428,7 +5428,7 @@ void game_command_set_sign_name(int* eax, int* ebx, int* ecx, int* edx, int* esi *ebx = 0; } -void game_command_set_banner_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { +void game_command_set_banner_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { if ((*ecx >= MAX_BANNERS) || (*ecx < 0)) { gGameCommandErrorText = STR_INVALID_SELECTION_OF_OBJECTS; @@ -5449,8 +5449,8 @@ void game_command_set_banner_style(int* eax, int* ebx, int* ecx, int* edx, int* uint8 bannerIndex = *ecx & 0xFF; - int x = banner->x << 5; - int y = banner->y << 5; + sint32 x = banner->x << 5; + sint32 y = banner->y << 5; rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); bool bannerFound = false; @@ -5475,11 +5475,11 @@ void game_command_set_banner_style(int* eax, int* ebx, int* ecx, int* edx, int* map_element->properties.banner.flags &= ~(1 << map_element->properties.banner.position); } - int colourCodepoint = FORMAT_COLOUR_CODE_START + banner->text_colour; + sint32 colourCodepoint = FORMAT_COLOUR_CODE_START + banner->text_colour; utf8 buffer[256]; format_string(buffer, 256, banner->string_idx, 0); - int firstCodepoint = utf8_get_next(buffer, NULL); + sint32 firstCodepoint = utf8_get_next(buffer, NULL); if (firstCodepoint >= FORMAT_COLOUR_CODE_START && firstCodepoint <= FORMAT_COLOUR_CODE_END) { utf8_write_codepoint(buffer, colourCodepoint); } else { @@ -5504,11 +5504,11 @@ void game_command_set_banner_style(int* eax, int* ebx, int* ecx, int* edx, int* *ebx = 0; } -void game_command_set_sign_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) { +void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { uint8 bannerId = *ecx & 0xFF; rct_banner *banner = &gBanners[bannerId]; - int x = banner->x << 5; - int y = banner->y << 5; + sint32 x = banner->x << 5; + sint32 y = banner->y << 5; uint8 mainColour = (uint8)*edx; uint8 textColour = (uint8)*edi; @@ -5588,7 +5588,7 @@ void game_command_set_sign_style(int* eax, int* ebx, int* ecx, int* edx, int* es * @param y y units, not tiles. * @param z Base height. */ -rct_map_element *map_get_track_element_at(int x, int y, int z) +rct_map_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -5608,7 +5608,7 @@ rct_map_element *map_get_track_element_at(int x, int y, int z) * @param z Base height. * @param trackType */ -rct_map_element *map_get_track_element_at_of_type(int x, int y, int z, int trackType) +rct_map_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -5630,7 +5630,7 @@ rct_map_element *map_get_track_element_at_of_type(int x, int y, int z, int track * @param trackType * @param sequence */ -rct_map_element *map_get_track_element_at_of_type_seq(int x, int y, int z, int trackType, int sequence) +rct_map_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 sequence) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -5654,7 +5654,7 @@ rct_map_element *map_get_track_element_at_of_type_seq(int x, int y, int z, int t * @param trackType * @param ride index */ -rct_map_element *map_get_track_element_at_of_type_from_ride(int x, int y, int z, int trackType, int rideIndex) { +rct_map_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 rideIndex) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; @@ -5675,7 +5675,7 @@ rct_map_element *map_get_track_element_at_of_type_from_ride(int x, int y, int z, * @param z Base height. * @param ride index */ -rct_map_element *map_get_track_element_at_from_ride(int x, int y, int z, int rideIndex) { +rct_map_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z, sint32 rideIndex) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; @@ -5696,7 +5696,7 @@ rct_map_element *map_get_track_element_at_from_ride(int x, int y, int z, int rid * @param direction The direction (0 - 3). * @param ride index */ -rct_map_element *map_get_track_element_at_with_direction_from_ride(int x, int y, int z, int direction, int rideIndex) +rct_map_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex) { rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { diff --git a/src/openrct2/world/map.h b/src/openrct2/world/map.h index 9f2eb1a645..188acb5e8f 100644 --- a/src/openrct2/world/map.h +++ b/src/openrct2/world/map.h @@ -289,7 +289,7 @@ typedef struct rct_xyz32 { } rct_xyz32; typedef struct rct_xy_element { - int x, y; + sint32 x, y; rct_map_element *element; } rct_xy_element; #ifdef PLATFORM_32BIT @@ -392,88 +392,88 @@ extern rct_xyz16 gCommandPosition; extern uint8 gUnk9E2E28; -void map_init(int size); +void map_init(sint32 size); void map_count_remaining_land_rights(); void map_update_tile_pointers(); -rct_map_element *map_get_first_element_at(int x, int y); -void map_set_tile_elements(int x, int y, rct_map_element *elements); -int map_element_is_last_for_tile(const rct_map_element *element); +rct_map_element *map_get_first_element_at(sint32 x, sint32 y); +void map_set_tile_elements(sint32 x, sint32 y, rct_map_element *elements); +sint32 map_element_is_last_for_tile(const rct_map_element *element); uint8 map_element_get_scenery_quadrant(const rct_map_element *element); -int map_element_get_type(const rct_map_element *element); -int map_element_get_direction(const rct_map_element *element); -int map_element_get_terrain(const rct_map_element *element); -int map_element_get_terrain_edge(const rct_map_element *element); -void map_element_set_terrain(rct_map_element *element, int terrain); -void map_element_set_terrain_edge(rct_map_element *element, int terrain); -int map_height_from_slope(int x, int y, int slope); -rct_map_element* map_get_banner_element_at(int x, int y, int z, uint8 direction); -rct_map_element *map_get_surface_element_at(int x, int y); -rct_map_element* map_get_path_element_at(int x, int y, int z); -rct_map_element *map_get_fence_element_at(int x, int y, int z, int direction); -rct_map_element *map_get_small_scenery_element_at(int x, int y, int z, int type, uint8 quadrant); -rct_map_element *map_get_park_entrance_element_at(int x, int y, int z, bool ghost); -int map_element_height(int x, int y); +sint32 map_element_get_type(const rct_map_element *element); +sint32 map_element_get_direction(const rct_map_element *element); +sint32 map_element_get_terrain(const rct_map_element *element); +sint32 map_element_get_terrain_edge(const rct_map_element *element); +void map_element_set_terrain(rct_map_element *element, sint32 terrain); +void map_element_set_terrain_edge(rct_map_element *element, sint32 terrain); +sint32 map_height_from_slope(sint32 x, sint32 y, sint32 slope); +rct_map_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 direction); +rct_map_element *map_get_surface_element_at(sint32 x, sint32 y); +rct_map_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z); +rct_map_element *map_get_fence_element_at(sint32 x, sint32 y, sint32 z, sint32 direction); +rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant); +rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost); +sint32 map_element_height(sint32 x, sint32 y); void sub_68B089(); -int map_coord_is_connected(int x, int y, int z, uint8 faceDirection); +sint32 map_coord_is_connected(sint32 x, sint32 y, sint32 z, uint8 faceDirection); void map_remove_provisional_elements(); void map_restore_provisional_elements(); void map_update_path_wide_flags(); -bool map_is_location_valid(int x, int y); -bool map_is_location_owned(int x, int y, int z); -bool map_is_location_in_park(int x, int y); -bool map_is_location_owned_or_has_rights(int x, int y); +bool map_is_location_valid(sint32 x, sint32 y); +bool map_is_location_owned(sint32 x, sint32 y, sint32 z); +bool map_is_location_in_park(sint32 x, sint32 y); +bool map_is_location_owned_or_has_rights(sint32 x, sint32 y); bool map_surface_is_blocked(sint16 x, sint16 y); -int map_get_station(rct_map_element *mapElement); +sint32 map_get_station(rct_map_element *mapElement); void map_element_remove(rct_map_element *mapElement); void map_remove_all_rides(); void map_invalidate_map_selection_tiles(); void map_invalidate_selection_rect(); void map_reorganise_elements(); -bool map_check_free_elements_and_reorganise(int num_elements); -rct_map_element *map_element_insert(int x, int y, int z, int flags); +bool map_check_free_elements_and_reorganise(sint32 num_elements); +rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags); -typedef int (CLEAR_FUNC)(rct_map_element** map_element, int x, int y, uint8 flags, money32* price); -int map_place_non_scenery_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price); -int map_can_construct_with_clear_at(int x, int y, int zLow, int zHigh, CLEAR_FUNC *clearFunc, uint8 bl, uint8 flags, money32 *price); -int map_can_construct_at(int x, int y, int zLow, int zHigh, uint8 bl); -void rotate_map_coordinates(sint16 *x, sint16 *y, int rotation); -rct_xy16 coordinate_3d_to_2d(const rct_xyz16* coordinate_3d, int rotation); -money32 map_clear_scenery(int x0, int y0, int x1, int y1, int clear, int flags); +typedef sint32 (CLEAR_FUNC)(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price); +sint32 map_place_non_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price); +sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, CLEAR_FUNC *clearFunc, uint8 bl, uint8 flags, money32 *price); +sint32 map_can_construct_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, uint8 bl); +void rotate_map_coordinates(sint16 *x, sint16 *y, sint32 rotation); +rct_xy16 coordinate_3d_to_2d(const rct_xyz16* coordinate_3d, sint32 rotation); +money32 map_clear_scenery(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 clear, sint32 flags); money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags); money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags); -money32 map_place_fence(int type, int x, int y, int z, int edge, int primaryColour, int secondaryColour, int tertiaryColour, int flags); +money32 map_place_fence(sint32 type, sint32 x, sint32 y, sint32 z, sint32 edge, sint32 primaryColour, sint32 secondaryColour, sint32 tertiaryColour, sint32 flags); -void game_command_set_land_height(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_land_ownership(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_remove_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_remove_large_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_remove_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_fence_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_large_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_banner_colour(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_clear_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_change_surface_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_raise_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_lower_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_smooth_land(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_raise_water(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_lower_water(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_water_height(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_remove_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_place_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_place_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_place_park_entrance(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_banner_name(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_sign_name(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_banner_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); -void game_command_set_sign_style(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void game_command_set_land_height(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_land_ownership(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_remove_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_remove_banner(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_fence_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_banner_colour(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_clear_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_change_surface_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_raise_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_lower_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_smooth_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_raise_water(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_lower_water(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_water_height(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_remove_fence(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_place_banner(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_place_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_place_fence(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_place_park_entrance(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_banner_name(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_sign_name(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_banner_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); +void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); typedef struct map_element_iterator { - int x; - int y; + sint32 x; + sint32 y; rct_map_element *element; } map_element_iterator; #ifdef PLATFORM_32BIT @@ -481,14 +481,14 @@ assert_struct_size(map_element_iterator, 12); #endif void map_element_iterator_begin(map_element_iterator *it); -int map_element_iterator_next(map_element_iterator *it); +sint32 map_element_iterator_next(map_element_iterator *it); void map_element_iterator_restart_for_tile(map_element_iterator *it); -void map_remove_intersecting_walls(int x, int y, int z0, int z1, int direction); +void map_remove_intersecting_walls(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction); void map_update_tiles(); -int map_get_highest_z(int tileX, int tileY); +sint32 map_get_highest_z(sint32 tileX, sint32 tileY); -int map_element_get_banner_index(rct_map_element *mapElement); +sint32 map_element_get_banner_index(rct_map_element *mapElement); void map_element_remove_banner_entry(rct_map_element *mapElement); bool map_element_is_underground(rct_map_element *mapElement); @@ -496,35 +496,35 @@ bool map_element_is_underground(rct_map_element *mapElement); void map_remove_out_of_range_elements(); void map_extend_boundary_surface(); -bool sign_set_colour(int x, int y, int z, int direction, int sequence, uint8 mainColour, uint8 textColour); -void map_remove_walls_at(int x, int y, int z0, int z1); -void map_remove_walls_at_z(int x, int y, int z); +bool sign_set_colour(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, uint8 mainColour, uint8 textColour); +void map_remove_walls_at(sint32 x, sint32 y, sint32 z0, sint32 z1); +void map_remove_walls_at_z(sint32 x, sint32 y, sint32 z); -void map_invalidate_tile(int x, int y, int z0, int z1); -void map_invalidate_tile_zoom1(int x, int y, int z0, int z1); -void map_invalidate_tile_zoom0(int x, int y, int z0, int z1); -void map_invalidate_tile_full(int x, int y); -void map_invalidate_element(int x, int y, rct_map_element *mapElement); +void map_invalidate_tile(sint32 x, sint32 y, sint32 z0, sint32 z1); +void map_invalidate_tile_zoom1(sint32 x, sint32 y, sint32 z0, sint32 z1); +void map_invalidate_tile_zoom0(sint32 x, sint32 y, sint32 z0, sint32 z1); +void map_invalidate_tile_full(sint32 x, sint32 y); +void map_invalidate_element(sint32 x, sint32 y, rct_map_element *mapElement); -int map_get_tile_side(int mapX, int mapY); -int map_get_tile_quadrant(int mapX, int mapY); +sint32 map_get_tile_side(sint32 mapX, sint32 mapY); +sint32 map_get_tile_quadrant(sint32 mapX, sint32 mapY); void map_clear_all_elements(); -rct_map_element *map_get_large_scenery_segment(int x, int y, int z, int direction, int sequence); +rct_map_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence); bool map_large_scenery_get_origin( - int x, int y, int z, int direction, int sequence, - int *outX, int *outY, int *outZ, rct_map_element** outElement + sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, + sint32 *outX, sint32 *outY, sint32 *outZ, rct_map_element** outElement ); void map_offset_with_rotation(sint16 *x, sint16 *y, sint16 offsetX, sint16 offsetY, uint8 rotation); rct_xy32 translate_3d_to_2d_with_z(sint32 rotation, rct_xyz32 pos); -rct_map_element *map_get_track_element_at(int x, int y, int z); -rct_map_element *map_get_track_element_at_of_type(int x, int y, int z, int trackType); -rct_map_element *map_get_track_element_at_of_type_seq(int x, int y, int z, int trackType, int sequence); -rct_map_element *map_get_track_element_at_of_type_from_ride(int x, int y, int z, int trackType, int rideIndex); -rct_map_element *map_get_track_element_at_from_ride(int x, int y, int z, int rideIndex); -rct_map_element *map_get_track_element_at_with_direction_from_ride(int x, int y, int z, int direction, int rideIndex); +rct_map_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z); +rct_map_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType); +rct_map_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 sequence); +rct_map_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 rideIndex); +rct_map_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z, sint32 rideIndex); +rct_map_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex); #endif diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c index de0e2656f6..14653e3c67 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/map_animation.c @@ -24,7 +24,7 @@ #include "scenery.h" #include "sprite.h" -typedef bool (*map_animation_invalidate_event_handler)(int x, int y, int baseZ); +typedef bool (*map_animation_invalidate_event_handler)(sint32 x, sint32 y, sint32 baseZ); static bool map_animation_invalidate(rct_map_animation *obj); @@ -42,15 +42,15 @@ rct_map_animation gAnimatedObjects[MAX_ANIMATED_OBJECTS]; * @param y (cx) * @param z (dl) */ -void map_animation_create(int type, int x, int y, int z) +void map_animation_create(sint32 type, sint32 x, sint32 y, sint32 z) { rct_map_animation *aobj = &gAnimatedObjects[0]; - int numAnimatedObjects = gNumMapAnimations; + sint32 numAnimatedObjects = gNumMapAnimations; if (numAnimatedObjects >= MAX_ANIMATED_OBJECTS) { log_error("Exceeded the maximum number of animations"); return; } - for (int i = 0; i < numAnimatedObjects; i++, aobj++) { + for (sint32 i = 0; i < numAnimatedObjects; i++, aobj++) { if (aobj->x != x) continue; if (aobj->y != y) @@ -78,7 +78,7 @@ void map_animation_create(int type, int x, int y, int z) void map_animation_invalidate_all() { rct_map_animation *aobj = &gAnimatedObjects[0]; - int numAnimatedObjects = gNumMapAnimations; + sint32 numAnimatedObjects = gNumMapAnimations; while (numAnimatedObjects > 0) { if (map_animation_invalidate(aobj)) { // Remove animated object @@ -107,7 +107,7 @@ static bool map_animation_invalidate(rct_map_animation *obj) * * rct2: 0x00666670 */ -static bool map_animation_invalidate_ride_entrance(int x, int y, int baseZ) +static bool map_animation_invalidate_ride_entrance(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; rct_ride *ride; @@ -125,7 +125,7 @@ static bool map_animation_invalidate_ride_entrance(int x, int y, int baseZ) ride = get_ride(mapElement->properties.entrance.ride_index); entranceDefinition = &RideEntranceDefinitions[ride->entrance_style]; - int height = (mapElement->base_height * 8) + entranceDefinition->height + 8; + sint32 height = (mapElement->base_height * 8) + entranceDefinition->height + 8; map_invalidate_tile_zoom1(x, y, height, height + 16); return false; } while (!map_element_is_last_for_tile(mapElement++)); @@ -137,7 +137,7 @@ static bool map_animation_invalidate_ride_entrance(int x, int y, int baseZ) * * rct2: 0x006A7BD4 */ -static bool map_animation_invalidate_queue_banner(int x, int y, int baseZ) +static bool map_animation_invalidate_queue_banner(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -152,7 +152,7 @@ static bool map_animation_invalidate_queue_banner(int x, int y, int baseZ) if (!(mapElement->properties.path.type & PATH_FLAG_QUEUE_BANNER)) continue; - int direction = ((mapElement->type >> 6) + get_current_rotation()) & 3; + sint32 direction = ((mapElement->type >> 6) + get_current_rotation()) & 3; if (direction == MAP_ELEMENT_DIRECTION_NORTH || direction == MAP_ELEMENT_DIRECTION_EAST) { baseZ = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, baseZ + 16, baseZ + 30); @@ -167,7 +167,7 @@ static bool map_animation_invalidate_queue_banner(int x, int y, int baseZ) * * rct2: 0x006E32C9 */ -static bool map_animation_invalidate_small_scenery(int x, int y, int baseZ) +static bool map_animation_invalidate_small_scenery(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; @@ -192,9 +192,9 @@ static bool map_animation_invalidate_small_scenery(int x, int y, int baseZ) if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_IS_CLOCK) { // Peep, looking at scenery if (!(gCurrentTicks & 0x3FF) && game_is_not_paused()) { - int direction = mapElement->type & 3; - int x2 = x - TileDirectionDelta[direction].x; - int y2 = y - TileDirectionDelta[direction].y; + sint32 direction = mapElement->type & 3; + sint32 x2 = x - TileDirectionDelta[direction].x; + sint32 y2 = y - TileDirectionDelta[direction].y; uint16 spriteIdx = sprite_get_first_in_quadrant(x2, y2); for (; spriteIdx != SPRITE_INDEX_NULL; spriteIdx = sprite->unknown.next_in_quadrant) { @@ -229,7 +229,7 @@ static bool map_animation_invalidate_small_scenery(int x, int y, int baseZ) * * rct2: 0x00666C63 */ -static bool map_animation_invalidate_park_entrance(int x, int y, int baseZ) +static bool map_animation_invalidate_park_entrance(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -256,7 +256,7 @@ static bool map_animation_invalidate_park_entrance(int x, int y, int baseZ) * * rct2: 0x006CE29E */ -static bool map_animation_invalidate_track_waterfall(int x, int y, int baseZ) +static bool map_animation_invalidate_track_waterfall(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -268,7 +268,7 @@ static bool map_animation_invalidate_track_waterfall(int x, int y, int baseZ) continue; if (mapElement->properties.track.type == TRACK_ELEM_WATERFALL) { - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z + 14, z + 46); return false; } @@ -281,7 +281,7 @@ static bool map_animation_invalidate_track_waterfall(int x, int y, int baseZ) * * rct2: 0x006CE2F3 */ -static bool map_animation_invalidate_track_rapids(int x, int y, int baseZ) +static bool map_animation_invalidate_track_rapids(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -293,7 +293,7 @@ static bool map_animation_invalidate_track_rapids(int x, int y, int baseZ) continue; if (mapElement->properties.track.type == TRACK_ELEM_RAPIDS) { - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z + 14, z + 18); return false; } @@ -306,7 +306,7 @@ static bool map_animation_invalidate_track_rapids(int x, int y, int baseZ) * * rct2: 0x006CE39D */ -static bool map_animation_invalidate_track_onridephoto(int x, int y, int baseZ) +static bool map_animation_invalidate_track_onridephoto(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -338,7 +338,7 @@ static bool map_animation_invalidate_track_onridephoto(int x, int y, int baseZ) * * rct2: 0x006CE348 */ -static bool map_animation_invalidate_track_whirlpool(int x, int y, int baseZ) +static bool map_animation_invalidate_track_whirlpool(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -350,7 +350,7 @@ static bool map_animation_invalidate_track_whirlpool(int x, int y, int baseZ) continue; if (mapElement->properties.track.type == TRACK_ELEM_WHIRLPOOL) { - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z + 14, z + 18); return false; } @@ -363,7 +363,7 @@ static bool map_animation_invalidate_track_whirlpool(int x, int y, int baseZ) * * rct2: 0x006CE3FA */ -static bool map_animation_invalidate_track_spinningtunnel(int x, int y, int baseZ) +static bool map_animation_invalidate_track_spinningtunnel(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -375,7 +375,7 @@ static bool map_animation_invalidate_track_spinningtunnel(int x, int y, int base continue; if (mapElement->properties.track.type == TRACK_ELEM_SPINNING_TUNNEL) { - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z + 14, z + 32); return false; } @@ -388,7 +388,7 @@ static bool map_animation_invalidate_track_spinningtunnel(int x, int y, int base * * rct2: 0x0068DF8F */ -static bool map_animation_invalidate_remove(int x, int y, int baseZ) +static bool map_animation_invalidate_remove(sint32 x, sint32 y, sint32 baseZ) { return true; } @@ -397,7 +397,7 @@ static bool map_animation_invalidate_remove(int x, int y, int baseZ) * * rct2: 0x006BA2BB */ -static bool map_animation_invalidate_banner(int x, int y, int baseZ) +static bool map_animation_invalidate_banner(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; @@ -420,7 +420,7 @@ static bool map_animation_invalidate_banner(int x, int y, int baseZ) * * rct2: 0x006B94EB */ -static bool map_animation_invalidate_large_scenery(int x, int y, int baseZ) +static bool map_animation_invalidate_large_scenery(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; @@ -435,7 +435,7 @@ static bool map_animation_invalidate_large_scenery(int x, int y, int baseZ) sceneryEntry = get_large_scenery_entry(mapElement->properties.scenery.type & 0x3FF); if (sceneryEntry->large_scenery.flags & (1 << 3)) { - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z, z + 16); wasInvalidated = true; } @@ -448,7 +448,7 @@ static bool map_animation_invalidate_large_scenery(int x, int y, int baseZ) * * rct2: 0x006E5B50 */ -static bool map_animation_invalidate_wall_door(int x, int y, int baseZ) +static bool map_animation_invalidate_wall_door(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; @@ -492,7 +492,7 @@ static bool map_animation_invalidate_wall_door(int x, int y, int baseZ) } mapElement->properties.fence.item[2] = bl; if (di & 1) { - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z, z + 32); } if (di & 2) @@ -506,7 +506,7 @@ static bool map_animation_invalidate_wall_door(int x, int y, int baseZ) * * rct2: 0x006E5EE4 */ -static bool map_animation_invalidate_wall(int x, int y, int baseZ) +static bool map_animation_invalidate_wall(sint32 x, sint32 y, sint32 baseZ) { rct_map_element *mapElement; rct_scenery_entry *sceneryEntry; @@ -523,7 +523,7 @@ static bool map_animation_invalidate_wall(int x, int y, int baseZ) if (!(sceneryEntry->wall.flags2 & (1 << 4)) && sceneryEntry->wall.var_0D == 255) continue; - int z = mapElement->base_height * 8; + sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z, z + 16); wasInvalidated = true; } while (!map_element_is_last_for_tile(mapElement++)); diff --git a/src/openrct2/world/map_animation.h b/src/openrct2/world/map_animation.h index d0d7e8253d..0648e48353 100644 --- a/src/openrct2/world/map_animation.h +++ b/src/openrct2/world/map_animation.h @@ -56,7 +56,7 @@ enum { extern uint16 gNumMapAnimations; extern rct_map_animation gAnimatedObjects[MAX_ANIMATED_OBJECTS]; -void map_animation_create(int type, int x, int y, int z); +void map_animation_create(sint32 type, sint32 x, sint32 y, sint32 z); void map_animation_invalidate_all(); #endif diff --git a/src/openrct2/world/map_helpers.c b/src/openrct2/world/map_helpers.c index d2bede622c..91310549f1 100644 --- a/src/openrct2/world/map_helpers.c +++ b/src/openrct2/world/map_helpers.c @@ -20,9 +20,9 @@ /** * Not perfect, this still leaves some particular tiles unsmoothed. */ -int map_smooth(int l, int t, int r, int b) +sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) { - int i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; + sint32 i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; rct_map_element *mapElement, *mapElement2; for (y = t; y < b; y++) { for (x = l; x < r; x++) { @@ -52,7 +52,7 @@ int map_smooth(int l, int t, int r, int b) if (highest >= mapElement->base_height + 4) { count = 0; - int canCompensate = 1; + sint32 canCompensate = 1; for (i = 0; i < 4; i++) if (cornerHeights[i] == highest){ count++; @@ -60,7 +60,7 @@ int map_smooth(int l, int t, int r, int b) // Check if surrounding corners aren't too high. The current tile // can't compensate for all the height differences anymore if it has // the extra height slope. - int highestOnLowestSide; + sint32 highestOnLowestSide; switch (i){ default: case 0: @@ -176,12 +176,12 @@ int map_smooth(int l, int t, int r, int b) return raisedLand; } -static int map_get_corner_height(int x, int y, int corner) +static sint32 map_get_corner_height(sint32 x, sint32 y, sint32 corner) { rct_map_element *mapElement = map_get_surface_element_at(x, y); - int baseHeight = mapElement->base_height; - int slope = mapElement->properties.surface.slope; - int doubleCorner = slope & 16; + sint32 baseHeight = mapElement->base_height; + sint32 slope = mapElement->properties.surface.slope; + sint32 doubleCorner = slope & 16; if (doubleCorner) { if (!(slope & 1)) doubleCorner = 4; else if (!(slope & 2)) doubleCorner = 8; @@ -206,9 +206,9 @@ static int map_get_corner_height(int x, int y, int corner) /** * There are non-smoothed tiles with this version, but diagonal land blocks end up being wavy. */ -static int map_smooth_wavy(int l, int t, int r, int b) +static sint32 map_smooth_wavy(sint32 l, sint32 t, sint32 r, sint32 b) { - int i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; + sint32 i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; rct_map_element *mapElement; for (y = t; y < b; y++) { for (x = l; x < r; x++) { diff --git a/src/openrct2/world/map_helpers.h b/src/openrct2/world/map_helpers.h index 81343677de..d830d9f2f9 100644 --- a/src/openrct2/world/map_helpers.h +++ b/src/openrct2/world/map_helpers.h @@ -17,6 +17,6 @@ #ifndef _MAP_HELPERS_H_ #define _MAP_HELPERS_H_ -int map_smooth(int l, int t, int r, int b); +sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b); #endif diff --git a/src/openrct2/world/mapgen.c b/src/openrct2/world/mapgen.c index 26c5a6d119..e9175cc25c 100644 --- a/src/openrct2/world/mapgen.c +++ b/src/openrct2/world/mapgen.c @@ -73,18 +73,18 @@ const uint8 BaseTerrain[] = { TERRAIN_GRASS, TERRAIN_SAND, TERRAIN_SAND_LIGHT, T #define BLOB_HEIGHT 255 static void mapgen_place_trees(); -static void mapgen_set_water_level(int height); -static void mapgen_blobs(int count, int lowSize, int highSize, int lowHeight, int highHeight); -static void mapgen_blob(int cx, int cy, int size, int height); -static void mapgen_smooth_height(int iterations); +static void mapgen_set_water_level(sint32 height); +static void mapgen_blobs(sint32 count, sint32 lowSize, sint32 highSize, sint32 lowHeight, sint32 highHeight); +static void mapgen_blob(sint32 cx, sint32 cy, sint32 size, sint32 height); +static void mapgen_smooth_height(sint32 iterations); static void mapgen_set_height(); static void mapgen_simplex(mapgen_settings *settings); -static int _heightSize; +static sint32 _heightSize; static uint8 *_height; -static int get_height(int x, int y) +static sint32 get_height(sint32 x, sint32 y) { if (x >= 0 && y >= 0 && x < _heightSize && y < _heightSize) return _height[x + y * _heightSize]; @@ -92,7 +92,7 @@ static int get_height(int x, int y) return 0; } -static void set_height(int x, int y, int height) +static void set_height(sint32 x, sint32 y, sint32 height) { if (x >= 0 && y >= 0 && x < _heightSize && y < _heightSize) _height[x + y * _heightSize] = height; @@ -100,7 +100,7 @@ static void set_height(int x, int y, int height) void mapgen_generate_blank(mapgen_settings *settings) { - int x, y; + sint32 x, y; rct_map_element *mapElement; map_clear_all_elements(); @@ -121,10 +121,10 @@ void mapgen_generate_blank(mapgen_settings *settings) void mapgen_generate(mapgen_settings *settings) { - int x, y, mapSize, floorTexture, wallTexture, waterLevel; + sint32 x, y, mapSize, floorTexture, wallTexture, waterLevel; rct_map_element *mapElement; - util_srand((int)SDL_GetTicks()); + util_srand((sint32)SDL_GetTicks()); mapSize = settings->mapSize; floorTexture = settings->floor; @@ -196,7 +196,7 @@ void mapgen_generate(mapgen_settings *settings) mapgen_set_water_level(waterLevel); // Add sandy beaches - int beachTexture = floorTexture; + sint32 beachTexture = floorTexture; if (settings->floor == -1 && floorTexture == TERRAIN_GRASS) { switch (util_rand() % 4) { case 0: @@ -223,9 +223,9 @@ void mapgen_generate(mapgen_settings *settings) map_reorganise_elements(); } -static void mapgen_place_tree(int type, int x, int y) +static void mapgen_place_tree(sint32 type, sint32 x, sint32 y) { - int surfaceZ; + sint32 surfaceZ; rct_map_element *mapElement; rct_scenery_entry *sceneryEntry = get_small_scenery_entry(type); @@ -245,19 +245,19 @@ static void mapgen_place_tree(int type, int x, int y) */ static void mapgen_place_trees() { - int numGrassTreeIds = 0, numDesertTreeIds = 0, numSnowTreeIds = 0; - int *grassTreeIds = (int*)malloc(countof(GrassTrees) * sizeof(int)); - int *desertTreeIds = (int*)malloc(countof(DesertTrees) * sizeof(int)); - int *snowTreeIds = (int*)malloc(countof(SnowTrees) * sizeof(int)); + sint32 numGrassTreeIds = 0, numDesertTreeIds = 0, numSnowTreeIds = 0; + sint32 *grassTreeIds = (sint32*)malloc(countof(GrassTrees) * sizeof(sint32)); + sint32 *desertTreeIds = (sint32*)malloc(countof(DesertTrees) * sizeof(sint32)); + sint32 *snowTreeIds = (sint32*)malloc(countof(SnowTrees) * sizeof(sint32)); - for (int i = 0; i < object_entry_group_counts[OBJECT_TYPE_SMALL_SCENERY]; i++) { + for (sint32 i = 0; i < object_entry_group_counts[OBJECT_TYPE_SMALL_SCENERY]; i++) { rct_scenery_entry *sceneryEntry = get_small_scenery_entry(i); rct_object_entry_extended *entry = &object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].entries[i]; if (sceneryEntry == (rct_scenery_entry*)-1 || sceneryEntry == NULL) continue; - int j; + sint32 j; for (j = 0; j < countof(GrassTrees); j++) if (strncmp(GrassTrees[j], entry->name, 8) == 0) break; @@ -283,13 +283,13 @@ static void mapgen_place_trees() } } - int availablePositionsCount = 0; - struct { int x; int y; } tmp, *pos, *availablePositions; + sint32 availablePositionsCount = 0; + struct { sint32 x; sint32 y; } tmp, *pos, *availablePositions; availablePositions = malloc(256 * 256 * sizeof(tmp)); // Create list of available tiles - for (int y = 1; y < gMapSize - 1; y++) { - for (int x = 1; x < gMapSize - 1; x++) { + for (sint32 y = 1; y < gMapSize - 1; y++) { + for (sint32 x = 1; x < gMapSize - 1; x++) { rct_map_element *mapElement = map_get_surface_element_at(x, y); // Exclude water tiles @@ -303,8 +303,8 @@ static void mapgen_place_trees() } // Shuffle list - for (int i = 0; i < availablePositionsCount; i++) { - int rindex = util_rand() % availablePositionsCount; + for (sint32 i = 0; i < availablePositionsCount; i++) { + sint32 rindex = util_rand() % availablePositionsCount; if (rindex == i) continue; @@ -315,12 +315,12 @@ static void mapgen_place_trees() // Place trees float treeToLandRatio = (10 + (util_rand() % 30)) / 100.0f; - int numTrees = max(4, (int)(availablePositionsCount * treeToLandRatio)); + sint32 numTrees = max(4, (sint32)(availablePositionsCount * treeToLandRatio)); - for (int i = 0; i < numTrees; i++) { + for (sint32 i = 0; i < numTrees; i++) { pos = &availablePositions[i]; - int type = -1; + sint32 type = -1; rct_map_element *mapElement = map_get_surface_element_at(pos->x, pos->y); switch (map_element_get_terrain(mapElement)) { case TERRAIN_GRASS: @@ -363,9 +363,9 @@ static void mapgen_place_trees() /** * Sets each tile's water level to the specified water level if underneath that water level. */ -static void mapgen_set_water_level(int waterLevel) +static void mapgen_set_water_level(sint32 waterLevel) { - int x, y, mapSize; + sint32 x, y, mapSize; rct_map_element *mapElement; mapSize = gMapSize; @@ -379,20 +379,20 @@ static void mapgen_set_water_level(int waterLevel) } } -static void mapgen_blobs(int count, int lowSize, int highSize, int lowHeight, int highHeight) +static void mapgen_blobs(sint32 count, sint32 lowSize, sint32 highSize, sint32 lowHeight, sint32 highHeight) { - int i; - int sizeRange = highSize - lowSize; - int heightRange = highHeight - lowHeight; + sint32 i; + sint32 sizeRange = highSize - lowSize; + sint32 heightRange = highHeight - lowHeight; - int border = 2 + (util_rand() % 24); - int borderRange = _heightSize - (border * 2); + sint32 border = 2 + (util_rand() % 24); + sint32 borderRange = _heightSize - (border * 2); for (i = 0; i < count; i++) { - int radius = lowSize + (util_rand() % sizeRange); + sint32 radius = lowSize + (util_rand() % sizeRange); mapgen_blob( border + (util_rand() % borderRange), border + (util_rand() % borderRange), - (int)(M_PI * radius * radius), + (sint32)(M_PI * radius * radius), lowHeight + (util_rand() % heightRange) ); } @@ -401,22 +401,22 @@ static void mapgen_blobs(int count, int lowSize, int highSize, int lowHeight, in /** * Sets any holes within a new created blob to the specified height. */ -static void mapgen_blob_fill(int height) +static void mapgen_blob_fill(sint32 height) { // For each square find out whether it is landlocked by BLOB_HEIGHT and then fill it if it is - int left = 0, + sint32 left = 0, top = 0, right = _heightSize - 1, bottom = _heightSize - 1; uint8 *landX = (uint8*)malloc(_heightSize * _heightSize * sizeof(uint8)); - int firstLand, lastLand; + sint32 firstLand, lastLand; // Check each row and see if each tile is between first land x and last land x - for (int y = top; y <= bottom; y++) { + for (sint32 y = top; y <= bottom; y++) { // Calculate first land firstLand = -1; - for (int xx = left; xx <= right; xx++) { + for (sint32 xx = left; xx <= right; xx++) { if (get_height(xx, y) == BLOB_HEIGHT) { firstLand = xx; break; @@ -426,7 +426,7 @@ static void mapgen_blob_fill(int height) lastLand = -1; if (firstLand >= 0) { // Calculate last land - for (int xx = right; xx >= left; xx--) { + for (sint32 xx = right; xx >= left; xx--) { if (get_height(xx, y) == BLOB_HEIGHT) { lastLand = xx; break; @@ -437,16 +437,16 @@ static void mapgen_blob_fill(int height) continue; } - for (int x = left; x <= right; x++) + for (sint32 x = left; x <= right; x++) if (x >= firstLand && x <= lastLand) landX[x * _heightSize + y] = 1; } // Do the same for Y - for (int x = left; x <= right; x++) { + for (sint32 x = left; x <= right; x++) { // Calculate first land firstLand = -1; - for (int yy = top; yy <= bottom; yy++) { + for (sint32 yy = top; yy <= bottom; yy++) { if (get_height(x, yy) == BLOB_HEIGHT) { firstLand = yy; break; @@ -456,7 +456,7 @@ static void mapgen_blob_fill(int height) lastLand = -1; if (firstLand >= 0) { // Calculate last land - for (int yy = bottom; yy >= top; yy--) { + for (sint32 yy = bottom; yy >= top; yy--) { if (get_height(x, yy) == BLOB_HEIGHT) { lastLand = yy; break; @@ -467,7 +467,7 @@ static void mapgen_blob_fill(int height) continue; } - for (int y = top; y <= bottom; y++) { + for (sint32 y = top; y <= bottom; y++) { if (y >= firstLand && y <= lastLand && landX[x * _heightSize + y]) { // Not only do we know its landlocked to both x and y // we can change the land too @@ -477,8 +477,8 @@ static void mapgen_blob_fill(int height) } // Replace all the BLOB_HEIGHT with the actual land height - for (int x = left; x <= right; x++) - for (int y = top; y <= bottom; y++) + for (sint32 x = left; x <= right; x++) + for (sint32 y = top; y <= bottom; y++) if (get_height(x, y) == BLOB_HEIGHT) set_height(x, y, height); @@ -488,9 +488,9 @@ static void mapgen_blob_fill(int height) /** * Sets a rough circular blob of tiles of the specified size to the specified height. */ -static void mapgen_blob(int cx, int cy, int size, int height) +static void mapgen_blob(sint32 cx, sint32 cy, sint32 size, sint32 height) { - int x, y, currentSize, direction; + sint32 x, y, currentSize, direction; x = cx; y = cy; @@ -570,10 +570,10 @@ static void mapgen_blob(int cx, int cy, int size, int height) /** * Smooths the height map. */ -static void mapgen_smooth_height(int iterations) +static void mapgen_smooth_height(sint32 iterations) { - int i, x, y, xx, yy, avg; - int arraySize = _heightSize * _heightSize * sizeof(uint8); + sint32 i, x, y, xx, yy, avg; + sint32 arraySize = _heightSize * _heightSize * sizeof(uint8); uint8 *copyHeight = malloc(arraySize); for (i = 0; i < iterations; i++) { @@ -598,7 +598,7 @@ static void mapgen_smooth_height(int iterations) */ static void mapgen_set_height() { - int x, y, heightX, heightY, mapSize; + sint32 x, y, heightX, heightY, mapSize; rct_map_element *mapElement; mapSize = _heightSize / 2; @@ -640,22 +640,22 @@ static void mapgen_set_height() */ static float generate(float x, float y); -static int fast_floor(float x); -static float grad(int hash, float x, float y); +static sint32 fast_floor(float x); +static float grad(sint32 hash, float x, float y); static uint8 perm[512]; static void noise_rand() { - for (int i = 0; i < countof(perm); i++) + for (sint32 i = 0; i < countof(perm); i++) perm[i] = util_rand() & 0xFF; } -static float fractal_noise(int x, int y, float frequency, int octaves, float lacunarity, float persistence) +static float fractal_noise(sint32 x, sint32 y, float frequency, sint32 octaves, float lacunarity, float persistence) { float total = 0.0f; float amplitude = persistence; - for (int i = 0; i < octaves; i++) { + for (sint32 i = 0; i < octaves; i++) { total += generate(x * frequency, y * frequency) * amplitude; frequency *= lacunarity; amplitude *= persistence; @@ -674,8 +674,8 @@ static float generate(float x, float y) float s = (x + y) * F2; // Hairy factor for 2D float xs = x + s; float ys = y + s; - int i = fast_floor(xs); - int j = fast_floor(ys); + sint32 i = fast_floor(xs); + sint32 j = fast_floor(ys); float t = (float)(i + j) * G2; float X0 = i - t; // Unskew the cell origin back to (x,y) space @@ -685,7 +685,7 @@ static float generate(float x, float y) // For the 2D case, the simplex shape is an equilateral triangle. // Determine which simplex we are in. - int i1, j1; // Offsets for second (middle) corner of simplex in (i,j) coords + sint32 i1, j1; // Offsets for second (middle) corner of simplex in (i,j) coords if (x0 > y0) { i1 = 1; j1 = 0; } // lower triangle, XY order: (0,0)->(1,0)->(1,1) else { i1 = 0; j1 = 1; } // upper triangle, YX order: (0,0)->(0,1)->(1,1) @@ -699,8 +699,8 @@ static float generate(float x, float y) float y2 = y0 - 1.0f + 2.0f * G2; // Wrap the integer indices at 256, to avoid indexing perm[] out of bounds - int ii = i % 256; - int jj = j % 256; + sint32 ii = i % 256; + sint32 jj = j % 256; // Calculate the contribution from the three corners float t0 = 0.5f - x0 * x0 - y0 * y0; @@ -729,14 +729,14 @@ static float generate(float x, float y) return 40.0f * (n0 + n1 + n2); // TODO: The scale factor is preliminary! } -static int fast_floor(float x) +static sint32 fast_floor(float x) { - return (x > 0) ? ((int)x) : (((int)x) - 1); + return (x > 0) ? ((sint32)x) : (((sint32)x) - 1); } -static float grad(int hash, float x, float y) +static float grad(sint32 hash, float x, float y) { - int h = hash & 7; // Convert low 3 bits of hash code + sint32 h = hash & 7; // Convert low 3 bits of hash code float u = h < 4 ? x : y; // into 8 simple gradient directions, float v = h < 4 ? y : x; // and compute the dot product with (x,y). return ((h & 1) != 0 ? -u : u) + ((h & 2) != 0 ? -2.0f * v : 2.0f * v); @@ -744,13 +744,13 @@ static float grad(int hash, float x, float y) static void mapgen_simplex(mapgen_settings *settings) { - int x, y; + sint32 x, y; float freq = settings->simplex_base_freq * (1.0f / _heightSize); - int octaves = settings->simplex_octaves; + sint32 octaves = settings->simplex_octaves; - int low = settings->simplex_low; - int high = settings->simplex_high; + sint32 low = settings->simplex_low; + sint32 high = settings->simplex_high; noise_rand(); for (y = 0; y < _heightSize; y++) { @@ -758,7 +758,7 @@ static void mapgen_simplex(mapgen_settings *settings) float noiseValue = clamp(-1.0f, fractal_noise(x, y, freq, octaves, 2.0f, 0.65f), 1.0f); float normalisedNoiseValue = (noiseValue + 1.0f) / 2.0f; - set_height(x, y, low + (int)(normalisedNoiseValue * high)); + set_height(x, y, low + (sint32)(normalisedNoiseValue * high)); } } } diff --git a/src/openrct2/world/mapgen.h b/src/openrct2/world/mapgen.h index 89a7726715..c4fd2d101e 100644 --- a/src/openrct2/world/mapgen.h +++ b/src/openrct2/world/mapgen.h @@ -19,20 +19,20 @@ typedef struct mapgen_settings { // Base - int mapSize; - int height; - int waterLevel; - int floor; - int wall; + sint32 mapSize; + sint32 height; + sint32 waterLevel; + sint32 floor; + sint32 wall; // Features (e.g. tree, rivers, lakes etc.) - int trees; + sint32 trees; // Simplex Noise Parameters - int simplex_low; - int simplex_high; + sint32 simplex_low; + sint32 simplex_high; float simplex_base_freq; - int simplex_octaves; + sint32 simplex_octaves; } mapgen_settings; void mapgen_generate_blank(mapgen_settings *settings); diff --git a/src/openrct2/world/money_effect.c b/src/openrct2/world/money_effect.c index dafa5952b1..d38787828b 100644 --- a/src/openrct2/world/money_effect.c +++ b/src/openrct2/world/money_effect.c @@ -30,7 +30,7 @@ static const rct_xy16 _moneyEffectMoveOffset[] = { * * rct2: 0x0067351F */ -static void money_effect_create_at(money32 value, int x, int y, int z) +static void money_effect_create_at(money32 value, sint32 x, sint32 y, sint32 z) { rct_money_effect *moneyEffect; rct_string_id stringId; @@ -111,9 +111,9 @@ void money_effect_update(rct_money_effect *moneyEffect) return; moneyEffect->move_delay = 0; - int x = moneyEffect->x + _moneyEffectMoveOffset[get_current_rotation()].x; - int y = moneyEffect->y + _moneyEffectMoveOffset[get_current_rotation()].y; - int z = moneyEffect->z; + sint32 x = moneyEffect->x + _moneyEffectMoveOffset[get_current_rotation()].x; + sint32 y = moneyEffect->y + _moneyEffectMoveOffset[get_current_rotation()].y; + sint32 z = moneyEffect->z; sprite_move(x, y, z, (rct_sprite*)moneyEffect); moneyEffect->num_movements++; diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c index e4b06c8a03..cb89dab644 100644 --- a/src/openrct2/world/park.c +++ b/src/openrct2/world/park.c @@ -55,12 +55,12 @@ uint8 gParkRatingHistory[32]; uint8 gGuestsInParkHistory[32]; // If this value is more than or equal to 0, the park rating is forced to this value. Used for cheat -int gForcedParkRating = -1; +sint32 gForcedParkRating = -1; /** * In a difficult guest generation scenario, no guests will be generated if over this value. */ -int _suggestedGuestMaximum; +sint32 _suggestedGuestMaximum; /** * Probability out of 65535, of gaining a new guest per game tick. @@ -68,7 +68,7 @@ int _suggestedGuestMaximum; * With a full park rating, non-overpriced entrance fee, less guests than the suggested maximum and four positive awards, * approximately 1 guest per second can be generated (+60 guests in one minute). */ -int _guestGenerationProbability; +sint32 _guestGenerationProbability; sint16 gParkEntranceX[4]; sint16 gParkEntranceY[4]; @@ -80,7 +80,7 @@ rct_xyz16 gParkEntranceGhostPosition; uint8 gParkEntranceGhostDirection; money32 gParkEntranceGhostPrice; -int park_is_open() +sint32 park_is_open() { return (gParkFlags & PARK_FLAGS_PARK_OPEN) != 0; } @@ -91,7 +91,7 @@ int park_is_open() */ void park_init() { - int i; + sint32 i; gUnk13CA740 = 0; gParkName = STR_UNNAMED_PARK; @@ -157,7 +157,7 @@ void park_init() */ void park_reset_history() { - for (int i = 0; i < 32; i++) { + for (sint32 i = 0; i < 32; i++) { gParkRatingHistory[i] = 255; gGuestsInParkHistory[i] = 255; } @@ -167,9 +167,9 @@ void park_reset_history() * * rct2: 0x0066A348 */ -int park_calculate_size() +sint32 park_calculate_size() { - int tiles; + sint32 tiles; map_element_iterator it; tiles = 0; @@ -194,12 +194,12 @@ int park_calculate_size() * * rct2: 0x00669EAA */ -int calculate_park_rating() +sint32 calculate_park_rating() { if (gForcedParkRating >= 0) return gForcedParkRating; - int result; + sint32 result; result = 1150; if (gParkFlags & PARK_FLAGS_DIFFICULT_PARK_RATING) @@ -209,8 +209,8 @@ int calculate_park_rating() { rct_peep* peep; uint16 spriteIndex; - int num_happy_peeps; - int num_lost_guests; + sint32 num_happy_peeps; + sint32 num_lost_guests; // -150 to +3 based on a range of guests from 0 to 2000 result -= 150 - (min(2000, gNumGuestsInPark) / 13); @@ -240,9 +240,9 @@ int calculate_park_rating() // Rides { - int i; - short total_ride_uptime = 0, total_ride_intensity = 0, total_ride_excitement = 0; - int num_rides, num_exciting_rides = 0; + sint32 i; + sint16 total_ride_uptime = 0, total_ride_intensity = 0, total_ride_excitement = 0; + sint32 num_rides, num_exciting_rides = 0; rct_ride* ride; num_rides = 0; @@ -263,8 +263,8 @@ int calculate_park_rating() result -= 100; if (num_exciting_rides>0){ - short average_excitement = total_ride_excitement / num_exciting_rides; - short average_intensity = total_ride_intensity / num_exciting_rides; + sint16 average_excitement = total_ride_excitement / num_exciting_rides; + sint16 average_intensity = total_ride_intensity / num_exciting_rides; average_excitement -= 46; if (average_excitement < 0){ @@ -290,7 +290,7 @@ int calculate_park_rating() { rct_litter* litter; uint16 sprite_idx; - short num_litter; + sint16 num_litter; num_litter = 0; for (sprite_idx = gSpriteListHead[SPRITE_LIST_LITTER]; sprite_idx != SPRITE_INDEX_NULL; sprite_idx = litter->next) { @@ -328,7 +328,7 @@ money32 calculate_park_value() // Sum ride values money32 result = 0; - for (int i = 0; i < 255; i++) { + for (sint32 i = 0; i < 255; i++) { rct_ride* ride = get_ride(i); result += calculate_ride_value(ride); } @@ -360,10 +360,10 @@ money32 calculate_company_value() void reset_park_entrances() { gParkName = 0; - for (int i = 0; i < 4; i++) { + for (sint32 i = 0; i < 4; i++) { gParkEntranceX[i] = 0x8000; } - for (int i = 0; i < 2; i++) { + for (sint32 i = 0; i < 2; i++) { gPeepSpawns[i].x = UINT16_MAX; } } @@ -375,10 +375,10 @@ void reset_park_entrances() * @returns A probability out of 65535 * rct2: 0x0066730A */ -static int park_calculate_guest_generation_probability() +static sint32 park_calculate_guest_generation_probability() { - unsigned int probability; - int i, suggestedMaxGuests; + uint32 probability; + sint32 i, suggestedMaxGuests; money16 totalRideValue; rct_ride *ride; @@ -438,7 +438,7 @@ static int park_calculate_guest_generation_probability() probability = 50 + clamp(0, gParkRating - 200, 650); // The more guests, the lower the chance of a new one - int numGuests = gNumGuestsInPark + gNumGuestsHeadingForPark; + sint32 numGuests = gNumGuestsInPark + gNumGuestsHeadingForPark; if (numGuests > suggestedMaxGuests) { probability /= 4; @@ -520,7 +520,7 @@ void generate_new_guest() park_generate_new_guest(); } -static rct_peep *park_generate_new_guest_due_to_campaign(int campaign) +static rct_peep *park_generate_new_guest_due_to_campaign(sint32 campaign) { rct_peep *peep = park_generate_new_guest(); if (peep != NULL) @@ -531,18 +531,18 @@ static rct_peep *park_generate_new_guest_due_to_campaign(int campaign) static void park_generate_new_guests() { // Generate a new guest for some probability - if ((int)(scenario_rand() & 0xFFFF) < _guestGenerationProbability) { - int difficultGeneration = (gParkFlags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0; + if ((sint32)(scenario_rand() & 0xFFFF) < _guestGenerationProbability) { + sint32 difficultGeneration = (gParkFlags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION) != 0; if (!difficultGeneration || _suggestedGuestMaximum + 150 >= gNumGuestsInPark) park_generate_new_guest(); } // Extra guests generated by advertising campaigns - int campaign; + sint32 campaign; for (campaign = 0; campaign < ADVERTISING_CAMPAIGN_COUNT; campaign++) { if (gMarketingCampaignDaysLeft[campaign] != 0) { // Random chance of guest generation - if ((int)(scenario_rand() & 0xFFFF) < marketing_get_campaign_guest_generation_probability(campaign)) + if ((sint32)(scenario_rand() & 0xFFFF) < marketing_get_campaign_guest_generation_probability(campaign)) park_generate_new_guest_due_to_campaign(campaign); } } @@ -602,13 +602,13 @@ uint8 calculate_guest_initial_happiness(uint8 percentage) { */ void park_update_histories() { - int guestsInPark = gNumGuestsInPark; - int lastGuestsInPark = gNumGuestsInParkLastWeek; + sint32 guestsInPark = gNumGuestsInPark; + sint32 lastGuestsInPark = gNumGuestsInParkLastWeek; gNumGuestsInParkLastWeek = guestsInPark; gToolbarDirtyFlags |= BTM_TB_DIRTY_FLAG_PEEP_COUNT; - int changeInGuestsInPark = guestsInPark - lastGuestsInPark; - int guestChangeModifier = 1; + sint32 changeInGuestsInPark = guestsInPark - lastGuestsInPark; + sint32 guestChangeModifier = 1; if (changeInGuestsInPark > -20) { guestChangeModifier++; if (changeInGuestsInPark < 20) @@ -617,19 +617,19 @@ void park_update_histories() gGuestChangeModifier = guestChangeModifier; // Update park rating history - for (int i = 31; i > 0; i--) + for (sint32 i = 31; i > 0; i--) gParkRatingHistory[i] = gParkRatingHistory[i - 1]; gParkRatingHistory[0] = calculate_park_rating() / 4; window_invalidate_by_class(WC_PARK_INFORMATION); // Update guests in park history - for (int i = 31; i > 0; i--) + for (sint32 i = 31; i > 0; i--) gGuestsInParkHistory[i] = gGuestsInParkHistory[i - 1]; gGuestsInParkHistory[0] = min(guestsInPark, 5000) / 20; window_invalidate_by_class(WC_PARK_INFORMATION); // Update current cash history - for (int i = 127; i > 0; i--) + for (sint32 i = 127; i > 0; i--) gCashHistory[i] = gCashHistory[i - 1]; gCashHistory[0] = DECRYPT_MONEY(gCashEncrypted) - gBankLoan; window_invalidate_by_class(WC_FINANCES); @@ -640,7 +640,7 @@ void park_update_histories() currentWeeklyProfit /= gWeeklyProfitAverageDivisor; } - for (int i = 127; i > 0; i--) + for (sint32 i = 127; i > 0; i--) gWeeklyProfitHistory[i] = gWeeklyProfitHistory[i - 1]; gWeeklyProfitHistory[0] = currentWeeklyProfit; @@ -649,7 +649,7 @@ void park_update_histories() window_invalidate_by_class(WC_FINANCES); // Update park value history - for (int i = 127; i > 0; i--) + for (sint32 i = 127; i > 0; i--) gParkValueHistory[i] = gParkValueHistory[i - 1]; gParkValueHistory[0] = gParkValue; } @@ -663,7 +663,7 @@ void park_set_entrance_fee(money32 value) * * rct2: 0x00669E30 */ -void game_command_set_park_entrance_fee(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_park_entrance_fee(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { gCommandExpenditureType = RCT_EXPENDITURE_TYPE_PARK_ENTRANCE_TICKETS; if (*ebx & GAME_COMMAND_FLAG_APPLY) { @@ -673,7 +673,7 @@ void game_command_set_park_entrance_fee(int *eax, int *ebx, int *ecx, int *edx, *ebx = 0; } -void park_set_open(int open) +void park_set_open(sint32 open) { game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, open << 8, GAME_COMMAND_SET_PARK_OPEN, 0, 0); } @@ -682,14 +682,14 @@ void park_set_open(int open) * * rct2: 0x00669D4A */ -void game_command_set_park_open(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp) +void game_command_set_park_open(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp) { if (!(*ebx & GAME_COMMAND_FLAG_APPLY)) { *ebx = 0; return; } - int dh = (*edx >> 8) & 0xFF; + sint32 dh = (*edx >> 8) & 0xFF; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_PARK_ENTRANCE_TICKETS; switch (dh) { @@ -718,9 +718,9 @@ void game_command_set_park_open(int* eax, int* ebx, int* ecx, int* edx, int* esi *ebx = 0; } -int park_get_entrance_index(int x, int y, int z) +sint32 park_get_entrance_index(sint32 x, sint32 y, sint32 z) { - int i; + sint32 i; for (i = 0; i < 4; i++) { if ( @@ -739,7 +739,7 @@ int park_get_entrance_index(int x, int y, int z) * * rct2: 0x00664D05 */ -void update_park_fences(int x, int y) +void update_park_fences(sint32 x, sint32 y) { if (x > 0x1FFF) return; @@ -799,14 +799,14 @@ void update_park_fences(int x, int y) } if (sufaceElement->properties.surface.ownership != newOwnership) { - int z0 = sufaceElement->base_height * 8; - int z1 = z0 + 16; + sint32 z0 = sufaceElement->base_height * 8; + sint32 z1 = z0 + 16; map_invalidate_tile(x, y, z0, z1); sufaceElement->properties.surface.ownership = newOwnership; } } -static void park_remove_entrance_segment(int x, int y, int z) +static void park_remove_entrance_segment(sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement; @@ -823,9 +823,9 @@ static void park_remove_entrance_segment(int x, int y, int z) * * rct2: 0x00666A63 */ -void game_command_remove_park_entrance(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { - int x, y, z, entranceIndex, direction; + sint32 x, y, z, entranceIndex, direction; x = *eax & 0xFFFF; y = *ecx & 0xFFFF; @@ -879,26 +879,26 @@ void game_command_remove_park_entrance(int *eax, int *ebx, int *ecx, int *edx, i void park_set_name(const char *name) { gGameCommandErrorTitle = STR_CANT_RENAME_PARK; - game_do_command(1, GAME_COMMAND_FLAG_APPLY, 0, *((int*)(name + 0)), GAME_COMMAND_SET_PARK_NAME, *((int*)(name + 8)), *((int*)(name + 4))); - game_do_command(2, GAME_COMMAND_FLAG_APPLY, 0, *((int*)(name + 12)), GAME_COMMAND_SET_PARK_NAME, *((int*)(name + 20)), *((int*)(name + 16))); - game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, *((int*)(name + 24)), GAME_COMMAND_SET_PARK_NAME, *((int*)(name + 32)), *((int*)(name + 28))); + game_do_command(1, GAME_COMMAND_FLAG_APPLY, 0, *((sint32*)(name + 0)), GAME_COMMAND_SET_PARK_NAME, *((sint32*)(name + 8)), *((sint32*)(name + 4))); + game_do_command(2, GAME_COMMAND_FLAG_APPLY, 0, *((sint32*)(name + 12)), GAME_COMMAND_SET_PARK_NAME, *((sint32*)(name + 20)), *((sint32*)(name + 16))); + game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, *((sint32*)(name + 24)), GAME_COMMAND_SET_PARK_NAME, *((sint32*)(name + 32)), *((sint32*)(name + 28))); } /** * * rct2: 0x00669C6D */ -void game_command_set_park_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_set_park_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { rct_string_id newUserStringId; char oldName[128]; static char newName[128]; - int nameChunkIndex = *eax & 0xFFFF; + sint32 nameChunkIndex = *eax & 0xFFFF; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; //if (*ebx & GAME_COMMAND_FLAG_APPLY) { // this check seems to be useless and causes problems in multiplayer - int nameChunkOffset = nameChunkIndex - 1; + sint32 nameChunkOffset = nameChunkIndex - 1; if (nameChunkOffset < 0) nameChunkOffset = 2; nameChunkOffset *= 12; @@ -945,7 +945,7 @@ void game_command_set_park_name(int *eax, int *ebx, int *ecx, int *edx, int *esi *ebx = 0; } -static money32 map_buy_land_rights_for_tile(int x, int y, int setting, int flags) { +static money32 map_buy_land_rights_for_tile(sint32 x, sint32 y, sint32 setting, sint32 flags) { rct_map_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32); if (surfaceElement == NULL) return MONEY32_UNDEFINED; @@ -1070,9 +1070,9 @@ static money32 map_buy_land_rights_for_tile(int x, int y, int setting, int flags } } -int map_buy_land_rights(int x0, int y0, int x1, int y1, int setting, int flags) +sint32 map_buy_land_rights(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 setting, sint32 flags) { - int x, y, z; + sint32 x, y, z; money32 totalCost, cost; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE; @@ -1110,9 +1110,9 @@ int map_buy_land_rights(int x0, int y0, int x1, int y1, int setting, int flags) * * rct2: 0x006649BD */ -void game_command_buy_land_rights(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp) +void game_command_buy_land_rights(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp) { - int flags = *ebx & 0xFFFF; + sint32 flags = *ebx & 0xFFFF; *ebx = map_buy_land_rights( (*eax & 0xFFFF), @@ -1132,14 +1132,14 @@ void game_command_buy_land_rights(int *eax, int *ebx, int *ecx, int *edx, int *e } -void set_forced_park_rating(int rating){ +void set_forced_park_rating(sint32 rating){ gForcedParkRating = rating; gParkRating = calculate_park_rating(); gToolbarDirtyFlags |= BTM_TB_DIRTY_FLAG_PARK_RATING; window_invalidate_by_class(WC_PARK_INFORMATION); } -int get_forced_park_rating(){ +sint32 get_forced_park_rating(){ return gForcedParkRating; } @@ -1167,7 +1167,7 @@ void park_remove_ghost_entrance() * * rct2: 0x00666F4E */ -money32 park_place_ghost_entrance(int x, int y, int z, int direction) +money32 park_place_ghost_entrance(sint32 x, sint32 y, sint32 z, sint32 direction) { money32 result; diff --git a/src/openrct2/world/park.h b/src/openrct2/world/park.h index 6d29bcce50..10548c50e3 100644 --- a/src/openrct2/world/park.h +++ b/src/openrct2/world/park.h @@ -62,8 +62,8 @@ extern money32 gCompanyValue; extern sint16 gParkRatingCasualtyPenalty; extern uint8 gParkRatingHistory[32]; extern uint8 gGuestsInParkHistory[32]; -extern int _guestGenerationProbability; -extern int _suggestedGuestMaximum; +extern sint32 _guestGenerationProbability; +extern sint32 _suggestedGuestMaximum; extern sint16 gParkEntranceX[4]; extern sint16 gParkEntranceY[4]; @@ -75,15 +75,15 @@ extern rct_xyz16 gParkEntranceGhostPosition; extern uint8 gParkEntranceGhostDirection; extern money32 gParkEntranceGhostPrice; -void set_forced_park_rating(int rating); -int get_forced_park_rating(); +void set_forced_park_rating(sint32 rating); +sint32 get_forced_park_rating(); -int park_is_open(); +sint32 park_is_open(); void park_init(); void park_reset_history(); -int park_calculate_size(); +sint32 park_calculate_size(); -int calculate_park_rating(); +sint32 calculate_park_rating(); money32 calculate_park_value(); money32 calculate_company_value(); void reset_park_entrances(); @@ -91,25 +91,25 @@ void generate_new_guest(); void park_update(); void park_update_histories(); -void update_park_fences(int x, int y); +void update_park_fences(sint32 x, sint32 y); uint8 calculate_guest_initial_happiness(uint8 percentage); -void park_set_open(int open); -int park_get_entrance_index(int x, int y, int z); +void park_set_open(sint32 open); +sint32 park_get_entrance_index(sint32 x, sint32 y, sint32 z); void park_set_name(const char *name); void park_set_entrance_fee(money32 value); -int map_buy_land_rights(int x0, int y0, int x1, int y1, int setting, int flags); +sint32 map_buy_land_rights(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 setting, sint32 flags); -void game_command_set_park_entrance_fee(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_park_open(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_remove_park_entrance(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_set_park_name(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); -void game_command_buy_land_rights(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp); +void game_command_set_park_entrance_fee(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_park_open(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_set_park_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); +void game_command_buy_land_rights(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); void park_remove_ghost_entrance(); -money32 park_place_ghost_entrance(int x, int y, int z, int direction); +money32 park_place_ghost_entrance(sint32 x, sint32 y, sint32 z, sint32 direction); money16 park_get_entrance_fee(); diff --git a/src/openrct2/world/particle.c b/src/openrct2/world/particle.c index 61b10e9cee..cc3cb70875 100644 --- a/src/openrct2/world/particle.c +++ b/src/openrct2/world/particle.c @@ -23,7 +23,7 @@ * * rct2: 0x006735A1 */ -void crashed_vehicle_particle_create(rct_vehicle_colour colours, int x, int y, int z) +void crashed_vehicle_particle_create(rct_vehicle_colour colours, sint32 x, sint32 y, sint32 z) { rct_crashed_vehicle_particle *sprite = (rct_crashed_vehicle_particle*)create_sprite(2); if (sprite != NULL) { @@ -113,7 +113,7 @@ void crashed_vehicle_particle_update(rct_crashed_vehicle_particle *particle) * * rct2: 0x00673699 */ -void crash_splash_create(int x, int y, int z) +void crash_splash_create(sint32 x, sint32 y, sint32 z) { rct_unk_sprite *sprite = (rct_unk_sprite*)create_sprite(2); if (sprite != NULL) { diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c index acfb87d39e..86d7055b22 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/scenery.c @@ -71,9 +71,9 @@ const rct_xy8 ScenerySubTileOffsets[] = { { 23, 7 } }; -void scenery_increase_age(int x, int y, rct_map_element *mapElement); +void scenery_increase_age(sint32 x, sint32 y, rct_map_element *mapElement); -void scenery_update_tile(int x, int y) +void scenery_update_tile(sint32 x, sint32 y) { rct_map_element *mapElement; @@ -99,7 +99,7 @@ void scenery_update_tile(int x, int y) * * rct2: 0x006E33D9 */ -void scenery_update_age(int x, int y, rct_map_element *mapElement) +void scenery_update_age(sint32 x, sint32 y, rct_map_element *mapElement) { rct_map_element *mapElementAbove; rct_scenery_entry *sceneryEntry; @@ -146,7 +146,7 @@ void scenery_update_age(int x, int y, rct_map_element *mapElement) map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } -void scenery_increase_age(int x, int y, rct_map_element *mapElement) +void scenery_increase_age(sint32 x, sint32 y, rct_map_element *mapElement) { if (mapElement->flags & SMALL_SCENERY_FLAG_ANIMATED) return; @@ -240,7 +240,7 @@ void scenery_remove_ghost_tool_placement(){ } } -rct_scenery_entry *get_small_scenery_entry(int entryIndex) +rct_scenery_entry *get_small_scenery_entry(sint32 entryIndex) { if (entryIndex >= object_entry_group_counts[OBJECT_TYPE_SMALL_SCENERY]) { return NULL; @@ -248,7 +248,7 @@ rct_scenery_entry *get_small_scenery_entry(int entryIndex) return (rct_scenery_entry*)gSmallSceneryEntries[entryIndex]; } -rct_scenery_entry *get_large_scenery_entry(int entryIndex) +rct_scenery_entry *get_large_scenery_entry(sint32 entryIndex) { if (entryIndex >= object_entry_group_counts[OBJECT_TYPE_LARGE_SCENERY]) { return NULL; @@ -256,7 +256,7 @@ rct_scenery_entry *get_large_scenery_entry(int entryIndex) return (rct_scenery_entry*)gLargeSceneryEntries[entryIndex]; } -rct_scenery_entry *get_wall_entry(int entryIndex) +rct_scenery_entry *get_wall_entry(sint32 entryIndex) { if (entryIndex >= object_entry_group_counts[OBJECT_TYPE_WALLS]) { return NULL; @@ -264,7 +264,7 @@ rct_scenery_entry *get_wall_entry(int entryIndex) return (rct_scenery_entry*)gWallSceneryEntries[entryIndex]; } -rct_scenery_entry *get_banner_entry(int entryIndex) +rct_scenery_entry *get_banner_entry(sint32 entryIndex) { if (entryIndex >= object_entry_group_counts[OBJECT_TYPE_BANNERS]) { return NULL; @@ -272,7 +272,7 @@ rct_scenery_entry *get_banner_entry(int entryIndex) return (rct_scenery_entry*)gBannerSceneryEntries[entryIndex]; } -rct_scenery_entry *get_footpath_item_entry(int entryIndex) +rct_scenery_entry *get_footpath_item_entry(sint32 entryIndex) { if (entryIndex >= object_entry_group_counts[OBJECT_TYPE_PATH_BITS]) { return NULL; @@ -280,7 +280,7 @@ rct_scenery_entry *get_footpath_item_entry(int entryIndex) return (rct_scenery_entry*)gFootpathAdditionEntries[entryIndex]; } -rct_scenery_set_entry *get_scenery_group_entry(int entryIndex) +rct_scenery_set_entry *get_scenery_group_entry(sint32 entryIndex) { if (entryIndex >= object_entry_group_counts[OBJECT_TYPE_SCENERY_SETS]) { return NULL; diff --git a/src/openrct2/world/scenery.h b/src/openrct2/world/scenery.h index 9ef8be3ca2..c959503b78 100644 --- a/src/openrct2/world/scenery.h +++ b/src/openrct2/world/scenery.h @@ -252,17 +252,17 @@ extern sint16 window_scenery_tab_entries[20][SCENERY_ENTRIES_BY_TAB + 1]; extern money32 gClearSceneryCost; void init_scenery(); -void scenery_update_tile(int x, int y); -void scenery_update_age(int x, int y, rct_map_element *mapElement); +void scenery_update_tile(sint32 x, sint32 y); +void scenery_update_age(sint32 x, sint32 y, rct_map_element *mapElement); void scenery_set_default_placement_configuration(); void scenery_remove_ghost_tool_placement(); -rct_scenery_entry *get_small_scenery_entry(int entryIndex); -rct_scenery_entry *get_large_scenery_entry(int entryIndex); -rct_scenery_entry *get_wall_entry(int entryIndex); -rct_scenery_entry *get_banner_entry(int entryIndex); -rct_scenery_entry *get_footpath_item_entry(int entryIndex); -rct_scenery_set_entry *get_scenery_group_entry(int entryIndex); +rct_scenery_entry *get_small_scenery_entry(sint32 entryIndex); +rct_scenery_entry *get_large_scenery_entry(sint32 entryIndex); +rct_scenery_entry *get_wall_entry(sint32 entryIndex); +rct_scenery_entry *get_banner_entry(sint32 entryIndex); +rct_scenery_entry *get_footpath_item_entry(sint32 entryIndex); +rct_scenery_set_entry *get_scenery_group_entry(sint32 entryIndex); #endif diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c index 8f1f284b23..cf9d1a4883 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/sprite.c @@ -47,17 +47,17 @@ rct_sprite *get_sprite(size_t sprite_idx) return &_spriteList[sprite_idx]; } -uint16 sprite_get_first_in_quadrant(int x, int y) +uint16 sprite_get_first_in_quadrant(sint32 x, sint32 y) { - int offset = ((x & 0x1FE0) << 3) | (y >> 5); + sint32 offset = ((x & 0x1FE0) << 3) | (y >> 5); return gSpriteSpatialIndex[offset]; } -static void invalidate_sprite_max_zoom(rct_sprite *sprite, int maxZoom) +static void invalidate_sprite_max_zoom(rct_sprite *sprite, sint32 maxZoom) { if (sprite->unknown.sprite_left == SPRITE_LOCATION_NULL) return; - for (int i = 0; i < MAX_VIEWPORT_COUNT; i++) { + for (sint32 i = 0; i < MAX_VIEWPORT_COUNT; i++) { rct_viewport *viewport = &g_viewport_list[i]; if (viewport->width != 0 && viewport->zoom <= maxZoom) { viewport_invalidate( @@ -109,14 +109,14 @@ void reset_sprite_list() gSavedAge = 0; memset(_spriteList, 0, sizeof(rct_sprite) * MAX_SPRITES); - for (int i = 0; i < NUM_SPRITE_LISTS; i++) { + for (sint32 i = 0; i < NUM_SPRITE_LISTS; i++) { gSpriteListHead[i] = SPRITE_INDEX_NULL; gSpriteListCount[i] = 0; } rct_sprite* previous_spr = (rct_sprite*)SPRITE_INDEX_NULL; - for (int i = 0; i < MAX_SPRITES; ++i){ + for (sint32 i = 0; i < MAX_SPRITES; ++i){ rct_sprite *spr = get_sprite(i); spr->unknown.sprite_identifier = SPRITE_IDENTIFIER_NULL; spr->unknown.sprite_index = i; @@ -169,7 +169,7 @@ void reset_sprite_spatial_index() #ifndef DISABLE_NETWORK -static unsigned char _spriteChecksum[EVP_MAX_MD_SIZE + 1]; +static uint8 _spriteChecksum[EVP_MAX_MD_SIZE + 1]; const char * sprite_checksum() { @@ -190,13 +190,13 @@ const char * sprite_checksum() } } } - unsigned char localhash[EVP_MAX_MD_SIZE + 1]; - unsigned int size = sizeof(localhash); + uint8 localhash[EVP_MAX_MD_SIZE + 1]; + uint32 size = sizeof(localhash); EVP_DigestFinal(gHashCTX, localhash, &size); assert(size <= sizeof(localhash)); localhash[sizeof(localhash) - 1] = '\0'; char *x = (char *)_spriteChecksum; - for (unsigned int i = 0; i < size; i++) + for (uint32 i = 0; i < size; i++) { snprintf(x, EVP_MAX_MD_SIZE + 1, "%02x", localhash[i]); x += 2; @@ -306,8 +306,8 @@ void move_sprite_to_list(rct_sprite *sprite, uint8 newListOffset) { rct_unk_sprite *unkSprite = &sprite->unknown; uint8 oldListOffset = unkSprite->linked_list_type_offset; - int oldList = oldListOffset >> 1; - int newList = newListOffset >> 1; + sint32 oldList = oldListOffset >> 1; + sint32 newList = newListOffset >> 1; // No need to move if the sprite is already in the desired list if (oldListOffset == newListOffset) { @@ -373,7 +373,7 @@ static void sprite_steam_particle_update(rct_steam_particle *steam) * * rct2: 0x0067363D */ -void sprite_misc_explosion_cloud_create(int x, int y, int z) +void sprite_misc_explosion_cloud_create(sint32 x, sint32 y, sint32 z) { rct_unk_sprite *sprite = (rct_unk_sprite*)create_sprite(2); if (sprite != NULL) { @@ -404,7 +404,7 @@ static void sprite_misc_explosion_cloud_update(rct_sprite * sprite) * * rct2: 0x0067366B */ -void sprite_misc_explosion_flare_create(int x, int y, int z) +void sprite_misc_explosion_flare_create(sint32 x, sint32 y, sint32 z) { rct_unk_sprite *sprite = (rct_unk_sprite*)create_sprite(2); if (sprite != NULL) { @@ -499,14 +499,14 @@ void sprite_move(sint16 x, sint16 y, sint16 z, rct_sprite* sprite){ if (x < 0 || y < 0 || x > 0x1FFF || y > 0x1FFF) x = SPRITE_LOCATION_NULL; - int new_position = x; + sint32 new_position = x; if (x == SPRITE_LOCATION_NULL)new_position = 0x10000; else{ new_position &= 0x1FE0; new_position = (y >> 5) | (new_position << 3); } - int current_position = sprite->unknown.x; + sint32 current_position = sprite->unknown.x; if (sprite->unknown.x == SPRITE_LOCATION_NULL)current_position = 0x10000; else{ current_position &= 0x1FE0; @@ -522,7 +522,7 @@ void sprite_move(sint16 x, sint16 y, sint16 z, rct_sprite* sprite){ } *sprite_idx = sprite->unknown.next_in_quadrant; - int temp_sprite_idx = gSpriteSpatialIndex[new_position]; + sint32 temp_sprite_idx = gSpriteSpatialIndex[new_position]; gSpriteSpatialIndex[new_position] = sprite->unknown.sprite_index; sprite->unknown.next_in_quadrant = temp_sprite_idx; } @@ -592,7 +592,7 @@ void sprite_remove(rct_sprite *sprite) *spriteIndex = sprite->unknown.next_in_quadrant; } -static bool litter_can_be_at(int x, int y, int z) +static bool litter_can_be_at(sint32 x, sint32 y, sint32 z) { rct_map_element *mapElement; @@ -604,7 +604,7 @@ static bool litter_can_be_at(int x, int y, int z) if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) continue; - int pathZ = mapElement->base_height * 8; + sint32 pathZ = mapElement->base_height * 8; if (pathZ < z || pathZ >= z + 32) continue; @@ -620,7 +620,7 @@ static bool litter_can_be_at(int x, int y, int z) * * rct2: 0x0067375D */ -void litter_create(int x, int y, int z, int direction, int type) +void litter_create(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type) { if (gCheatsDisableLittering) return; @@ -669,7 +669,7 @@ void litter_create(int x, int y, int z, int direction, int type) * * rct2: 0x006738E1 */ -void litter_remove_at(int x, int y, int z) +void litter_remove_at(sint32 x, sint32 y, sint32 z) { uint16 spriteIndex = sprite_get_first_in_quadrant(x, y); while (spriteIndex != SPRITE_INDEX_NULL) { diff --git a/src/openrct2/world/sprite.h b/src/openrct2/world/sprite.h index 3032b4b54c..054cb97189 100644 --- a/src/openrct2/world/sprite.h +++ b/src/openrct2/world/sprite.h @@ -426,11 +426,11 @@ void invalidate_sprite_0(rct_sprite* sprite); void invalidate_sprite_1(rct_sprite *sprite); void invalidate_sprite_2(rct_sprite *sprite); void sprite_remove(rct_sprite *sprite); -void litter_create(int x, int y, int z, int direction, int type); -void litter_remove_at(int x, int y, int z); -void sprite_misc_explosion_cloud_create(int x, int y, int z); -void sprite_misc_explosion_flare_create(int x, int y, int z); -uint16 sprite_get_first_in_quadrant(int x, int y); +void litter_create(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type); +void litter_remove_at(sint32 x, sint32 y, sint32 z); +void sprite_misc_explosion_cloud_create(sint32 x, sint32 y, sint32 z); +void sprite_misc_explosion_flare_create(sint32 x, sint32 y, sint32 z); +uint16 sprite_get_first_in_quadrant(sint32 x, sint32 y); void sprite_position_tween_store_a(); void sprite_position_tween_store_b(); void sprite_position_tween_all(float nudge); @@ -440,14 +440,14 @@ void sprite_position_tween_reset(); /////////////////////////////////////////////////////////////// // Balloon /////////////////////////////////////////////////////////////// -void create_balloon(int x, int y, int z, int colour, uint8 bl); +void create_balloon(sint32 x, sint32 y, sint32 z, sint32 colour, uint8 bl); void balloon_update(rct_balloon *balloon); -void game_command_balloon_press(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp); +void game_command_balloon_press(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); /////////////////////////////////////////////////////////////// // Duck /////////////////////////////////////////////////////////////// -void create_duck(int targetX, int targetY); +void create_duck(sint32 targetX, sint32 targetY); void duck_update(rct_duck *duck); void duck_press(rct_duck *duck); void duck_remove_all(); @@ -461,9 +461,9 @@ void money_effect_update(rct_money_effect *moneyEffect); /////////////////////////////////////////////////////////////// // Crash particles /////////////////////////////////////////////////////////////// -void crashed_vehicle_particle_create(rct_vehicle_colour colours, int x, int y, int z); +void crashed_vehicle_particle_create(rct_vehicle_colour colours, sint32 x, sint32 y, sint32 z); void crashed_vehicle_particle_update(rct_crashed_vehicle_particle *particle); -void crash_splash_create(int x, int y, int z); +void crash_splash_create(sint32 x, sint32 y, sint32 z); void crash_splash_update(rct_crash_splash *splash); const char *sprite_checksum(); From d857ebb2ad2ee6e1063fb7683d18c040dcaefcab Mon Sep 17 00:00:00 2001 From: Broxzier Date: Wed, 4 Jan 2017 22:27:25 +0100 Subject: [PATCH 2/6] Move type definitions before the first include This way the last remaining uses of int could be replaced with sint32 as well. Before this change there was a circular dependancy which made the types unknown in diagnostic.h. --- src/openrct2/common.h | 4 ++-- src/openrct2/diagnostic.c | 8 ++++---- src/openrct2/diagnostic.h | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 15ffd8f000..e0bdd02cdb 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -37,8 +37,6 @@ #include #include -#include "diagnostic.h" - typedef int8_t sint8; typedef int16_t sint16; typedef int32_t sint32; @@ -48,6 +46,8 @@ typedef uint16_t uint16; typedef uint32_t uint32; typedef uint64_t uint64; +#include "diagnostic.h" + typedef char utf8; typedef utf8* utf8string; typedef const utf8* const_utf8string; diff --git a/src/openrct2/diagnostic.c b/src/openrct2/diagnostic.c index 0166235e23..ebb34b8029 100644 --- a/src/openrct2/diagnostic.c +++ b/src/openrct2/diagnostic.c @@ -19,8 +19,8 @@ #include #include "diagnostic.h" -int _log_levels[DIAGNOSTIC_LEVEL_COUNT] = { 1, 1, 1, 0, 1 }; -int _log_location_enabled = 1; +sint32 _log_levels[DIAGNOSTIC_LEVEL_COUNT] = { 1, 1, 1, 0, 1 }; +sint32 _log_location_enabled = 1; const char * _level_strings[] = { "FATAL", @@ -30,7 +30,7 @@ const char * _level_strings[] = { "INFO" }; -void diagnostic_log(int diagnosticLevel, const char *format, ...) +void diagnostic_log(sint32 diagnosticLevel, const char *format, ...) { FILE *stream; va_list args; @@ -52,7 +52,7 @@ void diagnostic_log(int diagnosticLevel, const char *format, ...) fprintf(stream, "\n"); } -void diagnostic_log_with_location(int diagnosticLevel, const char *file, const char *function, int line, const char *format, ...) +void diagnostic_log_with_location(sint32 diagnosticLevel, const char *file, const char *function, sint32 line, const char *format, ...) { FILE *stream; va_list args; diff --git a/src/openrct2/diagnostic.h b/src/openrct2/diagnostic.h index f862a9a278..0368b6236e 100644 --- a/src/openrct2/diagnostic.h +++ b/src/openrct2/diagnostic.h @@ -48,6 +48,8 @@ enum { * only checking whether the define is present or not. */ +#include "common.h" + #if defined(DEBUG) #if DEBUG > 0 #define DEBUG_LEVEL_1 1 @@ -73,14 +75,14 @@ enum { #define DEBUG_LEVEL_1 0 #endif // defined(DEBUG) -extern int _log_levels[DIAGNOSTIC_LEVEL_COUNT]; +extern sint32 _log_levels[DIAGNOSTIC_LEVEL_COUNT]; #ifdef __cplusplus extern "C" { #endif // __cplusplus -void diagnostic_log(int diagnosticLevel, const char *format, ...); -void diagnostic_log_with_location(int diagnosticLevel, const char *file, const char *function, int line, const char *format, ...); +void diagnostic_log(sint32 diagnosticLevel, const char *format, ...); +void diagnostic_log_with_location(sint32 diagnosticLevel, const char *file, const char *function, sint32 line, const char *format, ...); #ifdef __cplusplus } From a26eac91ef2ce79135811d6824d4bfdd68031898 Mon Sep 17 00:00:00 2001 From: Broxzier Date: Wed, 4 Jan 2017 23:51:50 +0100 Subject: [PATCH 3/6] Use typedef for diagnostic levels, small refactor --- src/openrct2/cmdline/RootCommands.cpp | 2 +- src/openrct2/diagnostic.c | 8 +++---- src/openrct2/diagnostic.h | 30 +++++++++------------------ 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp index 9872b91f71..44f02193ac 100644 --- a/src/openrct2/cmdline/RootCommands.cpp +++ b/src/openrct2/cmdline/RootCommands.cpp @@ -163,7 +163,7 @@ exitcode_t CommandLine::HandleCommandDefault() { if (_verbose) { - _log_levels[DIAGNOSTIC_LEVEL_VERBOSE] = 1; + _log_levels[DIAGNOSTIC_LEVEL_VERBOSE] = true; PrintLaunchInformation(); } diff --git a/src/openrct2/diagnostic.c b/src/openrct2/diagnostic.c index ebb34b8029..10e9a8466a 100644 --- a/src/openrct2/diagnostic.c +++ b/src/openrct2/diagnostic.c @@ -19,8 +19,8 @@ #include #include "diagnostic.h" -sint32 _log_levels[DIAGNOSTIC_LEVEL_COUNT] = { 1, 1, 1, 0, 1 }; -sint32 _log_location_enabled = 1; +static bool _log_location_enabled = true; +bool _log_levels[DIAGNOSTIC_LEVEL_COUNT] = { true, true, true, false, true }; const char * _level_strings[] = { "FATAL", @@ -30,7 +30,7 @@ const char * _level_strings[] = { "INFO" }; -void diagnostic_log(sint32 diagnosticLevel, const char *format, ...) +void diagnostic_log(DiagnosticLevel diagnosticLevel, const char *format, ...) { FILE *stream; va_list args; @@ -52,7 +52,7 @@ void diagnostic_log(sint32 diagnosticLevel, const char *format, ...) fprintf(stream, "\n"); } -void diagnostic_log_with_location(sint32 diagnosticLevel, const char *file, const char *function, sint32 line, const char *format, ...) +void diagnostic_log_with_location(DiagnosticLevel diagnosticLevel, const char *file, const char *function, sint32 line, const char *format, ...) { FILE *stream; va_list args; diff --git a/src/openrct2/diagnostic.h b/src/openrct2/diagnostic.h index 0368b6236e..0df941c6b9 100644 --- a/src/openrct2/diagnostic.h +++ b/src/openrct2/diagnostic.h @@ -17,14 +17,16 @@ #ifndef _DIAGNOSTIC_H_ #define _DIAGNOSTIC_H_ -enum { +#include "common.h" + +typedef enum { DIAGNOSTIC_LEVEL_FATAL, DIAGNOSTIC_LEVEL_ERROR, DIAGNOSTIC_LEVEL_WARNING, DIAGNOSTIC_LEVEL_VERBOSE, DIAGNOSTIC_LEVEL_INFORMATION, DIAGNOSTIC_LEVEL_COUNT -}; +} DiagnosticLevel; /** * Compile-time debug levels. @@ -48,8 +50,6 @@ enum { * only checking whether the define is present or not. */ -#include "common.h" - #if defined(DEBUG) #if DEBUG > 0 #define DEBUG_LEVEL_1 1 @@ -75,32 +75,24 @@ enum { #define DEBUG_LEVEL_1 0 #endif // defined(DEBUG) -extern sint32 _log_levels[DIAGNOSTIC_LEVEL_COUNT]; +extern bool _log_levels[DIAGNOSTIC_LEVEL_COUNT]; #ifdef __cplusplus extern "C" { #endif // __cplusplus -void diagnostic_log(sint32 diagnosticLevel, const char *format, ...); -void diagnostic_log_with_location(sint32 diagnosticLevel, const char *file, const char *function, sint32 line, const char *format, ...); +void diagnostic_log(DiagnosticLevel diagnosticLevel, const char *format, ...); +void diagnostic_log_with_location(DiagnosticLevel diagnosticLevel, const char *file, const char *function, sint32 line, const char *format, ...); #ifdef __cplusplus } #endif // __cplusplus #ifdef _MSC_VER - -#define diagnostic_log_macro(level, format, ...) diagnostic_log_with_location(level, __FILE__, __FUNCTION__, __LINE__, format, __VA_ARGS__) - -#define log_fatal(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_FATAL, format, __VA_ARGS__) -#define log_error(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_ERROR, format, __VA_ARGS__) -#define log_warning(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_WARNING, format, __VA_ARGS__) -#define log_verbose(format, ...) diagnostic_log(DIAGNOSTIC_LEVEL_VERBOSE, format, __VA_ARGS__) -#define log_info(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_INFORMATION, format, __VA_ARGS__) - +#define diagnostic_log_macro(level, format, ...) diagnostic_log_with_location(level, __FILE__, __FUNCTION__, __LINE__, format, ## __VA_ARGS__) #else - -#define diagnostic_log_macro(level, format, ...) diagnostic_log_with_location(level, __FILE__, __func__, __LINE__, format, ## __VA_ARGS__) + #define diagnostic_log_macro(level, format, ...) diagnostic_log_with_location(level, __FILE__, __func__, __LINE__, format, ## __VA_ARGS__) +#endif // _MSC_VER #define log_fatal(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_FATAL, format, ## __VA_ARGS__) #define log_error(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_ERROR, format, ## __VA_ARGS__) @@ -109,5 +101,3 @@ void diagnostic_log_with_location(sint32 diagnosticLevel, const char *file, cons #define log_info(format, ...) diagnostic_log_macro(DIAGNOSTIC_LEVEL_INFORMATION, format, ## __VA_ARGS__) #endif - -#endif From 2bf1b4cd2fd45636b77f025bdc63269b2bc148ab Mon Sep 17 00:00:00 2001 From: Broxzier Date: Thu, 5 Jan 2017 23:43:19 +0100 Subject: [PATCH 4/6] Fox linux builds (hopefully) --- src/openrct2/network/TcpSocket.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp index 864986971e..bdc58f5500 100644 --- a/src/openrct2/network/TcpSocket.cpp +++ b/src/openrct2/network/TcpSocket.cpp @@ -47,6 +47,7 @@ #include #include #include + #include "../common.h" typedef sint32 SOCKET; #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 From b80b71cf813899e9f0529328607b856c411bd9bf Mon Sep 17 00:00:00 2001 From: Broxzier Date: Fri, 13 Jan 2017 20:28:02 +0100 Subject: [PATCH 5/6] Fixed typos and warnings after rebase --- src/openrct2/cmdline_sprite.h | 2 ++ .../paint/map_element/scenery_multiple.c | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/ride/ride.c | 2 +- src/openrct2/util/util.c | 4 ++-- src/openrct2/windows/dropdown.c | 16 ++++++++-------- src/openrct2/windows/dropdown.h | 4 ++-- src/openrct2/windows/options.c | 10 +++++----- src/openrct2/windows/tile_inspector.c | 4 ++-- src/openrct2/world/footpath.h | 2 +- 10 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/openrct2/cmdline_sprite.h b/src/openrct2/cmdline_sprite.h index 8c0f5d2623..09d3be3075 100644 --- a/src/openrct2/cmdline_sprite.h +++ b/src/openrct2/cmdline_sprite.h @@ -17,6 +17,8 @@ #ifndef _CMDLINE_SPRITE_H_ #define _CMDLINE_SPRITE_H_ +#include "common.h" + #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/paint/map_element/scenery_multiple.c b/src/openrct2/paint/map_element/scenery_multiple.c index 5fc8fd6b50..70b2851807 100644 --- a/src/openrct2/paint/map_element/scenery_multiple.c +++ b/src/openrct2/paint/map_element/scenery_multiple.c @@ -272,7 +272,7 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map utf8 fitStr[32]; const utf8 *fitStrPtr = fitStr; safe_strcpy(fitStr, scenery_multiple_sign_fit_text(signString, text, true), sizeof(fitStr)); - sint32 height = scenery_multiple_sign_text_height(fitStr, text); + sint32 height2 = scenery_multiple_sign_text_height(fitStr, text); uint32 codepoint; while ((codepoint = utf8_get_next(fitStrPtr, &fitStrPtr)) != 0) { utf8 str[5] = {0}; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index c1fbcc69ec..f19e09006a 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1263,7 +1263,7 @@ private: Memory::Set(_researchRideTypeUsed, 0, sizeof(_researchRideTypeUsed)); // The first six scenery groups are always available - for (size_t i = 0; i < 6; i++) + for (uint8 i = 0; i < 6; i++) { research_insert_scenery_group_entry(i, true); } diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 945f2948f2..0fbd1292c2 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -209,7 +209,7 @@ static sint32 ride_get_new_breakdown_problem(rct_ride *ride); static void ride_inspection_update(rct_ride *ride); static void ride_mechanic_status_update(sint32 rideIndex, sint32 mechanicStatus); static void ride_music_update(sint32 rideIndex); -static void ride_shop_connected(rct_ride* ride, insint32t ride_idx); +static void ride_shop_connected(rct_ride* ride, sint32 ride_idx); static void ride_spiral_slide_update(rct_ride *ride); static void ride_update(sint32 rideIndex); static void ride_update_vehicle_colours(sint32 rideIndex); diff --git a/src/openrct2/util/util.c b/src/openrct2/util/util.c index 099698dd8e..62616f8f52 100644 --- a/src/openrct2/util/util.c +++ b/src/openrct2/util/util.c @@ -175,8 +175,8 @@ bool readentirefile(const utf8 *path, void **outBuffer, size_t *outLength) sint32 bitscanforward(sint32 source) { #if defined(_MSC_VER) && (_MSC_VER >= 1400) // Visual Studio 2005 - sint32 i; - uint8 success = _BitScanForward((uint32 *)&i, (uint32)source); + DWORD i; + uint8 success = _BitScanForward(&i, (uint32)source); return success != 0 ? i : -1; #elif defined(__GNUC__) sint32 success = __builtin_ffs(source); diff --git a/src/openrct2/windows/dropdown.c b/src/openrct2/windows/dropdown.c index 509a289fa3..dd75d2357e 100644 --- a/src/openrct2/windows/dropdown.c +++ b/src/openrct2/windows/dropdown.c @@ -126,14 +126,14 @@ static rct_window_event_list window_dropdown_events = { * @param num_items (bx) * @param colour (al) */ -void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items) +void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, size_t num_items) { - sint32 i, string_width, max_string_width; + sint32 string_width, max_string_width; char buffer[256]; // Calculate the longest string width max_string_width = 0; - for (i = 0; i < num_items; i++) { + for (size_t i = 0; i < num_items; i++) { format_string(buffer, 256, gDropdownItemsFormat[i], (void*)(&gDropdownItemsArgs[i])); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; string_width = gfx_get_string_width(buffer); @@ -154,7 +154,7 @@ void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, * @param num_items (bx) * @param colour (al) */ -void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items, sint32 width) +void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, size_t num_items, sint32 width) { rct_window* w; @@ -170,8 +170,8 @@ void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, u _dropdown_item_height = flags & 0x3F; // Set the widgets - gDropdownNumItems = num_items; - _dropdown_num_rows = num_items; + gDropdownNumItems = (sint32)num_items; + _dropdown_num_rows = (sint32)num_items; width = _dropdown_item_width * _dropdown_num_columns + 3; sint32 height = _dropdown_item_height * _dropdown_num_rows + 3; @@ -180,8 +180,8 @@ void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, u if (y + height > gScreenHeight) y = max(0, gScreenHeight - height); - window_dropdown_widgets[WIDX_BACKGROUND].bottom = _dropdown_item_height * num_items + 3; - window_dropdown_widgets[WIDX_BACKGROUND].right = _dropdown_item_width + 3; + window_dropdown_widgets[WIDX_BACKGROUND].bottom = (sint16)(_dropdown_item_height * num_items + 3); + window_dropdown_widgets[WIDX_BACKGROUND].right = (sint16)(_dropdown_item_width + 3); // Create the window w = window_create( diff --git a/src/openrct2/windows/dropdown.h b/src/openrct2/windows/dropdown.h index 86539d7c32..5a7701bdb4 100644 --- a/src/openrct2/windows/dropdown.h +++ b/src/openrct2/windows/dropdown.h @@ -44,8 +44,8 @@ bool dropdown_is_disabled(sint32 index); void dropdown_set_checked(sint32 index, bool value); void dropdown_set_disabled(sint32 index, bool value); -void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items); -void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 num_items, sint32 width); +void window_dropdown_show_text(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, size_t num_items); +void window_dropdown_show_text_custom_width(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, size_t num_items, sint32 width); void window_dropdown_show_image(sint32 x, sint32 y, sint32 extray, uint8 colour, uint8 flags, sint32 numItems, sint32 itemWidth, sint32 itemHeight, sint32 numColumns); void window_dropdown_close(); sint32 dropdown_index_from_point(sint32 x, sint32 y, rct_window* w); diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index 41c97dcaf5..6af7109e63 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -855,7 +855,7 @@ static void window_options_mouseup(rct_window *w, sint32 widgetIndex) */ static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widget* widget) { - sint32 num_items; + uint32 num_items; widget = &w->widgets[widgetIndex - 1]; @@ -973,7 +973,7 @@ static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widge break; case WIDX_CURRENCY_DROPDOWN: num_items = CURRENCY_END + 1; // All the currencies plus the separator - sint32 num_ordinary_currencies = CURRENCY_END - 1; // All the currencies except custom currency + size_t num_ordinary_currencies = CURRENCY_END - 1; // All the currencies except custom currency for (size_t i = 0; i < num_ordinary_currencies; i++) { gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; @@ -1041,7 +1041,7 @@ static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widge audio_populate_devices(); // populate the list with the sound devices - for (size_t i = 0; i < gAudioDeviceCount; i++) { + for (size_t i = 0; (sint32)i < gAudioDeviceCount; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)gAudioDevices[i].name; } @@ -1068,9 +1068,9 @@ static void window_options_mousedown(sint32 widgetIndex, rct_window*w, rct_widge case WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE: switch (widgetIndex) { case WIDX_THEMES_DROPDOWN: - num_items = (sint32)theme_manager_get_num_available_themes(); + num_items = (uint32)theme_manager_get_num_available_themes(); - for (sint32 i = 0; i < num_items; i++) { + for (size_t i = 0; i < num_items; i++) { gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM; gDropdownItemsArgs[i] = (uintptr_t)theme_manager_get_available_theme_name(i); } diff --git a/src/openrct2/windows/tile_inspector.c b/src/openrct2/windows/tile_inspector.c index 57ede3ac4b..ddce9152c0 100644 --- a/src/openrct2/windows/tile_inspector.c +++ b/src/openrct2/windows/tile_inspector.c @@ -1485,8 +1485,8 @@ static void window_tile_inspector_update_selected_tile(rct_window *w, sint32 x, windowTileInspectorToolMouseX = x; windowTileInspectorToolMouseY = y; - sint32 mapX = x; - sint32 mapY = y; + sint16 mapX = x; + sint16 mapY = y; sint32 direction; screen_pos_to_map_pos(&mapX, &mapY, &direction); if (mapX == MAP_LOCATION_NULL) { diff --git a/src/openrct2/world/footpath.h b/src/openrct2/world/footpath.h index 79c36c4ba3..a7d13918f4 100644 --- a/src/openrct2/world/footpath.h +++ b/src/openrct2/world/footpath.h @@ -85,7 +85,7 @@ bool fence_in_the_way(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction); void footpath_update_path_wide_flags(sint32 x, sint32 y); -sint32 footpath_is_connected_to_map_edge(sint32 x, sint32 y, insint32t z, sint32 direction, sint32 flags); +sint32 footpath_is_connected_to_map_edge(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags); bool footpath_element_is_sloped(rct_map_element *mapElement); uint8 footpath_element_get_slope_direction(rct_map_element *mapElement); bool footpath_element_is_queue(rct_map_element *mapElement); From 0d51bdde3fb13b878c9b249da1756f329d788ed7 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 14 Jan 2017 23:40:46 +0000 Subject: [PATCH 6/6] Fix broken code alignment --- src/openrct2/audio/AudioChannel.cpp | 4 ++-- src/openrct2/audio/AudioChannel.h | 8 ++++---- src/openrct2/audio/AudioFormat.h | 4 ++-- src/openrct2/core/String.hpp | 2 +- src/openrct2/network/NetworkAction.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2/audio/AudioChannel.cpp b/src/openrct2/audio/AudioChannel.cpp index c646d334dc..1faac86448 100644 --- a/src/openrct2/audio/AudioChannel.cpp +++ b/src/openrct2/audio/AudioChannel.cpp @@ -31,12 +31,12 @@ private: uint64 _offset = 0; sint32 _loop = 0; - sint32 _volume = 1; + sint32 _volume = 1; float _volume_l = 0.f; float _volume_r = 0.f; float _oldvolume_l = 0.f; float _oldvolume_r = 0.f; - sint32 _oldvolume = 0; + sint32 _oldvolume = 0; float _pan = 0; bool _stopping = false; diff --git a/src/openrct2/audio/AudioChannel.h b/src/openrct2/audio/AudioChannel.h index 33ee733c61..b185bf1382 100644 --- a/src/openrct2/audio/AudioChannel.h +++ b/src/openrct2/audio/AudioChannel.h @@ -36,7 +36,7 @@ interface IAudioChannel virtual SpeexResamplerState * GetResampler() const abstract; virtual void SetResampler(SpeexResamplerState * value) abstract; - virtual sint32 GetGroup() const abstract; + virtual sint32 GetGroup() const abstract; virtual void SetGroup(sint32 group) abstract; virtual double GetRate() const abstract; @@ -45,15 +45,15 @@ interface IAudioChannel virtual uint64 GetOffset() const abstract; virtual bool SetOffset(uint64 offset) abstract; - virtual sint32 GetLoop() const abstract; + virtual sint32 GetLoop() const abstract; virtual void SetLoop(sint32 value) abstract; - virtual sint32 GetVolume() const abstract; + virtual sint32 GetVolume() const abstract; virtual float GetVolumeL() const abstract; virtual float GetVolumeR() const abstract; virtual float GetOldVolumeL() const abstract; virtual float GetOldVolumeR() const abstract; - virtual sint32 GetOldVolume() const abstract; + virtual sint32 GetOldVolume() const abstract; virtual void SetVolume(sint32 volume) abstract; virtual float GetPan() const abstract; diff --git a/src/openrct2/audio/AudioFormat.h b/src/openrct2/audio/AudioFormat.h index 839e3b1a6e..59f9d8bc08 100644 --- a/src/openrct2/audio/AudioFormat.h +++ b/src/openrct2/audio/AudioFormat.h @@ -25,9 +25,9 @@ */ struct AudioFormat { - sint32 freq; + sint32 freq; SDL_AudioFormat format; - sint32 channels; + sint32 channels; sint32 BytesPerSample() const { diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp index 3e01b69fbe..287c1c3cd0 100644 --- a/src/openrct2/core/String.hpp +++ b/src/openrct2/core/String.hpp @@ -29,7 +29,7 @@ namespace String bool IsNullOrEmpty(const utf8 * str); sint32 Compare(const std::string &a, const std::string &b, bool ignoreCase = false); sint32 Compare(const utf8 * a, const utf8 * b, bool ignoreCase = false); - bool Equals(const std::string &a, const std::string &b, bool ignoreCase = false); + bool Equals(const std::string &a, const std::string &b, bool ignoreCase = false); bool Equals(const utf8 * a, const utf8 * b, bool ignoreCase = false); bool StartsWith(const utf8 * str, const utf8 * match, bool ignoreCase = false); size_t LastIndexOf(const utf8 * str, utf8 match); diff --git a/src/openrct2/network/NetworkAction.h b/src/openrct2/network/NetworkAction.h index 3e672bc57d..6e0ca27136 100644 --- a/src/openrct2/network/NetworkAction.h +++ b/src/openrct2/network/NetworkAction.h @@ -25,7 +25,7 @@ class NetworkAction final public: rct_string_id Name; std::string PermissionName; - std::vector Commands; + std::vector Commands; }; class NetworkActions final