mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix function definitions to match their declarations
This makes sure every function is properly declared, which includes proper `extern` wrappers.
This commit is contained in:
Michał Janiszewski
parent
5204fb0ce9
commit
a6d0e6916e
|
|
@ -17,6 +17,7 @@
|
|||
extern "C"
|
||||
{
|
||||
#include "../platform/platform.h"
|
||||
#include "../openrct2.h"
|
||||
}
|
||||
|
||||
#include "../core/Console.hpp"
|
||||
|
|
@ -290,7 +291,7 @@ namespace CommandLine
|
|||
return buffer;
|
||||
}
|
||||
|
||||
const CommandLineCommand * FindCommandFor(const CommandLineCommand * commands, CommandLineArgEnumerator *argEnumerator)
|
||||
static const CommandLineCommand * FindCommandFor(const CommandLineCommand * commands, CommandLineArgEnumerator *argEnumerator)
|
||||
{
|
||||
// Check if end of arguments or options have started
|
||||
const char * firstArgument;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
extern "C"
|
||||
{
|
||||
#include "../common.h"
|
||||
#include "../cmdline_sprite.h"
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include "openrct2.h"
|
||||
#include "platform/platform.h"
|
||||
#include "util/util.h"
|
||||
#include "cmdline_sprite.h"
|
||||
|
||||
#define MODE_DEFAULT 0
|
||||
#define MODE_CLOSEST 1
|
||||
|
|
@ -57,7 +58,7 @@ rct_sprite_file_header spriteFileHeader;
|
|||
rct_g1_element *spriteFileEntries;
|
||||
uint8 *spriteFileData;
|
||||
|
||||
void sprite_file_load_palette(int spriteIndex)
|
||||
static void sprite_file_load_palette(int spriteIndex)
|
||||
{
|
||||
rct_g1_element *g1 = &spriteFileEntries[spriteIndex];
|
||||
int numPaletteEntries = g1->width;
|
||||
|
|
@ -72,19 +73,19 @@ void sprite_file_load_palette(int spriteIndex)
|
|||
}
|
||||
}
|
||||
|
||||
void sprite_entries_make_absolute()
|
||||
static void sprite_entries_make_absolute()
|
||||
{
|
||||
for (uint32 i = 0; i < spriteFileHeader.num_entries; i++)
|
||||
spriteFileEntries[i].offset += (int)spriteFileData;
|
||||
}
|
||||
|
||||
void sprite_entries_make_relative()
|
||||
static void sprite_entries_make_relative()
|
||||
{
|
||||
for (uint32 i = 0; i < spriteFileHeader.num_entries; i++)
|
||||
spriteFileEntries[i].offset -= (int)spriteFileData;
|
||||
}
|
||||
|
||||
bool sprite_file_open(const utf8 *path)
|
||||
static bool sprite_file_open(const utf8 *path)
|
||||
{
|
||||
SDL_RWops *file;
|
||||
|
||||
|
|
@ -119,7 +120,7 @@ bool sprite_file_open(const utf8 *path)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool sprite_file_save(const char *path)
|
||||
static bool sprite_file_save(const char *path)
|
||||
{
|
||||
SDL_RWops *file = SDL_RWFromFile(path, "wb");
|
||||
if (file == NULL)
|
||||
|
|
@ -153,13 +154,13 @@ bool sprite_file_save(const char *path)
|
|||
return true;
|
||||
}
|
||||
|
||||
void sprite_file_close()
|
||||
static void sprite_file_close()
|
||||
{
|
||||
free(spriteFileEntries);
|
||||
free(spriteFileData);
|
||||
}
|
||||
|
||||
bool sprite_file_export(int spriteIndex, const char *outPath)
|
||||
static bool sprite_file_export(int spriteIndex, const char *outPath)
|
||||
{
|
||||
rct_g1_element *spriteHeader;
|
||||
rct_drawpixelinfo dpi;
|
||||
|
|
@ -190,12 +191,12 @@ bool sprite_file_export(int spriteIndex, const char *outPath)
|
|||
}
|
||||
}
|
||||
|
||||
bool is_transparent_pixel(sint16 *colour){
|
||||
static bool is_transparent_pixel(sint16 *colour){
|
||||
return colour[3] < 128;
|
||||
}
|
||||
|
||||
// Returns true if pixel index is an index not used for remapping
|
||||
bool is_changable_pixel(int palette_index) {
|
||||
static bool is_changable_pixel(int palette_index) {
|
||||
if (palette_index == -1)
|
||||
return true;
|
||||
if (palette_index == 0)
|
||||
|
|
@ -211,7 +212,7 @@ bool is_changable_pixel(int palette_index) {
|
|||
return true;
|
||||
}
|
||||
|
||||
int get_closest_palette_index(sint16 *colour){
|
||||
static int get_closest_palette_index(sint16 *colour){
|
||||
uint32 smallest_error = -1;
|
||||
int best_match = -1;
|
||||
|
||||
|
|
@ -231,7 +232,7 @@ int get_closest_palette_index(sint16 *colour){
|
|||
return best_match;
|
||||
}
|
||||
|
||||
int get_palette_index(sint16 *colour)
|
||||
static int get_palette_index(sint16 *colour)
|
||||
{
|
||||
if (is_transparent_pixel(colour))
|
||||
return -1;
|
||||
|
|
@ -246,7 +247,7 @@ int get_palette_index(sint16 *colour)
|
|||
return -1;
|
||||
}
|
||||
|
||||
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, int *outBufferLength, int mode)
|
||||
{
|
||||
uint8 *pixels;
|
||||
uint32 width, height;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
|
||||
/*****************************************************************************
|
||||
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
|
||||
*
|
||||
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
|
||||
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
|
||||
*
|
||||
* OpenRCT2 is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* A full copy of the GNU General Public License can be found in licence.txt
|
||||
*****************************************************************************/
|
||||
#pragma endregion
|
||||
|
||||
#ifndef _CMDLINE_SPRITE_H_
|
||||
#define _CMDLINE_SPRITE_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
int cmdline_for_sprite(const char **argv, int argc);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
12
src/config.c
12
src/config.c
|
|
@ -628,7 +628,7 @@ static void config_save_property_value(SDL_RWops *file, uint8 type, value_union
|
|||
}
|
||||
}
|
||||
|
||||
bool config_get_section(const utf8string line, const utf8 **sectionName, int *sectionNameSize)
|
||||
static bool config_get_section(const utf8string line, const utf8 **sectionName, int *sectionNameSize)
|
||||
{
|
||||
utf8 *ch;
|
||||
int c;
|
||||
|
|
@ -649,7 +649,7 @@ bool config_get_section(const utf8string line, const utf8 **sectionName, int *se
|
|||
return true;
|
||||
}
|
||||
|
||||
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, int *propertyNameSize, utf8 **value, int *valueSize)
|
||||
{
|
||||
utf8 *ch, *clast;
|
||||
int c;
|
||||
|
|
@ -702,7 +702,7 @@ bool config_get_property_name_value(const utf8string line, utf8 **propertyName,
|
|||
return true;
|
||||
}
|
||||
|
||||
config_section_definition *config_get_section_def(const utf8 *name, int size)
|
||||
static config_section_definition *config_get_section_def(const utf8 *name, int size)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -716,7 +716,7 @@ config_section_definition *config_get_section_def(const utf8 *name, int size)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
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, int size)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -756,7 +756,7 @@ static utf8string escape_string(const utf8 *value, int valueSize) {
|
|||
return escaped;
|
||||
}
|
||||
|
||||
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, int valueSize)
|
||||
{
|
||||
value_union *destValue = (value_union*)((size_t)section->base_address + (size_t)property->offset);
|
||||
|
||||
|
|
@ -1069,7 +1069,7 @@ void config_reset_shortcut_keys()
|
|||
memcpy(gShortcutKeys, _defaultShortcutKeys, sizeof(gShortcutKeys));
|
||||
}
|
||||
|
||||
void config_shortcut_keys_get_path(utf8 *outPath)
|
||||
static void config_shortcut_keys_get_path(utf8 *outPath)
|
||||
{
|
||||
platform_get_user_directory(outPath, NULL);
|
||||
strcat(outPath, "hotkeys.cfg");
|
||||
|
|
|
|||
|
|
@ -17,11 +17,14 @@
|
|||
#include "../core/Exception.hpp"
|
||||
#include "IDrawingContext.h"
|
||||
#include "IDrawingEngine.h"
|
||||
#include "NewDrawing.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#include "../config.h"
|
||||
#include "../localisation/string_ids.h"
|
||||
#include "../drawing/drawing.h"
|
||||
#include "../interface/screenshot.h"
|
||||
#include "../localisation/string_ids.h"
|
||||
#include "../platform/platform.h"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#ifdef _cplusplus
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
|
@ -34,7 +34,7 @@ rct_drawpixelinfo * drawing_engine_get_dpi();
|
|||
bool drawing_engine_has_dirty_optimisations();
|
||||
void drawing_engine_invalidate_image(uint32 image);
|
||||
|
||||
#ifdef _cplusplus
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -215,6 +215,8 @@ void gfx_draw_string_centred_wrapped_partial(rct_drawpixelinfo *dpi, int x, int
|
|||
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);
|
||||
SDL_Surface *ttf_surface_cache_get_or_add(TTF_Font *font, const utf8 *text);
|
||||
TTFFontDescriptor *ttf_get_font_from_sprite_base(uint16 spriteBase);
|
||||
|
||||
bool ttf_initialise();
|
||||
void ttf_dispose();
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
* Draws a horizontal line of specified colour to a buffer.
|
||||
* rct2: 0x0068474C
|
||||
*/
|
||||
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, int y, int x, int no_pixels)
|
||||
{
|
||||
y -= dpi->y;
|
||||
|
||||
|
|
|
|||
|
|
@ -233,9 +233,6 @@ void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap,
|
|||
}
|
||||
}
|
||||
|
||||
TTFFontDescriptor *ttf_get_font_from_sprite_base(uint16 spriteBase);
|
||||
SDL_Surface *_ttf_surface_cache_get_or_add(TTF_Font *font, const utf8 *text);
|
||||
|
||||
void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, sint16 *scrollPositionOffsets)
|
||||
{
|
||||
TTFFontDescriptor *fontDesc = ttf_get_font_from_sprite_base(FONT_SPRITE_BASE_TINY);
|
||||
|
|
@ -267,7 +264,7 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, si
|
|||
colour = RCT2_GLOBAL(0x009FF048, uint8*)[(colour - FORMAT_COLOUR_CODE_START) * 4];
|
||||
}
|
||||
|
||||
SDL_Surface *surface = _ttf_surface_cache_get_or_add(fontDesc->font, text);
|
||||
SDL_Surface *surface = ttf_surface_cache_get_or_add(fontDesc->font, text);
|
||||
if (surface == NULL) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format,
|
|||
/**
|
||||
* Changes the palette so that the next character changes colour
|
||||
*/
|
||||
void colour_char(uint8 colour, uint16* current_font_flags, uint8* palette_pointer) {
|
||||
static void colour_char(uint8 colour, uint16* current_font_flags, uint8* palette_pointer) {
|
||||
|
||||
int eax;
|
||||
|
||||
|
|
@ -468,7 +468,7 @@ void colour_char(uint8 colour, uint16* current_font_flags, uint8* palette_pointe
|
|||
* Changes the palette so that the next character changes colour
|
||||
* This is specific to changing to a predefined window related colour
|
||||
*/
|
||||
void colour_char_window(uint8 colour, uint16* current_font_flags,uint8* palette_pointer) {
|
||||
static void colour_char_window(uint8 colour, uint16* current_font_flags,uint8* palette_pointer) {
|
||||
|
||||
int eax;
|
||||
|
||||
|
|
@ -727,7 +727,7 @@ static void _ttf_surface_cache_dispose_all()
|
|||
}
|
||||
}
|
||||
|
||||
SDL_Surface *_ttf_surface_cache_get_or_add(TTF_Font *font, const utf8 *text)
|
||||
SDL_Surface *ttf_surface_cache_get_or_add(TTF_Font *font, const utf8 *text)
|
||||
{
|
||||
ttf_cache_entry *entry;
|
||||
|
||||
|
|
@ -956,7 +956,7 @@ static void ttf_draw_string_raw_ttf(rct_drawpixelinfo *dpi, const utf8 *text, te
|
|||
return;
|
||||
} else {
|
||||
uint8 colour = info->palette[1];
|
||||
SDL_Surface *surface = _ttf_surface_cache_get_or_add(fontDesc->font, text);
|
||||
SDL_Surface *surface = ttf_surface_cache_get_or_add(fontDesc->font, text);
|
||||
if (surface == NULL)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ bool gInUpdateCode = false;
|
|||
int gGameCommandNestLevel;
|
||||
bool gGameCommandIsNetworked;
|
||||
|
||||
extern void game_command_callback_place_banner(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp);
|
||||
|
||||
GAME_COMMAND_CALLBACK_POINTER* game_command_callback = 0;
|
||||
GAME_COMMAND_CALLBACK_POINTER* game_command_callback_table[] = {
|
||||
0,
|
||||
|
|
@ -912,11 +910,11 @@ void save_game_as()
|
|||
window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, name);
|
||||
}
|
||||
|
||||
int compare_autosave_file_paths (const void * a, const void * b ) {
|
||||
static int compare_autosave_file_paths (const void * a, const void * b ) {
|
||||
return strcmp(*(char **)a, *(char **)b);
|
||||
}
|
||||
|
||||
void limit_autosave_count(const size_t numberOfFilesToKeep)
|
||||
static void limit_autosave_count(const size_t numberOfFilesToKeep)
|
||||
{
|
||||
int fileEnumHandle = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ int g_maxhooks = 1000;
|
|||
*(data + 2) = ((addr) & 0x00ff0000) >> 16; \
|
||||
*(data + 3) = ((addr) & 0xff000000) >> 24;
|
||||
|
||||
void hookfunc(int address, int newaddress, int stacksize, int registerargs[], int registersreturned, int eaxDestinationRegister)
|
||||
static void hookfunc(int address, int newaddress, int stacksize, int registerargs[], int registersreturned, int eaxDestinationRegister)
|
||||
{
|
||||
int i = 0;
|
||||
char data[100];
|
||||
|
|
|
|||
|
|
@ -508,7 +508,7 @@ namespace ThemeManager
|
|||
bool EnsureThemeDirectoryExists();
|
||||
void GetThemePath(utf8 * buffer, size_t bufferSize);
|
||||
|
||||
void GetAvailableThemes(List<AvailableTheme> * outThemes)
|
||||
static void GetAvailableThemes(List<AvailableTheme> * outThemes)
|
||||
{
|
||||
Guard::ArgumentNotNull(outThemes);
|
||||
|
||||
|
|
@ -550,7 +550,7 @@ namespace ThemeManager
|
|||
}
|
||||
}
|
||||
|
||||
void LoadTheme(UITheme * theme)
|
||||
static void LoadTheme(UITheme * theme)
|
||||
{
|
||||
if (CurrentTheme == theme)
|
||||
{
|
||||
|
|
@ -571,7 +571,7 @@ namespace ThemeManager
|
|||
gfx_invalidate_screen();
|
||||
}
|
||||
|
||||
void LoadTheme(const utf8 * path)
|
||||
static void LoadTheme(const utf8 * path)
|
||||
{
|
||||
UITheme * theme = UITheme::FromFile(path);
|
||||
if (theme == nullptr)
|
||||
|
|
@ -587,7 +587,7 @@ namespace ThemeManager
|
|||
}
|
||||
}
|
||||
|
||||
bool LoadThemeByName(const utf8 * name)
|
||||
static bool LoadThemeByName(const utf8 * name)
|
||||
{
|
||||
for (size_t i = 0; i < ThemeManager::AvailableThemes.GetCount(); i++)
|
||||
{
|
||||
|
|
@ -609,7 +609,7 @@ namespace ThemeManager
|
|||
return false;
|
||||
}
|
||||
|
||||
void Initialise()
|
||||
static void Initialise()
|
||||
{
|
||||
ThemeManager::GetAvailableThemes(&ThemeManager::AvailableThemes);
|
||||
LoadTheme((UITheme *)&PredefinedThemeRCT2);
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ void console_toggle()
|
|||
console_open();
|
||||
}
|
||||
|
||||
void console_init()
|
||||
static void console_init()
|
||||
{
|
||||
_consoleInitialised = true;
|
||||
console_writeline(OPENRCT2_NAME " " OPENRCT2_VERSION);
|
||||
|
|
|
|||
|
|
@ -224,12 +224,12 @@ void sub_689174(sint16* x, sint16* y, sint16 *z)
|
|||
*z = height;
|
||||
}
|
||||
|
||||
void sub_683326(int left, int top, int right, int bottom)
|
||||
static void sub_683326(int left, int top, int right, int bottom)
|
||||
{
|
||||
RCT2_CALLPROC_X(0x00683359, left, top, right, bottom, 0, 0, 0);
|
||||
}
|
||||
|
||||
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, int x, int y)
|
||||
{
|
||||
// sub-divide by intersecting windows
|
||||
if (window < gWindowNextSlot)
|
||||
|
|
@ -349,7 +349,7 @@ void sub_6E7FF3(rct_drawpixelinfo *dpi, rct_window *window, rct_viewport *viewpo
|
|||
}
|
||||
}
|
||||
|
||||
void viewport_shift_pixels(rct_drawpixelinfo *dpi, rct_window* w, rct_viewport* viewport, sint16 x_diff, sint16 y_diff)
|
||||
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;
|
||||
|
|
@ -385,7 +385,7 @@ void viewport_shift_pixels(rct_drawpixelinfo *dpi, rct_window* w, rct_viewport*
|
|||
sub_6E7FF3(dpi, w, viewport, x_diff, y_diff);
|
||||
}
|
||||
|
||||
void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport)
|
||||
static void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport)
|
||||
{
|
||||
uint8 zoom = (1 << viewport->zoom);
|
||||
|
||||
|
|
@ -465,7 +465,7 @@ void viewport_move(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport)
|
|||
}
|
||||
|
||||
//rct2: 0x006E7A15
|
||||
void viewport_set_underground_flag(int underground, rct_window* window, rct_viewport* viewport)
|
||||
static void viewport_set_underground_flag(int underground, rct_window* window, rct_viewport* viewport)
|
||||
{
|
||||
if (window->classification != WC_MAIN_WINDOW)
|
||||
{
|
||||
|
|
@ -990,7 +990,7 @@ void viewport_set_visibility(uint8 mode)
|
|||
* Stores some info about the element pointed at, if requested for this particular type through the interaction mask.
|
||||
* rct2: 0x00688697
|
||||
*/
|
||||
void store_interaction_info(paint_struct *ps)
|
||||
static void store_interaction_info(paint_struct *ps)
|
||||
{
|
||||
if (RCT2_GLOBAL(0x0141F569, uint8) == 0) return;
|
||||
|
||||
|
|
@ -1282,7 +1282,7 @@ static bool sub_679074(rct_drawpixelinfo *dpi, int imageId, sint16 x, sint16 y)
|
|||
*
|
||||
* rct2: 0x00679023
|
||||
*/
|
||||
void sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
|
||||
static void sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
|
||||
{
|
||||
RCT2_GLOBAL(0x00141F569, uint8) = 0;
|
||||
imageId &= 0xBFFFFFFF;
|
||||
|
|
@ -1304,7 +1304,7 @@ void sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
|
|||
*
|
||||
* rct2: 0x0068862C
|
||||
*/
|
||||
void sub_68862C()
|
||||
static void sub_68862C()
|
||||
{
|
||||
rct_drawpixelinfo *dpi = unk_140E9A8;
|
||||
paint_struct *ps = unk_EE7884, *old_ps, *next_ps;
|
||||
|
|
@ -1440,7 +1440,7 @@ void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, i
|
|||
}
|
||||
}
|
||||
|
||||
rct_viewport *viewport_find_from_point(int screenX, int screenY)
|
||||
static rct_viewport *viewport_find_from_point(int screenX, int screenY)
|
||||
{
|
||||
rct_window *w = window_find_from_point(screenX, screenY);
|
||||
if (w == NULL)
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ 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);
|
||||
|
||||
int window_get_widget_index(rct_window *w, rct_widget *widget)
|
||||
static int window_get_widget_index(rct_window *w, rct_widget *widget)
|
||||
{
|
||||
int i = 0;
|
||||
for (rct_widget *widget2 = w->widgets; widget2->type != WWT_LAST; widget2++, i++)
|
||||
|
|
@ -85,7 +85,7 @@ int window_get_widget_index(rct_window *w, rct_widget *widget)
|
|||
return -1;
|
||||
}
|
||||
|
||||
int window_get_scroll_index(rct_window *w, int targetWidgetIndex)
|
||||
static int window_get_scroll_index(rct_window *w, int targetWidgetIndex)
|
||||
{
|
||||
if (w->widgets[targetWidgetIndex].type != WWT_SCROLL)
|
||||
return -1;
|
||||
|
|
@ -102,7 +102,7 @@ int window_get_scroll_index(rct_window *w, int targetWidgetIndex)
|
|||
return scrollIndex;
|
||||
}
|
||||
|
||||
int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget)
|
||||
static int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget)
|
||||
{
|
||||
if (widget->type != WWT_SCROLL)
|
||||
return -1;
|
||||
|
|
@ -118,7 +118,7 @@ int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget)
|
|||
return scrollIndex;
|
||||
}
|
||||
|
||||
rct_widget *window_get_scroll_widget(rct_window *w, int scrollIndex)
|
||||
static rct_widget *window_get_scroll_widget(rct_window *w, int scrollIndex)
|
||||
{
|
||||
for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++) {
|
||||
if (widget->type != WWT_SCROLL)
|
||||
|
|
@ -1347,7 +1347,7 @@ void window_scroll_to_location(rct_window *w, int x, int y, int z)
|
|||
*
|
||||
* rct2: 0x00688956
|
||||
*/
|
||||
void sub_688956()
|
||||
static void sub_688956()
|
||||
{
|
||||
rct_window *w;
|
||||
|
||||
|
|
@ -2163,7 +2163,7 @@ void window_close_construction_windows()
|
|||
*
|
||||
* rct2: 0x006EA776
|
||||
*/
|
||||
void window_invalidate_pressed_image_buttons(rct_window *w)
|
||||
static void window_invalidate_pressed_image_buttons(rct_window *w)
|
||||
{
|
||||
int widgetIndex;
|
||||
rct_widget *widget;
|
||||
|
|
@ -2226,7 +2226,7 @@ void window_update_viewport_ride_music()
|
|||
}
|
||||
}
|
||||
|
||||
void window_snap_left(rct_window *w, int proximity)
|
||||
static void window_snap_left(rct_window *w, int proximity)
|
||||
{
|
||||
int right, rightMost, wLeftProximity, wRightProximity, wBottom;
|
||||
rct_window *mainWindow, *w2;
|
||||
|
|
@ -2259,7 +2259,7 @@ void window_snap_left(rct_window *w, int proximity)
|
|||
w->x = rightMost;
|
||||
}
|
||||
|
||||
void window_snap_top(rct_window *w, int proximity)
|
||||
static void window_snap_top(rct_window *w, int proximity)
|
||||
{
|
||||
int bottom, bottomMost, wTopProximity, wBottomProximity, wRight;
|
||||
rct_window *mainWindow, *w2;
|
||||
|
|
@ -2292,7 +2292,7 @@ void window_snap_top(rct_window *w, int proximity)
|
|||
w->y = bottomMost;
|
||||
}
|
||||
|
||||
void window_snap_right(rct_window *w, int proximity)
|
||||
static void window_snap_right(rct_window *w, int proximity)
|
||||
{
|
||||
int leftMost, wLeftProximity, wRightProximity, wRight, wBottom, screenWidth;
|
||||
rct_window *mainWindow, *w2;
|
||||
|
|
@ -2325,7 +2325,7 @@ void window_snap_right(rct_window *w, int proximity)
|
|||
w->x = leftMost - w->width;
|
||||
}
|
||||
|
||||
void window_snap_bottom(rct_window *w, int proximity)
|
||||
static void window_snap_bottom(rct_window *w, int proximity)
|
||||
{
|
||||
int topMost, wTopProximity, wBottomProximity, wRight, wBottom, screenHeight;
|
||||
rct_window *mainWindow, *w2;
|
||||
|
|
|
|||
|
|
@ -599,6 +599,7 @@ void window_resize_gui(int width, int height);
|
|||
void window_resize_gui_scenario_editor(int width, int height);
|
||||
void window_top_toolbar_open();
|
||||
void window_game_bottom_toolbar_open();
|
||||
void window_game_bottom_toolbar_invalidate_news_item();
|
||||
void window_about_open();
|
||||
void window_footpath_open();
|
||||
void window_save_prompt_open();
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ uint16 ObjectTypeStringTableCount[] = { 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3 };
|
|||
|
||||
utf8 *_cachedObjectStrings[MAX_OBJECT_CACHED_STRINGS] = { nullptr };
|
||||
|
||||
void utf8_trim_string(utf8 *text)
|
||||
static void utf8_trim_string(utf8 *text)
|
||||
{
|
||||
utf8 *src = text;
|
||||
utf8 *dst = text;
|
||||
|
|
|
|||
|
|
@ -480,7 +480,7 @@ void utf8_remove_formatting(utf8* string, bool allowColours) {
|
|||
void format_string_part_from_raw(char **dest, const char *src, char **args);
|
||||
void format_string_part(char **dest, rct_string_id format, char **args);
|
||||
|
||||
void format_integer(char **dest, long long value)
|
||||
static void format_integer(char **dest, long long value)
|
||||
{
|
||||
int digit;
|
||||
char *dst = *dest;
|
||||
|
|
@ -520,7 +520,7 @@ void format_integer(char **dest, long long value)
|
|||
*dest = finish;
|
||||
}
|
||||
|
||||
void format_comma_separated_integer(char **dest, long long value)
|
||||
static void format_comma_separated_integer(char **dest, long long value)
|
||||
{
|
||||
int digit, groupIndex;
|
||||
char *dst = *dest;
|
||||
|
|
@ -574,7 +574,7 @@ void format_comma_separated_integer(char **dest, long long value)
|
|||
*dest = finish;
|
||||
}
|
||||
|
||||
void format_comma_separated_fixed_1dp(char **dest, long long value)
|
||||
static void format_comma_separated_fixed_1dp(char **dest, long long value)
|
||||
{
|
||||
int digit, groupIndex;
|
||||
char *dst = *dest;
|
||||
|
|
@ -639,7 +639,7 @@ void format_comma_separated_fixed_1dp(char **dest, long long value)
|
|||
*dest = finish;
|
||||
}
|
||||
|
||||
void format_comma_separated_fixed_2dp(char **dest, long long value)
|
||||
static void format_comma_separated_fixed_2dp(char **dest, long long value)
|
||||
{
|
||||
int digit, groupIndex;
|
||||
char *dst = *dest;
|
||||
|
|
@ -707,7 +707,7 @@ void format_comma_separated_fixed_2dp(char **dest, long long value)
|
|||
*dest = finish;
|
||||
}
|
||||
|
||||
void format_currency(char **dest, long long value)
|
||||
static void format_currency(char **dest, long long value)
|
||||
{
|
||||
const currency_descriptor *currencyDesc = &CurrencyDescriptors[gConfigGeneral.currency_format];
|
||||
|
||||
|
|
@ -749,7 +749,7 @@ void format_currency(char **dest, long long value)
|
|||
}
|
||||
}
|
||||
|
||||
void format_currency_2dp(char **dest, long long value)
|
||||
static void format_currency_2dp(char **dest, long long value)
|
||||
{
|
||||
const currency_descriptor *currencyDesc = &CurrencyDescriptors[gConfigGeneral.currency_format];
|
||||
|
||||
|
|
@ -790,7 +790,7 @@ void format_currency_2dp(char **dest, long long value)
|
|||
}
|
||||
}
|
||||
|
||||
void format_date(char **dest, uint16 value)
|
||||
static void format_date(char **dest, uint16 value)
|
||||
{
|
||||
uint16 args[] = { date_get_month(value), date_get_year(value) + 1 };
|
||||
uint16 *argsRef = args;
|
||||
|
|
@ -798,7 +798,7 @@ void format_date(char **dest, uint16 value)
|
|||
(*dest)--;
|
||||
}
|
||||
|
||||
void format_length(char **dest, sint16 value)
|
||||
static void format_length(char **dest, sint16 value)
|
||||
{
|
||||
rct_string_id stringId = STR_UNIT_SUFFIX_METRES;
|
||||
|
||||
|
|
@ -812,7 +812,7 @@ void format_length(char **dest, sint16 value)
|
|||
(*dest)--;
|
||||
}
|
||||
|
||||
void format_velocity(char **dest, uint16 value)
|
||||
static void format_velocity(char **dest, uint16 value)
|
||||
{
|
||||
rct_string_id stringId;
|
||||
|
||||
|
|
@ -841,7 +841,7 @@ static const rct_string_id DurationFormats[][2] = {
|
|||
{STR_DURATION_MINS_SEC, STR_DURATION_MINS_SECS},
|
||||
};
|
||||
|
||||
void format_duration(char **dest, uint16 value)
|
||||
static void format_duration(char **dest, uint16 value)
|
||||
{
|
||||
uint16 minutes = value / 60;
|
||||
uint16 seconds = value % 60;
|
||||
|
|
@ -875,7 +875,7 @@ static const rct_string_id RealtimeFormats[][2] = {
|
|||
{STR_REALTIME_HOURS_MIN, STR_REALTIME_HOURS_MINS},
|
||||
};
|
||||
|
||||
void format_realtime(char ** dest, uint16 value)
|
||||
static void format_realtime(char ** dest, uint16 value)
|
||||
{
|
||||
uint16 hours = value / 60;
|
||||
uint16 minutes = value % 60;
|
||||
|
|
@ -903,7 +903,7 @@ void format_realtime(char ** dest, uint16 value)
|
|||
(*dest)--;
|
||||
}
|
||||
|
||||
void format_string_code(unsigned int format_code, char **dest, char **args)
|
||||
static void format_string_code(unsigned int format_code, char **dest, char **args)
|
||||
{
|
||||
int value;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include "../ride/ride.h"
|
||||
#include "../util/util.h"
|
||||
#include "localisation.h"
|
||||
#include "user.h"
|
||||
|
||||
utf8 *gUserStrings = (char*)0x0135A8F4;
|
||||
|
||||
|
|
|
|||
|
|
@ -1882,7 +1882,7 @@ void Network::Client_Send_GAMEINFO()
|
|||
server_connection.QueuePacket(std::move(packet));
|
||||
}
|
||||
|
||||
std::string json_stdstring_value(const json_t * string)
|
||||
static std::string json_stdstring_value(const json_t * string)
|
||||
{
|
||||
const char * cstr = json_string_value(string);
|
||||
return cstr == nullptr ? std::string() : std::string(cstr);
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public:
|
|||
|
||||
namespace ObjectFactory
|
||||
{
|
||||
void ReadObjectLegacy(Object * object, IReadObjectContext * context, IStream * stream)
|
||||
static void ReadObjectLegacy(Object * object, IReadObjectContext * context, IStream * stream)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -102,7 +102,7 @@ namespace ObjectFactory
|
|||
}
|
||||
}
|
||||
|
||||
MemoryStream * GetDecodedChunkStream(IReadObjectContext * context, SDL_RWops * file)
|
||||
static MemoryStream * GetDecodedChunkStream(IReadObjectContext * context, SDL_RWops * file)
|
||||
{
|
||||
size_t bufferSize = 0x600000;
|
||||
void * buffer = Memory::Allocate<void>(bufferSize);
|
||||
|
|
|
|||
|
|
@ -49,7 +49,12 @@ interface IObjectManager
|
|||
|
||||
IObjectManager * GetObjectManager();
|
||||
|
||||
#else
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
void * object_manager_get_loaded_object_by_index(size_t index);
|
||||
void * object_manager_get_loaded_object(const rct_object_entry * entry);
|
||||
|
|
@ -58,4 +63,6 @@ void * object_manager_load_object(const rct_object_entry * entry);
|
|||
void object_manager_unload_objects(const rct_object_entry * entries, size_t count);
|
||||
void object_manager_unload_all_objects();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -79,7 +79,12 @@ interface IObjectRepository
|
|||
|
||||
IObjectRepository * GetObjectRepository();
|
||||
|
||||
#else
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
size_t object_repository_get_items_count();
|
||||
const ObjectRepositoryItem * object_repository_get_items();
|
||||
|
|
@ -92,6 +97,8 @@ const utf8 * object_get_description(const void * object);
|
|||
const utf8 * object_get_capacity(const void * object);
|
||||
void object_draw_preview(const void * object, rct_drawpixelinfo * dpi, sint32 width, sint32 height);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
enum ORI_RIDE_FLAG
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ constexpr uint8 RCT2_LANGUAGE_ID_ENGLISH_UK = 0;
|
|||
constexpr uint8 RCT2_LANGUAGE_ID_BLANK = 254;
|
||||
constexpr uint8 RCT2_LANGUAGE_ID_END = 255;
|
||||
|
||||
bool StringIsBlank(utf8 * str)
|
||||
static bool StringIsBlank(utf8 * str)
|
||||
{
|
||||
for (utf8 * ch = str; *ch != '\0'; ch++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include "../../game.h"
|
||||
#include "../../interface/viewport.h"
|
||||
#include "../../localisation/localisation.h"
|
||||
#include "../../paint/map_element/map_element.h"
|
||||
#include "../../world/banner.h"
|
||||
#include "../../world/scenery.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
*
|
||||
* rct2: 0x0066508C, 0x00665540
|
||||
*/
|
||||
void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_element)
|
||||
static void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_element)
|
||||
{
|
||||
uint8 is_exit = map_element->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT;
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_
|
|||
*
|
||||
* rct2: 0x006658ED
|
||||
*/
|
||||
void park_entrance_paint(uint8 direction, int height, rct_map_element* map_element){
|
||||
static void park_entrance_paint(uint8 direction, int height, rct_map_element* map_element){
|
||||
if (RCT2_GLOBAL(0x9DEA6F, uint8_t) & 1)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include "../../localisation/localisation.h"
|
||||
#include "../../interface/colour.h"
|
||||
#include "../../interface/viewport.h"
|
||||
#include "../../paint/map_element/map_element.h"
|
||||
#include "../paint.h"
|
||||
|
||||
const uint8 byte_9A406C[] = {
|
||||
|
|
@ -46,7 +47,7 @@ const uint8 byte_9A40CC[] = {
|
|||
0, 0, 4, 8, 12, 16, 16, 16, 16, 16, 12, 8, 4, 0, 20, 0
|
||||
};
|
||||
|
||||
void fence_paint_door(uint32 imageId,
|
||||
static void fence_paint_door(uint32 imageId,
|
||||
rct_scenery_entry * sceneryEntry,
|
||||
uint32 imageColourFlags, uint32 tertiaryColour, uint32 dword_141F710,
|
||||
rct_xyz16 offset,
|
||||
|
|
@ -89,7 +90,7 @@ void fence_paint_door(uint32 imageId,
|
|||
}
|
||||
}
|
||||
|
||||
void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryEntry, uint32 dword_141F710, uint32 imageColourFlags, uint32 dword_141F718, uint32 tertiaryColour, uint32 imageOffset, rct_xyz16 offset, rct_xyz16 bounds, rct_xyz16 boundsOffset)
|
||||
static void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryEntry, uint32 dword_141F710, uint32 imageColourFlags, uint32 dword_141F718, uint32 tertiaryColour, uint32 imageOffset, rct_xyz16 offset, rct_xyz16 bounds, rct_xyz16 boundsOffset)
|
||||
{
|
||||
uint32 baseImageId = sceneryEntry->image + imageOffset + frameNum;
|
||||
uint32 imageId = baseImageId;
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ void loc_6A37C9(rct_map_element * mapElement, int height, rct_footpath_entry * f
|
|||
void loc_6A3B57(rct_map_element* mapElement, sint16 height, rct_footpath_entry* footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags);
|
||||
|
||||
/* rct2: 0x006A5AE5 */
|
||||
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, int height, uint8 edges, uint32 pathBitImageFlags) {
|
||||
if (footpath_element_is_sloped(mapElement))
|
||||
height += 8;
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ void path_bit_lights_paint(rct_scenery_entry* pathBitEntry, rct_map_element* map
|
|||
}
|
||||
|
||||
/* rct2: 0x006A5C94 */
|
||||
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, int height, uint8 edges, uint32 pathBitImageFlags) {
|
||||
if (footpath_element_is_sloped(mapElement))
|
||||
height += 8;
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ void path_bit_bins_paint(rct_scenery_entry* pathBitEntry, rct_map_element* mapEl
|
|||
}
|
||||
|
||||
/* rct2: 0x006A5E81 */
|
||||
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, int height, uint8 edges, uint32 pathBitImageFlags) {
|
||||
uint32 imageId;
|
||||
|
||||
if (!(edges & (1 << 0))) {
|
||||
|
|
@ -256,7 +256,7 @@ void path_bit_benches_paint(rct_scenery_entry* pathBitEntry, rct_map_element* ma
|
|||
}
|
||||
|
||||
/* rct2: 0x006A6008 */
|
||||
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, int height, uint8 edges, uint32 pathBitImageFlags, rct_drawpixelinfo* dpi) {
|
||||
if (dpi->zoom_level != 0)
|
||||
return;
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ void path_bit_jumping_fountains_paint(rct_scenery_entry* pathBitEntry, rct_map_e
|
|||
* @param ebp (ebp)
|
||||
* @param base_image_id (0x00F3EF78)
|
||||
*/
|
||||
void sub_6A4101(rct_map_element * map_element, uint16 height, uint32 ebp, bool word_F3F038, rct_footpath_entry * footpathEntry, uint32 base_image_id, uint32 imageFlags)
|
||||
static void sub_6A4101(rct_map_element * map_element, uint16 height, uint32 ebp, bool word_F3F038, rct_footpath_entry * footpathEntry, uint32 base_image_id, uint32 imageFlags)
|
||||
{
|
||||
if (map_element->type & 1) {
|
||||
uint8 local_ebp = ebp & 0x0F;
|
||||
|
|
@ -574,7 +574,7 @@ void sub_6A4101(rct_map_element * map_element, uint16 height, uint32 ebp, bool w
|
|||
* @param imageFlags (0x00F3EF70)
|
||||
* @param sceneryImageFlags (0x00F3EF74)
|
||||
*/
|
||||
void sub_6A3F61(rct_map_element * map_element, uint16 bp, uint16 height, rct_footpath_entry * footpathEntry, uint32 imageFlags, uint32 sceneryImageFlags, bool word_F3F038)
|
||||
static void sub_6A3F61(rct_map_element * map_element, uint16 bp, uint16 height, rct_footpath_entry * footpathEntry, uint32 imageFlags, uint32 sceneryImageFlags, bool word_F3F038)
|
||||
{
|
||||
// eax --
|
||||
// ebx --
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "../../world/scenery.h"
|
||||
|
||||
// 6B8172:
|
||||
void scenery_multiple_paint_supports(uint8 direction, uint16 height, rct_map_element *mapElement, uint32 dword_F4387C, rct_large_scenery_tile *tile)
|
||||
static void scenery_multiple_paint_supports(uint8 direction, uint16 height, rct_map_element *mapElement, uint32 dword_F4387C, rct_large_scenery_tile *tile)
|
||||
{
|
||||
if (tile->var_7 & 0x20) {
|
||||
return;
|
||||
|
|
@ -59,7 +59,7 @@ void scenery_multiple_paint_supports(uint8 direction, uint16 height, rct_map_ele
|
|||
paint_util_set_general_support_height(clearanceHeight, 0x20);
|
||||
}
|
||||
|
||||
rct_large_scenery_text_glyph *scenery_multiple_sign_get_glyph(rct_large_scenery_text *text, uint32 codepoint)
|
||||
static rct_large_scenery_text_glyph *scenery_multiple_sign_get_glyph(rct_large_scenery_text *text, uint32 codepoint)
|
||||
{
|
||||
if (codepoint >= countof(text->glyphs)) {
|
||||
return &text->glyphs['?'];
|
||||
|
|
@ -67,7 +67,7 @@ rct_large_scenery_text_glyph *scenery_multiple_sign_get_glyph(rct_large_scenery_
|
|||
return &text->glyphs[codepoint];
|
||||
}
|
||||
|
||||
int scenery_multiple_sign_text_width(const utf8 *str, rct_large_scenery_text *text)
|
||||
static int scenery_multiple_sign_text_width(const utf8 *str, rct_large_scenery_text *text)
|
||||
{
|
||||
int width = 0;
|
||||
uint32 codepoint;
|
||||
|
|
@ -77,7 +77,7 @@ int scenery_multiple_sign_text_width(const utf8 *str, rct_large_scenery_text *te
|
|||
return width;
|
||||
}
|
||||
|
||||
int scenery_multiple_sign_text_height(const utf8 *str, rct_large_scenery_text *text)
|
||||
static int scenery_multiple_sign_text_height(const utf8 *str, rct_large_scenery_text *text)
|
||||
{
|
||||
int height = 0;
|
||||
uint32 codepoint;
|
||||
|
|
@ -87,7 +87,7 @@ int scenery_multiple_sign_text_height(const utf8 *str, rct_large_scenery_text *t
|
|||
return height;
|
||||
}
|
||||
|
||||
const utf8 *scenery_multiple_sign_fit_text(const utf8 *str, rct_large_scenery_text *text, bool height)
|
||||
static const utf8 *scenery_multiple_sign_fit_text(const utf8 *str, rct_large_scenery_text *text, bool height)
|
||||
{
|
||||
static utf8 fitStr[32] = {0};
|
||||
utf8 *fitStrEnd = fitStr;
|
||||
|
|
@ -105,11 +105,11 @@ const utf8 *scenery_multiple_sign_fit_text(const utf8 *str, rct_large_scenery_te
|
|||
return fitStr;
|
||||
}
|
||||
|
||||
int div_to_minus_infinity(int a, int b) {
|
||||
static int div_to_minus_infinity(int a, int b) {
|
||||
return (a / b) - (a % b < 0);
|
||||
}
|
||||
|
||||
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, int textImage, int textColour, uint8 direction, int y_offset)
|
||||
{
|
||||
const utf8 *fitStr = scenery_multiple_sign_fit_text(str, text, false);
|
||||
int width = scenery_multiple_sign_text_width(fitStr, text);
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ struct tile_descriptor
|
|||
corner_height corner_heights;
|
||||
};
|
||||
|
||||
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, int rotation)
|
||||
{
|
||||
uint8 slope = mapElement->properties.surface.slope;
|
||||
|
||||
|
|
@ -329,7 +329,7 @@ uint8 viewport_surface_paint_setup_get_relative_slope(rct_map_element * mapEleme
|
|||
/**
|
||||
* rct2: 0x0065E890, 0x0065E946, 0x0065E9FC, 0x0065EAB2
|
||||
*/
|
||||
void viewport_surface_smoothen_edge(enum edge edge, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
static void viewport_surface_smoothen_edge(enum edge edge, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
{
|
||||
|
||||
if (neighbour.map_element == NULL) {
|
||||
|
|
@ -433,7 +433,7 @@ void viewport_surface_smoothen_edge(enum edge edge, struct tile_descriptor self,
|
|||
/**
|
||||
* rct2: 0x0065F63B, 0x0065F77D
|
||||
*/
|
||||
void viewport_surface_draw_land_side_top(enum edge edge, uint8 height, uint8 terrain, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
static void viewport_surface_draw_land_side_top(enum edge edge, uint8 height, uint8 terrain, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
{
|
||||
registers regs;
|
||||
|
||||
|
|
@ -529,7 +529,7 @@ void viewport_surface_draw_land_side_top(enum edge edge, uint8 height, uint8 ter
|
|||
/**
|
||||
* rct2: 0x0065EB7D, 0x0065F0D8
|
||||
*/
|
||||
void viewport_surface_draw_land_side_bottom(enum edge edge, uint8 height, uint8 edgeStyle, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
static void viewport_surface_draw_land_side_bottom(enum edge edge, uint8 height, uint8 edgeStyle, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
{
|
||||
registers regs;
|
||||
|
||||
|
|
@ -689,7 +689,7 @@ void viewport_surface_draw_land_side_bottom(enum edge edge, uint8 height, uint8
|
|||
/**
|
||||
* rct2: 0x0066039B, 0x006604F1
|
||||
*/
|
||||
void viewport_surface_draw_water_side_top(enum edge edge, uint8 height, uint8 terrain, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
static void viewport_surface_draw_water_side_top(enum edge edge, uint8 height, uint8 terrain, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
{
|
||||
registers regs;
|
||||
|
||||
|
|
@ -791,7 +791,7 @@ void viewport_surface_draw_water_side_top(enum edge edge, uint8 height, uint8 te
|
|||
/**
|
||||
* rct2: 0x0065F8B9, 0x0065FE26
|
||||
*/
|
||||
void viewport_surface_draw_water_side_bottom(enum edge edge, uint8 height, uint8 edgeStyle, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
static void viewport_surface_draw_water_side_bottom(enum edge edge, uint8 height, uint8 edgeStyle, struct tile_descriptor self, struct tile_descriptor neighbour)
|
||||
{
|
||||
registers regs;
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ void painter_setup() {
|
|||
/**
|
||||
* Extracted from 0x0098196c, 0x0098197c, 0x0098198c, 0x0098199c
|
||||
*/
|
||||
paint_struct * sub_9819_c(uint32 image_id, rct_xyz16 offset, rct_xyz16 boundBoxSize, rct_xyz16 boundBoxOffset, uint8 rotation)
|
||||
static paint_struct * sub_9819_c(uint32 image_id, rct_xyz16 offset, rct_xyz16 boundBoxSize, rct_xyz16 boundBoxOffset, uint8 rotation)
|
||||
{
|
||||
paint_struct * ps = unk_EE7888;
|
||||
|
||||
|
|
@ -722,7 +722,7 @@ void viewport_paint_setup()
|
|||
}
|
||||
}
|
||||
|
||||
void sub_688217_helper(uint16 ax, uint8 flag)
|
||||
static void sub_688217_helper(uint16 ax, uint8 flag)
|
||||
{
|
||||
paint_struct *ps, *ps_temp;
|
||||
paint_struct *ps_next = unk_EE7884;
|
||||
|
|
@ -869,7 +869,7 @@ void sub_688217()
|
|||
* rct2: 0x00688596
|
||||
* Part of 0x688485
|
||||
*/
|
||||
void paint_attached_ps(paint_struct* ps, attached_paint_struct* attached_ps, rct_drawpixelinfo* dpi) {
|
||||
static void paint_attached_ps(paint_struct* ps, attached_paint_struct* attached_ps, rct_drawpixelinfo* dpi) {
|
||||
for (; attached_ps; attached_ps = attached_ps->next) {
|
||||
sint16 x = attached_ps->x + ps->x;
|
||||
sint16 y = attached_ps->y + ps->y;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include "../../addresses.h"
|
||||
#include "../../drawing/drawing.h"
|
||||
#include "../../interface/viewport.h"
|
||||
#include "../../paint/sprite/sprite.h"
|
||||
#include "../paint.h"
|
||||
#include "../../localisation/string_ids.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include "../../world/sprite.h"
|
||||
#include "../../interface/viewport.h"
|
||||
#include "../../paint/sprite/sprite.h"
|
||||
#include "../../peep/peep.h"
|
||||
#include "../paint.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -810,7 +810,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
|
||||
*/
|
||||
int checkForPath(rct_peep *peep){
|
||||
static int 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,
|
||||
|
|
@ -905,7 +905,7 @@ static void peep_state_reset(rct_peep* peep){
|
|||
* rct2: 0x69C308
|
||||
* Check if lost.
|
||||
*/
|
||||
void peep_check_if_lost(rct_peep* peep){
|
||||
static void peep_check_if_lost(rct_peep* peep){
|
||||
if (!(peep->peep_flags & PEEP_FLAGS_LOST)){
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_RIDE_COUNT, uint16) < 2)return;
|
||||
peep->peep_flags ^= PEEP_FLAGS_21;
|
||||
|
|
@ -926,7 +926,7 @@ void peep_check_if_lost(rct_peep* peep){
|
|||
* rct2: 0x69C26B
|
||||
* Check if cant find ride.
|
||||
*/
|
||||
void peep_check_cant_find_ride(rct_peep* peep){
|
||||
static void peep_check_cant_find_ride(rct_peep* peep){
|
||||
if (peep->guest_heading_to_ride_id == 0xFF)
|
||||
return;
|
||||
|
||||
|
|
@ -955,7 +955,7 @@ void peep_check_cant_find_ride(rct_peep* peep){
|
|||
* rct2: 0x69C2D0
|
||||
* Check if cant find exit.
|
||||
*/
|
||||
void peep_check_cant_find_exit(rct_peep* peep){
|
||||
static void peep_check_cant_find_exit(rct_peep* peep){
|
||||
if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK))
|
||||
return;
|
||||
|
||||
|
|
@ -982,7 +982,7 @@ void peep_check_cant_find_exit(rct_peep* peep){
|
|||
* @param distance (bp)
|
||||
* @param peep (esi)
|
||||
*/
|
||||
int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_peep* peep){
|
||||
static int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_peep* peep){
|
||||
RCT2_GLOBAL(0xF1AEF0, uint8) = peep->action_sprite_image_offset;
|
||||
if (peep->action == 0xFE){
|
||||
peep->action = 0xFF;
|
||||
|
|
@ -1089,7 +1089,7 @@ void peep_decrement_num_riders(rct_peep* peep){
|
|||
}
|
||||
|
||||
/* Part of 0x0069B8CC rct2: 0x0069BC31 */
|
||||
void set_sprite_type(rct_peep* peep, uint8 type){
|
||||
static void set_sprite_type(rct_peep* peep, uint8 type){
|
||||
if (peep->sprite_type == type)return;
|
||||
|
||||
peep->sprite_type = type;
|
||||
|
|
@ -1339,7 +1339,7 @@ void peep_remove(rct_peep* peep){
|
|||
* Falling and its subset drowning
|
||||
* rct2: 0x690028
|
||||
*/
|
||||
void peep_update_falling(rct_peep* peep){
|
||||
static void peep_update_falling(rct_peep* peep){
|
||||
if (peep->action == PEEP_ACTION_DROWNING){
|
||||
// Check to see if we are ready to drown.
|
||||
sint16 x, y, xy_distance;
|
||||
|
|
@ -1455,7 +1455,7 @@ void peep_update_falling(rct_peep* peep){
|
|||
*
|
||||
* rct2: 0x00691677
|
||||
*/
|
||||
void peep_try_get_up_from_sitting(rct_peep* peep){
|
||||
static void peep_try_get_up_from_sitting(rct_peep* peep){
|
||||
// Eats all food first
|
||||
if (peep_has_food(peep))return;
|
||||
|
||||
|
|
@ -1477,7 +1477,7 @@ void peep_try_get_up_from_sitting(rct_peep* peep){
|
|||
*
|
||||
* rct2: 0x0069152B
|
||||
*/
|
||||
void peep_update_sitting(rct_peep* peep){
|
||||
static void peep_update_sitting(rct_peep* peep){
|
||||
if (peep->sub_state == 0){
|
||||
if (!checkForPath(peep))return;
|
||||
//691541
|
||||
|
|
@ -1865,7 +1865,7 @@ static void peep_update_ride_sub_state_0(rct_peep* peep){
|
|||
*
|
||||
* rct2: 0x006921D3
|
||||
*/
|
||||
void peep_update_ride_sub_state_1(rct_peep* peep){
|
||||
static void peep_update_ride_sub_state_1(rct_peep* peep){
|
||||
sint16 x, y, xy_distance;
|
||||
|
||||
rct_ride* ride = get_ride(peep->current_ride);
|
||||
|
|
@ -2365,7 +2365,7 @@ static void peep_update_ride_sub_state_5(rct_peep* peep){
|
|||
*
|
||||
* rct2: 0x00693028
|
||||
*/
|
||||
void peep_update_ride_sub_state_7(rct_peep* peep){
|
||||
static void peep_update_ride_sub_state_7(rct_peep* peep){
|
||||
rct_ride* ride = get_ride(peep->current_ride);
|
||||
|
||||
rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]);
|
||||
|
|
@ -6445,7 +6445,7 @@ const int face_sprite_large[] = {
|
|||
SPR_PEEP_LARGE_FACE_VERY_VERY_HAPPY,
|
||||
};
|
||||
|
||||
int get_face_sprite_offset(rct_peep *peep){
|
||||
static int get_face_sprite_offset(rct_peep *peep){
|
||||
|
||||
// ANGRY
|
||||
if (peep->var_F3) return PEEP_FACE_OFFSET_ANGRY;
|
||||
|
|
@ -7499,7 +7499,7 @@ static int guest_surface_path_finding(rct_peep* peep){
|
|||
return peep_move_one_tile(randDirection, peep);
|
||||
}
|
||||
|
||||
rct_map_element* get_banner_on_path(rct_map_element *path_element)
|
||||
static rct_map_element* get_banner_on_path(rct_map_element *path_element)
|
||||
{
|
||||
// This is an improved version of original.
|
||||
// That only checked for one fence in the way.
|
||||
|
|
@ -7711,7 +7711,7 @@ static int guest_path_find_aimless(rct_peep* peep, uint8 edges){
|
|||
*
|
||||
* rct2: 0x0069A60A
|
||||
*/
|
||||
uint8 peep_pathfind_get_max_number_junctions(rct_peep* peep){
|
||||
static uint8 peep_pathfind_get_max_number_junctions(rct_peep* peep){
|
||||
if (peep->type == PEEP_TYPE_STAFF)
|
||||
return 16;
|
||||
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ static inline void staff_autoposition_new_staff_member(rct_peep *newPeep)
|
|||
invalidate_sprite_2((rct_sprite *)newPeep);
|
||||
}
|
||||
|
||||
money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16 command_x, sint16 command_y, sint16 command_z, 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, int *newPeep_sprite_index)
|
||||
{
|
||||
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES;
|
||||
gCommandPosition.x = command_x;
|
||||
|
|
@ -834,7 +834,7 @@ static int staff_path_finding_handyman(rct_peep* peep)
|
|||
return 0;
|
||||
}
|
||||
|
||||
uint8 staff_direction_surface(rct_peep* peep, uint8 initialDirection) {
|
||||
static uint8 staff_direction_surface(rct_peep* peep, uint8 initialDirection) {
|
||||
uint8 direction = initialDirection;
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
// Looks left and right from initial direction
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ void platform_posix_sub_resolve_openrct_data_path(utf8 *out) {
|
|||
}
|
||||
|
||||
|
||||
void execute_cmd(char *command, int *exit_value, char *buf, size_t *buf_size) {
|
||||
static void execute_cmd(char *command, int *exit_value, char *buf, size_t *buf_size) {
|
||||
FILE *f;
|
||||
size_t n_chars;
|
||||
|
||||
|
|
@ -181,7 +181,7 @@ void execute_cmd(char *command, int *exit_value, char *buf, size_t *buf_size) {
|
|||
pclose(f);
|
||||
}
|
||||
|
||||
dialog_type get_dialog_app(char *cmd, size_t *cmd_size) {
|
||||
static dialog_type get_dialog_app(char *cmd, size_t *cmd_size) {
|
||||
int exit_value;
|
||||
size_t size;
|
||||
dialog_type dtype;
|
||||
|
|
|
|||
|
|
@ -198,4 +198,9 @@ datetime64 platform_get_datetime_now_utc();
|
|||
void platform_remove_file_associations();
|
||||
#endif // __WINDOWS__
|
||||
|
||||
#if defined(__LINUX__) || defined(__MACOSX__)
|
||||
void platform_posix_sub_user_data_path(char *buffer, const char *homedir, const char *separator);
|
||||
void platform_posix_sub_resolve_openrct_data_path(utf8 *out);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ bool platform_original_game_data_exists(const utf8 *path)
|
|||
return platform_file_exists(checkPath);
|
||||
}
|
||||
|
||||
mode_t getumask()
|
||||
static mode_t getumask()
|
||||
{
|
||||
mode_t mask = umask(0);
|
||||
umask(mask);
|
||||
|
|
@ -627,7 +627,7 @@ bool platform_file_delete(const utf8 *path)
|
|||
return ret == 0;
|
||||
}
|
||||
|
||||
wchar_t *regular_to_wchar(const char* src)
|
||||
static wchar_t *regular_to_wchar(const char* src)
|
||||
{
|
||||
int len = strnlen(src, MAX_PATH);
|
||||
wchar_t *w_buffer = malloc((len + 1) * sizeof(wchar_t));
|
||||
|
|
@ -650,8 +650,6 @@ wchar_t *regular_to_wchar(const char* src)
|
|||
return w_buffer;
|
||||
}
|
||||
|
||||
void platform_posix_sub_user_data_path(char *buffer, const char *homedir, const char *separator);
|
||||
|
||||
/**
|
||||
* Default directory fallback is:
|
||||
* - (command line argument)
|
||||
|
|
@ -710,8 +708,6 @@ void platform_get_openrct_data_path(utf8 *outPath)
|
|||
safe_strcpy(outPath, _openrctDataDirectoryPath, sizeof(_openrctDataDirectoryPath));
|
||||
}
|
||||
|
||||
void platform_posix_sub_resolve_openrct_data_path(utf8 *out);
|
||||
|
||||
/**
|
||||
* Default directory fallback is:
|
||||
* - (command line argument)
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ static void platform_create_window();
|
|||
static void platform_load_cursors();
|
||||
static void platform_unload_cursors();
|
||||
|
||||
int resolution_sort_func(const void *pa, const void *pb)
|
||||
static int resolution_sort_func(const void *pa, const void *pb)
|
||||
{
|
||||
const resolution *a = (resolution*)pa;
|
||||
const resolution *b = (resolution*)pb;
|
||||
|
|
|
|||
|
|
@ -952,7 +952,7 @@ namespace RCT1
|
|||
return map[sceneryGroupType];
|
||||
}
|
||||
|
||||
const char * GetWaterObject(uint8 waterType)
|
||||
static const char * GetWaterObject(uint8 waterType)
|
||||
{
|
||||
static const char * map[] =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ static void cable_lift_update_arriving(rct_vehicle *vehicle)
|
|||
vehicle->status = VEHICLE_STATUS_MOVING_TO_END_OF_STATION;
|
||||
}
|
||||
|
||||
bool sub_6DF01A_loop(rct_vehicle* vehicle) {
|
||||
static bool sub_6DF01A_loop(rct_vehicle* vehicle) {
|
||||
rct_ride* ride = get_ride(vehicle->ride);
|
||||
rct_xyz16 *unk_F64E20 = RCT2_ADDRESS(0x00F64E20, rct_xyz16);
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ bool sub_6DF01A_loop(rct_vehicle* vehicle) {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool sub_6DF21B_loop(rct_vehicle* vehicle) {
|
||||
static bool sub_6DF21B_loop(rct_vehicle* vehicle) {
|
||||
rct_ride* ride = get_ride(vehicle->ride);
|
||||
rct_xyz16 *unk_F64E20 = RCT2_ADDRESS(0x00F64E20, rct_xyz16);
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include "../track_data.h"
|
||||
#include "../track_paint.h"
|
||||
#include "../../world/map.h"
|
||||
#include "../vehicle_paint.h"
|
||||
|
||||
enum {
|
||||
SPR_MINI_GOLF_FLAT_SW_NE = 14404,
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "../track.h"
|
||||
#include "../../world/map.h"
|
||||
#include "../../paint/supports.h"
|
||||
#include "../vehicle_paint.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ money16 get_shop_hot_value(int shopItem)
|
|||
*
|
||||
* rct2: 0x006AC3AB
|
||||
*/
|
||||
money32 ride_calculate_income_per_hour(rct_ride *ride)
|
||||
static money32 ride_calculate_income_per_hour(rct_ride *ride)
|
||||
{
|
||||
rct_ride_entry *entry;
|
||||
money32 customersPerHour, priceMinusCost;
|
||||
|
|
@ -960,7 +960,7 @@ static rct_window *ride_create_or_find_construction_window(int rideIndex)
|
|||
return w;
|
||||
}
|
||||
|
||||
int ride_create_ride(ride_list_item listItem)
|
||||
static int ride_create_ride(ride_list_item listItem)
|
||||
{
|
||||
int eax, ebx, ecx, edx, esi, edi, ebp;
|
||||
edx = listItem.ride_type_and_entry;
|
||||
|
|
@ -1094,7 +1094,7 @@ void ride_clear_for_construction(int rideIndex)
|
|||
*
|
||||
* rct2: 0x006664DF
|
||||
*/
|
||||
void ride_remove_peeps(int rideIndex)
|
||||
static void ride_remove_peeps(int rideIndex)
|
||||
{
|
||||
int i, stationIndex, x, y, z, exitX, exitY, exitZ, exitDirection;
|
||||
uint16 xy, spriteIndex;
|
||||
|
|
@ -1749,7 +1749,7 @@ static int ride_modify_entrance_or_exit(rct_map_element *mapElement, int x, int
|
|||
*
|
||||
* rct2: 0x006CC287
|
||||
*/
|
||||
int ride_modify_maze(rct_map_element *mapElement, int x, int y)
|
||||
static int ride_modify_maze(rct_map_element *mapElement, int x, int y)
|
||||
{
|
||||
_currentRideIndex = mapElement->properties.track.ride_index;
|
||||
_rideConstructionState = RIDE_CONSTRUCTION_STATE_MAZE_BUILD;
|
||||
|
|
@ -2797,7 +2797,7 @@ void ride_measurement_clear(rct_ride *ride)
|
|||
*
|
||||
* rct2: 0x006B64F2
|
||||
*/
|
||||
void ride_measurement_update(rct_ride_measurement *measurement)
|
||||
static void ride_measurement_update(rct_ride_measurement *measurement)
|
||||
{
|
||||
uint16 spriteIndex;
|
||||
rct_ride *ride;
|
||||
|
|
@ -2918,7 +2918,7 @@ void ride_measurements_update()
|
|||
}
|
||||
}
|
||||
|
||||
rct_ride_measurement *ride_get_existing_measurement(int rideIndex)
|
||||
static rct_ride_measurement *ride_get_existing_measurement(int rideIndex)
|
||||
{
|
||||
int i;
|
||||
rct_ride_measurement *measurement;
|
||||
|
|
@ -2932,7 +2932,7 @@ rct_ride_measurement *ride_get_existing_measurement(int rideIndex)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int ride_get_free_measurement()
|
||||
static int ride_get_free_measurement()
|
||||
{
|
||||
int i;
|
||||
rct_ride_measurement *measurement;
|
||||
|
|
@ -3950,7 +3950,7 @@ void game_command_set_ride_setting(int *eax, int *ebx, int *ecx, int *edx, int *
|
|||
*
|
||||
* rct2: 0x006B4CC1
|
||||
*/
|
||||
int ride_mode_check_valid_station_numbers(rct_ride *ride)
|
||||
static int ride_mode_check_valid_station_numbers(rct_ride *ride)
|
||||
{
|
||||
uint8 no_stations = 0;
|
||||
for (uint8 station_index = 0; station_index < 4; ++station_index){
|
||||
|
|
@ -3984,7 +3984,7 @@ int ride_mode_check_valid_station_numbers(rct_ride *ride)
|
|||
* returns stationIndex of first station on success
|
||||
* -1 on failure.
|
||||
*/
|
||||
int ride_mode_check_station_present(rct_ride* ride){
|
||||
static int ride_mode_check_station_present(rct_ride* ride){
|
||||
int stationIndex = -1;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (ride->station_starts[i] != 0xFFFF) {
|
||||
|
|
@ -4012,7 +4012,7 @@ int ride_mode_check_station_present(rct_ride* ride){
|
|||
*
|
||||
* rct2: 0x006B5872
|
||||
*/
|
||||
int ride_check_for_entrance_exit(int rideIndex)
|
||||
static int ride_check_for_entrance_exit(int rideIndex)
|
||||
{
|
||||
rct_ride* ride = get_ride(rideIndex);
|
||||
|
||||
|
|
@ -4059,7 +4059,7 @@ int ride_check_for_entrance_exit(int rideIndex)
|
|||
*
|
||||
* rct2: 0x006B5952
|
||||
*/
|
||||
void sub_6B5952(int rideIndex)
|
||||
static void sub_6B5952(int rideIndex)
|
||||
{
|
||||
rct_ride *ride = get_ride(rideIndex);
|
||||
|
||||
|
|
@ -4089,7 +4089,7 @@ void sub_6B5952(int rideIndex)
|
|||
*
|
||||
* rct2: 0x006D3319
|
||||
*/
|
||||
int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output)
|
||||
static int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output)
|
||||
{
|
||||
rct_window *w;
|
||||
track_circuit_iterator it;
|
||||
|
|
@ -4138,7 +4138,7 @@ int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output)
|
|||
* @returns true if an inversion track piece is found, otherwise false.
|
||||
* rct2: 0x006CB149
|
||||
*/
|
||||
bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_element *output)
|
||||
static bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_element *output)
|
||||
{
|
||||
rct_window *w;
|
||||
rct_ride *ride;
|
||||
|
|
@ -4173,7 +4173,7 @@ bool ride_check_track_contains_inversions(rct_xy_element *input, rct_xy_element
|
|||
* @returns true if a banked track piece is found, otherwise false.
|
||||
* rct2: 0x006CB1D3
|
||||
*/
|
||||
bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_element *output)
|
||||
static bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_element *output)
|
||||
{
|
||||
rct_window *w;
|
||||
rct_ride *ride;
|
||||
|
|
@ -4205,7 +4205,7 @@ bool ride_check_track_contains_banked(rct_xy_element *input, rct_xy_element *out
|
|||
*
|
||||
* rct2: 0x006CB25D
|
||||
*/
|
||||
int ride_check_station_length(rct_xy_element *input, rct_xy_element *output)
|
||||
static int 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 &&
|
||||
|
|
@ -4254,7 +4254,7 @@ int ride_check_station_length(rct_xy_element *input, rct_xy_element *output)
|
|||
*
|
||||
* rct2: 0x006CB2DA
|
||||
*/
|
||||
bool ride_check_start_and_end_is_station(rct_xy_element *input, rct_xy_element *output)
|
||||
static bool ride_check_start_and_end_is_station(rct_xy_element *input, rct_xy_element *output)
|
||||
{
|
||||
rct_window *w;
|
||||
rct_ride *ride;
|
||||
|
|
@ -4296,7 +4296,7 @@ bool ride_check_start_and_end_is_station(rct_xy_element *input, rct_xy_element *
|
|||
* station or the last track piece from the end of the direction.
|
||||
* rct2: 0x006B4D39
|
||||
*/
|
||||
void ride_set_boat_hire_return_point(rct_ride *ride, rct_xy_element *startElement)
|
||||
static void ride_set_boat_hire_return_point(rct_ride *ride, rct_xy_element *startElement)
|
||||
{
|
||||
int trackType = -1;
|
||||
int returnX = startElement->x;
|
||||
|
|
@ -4394,7 +4394,7 @@ static void ride_set_block_points(rct_xy_element *startElement)
|
|||
*
|
||||
* rct2: 0x006B4D26
|
||||
*/
|
||||
void ride_set_start_finish_points(int rideIndex, rct_xy_element *startElement)
|
||||
static void ride_set_start_finish_points(int rideIndex, rct_xy_element *startElement)
|
||||
{
|
||||
rct_ride *ride = get_ride(rideIndex);
|
||||
|
||||
|
|
@ -4446,7 +4446,7 @@ const rct_xy16 word_9A2A60[] = {
|
|||
*
|
||||
* rct2: 0x006DD90D
|
||||
*/
|
||||
rct_vehicle *vehicle_create_car(
|
||||
static rct_vehicle *vehicle_create_car(
|
||||
int rideIndex,
|
||||
int vehicleEntryIndex,
|
||||
int carIndex,
|
||||
|
|
@ -4624,7 +4624,7 @@ rct_vehicle *vehicle_create_car(
|
|||
*
|
||||
* rct2: 0x006DD84C
|
||||
*/
|
||||
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(int rideIndex, int x, int y, int z, int vehicleIndex, int *remainingDistance, rct_map_element *mapElement)
|
||||
{
|
||||
rct_ride *ride = get_ride(rideIndex);
|
||||
|
||||
|
|
@ -4645,7 +4645,7 @@ train_ref vehicle_create_train(int rideIndex, int x, int y, int z, int vehicleIn
|
|||
return train;
|
||||
}
|
||||
|
||||
void vehicle_create_trains(int rideIndex, int x, int y, int z, rct_map_element *mapElement)
|
||||
static void vehicle_create_trains(int rideIndex, int x, int y, int z, rct_map_element *mapElement)
|
||||
{
|
||||
rct_ride *ride = get_ride(rideIndex);
|
||||
train_ref firstTrain = { 0 }, lastTrain = { 0 };
|
||||
|
|
@ -4680,7 +4680,7 @@ void vehicle_create_trains(int rideIndex, int x, int y, int z, rct_map_element *
|
|||
lastTrain.tail->next_vehicle_on_ride = firstTrain.head->sprite_index;
|
||||
}
|
||||
|
||||
void vehicle_unset_var_48_b1(rct_vehicle *head)
|
||||
static void vehicle_unset_var_48_b1(rct_vehicle *head)
|
||||
{
|
||||
uint16 spriteIndex;
|
||||
rct_vehicle *vehicle = head;
|
||||
|
|
@ -4698,7 +4698,7 @@ void vehicle_unset_var_48_b1(rct_vehicle *head)
|
|||
*
|
||||
* rct2: 0x006DDE9E
|
||||
*/
|
||||
void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element *outXYElement)
|
||||
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;
|
||||
|
|
@ -4769,7 +4769,7 @@ void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element *outXY
|
|||
*
|
||||
* rct2: 0x006DD84C
|
||||
*/
|
||||
bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element *element, int isApplying)
|
||||
static bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element *element, int isApplying)
|
||||
{
|
||||
ride_update_max_vehicles(rideIndex);
|
||||
if (ride->subtype == 0xFF) {
|
||||
|
|
@ -4999,7 +4999,7 @@ static bool ride_initialise_cable_lift_track(rct_ride *ride, bool isApplying)
|
|||
*
|
||||
* rct2: 0x006DF4D4
|
||||
*/
|
||||
bool ride_create_cable_lift(int rideIndex, bool isApplying)
|
||||
static bool ride_create_cable_lift(int rideIndex, bool isApplying)
|
||||
{
|
||||
rct_ride *ride = get_ride(rideIndex);
|
||||
|
||||
|
|
@ -5073,7 +5073,7 @@ bool ride_create_cable_lift(int rideIndex, bool isApplying)
|
|||
*
|
||||
* rct2: 0x006B51C0
|
||||
*/
|
||||
void loc_6B51C0(int rideIndex)
|
||||
static void loc_6B51C0(int rideIndex)
|
||||
{
|
||||
int i, x, y, z;
|
||||
rct_ride *ride;
|
||||
|
|
@ -5131,7 +5131,7 @@ void loc_6B51C0(int rideIndex)
|
|||
*
|
||||
* rct2: 0x006B528A
|
||||
*/
|
||||
void ride_scroll_to_track_error(rct_xy_element *trackElement)
|
||||
static void ride_scroll_to_track_error(rct_xy_element *trackElement)
|
||||
{
|
||||
if (!gGameCommandIsNetworked && RCT2_GLOBAL(0x0141F568, uint8) == RCT2_GLOBAL(0x013CA740, uint8)) {
|
||||
rct_window *w = window_get_main();
|
||||
|
|
@ -5146,7 +5146,7 @@ void ride_scroll_to_track_error(rct_xy_element *trackElement)
|
|||
*
|
||||
* rct2: 0x006B4F6B
|
||||
*/
|
||||
rct_map_element *loc_6B4F6B(int rideIndex, int x, int y)
|
||||
static rct_map_element *loc_6B4F6B(int rideIndex, int x, int y)
|
||||
{
|
||||
rct_map_element *mapElement;
|
||||
|
||||
|
|
@ -5171,7 +5171,7 @@ rct_map_element *loc_6B4F6B(int rideIndex, int x, int y)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int ride_is_valid_for_test(int rideIndex, int goingToBeOpen, int isApplying)
|
||||
static int ride_is_valid_for_test(int rideIndex, int goingToBeOpen, int isApplying)
|
||||
{
|
||||
int stationIndex;
|
||||
rct_ride *ride;
|
||||
|
|
@ -5300,7 +5300,7 @@ int ride_is_valid_for_test(int rideIndex, int goingToBeOpen, int isApplying)
|
|||
*
|
||||
* rct2: 0x006B4EEA
|
||||
*/
|
||||
int ride_is_valid_for_open(int rideIndex, int goingToBeOpen, int isApplying)
|
||||
static int ride_is_valid_for_open(int rideIndex, int goingToBeOpen, int isApplying)
|
||||
{
|
||||
int stationIndex;
|
||||
rct_ride *ride;
|
||||
|
|
@ -5909,7 +5909,7 @@ money32 ride_create_command(int type, int subType, int flags, uint8 *outRideInde
|
|||
*
|
||||
* rct2: 0x006B3F0F
|
||||
*/
|
||||
money32 ride_create(int type, int subType, int flags, int *outRideIndex, int *outRideColour)
|
||||
static money32 ride_create(int type, int subType, int flags, int *outRideIndex, int *outRideColour)
|
||||
{
|
||||
char rideNameBuffer[256];
|
||||
rct_ride *ride;
|
||||
|
|
@ -7048,7 +7048,7 @@ money32 ride_get_entrance_or_exit_price(int rideIndex, int x, int y, int directi
|
|||
return result;
|
||||
}
|
||||
|
||||
int loc_6CD18E(short mapX, short mapY, short entranceMinX, short entranceMinY, short entranceMaxX, short entranceMaxY)
|
||||
static int loc_6CD18E(short mapX, short mapY, short entranceMinX, short entranceMinY, short entranceMaxX, short entranceMaxY)
|
||||
{
|
||||
int direction = 0;
|
||||
if (mapX == entranceMinX) {
|
||||
|
|
@ -7451,7 +7451,7 @@ uint8 ride_entry_get_vehicle_at_position(int rideEntryIndex,int numCarsPerTrain,
|
|||
}
|
||||
}
|
||||
|
||||
int ride_get_smallest_station_length(rct_ride *ride)
|
||||
static int ride_get_smallest_station_length(rct_ride *ride)
|
||||
{
|
||||
uint32 result = -1;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
|
|
@ -7727,7 +7727,7 @@ static bool ride_is_vehicle_type_valid(rct_ride *ride, uint8 inputRideEntryIndex
|
|||
return false;
|
||||
}
|
||||
|
||||
money32 ride_set_vehicles(uint8 rideIndex, uint8 setting, uint8 value, uint32 flags, uint8 ex)
|
||||
static money32 ride_set_vehicles(uint8 rideIndex, uint8 setting, uint8 value, uint32 flags, uint8 ex)
|
||||
{
|
||||
rct_ride_entry *rideEntry;
|
||||
|
||||
|
|
@ -8099,7 +8099,7 @@ static void maze_entrance_hedge_replacement(int x, int y, rct_map_element *mapEl
|
|||
} while (!map_element_is_last_for_tile(mapElement++));
|
||||
}
|
||||
|
||||
money32 place_ride_entrance_or_exit(sint16 x, sint16 y, sint16 z, uint8 direction, uint8 flags, uint8 rideIndex, uint8 station_num, uint8 is_exit)
|
||||
static money32 place_ride_entrance_or_exit(sint16 x, sint16 y, sint16 z, uint8 direction, uint8 flags, uint8 rideIndex, uint8 station_num, uint8 is_exit)
|
||||
{
|
||||
// Remember when in Unknown station num mode rideIndex is unknown and z is set
|
||||
// When in known station num mode rideIndex is known and z is unknown
|
||||
|
|
@ -8301,7 +8301,7 @@ void game_command_place_ride_entrance_or_exit(int *eax, int *ebx, int *ecx, int
|
|||
);
|
||||
}
|
||||
|
||||
money32 remove_ride_entrance_or_exit(sint16 x, sint16 y, uint8 rideIndex, uint8 station_num, uint8 flags){
|
||||
static money32 remove_ride_entrance_or_exit(sint16 x, sint16 y, uint8 rideIndex, uint8 station_num, uint8 flags){
|
||||
if (rideIndex >= MAX_RIDES)
|
||||
{
|
||||
log_warning("Invalid game command for ride %u", rideIndex);
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include "../track_paint.h"
|
||||
#include "../track.h"
|
||||
#include "../../paint/supports.h"
|
||||
#include "../vehicle_paint.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "../track_paint.h"
|
||||
#include "../track.h"
|
||||
#include "../../paint/supports.h"
|
||||
#include "../vehicle_paint.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1108,7 +1108,7 @@ void game_command_place_track(int *eax, int *ebx, int *ecx, int *edx, int *esi,
|
|||
);
|
||||
}
|
||||
|
||||
money32 track_remove(uint8 type, uint8 sequence, sint16 originX, sint16 originY, sint16 originZ, uint8 rotation, uint8 flags){
|
||||
static money32 track_remove(uint8 type, uint8 sequence, sint16 originX, sint16 originY, sint16 originZ, uint8 rotation, uint8 flags){
|
||||
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
|
||||
gCommandPosition.x = originX + 16;
|
||||
gCommandPosition.y = originY + 16;
|
||||
|
|
@ -1397,7 +1397,7 @@ void game_command_remove_track(int *eax, int *ebx, int *ecx, int *edx, int *esi,
|
|||
return;
|
||||
}
|
||||
|
||||
uint8 maze_element_get_segment_bit(uint16 x, uint16 y) {
|
||||
static uint8 maze_element_get_segment_bit(uint16 x, uint16 y) {
|
||||
uint8 minorX = x & 0x1F; // 0 or 16
|
||||
uint8 minorY = y & 0x1F; // 0 or 16
|
||||
|
||||
|
|
@ -1416,7 +1416,7 @@ uint8 maze_element_get_segment_bit(uint16 x, uint16 y) {
|
|||
return 7;
|
||||
}
|
||||
|
||||
money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, uint8 rideIndex, uint8 mode, uint16 z) {
|
||||
static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, uint8 rideIndex, uint8 mode, uint16 z) {
|
||||
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
|
||||
gCommandPosition.x = x + 8;
|
||||
gCommandPosition.y = y + 8;
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ static void track_design_update_max_min_coordinates(sint16 x, sint16 y, sint16 z
|
|||
*
|
||||
* rct2: 0x006D0964
|
||||
*/
|
||||
int track_design_place_scenery(rct_td6_scenery_element *scenery_start, uint8 rideIndex, int originX, int originY, int originZ)
|
||||
static int track_design_place_scenery(rct_td6_scenery_element *scenery_start, uint8 rideIndex, int originX, int originY, int originZ)
|
||||
{
|
||||
for (uint8 mode = 0; mode <= 1; mode++) {
|
||||
if ((scenery_start->scenery_object.flags & 0xFF) != 0xFF) {
|
||||
|
|
@ -870,7 +870,7 @@ int track_design_place_scenery(rct_td6_scenery_element *scenery_start, uint8 rid
|
|||
return 1;
|
||||
}
|
||||
|
||||
int track_design_place_maze(rct_track_td6 *td6, sint16 x, sint16 y, sint16 z, uint8 rideIndex)
|
||||
static int 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;
|
||||
|
|
@ -1003,7 +1003,7 @@ int track_design_place_maze(rct_track_td6 *td6, sint16 x, sint16 y, sint16 z, ui
|
|||
return 1;
|
||||
}
|
||||
|
||||
bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint16 z, uint8 rideIndex)
|
||||
static bool track_design_place_ride(rct_track_td6 *td6, sint16 x, sint16 y, sint16 z, uint8 rideIndex)
|
||||
{
|
||||
gTrackPreviewOrigin = (rct_xyz16) { x, y, z };
|
||||
if (_trackDesignPlaceOperation == PTD_OPERATION_DRAW_OUTLINES) {
|
||||
|
|
@ -1294,7 +1294,7 @@ int sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, int x, int y, int
|
|||
* ebx = ride_id
|
||||
* cost = edi
|
||||
*/
|
||||
bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 *flags)
|
||||
static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 *flags)
|
||||
{
|
||||
*flags = 0;
|
||||
|
||||
|
|
@ -1377,7 +1377,7 @@ bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 *flags)
|
|||
}
|
||||
}
|
||||
|
||||
money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uint8 *outRideIndex)
|
||||
static money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uint8 *outRideIndex)
|
||||
{
|
||||
*outRideIndex = 255;
|
||||
|
||||
|
|
@ -1498,7 +1498,7 @@ money32 place_track_design(sint16 x, sint16 y, sint16 z, uint8 flags, uint8 *out
|
|||
return cost;
|
||||
}
|
||||
|
||||
money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, sint16 x, sint16 y, sint16 z)
|
||||
static money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, sint16 x, sint16 y, sint16 z)
|
||||
{
|
||||
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
|
||||
gCommandPosition.x = x + 8;
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ void track_design_save_reset_scenery()
|
|||
gfx_invalidate_screen();
|
||||
}
|
||||
|
||||
void track_design_save_callback(int result) {
|
||||
static void track_design_save_callback(int result) {
|
||||
free(_trackDesign->track_elements);
|
||||
free(_trackDesign->entrance_elements);
|
||||
free(_trackDesign->scenery_elements);
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ static void chairlift_paint_util_draw_supports(int segments, uint16 height)
|
|||
}
|
||||
}
|
||||
|
||||
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(int x, int y, int z, int rideIndex)
|
||||
{
|
||||
rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5);
|
||||
if (mapElement == NULL) {
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ const uint8 _soundParams[SOUND_MAXID][2] = {
|
|||
{ 0, 0 } // SOUND_62
|
||||
};
|
||||
|
||||
bool vehicle_move_info_valid(int cd, int typeAndDirection, int offset)
|
||||
static bool vehicle_move_info_valid(int cd, int typeAndDirection, int offset)
|
||||
{
|
||||
if (cd >= countof(gTrackVehicleInfo)) {
|
||||
return false;
|
||||
|
|
@ -263,7 +263,7 @@ static const struct { sint8 x, y, z; } SteamParticleOffsets[] = {
|
|||
{ -8, -4, 17 }
|
||||
};
|
||||
|
||||
void vehicle_invalidate(rct_vehicle *vehicle)
|
||||
static void vehicle_invalidate(rct_vehicle *vehicle)
|
||||
{
|
||||
invalidate_sprite_2((rct_sprite*)vehicle);
|
||||
}
|
||||
|
|
@ -272,7 +272,7 @@ void vehicle_invalidate(rct_vehicle *vehicle)
|
|||
*
|
||||
* rct2: 0x006BB9FF
|
||||
*/
|
||||
void vehicle_update_sound_params(rct_vehicle* vehicle)
|
||||
static void vehicle_update_sound_params(rct_vehicle* vehicle)
|
||||
{
|
||||
if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && (!(gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) || gS6Info->editor_step == EDITOR_STEP_ROLLERCOASTER_DESIGNER)) {
|
||||
if (vehicle->sound1_id != (uint8)-1 || vehicle->sound2_id != (uint8)-1) {
|
||||
|
|
@ -5388,7 +5388,7 @@ static void vehicle_update_track_motion_up_stop_check(rct_vehicle *vehicle)
|
|||
* merely as a velocity regulator, in a closed state. When the brake is open, it
|
||||
* boosts the train to the speed limit
|
||||
*/
|
||||
void apply_non_stop_block_brake(rct_vehicle *vehicle, bool block_brake_closed) {
|
||||
static void apply_non_stop_block_brake(rct_vehicle *vehicle, bool block_brake_closed) {
|
||||
if (vehicle->velocity >= 0) {
|
||||
// If the vehicle is below the speed limit
|
||||
if (vehicle->velocity <= 0x20364) {
|
||||
|
|
@ -5407,7 +5407,7 @@ void apply_non_stop_block_brake(rct_vehicle *vehicle, bool block_brake_closed) {
|
|||
*
|
||||
* Modifies the train's velocity influenced by a block brake
|
||||
*/
|
||||
void apply_block_brakes(rct_vehicle *vehicle, bool is_block_brake_closed)
|
||||
static void apply_block_brakes(rct_vehicle *vehicle, bool is_block_brake_closed)
|
||||
{
|
||||
// If the site is in a "train blocking" state
|
||||
if (is_block_brake_closed) {
|
||||
|
|
@ -6381,7 +6381,7 @@ static bool loc_6DB38B(rct_vehicle *vehicle, rct_map_element *mapElement)
|
|||
return true;
|
||||
}
|
||||
|
||||
void loc_6DB481(rct_vehicle *vehicle)
|
||||
static void loc_6DB481(rct_vehicle *vehicle)
|
||||
{
|
||||
uint16 probability = 0x8000;
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_6) {
|
||||
|
|
@ -6701,7 +6701,7 @@ static void sub_6DB7D6(rct_vehicle *vehicle)
|
|||
*
|
||||
* rct2: 0x006DBF3E
|
||||
*/
|
||||
void sub_6DBF3E(rct_vehicle *vehicle)
|
||||
static void sub_6DBF3E(rct_vehicle *vehicle)
|
||||
{
|
||||
rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle);
|
||||
|
||||
|
|
@ -6782,7 +6782,7 @@ void sub_6DBF3E(rct_vehicle *vehicle)
|
|||
*
|
||||
* rct2: 0x006DB08C
|
||||
*/
|
||||
bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry) {
|
||||
static bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry) {
|
||||
registers regs = { 0 };
|
||||
|
||||
RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_end;
|
||||
|
|
@ -6952,7 +6952,7 @@ loc_6DB41D:
|
|||
*
|
||||
* rct2: 0x006DAEB9
|
||||
*/
|
||||
bool vehicle_update_track_motion_forwards(rct_vehicle *vehicle, rct_ride_entry_vehicle* vehicleEntry, rct_ride* ride, rct_ride_entry* rideEntry) {
|
||||
static bool vehicle_update_track_motion_forwards(rct_vehicle *vehicle, rct_ride_entry_vehicle* vehicleEntry, rct_ride* ride, rct_ride_entry* rideEntry) {
|
||||
registers regs = { 0 };
|
||||
loc_6DAEB9:
|
||||
regs.edi = vehicle->track_type;
|
||||
|
|
@ -7159,7 +7159,7 @@ loc_6DB967:
|
|||
*
|
||||
* rct2: 0x006DBAA6
|
||||
*/
|
||||
bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry, uint16* progress) {
|
||||
static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, uint16 trackType, rct_ride* ride, rct_ride_entry* rideEntry, uint16* progress) {
|
||||
RCT2_GLOBAL(0x00F64E36, uint8) = gTrackDefinitions[trackType].vangle_start;
|
||||
RCT2_GLOBAL(0x00F64E37, uint8) = gTrackDefinitions[trackType].bank_start;
|
||||
rct_map_element* mapElement = map_get_track_element_at_of_type_seq(
|
||||
|
|
@ -7313,7 +7313,7 @@ bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle *vehicle, u
|
|||
*
|
||||
* rct2: 0x006DBA33
|
||||
*/
|
||||
bool vehicle_update_track_motion_backwards(rct_vehicle *vehicle, rct_ride_entry_vehicle* vehicleEntry, rct_ride* ride, rct_ride_entry* rideEntry) {
|
||||
static bool vehicle_update_track_motion_backwards(rct_vehicle *vehicle, rct_ride_entry_vehicle* vehicleEntry, rct_ride* ride, rct_ride_entry* rideEntry) {
|
||||
registers regs = { 0 };
|
||||
|
||||
loc_6DBA33:;
|
||||
|
|
@ -7435,7 +7435,7 @@ loc_6DBE7F:
|
|||
*
|
||||
*
|
||||
*/
|
||||
int vehicle_update_track_motion_mini_golf(rct_vehicle *vehicle, int* outStation) {
|
||||
static int vehicle_update_track_motion_mini_golf(rct_vehicle *vehicle, int* outStation) {
|
||||
registers regs = { 0 };
|
||||
|
||||
rct_ride *ride = get_ride(vehicle->ride);
|
||||
|
|
|
|||
|
|
@ -889,7 +889,7 @@ const vehicle_boundbox VehicleBoundboxes[16][224] = {
|
|||
};
|
||||
|
||||
// 6D5214
|
||||
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, int ebx, int ecx, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
int baseImage_id = ebx;
|
||||
vehicle_boundbox bb = VehicleBoundboxes[vehicleEntry->draw_order][ecx];
|
||||
|
|
@ -923,13 +923,13 @@ void vehicle_sprite_paint(rct_vehicle *vehicle, int ebx, int ecx, int z, const r
|
|||
}
|
||||
|
||||
// 6D520E
|
||||
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, int ebx, int ecx, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicle_sprite_paint(vehicle, ebx + vehicle->var_4A, ecx, z, vehicleEntry);
|
||||
}
|
||||
|
||||
// 6D51EB
|
||||
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, int ebx, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
int ecx = ebx / 2;
|
||||
if (vehicleEntry->flags_a & 0x800) {
|
||||
|
|
@ -943,7 +943,7 @@ void vehicle_sprite_paint_6D51EB(rct_vehicle *vehicle, int ebx, int z, const rct
|
|||
}
|
||||
|
||||
// 6D51DE
|
||||
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, int ebx, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->restraints_position < 64) {
|
||||
vehicle_sprite_paint_6D51EB(vehicle, ebx, z, vehicleEntry);
|
||||
|
|
@ -966,13 +966,13 @@ void vehicle_sprite_paint_6D51DE(rct_vehicle *vehicle, int ebx, int z, const rct
|
|||
}
|
||||
|
||||
// 6D51DE
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicle_sprite_paint_6D51DE(vehicle, imageDirection, z, vehicleEntry);
|
||||
}
|
||||
|
||||
// 6D4EE7
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -984,7 +984,7 @@ void vehicle_sprite_0_1(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4F34
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
int ecx = (imageDirection / 2) + 108;
|
||||
|
|
@ -996,7 +996,7 @@ void vehicle_sprite_0_2(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4F0C
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1008,7 +1008,7 @@ void vehicle_sprite_0_3(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4F5C
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
int ecx = ((imageDirection / 2) ^ 8) + 108;
|
||||
|
|
@ -1020,7 +1020,7 @@ void vehicle_sprite_0_4(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4F84
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1035,7 +1035,7 @@ void vehicle_sprite_0_5(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4FE4
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1050,7 +1050,7 @@ void vehicle_sprite_0_6(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D5055
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1065,7 +1065,7 @@ void vehicle_sprite_0_7(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D50C6
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1080,7 +1080,7 @@ void vehicle_sprite_0_8(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D5137
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1095,7 +1095,7 @@ void vehicle_sprite_0_9(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4FB1
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1110,7 +1110,7 @@ void vehicle_sprite_0_10(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D501B
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1125,7 +1125,7 @@ void vehicle_sprite_0_11(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D508C
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1140,7 +1140,7 @@ void vehicle_sprite_0_12(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D50FD
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1155,7 +1155,7 @@ void vehicle_sprite_0_13(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D516E
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1170,7 +1170,7 @@ void vehicle_sprite_0_14(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4EE4
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
|
|
@ -1183,7 +1183,7 @@ void vehicle_sprite_0_16(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4F31
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
|
|
@ -1196,7 +1196,7 @@ void vehicle_sprite_0_17(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4F09
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
|
|
@ -1209,7 +1209,7 @@ void vehicle_sprite_0_18(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4F59
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) {
|
||||
|
|
@ -1222,7 +1222,7 @@ void vehicle_sprite_0_19(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D51D7
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3DE4:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -1250,7 +1250,7 @@ void vehicle_sprite_0(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4614
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1262,7 +1262,7 @@ void vehicle_sprite_1_0(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4662
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1274,7 +1274,7 @@ void vehicle_sprite_1_1(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D46DB
|
||||
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, int imageDirection, int 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;
|
||||
|
|
@ -1286,7 +1286,7 @@ void vehicle_sprite_1_2(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D467D
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1298,7 +1298,7 @@ void vehicle_sprite_1_3(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D46FD
|
||||
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, int imageDirection, int 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;
|
||||
|
|
@ -1310,7 +1310,7 @@ void vehicle_sprite_1_4(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D460D
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3C04:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -1338,7 +1338,7 @@ void vehicle_sprite_1(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4791
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) {
|
||||
if (vehicleEntry->flags_a & 0x4000) {
|
||||
|
|
@ -1356,7 +1356,7 @@ void vehicle_sprite_2_0(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4833
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = (imageDirection / 2) + 16;
|
||||
|
|
@ -1368,7 +1368,7 @@ void vehicle_sprite_2_1(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D48D6
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1387,7 +1387,7 @@ void vehicle_sprite_2_2(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4858
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = (imageDirection / 2) + 16;
|
||||
|
|
@ -1399,7 +1399,7 @@ void vehicle_sprite_2_3(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4910
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1418,7 +1418,7 @@ void vehicle_sprite_2_4(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D476C
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3CA4:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -1446,7 +1446,7 @@ void vehicle_sprite_2(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D49DC
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) {
|
||||
vehicle_sprite_2(vehicle, imageDirection, z, vehicleEntry);
|
||||
|
|
@ -1458,7 +1458,7 @@ void vehicle_sprite_3(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4A31
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)) {
|
||||
vehicle_sprite_2(vehicle, imageDirection, z, vehicleEntry);
|
||||
|
|
@ -1470,7 +1470,7 @@ void vehicle_sprite_4(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D463D
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1482,7 +1482,7 @@ void vehicle_sprite_5_0(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D469B
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1494,7 +1494,7 @@ void vehicle_sprite_5_1(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4722
|
||||
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, int imageDirection, int 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;
|
||||
|
|
@ -1506,7 +1506,7 @@ void vehicle_sprite_5_2(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D46B9
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1518,7 +1518,7 @@ void vehicle_sprite_5_3(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4747
|
||||
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, int imageDirection, int 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;
|
||||
|
|
@ -1530,7 +1530,7 @@ void vehicle_sprite_5_4(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4636
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3C54:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -1558,7 +1558,7 @@ void vehicle_sprite_5(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D47E4
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) {
|
||||
if (vehicleEntry->flags_a & 0x4000) {
|
||||
|
|
@ -1576,7 +1576,7 @@ void vehicle_sprite_6_0(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4880
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = ((imageDirection / 2) ^ 8) + 16;
|
||||
|
|
@ -1588,7 +1588,7 @@ void vehicle_sprite_6_1(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4953
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1607,7 +1607,7 @@ void vehicle_sprite_6_2(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D48AB
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = ((imageDirection / 2) ^ 8) + 16;
|
||||
|
|
@ -1619,7 +1619,7 @@ void vehicle_sprite_6_3(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D4996
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1638,7 +1638,7 @@ void vehicle_sprite_6_4(rct_vehicle *vehicle, int imageDirection, int z, const r
|
|||
}
|
||||
|
||||
// 6D47DD
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3CF4:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -1666,7 +1666,7 @@ void vehicle_sprite_6(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4A05
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) {
|
||||
int ecx = ((imageDirection / 4) ^ 4) + 32;
|
||||
|
|
@ -1678,7 +1678,7 @@ void vehicle_sprite_7(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4A59
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) {
|
||||
int ecx = ((imageDirection / 2) ^ 8) + 40;
|
||||
|
|
@ -1690,7 +1690,7 @@ void vehicle_sprite_8(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4A81
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 56;
|
||||
|
|
@ -1702,7 +1702,7 @@ void vehicle_sprite_9(rct_vehicle *vehicle, int imageDirection, int z, const rct
|
|||
}
|
||||
|
||||
// 6D4AE8
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 2) + 60;
|
||||
|
|
@ -1714,7 +1714,7 @@ void vehicle_sprite_10(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4B57
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 76;
|
||||
|
|
@ -1726,7 +1726,7 @@ void vehicle_sprite_11(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4BB7
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 80;
|
||||
|
|
@ -1738,7 +1738,7 @@ void vehicle_sprite_12(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4C17
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 84;
|
||||
|
|
@ -1750,7 +1750,7 @@ void vehicle_sprite_13(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4C77
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 88;
|
||||
|
|
@ -1762,7 +1762,7 @@ void vehicle_sprite_14(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4CD7
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 92;
|
||||
|
|
@ -1774,7 +1774,7 @@ void vehicle_sprite_15(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4D37
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 96;
|
||||
|
|
@ -1786,7 +1786,7 @@ void vehicle_sprite_16(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4AA3
|
||||
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, int imageDirection, int 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 &&
|
||||
|
|
@ -1804,7 +1804,7 @@ void vehicle_sprite_17(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4B0D
|
||||
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, int imageDirection, int 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 &&
|
||||
|
|
@ -1823,7 +1823,7 @@ void vehicle_sprite_18(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4B80
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1838,7 +1838,7 @@ void vehicle_sprite_19(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4BE0
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1853,7 +1853,7 @@ void vehicle_sprite_20(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4C40
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1868,7 +1868,7 @@ void vehicle_sprite_21(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4CA0
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1883,7 +1883,7 @@ void vehicle_sprite_22(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4D00
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1898,7 +1898,7 @@ void vehicle_sprite_23(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D51A5
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_11) {
|
||||
vehicleEntry--;
|
||||
|
|
@ -1914,7 +1914,7 @@ void vehicle_sprite_24(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4D67
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1926,7 +1926,7 @@ void vehicle_sprite_50_0(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4DB5
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1938,7 +1938,7 @@ void vehicle_sprite_50_1(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4DD3
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -1950,7 +1950,7 @@ void vehicle_sprite_50_3(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4D60
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3D44:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -1978,7 +1978,7 @@ void vehicle_sprite_50(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4E3A
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 100;
|
||||
|
|
@ -1990,7 +1990,7 @@ void vehicle_sprite_51(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4E8F
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) {
|
||||
int ecx = (imageDirection / 8) + 104;
|
||||
|
|
@ -2002,7 +2002,7 @@ void vehicle_sprite_52(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4D90
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -2014,7 +2014,7 @@ void vehicle_sprite_53_0(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4DF4
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -2026,7 +2026,7 @@ void vehicle_sprite_53_1(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4E15
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) {
|
||||
int ecx = imageDirection / 2;
|
||||
|
|
@ -2038,7 +2038,7 @@ void vehicle_sprite_53_3(rct_vehicle *vehicle, int imageDirection, int z, const
|
|||
}
|
||||
|
||||
// 6D4D89
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
// 0x009A3D94:
|
||||
switch (vehicle->bank_rotation) {
|
||||
|
|
@ -2066,7 +2066,7 @@ void vehicle_sprite_53(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4E63
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) {
|
||||
int ecx = ((imageDirection / 8) ^ 2) + 100;
|
||||
|
|
@ -2078,7 +2078,7 @@ void vehicle_sprite_54(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4EB8
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) {
|
||||
int ecx = ((imageDirection / 8) ^ 2) + 104;
|
||||
|
|
@ -2090,14 +2090,14 @@ void vehicle_sprite_55(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D47DA
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
vehicle_sprite_6(vehicle, imageDirection, z, vehicleEntry);
|
||||
}
|
||||
|
||||
// 6D4A02
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) {
|
||||
|
|
@ -2110,7 +2110,7 @@ void vehicle_sprite_57(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4A56
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
vehicleEntry--;
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) {
|
||||
|
|
@ -2123,7 +2123,7 @@ void vehicle_sprite_58(rct_vehicle *vehicle, int imageDirection, int z, const rc
|
|||
}
|
||||
|
||||
// 6D4773
|
||||
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, int imageDirection, int z, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_14) {
|
||||
int ecx = (imageDirection / 2) + 16;
|
||||
|
|
@ -2203,7 +2203,7 @@ vehicle_sprite_func vehicle_sprite_funcs[] = {
|
|||
*
|
||||
* rct2: 0x006D5600
|
||||
*/
|
||||
void vehicle_visual_splash1_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
static void vehicle_visual_splash1_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if ((vehicle->track_type >> 2) != TRACK_ELEM_WATER_SPLASH) {
|
||||
return;
|
||||
|
|
@ -2225,7 +2225,7 @@ void vehicle_visual_splash1_effect(int z, rct_vehicle *vehicle, const rct_ride_e
|
|||
*
|
||||
* rct2: 0x006D5696
|
||||
*/
|
||||
void vehicle_visual_splash2_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
static void vehicle_visual_splash2_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->sprite_direction & 7) {
|
||||
return;
|
||||
|
|
@ -2244,7 +2244,7 @@ void vehicle_visual_splash2_effect(int z, rct_vehicle *vehicle, const rct_ride_e
|
|||
*
|
||||
* rct2: 0x006D57EE
|
||||
*/
|
||||
void vehicle_visual_splash3_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
static void vehicle_visual_splash3_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
if (vehicle->sprite_direction & 7) {
|
||||
return;
|
||||
|
|
@ -2263,7 +2263,7 @@ void vehicle_visual_splash3_effect(int z, rct_vehicle *vehicle, const rct_ride_e
|
|||
*
|
||||
* rct2: 0x006D5783
|
||||
*/
|
||||
void vehicle_visual_splash4_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
static void vehicle_visual_splash4_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
rct_vehicle *vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride);
|
||||
if (vehicle2->velocity <= 0x50000) {
|
||||
|
|
@ -2283,7 +2283,7 @@ void vehicle_visual_splash4_effect(int z, rct_vehicle *vehicle, const rct_ride_e
|
|||
*
|
||||
* rct2: 0x006D5701
|
||||
*/
|
||||
void vehicle_visual_splash5_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
static void vehicle_visual_splash5_effect(int z, rct_vehicle *vehicle, const rct_ride_entry_vehicle *vehicleEntry)
|
||||
{
|
||||
rct_vehicle *vehicle2 = GET_VEHICLE(vehicle->prev_vehicle_on_ride);
|
||||
if (vehicle2->velocity <= 0x50000) {
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ void scenario_begin()
|
|||
gGameSpeed = 1;
|
||||
}
|
||||
|
||||
void scenario_end()
|
||||
static void scenario_end()
|
||||
{
|
||||
rct_window* w;
|
||||
window_close_by_class(WC_DROPDOWN);
|
||||
|
|
@ -370,7 +370,7 @@ void scenario_success_submit_name(const char *name)
|
|||
* Send a warning when entrance price is too high.
|
||||
* rct2: 0x0066A80E
|
||||
*/
|
||||
void scenario_entrance_fee_too_high_check()
|
||||
static void scenario_entrance_fee_too_high_check()
|
||||
{
|
||||
uint16 x = 0, y = 0;
|
||||
money16 totalRideValue = gTotalRideValue;
|
||||
|
|
@ -626,7 +626,7 @@ unsigned int scenario_rand_max(unsigned int max)
|
|||
* Prepare rides, for the finish five rollercoasters objective.
|
||||
* rct2: 0x006788F7
|
||||
*/
|
||||
void scenario_prepare_rides_for_save()
|
||||
static void scenario_prepare_rides_for_save()
|
||||
{
|
||||
int i;
|
||||
rct_ride *ride;
|
||||
|
|
@ -731,7 +731,7 @@ int scenario_write_packed_objects(SDL_RWops* rw)
|
|||
*
|
||||
* rct2: 0x006AA039
|
||||
*/
|
||||
int scenario_write_available_objects(FILE *file)
|
||||
static int scenario_write_available_objects(FILE *file)
|
||||
{
|
||||
uint8 *buffer, *dstBuffer;
|
||||
int i, encodedLength;
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ void window_editor_bottom_toolbar_jump_back_to_landscape_editor() {
|
|||
*
|
||||
* rct2: 0x0066F64E
|
||||
*/
|
||||
void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up() {
|
||||
static void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up() {
|
||||
window_close_all();
|
||||
window_editor_inventions_list_open();
|
||||
gS6Info->editor_step = EDITOR_STEP_INVENTIONS_LIST_SET_UP;
|
||||
|
|
@ -204,7 +204,7 @@ void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up() {
|
|||
*
|
||||
* rct2: 0x0066F666
|
||||
*/
|
||||
void window_editor_bottom_toolbar_jump_back_to_scenario_options() {
|
||||
static void window_editor_bottom_toolbar_jump_back_to_scenario_options() {
|
||||
window_close_all();
|
||||
window_editor_scenario_options_open();
|
||||
gS6Info->editor_step = EDITOR_STEP_OPTIONS_SELECTION;
|
||||
|
|
@ -226,7 +226,7 @@ void window_editor_bottom_toolbar_jump_back_to_options_selection() {
|
|||
*
|
||||
* rct2: 0x006AB1CE
|
||||
*/
|
||||
bool window_editor_bottom_toolbar_check_object_selection()
|
||||
static bool window_editor_bottom_toolbar_check_object_selection()
|
||||
{
|
||||
rct_window *w;
|
||||
|
||||
|
|
@ -365,12 +365,12 @@ static void window_editor_bottom_toolbar_mouseup(rct_window *w, int widgetIndex)
|
|||
}
|
||||
}
|
||||
|
||||
void hide_previous_step_button() {
|
||||
static void hide_previous_step_button() {
|
||||
window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_STEP_BUTTON].type = WWT_EMPTY;
|
||||
window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].type = WWT_EMPTY;
|
||||
}
|
||||
|
||||
void hide_next_step_button() {
|
||||
static void hide_next_step_button() {
|
||||
window_editor_bottom_toolbar_widgets[WIDX_NEXT_STEP_BUTTON].type = WWT_EMPTY;
|
||||
window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].type = WWT_EMPTY;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -695,7 +695,7 @@ static void editor_object_flags_free()
|
|||
*
|
||||
* rct2: 0x00685791
|
||||
*/
|
||||
void remove_selected_objects_from_research(const rct_object_entry* installedObject){
|
||||
static void remove_selected_objects_from_research(const rct_object_entry* installedObject){
|
||||
uint8 entry_type, entry_index;
|
||||
if (!find_object_in_entry_group(installedObject, &entry_type, &entry_index))
|
||||
return;
|
||||
|
|
@ -715,7 +715,7 @@ void remove_selected_objects_from_research(const rct_object_entry* installedObje
|
|||
*
|
||||
* rct2: 0x006ABB66
|
||||
*/
|
||||
void unload_unselected_objects()
|
||||
static void unload_unselected_objects()
|
||||
{
|
||||
int numItems = object_repository_get_items_count();
|
||||
const ObjectRepositoryItem * items = object_repository_get_items();
|
||||
|
|
@ -1548,7 +1548,7 @@ void reset_selected_object_count_and_size()
|
|||
* optional / required dependants of an
|
||||
* object.
|
||||
*/
|
||||
void set_object_selection_error(uint8 is_master_object, rct_string_id error_msg){
|
||||
static void set_object_selection_error(uint8 is_master_object, rct_string_id error_msg){
|
||||
gGameCommandErrorText = error_msg;
|
||||
if (!is_master_object){
|
||||
reset_selected_object_count_and_size();
|
||||
|
|
|
|||
|
|
@ -813,7 +813,7 @@ void window_guest_viewport_init(rct_window* w){
|
|||
* rct2: 0x6983dd
|
||||
* used by window_staff as well
|
||||
*/
|
||||
void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
if (w->disabled_widgets & (1<<WIDX_TAB_1))
|
||||
return;
|
||||
|
||||
|
|
@ -876,7 +876,7 @@ void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
|||
*
|
||||
* rct2: 0x69869b
|
||||
*/
|
||||
void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
static void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
if (w->disabled_widgets & (1 << WIDX_TAB_2))
|
||||
return;
|
||||
|
||||
|
|
@ -908,7 +908,7 @@ void window_guest_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
|||
*
|
||||
* rct2: 0x69861F
|
||||
*/
|
||||
void window_guest_rides_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
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];
|
||||
|
|
@ -928,7 +928,7 @@ void window_guest_rides_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
|||
*
|
||||
* rct2: 0x698597
|
||||
*/
|
||||
void window_guest_finance_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
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];
|
||||
|
|
@ -948,7 +948,7 @@ void window_guest_finance_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
|||
*
|
||||
* rct2: 0x6985D8
|
||||
*/
|
||||
void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
static void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
if (w->disabled_widgets & (1 << WIDX_TAB_5)) return;
|
||||
|
||||
rct_widget* widget = &w->widgets[WIDX_TAB_5];
|
||||
|
|
@ -968,7 +968,7 @@ void window_guest_thoughts_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
|||
*
|
||||
* rct2: 0x698661
|
||||
*/
|
||||
void window_guest_inventory_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
static void window_guest_inventory_tab_paint(rct_window* w, rct_drawpixelinfo* dpi){
|
||||
if (w->disabled_widgets & (1 << WIDX_TAB_6)) return;
|
||||
|
||||
rct_widget* widget = &w->widgets[WIDX_TAB_6];
|
||||
|
|
@ -1390,7 +1390,7 @@ void window_guest_stats_invalidate(rct_window *w)
|
|||
*
|
||||
* ebp: colour, contains flag 0x80000000 for blinking
|
||||
*/
|
||||
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(int value, int x, int y, rct_window *w, rct_drawpixelinfo *dpi, int colour){
|
||||
value *= 0x76;
|
||||
value >>= 8;
|
||||
|
||||
|
|
|
|||
|
|
@ -1165,7 +1165,7 @@ static void window_map_set_land_rights_tool_update(int x, int y)
|
|||
*
|
||||
* rct2: 0x00666EEF
|
||||
*/
|
||||
void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, int *direction)
|
||||
static void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, int *direction)
|
||||
{
|
||||
rct_map_element *mapElement;
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ static rct_window_event_list window_new_campaign_events = {
|
|||
uint8 window_new_campaign_rides[MAX_RIDES];
|
||||
uint8 window_new_campaign_shop_items[64];
|
||||
|
||||
int ride_value_compare(const void *a, const void *b)
|
||||
static int ride_value_compare(const void *a, const void *b)
|
||||
{
|
||||
rct_ride *rideA, *rideB;
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ int ride_value_compare(const void *a, const void *b)
|
|||
return rideB->value - rideA->value;
|
||||
}
|
||||
|
||||
int ride_name_compare(const void *a, const void *b)
|
||||
static int ride_name_compare(const void *a, const void *b)
|
||||
{
|
||||
char rideAName[256], rideBName[256];
|
||||
rct_ride *rideA, *rideB;
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ static void window_park_set_disabled_tabs(rct_window *w);
|
|||
*
|
||||
* rct2: 0x00667F11
|
||||
*/
|
||||
rct_window *window_park_open()
|
||||
static rct_window *window_park_open()
|
||||
{
|
||||
rct_window* w;
|
||||
|
||||
|
|
@ -751,7 +751,7 @@ static void window_park_entrance_update(rct_window *w)
|
|||
}
|
||||
|
||||
|
||||
void window_park_entrance_tool_update_land_rights(sint16 x, sint16 y)
|
||||
static void window_park_entrance_tool_update_land_rights(sint16 x, sint16 y)
|
||||
{
|
||||
map_invalidate_selection_rect();
|
||||
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ void window_player_open(uint8 id)
|
|||
window_player_set_page(window, WINDOW_PLAYER_PAGE_OVERVIEW);
|
||||
}
|
||||
|
||||
void window_player_overview_show_group_dropdown(rct_window *w, rct_widget *widget)
|
||||
static void window_player_overview_show_group_dropdown(rct_window *w, rct_widget *widget)
|
||||
{
|
||||
rct_widget *dropdownWidget;
|
||||
int numItems, i;
|
||||
|
|
|
|||
|
|
@ -1300,7 +1300,7 @@ static void window_ride_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
|
|||
*
|
||||
* rct2: 0x006AEB9F
|
||||
*/
|
||||
void window_ride_disable_tabs(rct_window *w)
|
||||
static void window_ride_disable_tabs(rct_window *w)
|
||||
{
|
||||
uint32 disabled_tabs = 0;
|
||||
rct_ride *ride = get_ride(w->number & 0xFF);
|
||||
|
|
@ -1404,7 +1404,7 @@ static void window_ride_update_overall_view(uint8 ride_index) {
|
|||
*
|
||||
* rct2: 0x006AEAB4
|
||||
*/
|
||||
rct_window *window_ride_open(int rideIndex)
|
||||
static rct_window *window_ride_open(int rideIndex)
|
||||
{
|
||||
rct_window *w;
|
||||
rct_ride *ride;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include "../sprites.h"
|
||||
|
||||
/* move to ride.c */
|
||||
void sub_6B2FA9(rct_windownumber number)
|
||||
static void sub_6B2FA9(rct_windownumber number)
|
||||
{
|
||||
rct_window* w = window_find_by_number(WC_RIDE, number);
|
||||
if (w != NULL && w->page == 1)
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ void window_scenery_update_scroll(rct_window *w);
|
|||
* Was part of 0x006DFA00
|
||||
* The same code repeated five times for every scenery entry type
|
||||
*/
|
||||
void init_scenery_entry(rct_scenery_entry *sceneryEntry, int index, uint8 sceneryTabId)
|
||||
static void init_scenery_entry(rct_scenery_entry *sceneryEntry, int index, uint8 sceneryTabId)
|
||||
{
|
||||
if (scenery_is_invented(index)) {
|
||||
if (sceneryTabId != 0xFF) {
|
||||
|
|
@ -483,7 +483,7 @@ void window_scenery_open()
|
|||
*
|
||||
* rct2: 0x0066DB3D
|
||||
*/
|
||||
bool window_scenery_is_scenery_tool_active() {
|
||||
static bool window_scenery_is_scenery_tool_active() {
|
||||
int toolWindowClassification = gCurrentToolWidget.window_classification;
|
||||
int toolWidgetIndex = gCurrentToolWidget.widget_index;
|
||||
|
||||
|
|
@ -806,7 +806,7 @@ void window_scenery_scrollgetsize(rct_window *w, int scrollIndex, int *width, in
|
|||
*height = window_scenery_rows_height(rows);
|
||||
}
|
||||
|
||||
short get_scenery_id_by_cursor_pos(short x, short y)
|
||||
static short get_scenery_id_by_cursor_pos(short x, short y)
|
||||
{
|
||||
int tabSceneryIndex = x / SCENERY_BUTTON_WIDTH + (y / SCENERY_BUTTON_HEIGHT) * 9;
|
||||
uint8 tabIndex = gWindowSceneryActiveTabIndex;
|
||||
|
|
|
|||
|
|
@ -606,7 +606,7 @@ void window_staff_overview_update(rct_window* w)
|
|||
*
|
||||
* rct2: 0x006BE814
|
||||
*/
|
||||
void window_staff_set_order(rct_window* w, int order_id)
|
||||
static void window_staff_set_order(rct_window* w, int order_id)
|
||||
{
|
||||
rct_peep* peep = GET_PEEP(w->number);
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ void window_staff_list_open()
|
|||
_quick_fire_mode = false;
|
||||
}
|
||||
|
||||
void window_staff_list_cancel_tools(rct_window *w) {
|
||||
static void window_staff_list_cancel_tools(rct_window *w) {
|
||||
if (gInputFlags & INPUT_FLAG_TOOL_ACTIVE)
|
||||
if (w->classification == gCurrentToolWidget.window_classification && w->number == gCurrentToolWidget.window_number)
|
||||
tool_cancel();
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ static const uint8 _button_offset_x = 220;
|
|||
static const uint8 _button_offset_y = 3;
|
||||
static const uint8 _check_offset_y = 3 + 12 + 2;
|
||||
|
||||
void window_themes_init_vars()
|
||||
static void window_themes_init_vars()
|
||||
{
|
||||
_selected_tab = WINDOW_THEMES_TAB_SETTINGS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../interface/window.h"
|
||||
#include "tooltip.h"
|
||||
|
||||
enum {
|
||||
WIDX_BACKGROUND
|
||||
|
|
|
|||
|
|
@ -1001,7 +1001,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, sint16 widgetIndex){
|
|||
* edx : parameter_2
|
||||
* edi : parameter_3
|
||||
*/
|
||||
void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid_x, sint16* grid_y, uint32* parameter_1, uint32* parameter_2, uint32* parameter_3){
|
||||
static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid_x, sint16* grid_y, uint32* parameter_1, uint32* parameter_2, uint32* parameter_3){
|
||||
rct_window* w = window_find_by_class(WC_SCENERY);
|
||||
|
||||
if (w == NULL)
|
||||
|
|
@ -1648,7 +1648,7 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window *w
|
|||
*
|
||||
* rct2: 0x0068E213
|
||||
*/
|
||||
void top_toolbar_tool_update_scenery_clear(sint16 x, sint16 y){
|
||||
static void top_toolbar_tool_update_scenery_clear(sint16 x, sint16 y){
|
||||
map_invalidate_selection_rect();
|
||||
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
|
||||
|
||||
|
|
@ -1727,7 +1727,7 @@ void top_toolbar_tool_update_scenery_clear(sint16 x, sint16 y){
|
|||
}
|
||||
}
|
||||
|
||||
void top_toolbar_tool_update_land_paint(sint16 x, sint16 y){
|
||||
static void top_toolbar_tool_update_land_paint(sint16 x, sint16 y){
|
||||
map_invalidate_selection_rect();
|
||||
gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
|
||||
|
||||
|
|
@ -1798,7 +1798,7 @@ void top_toolbar_tool_update_land_paint(sint16 x, sint16 y){
|
|||
*
|
||||
* rct2: 0x00664280
|
||||
*/
|
||||
void top_toolbar_tool_update_land(sint16 x, sint16 y){
|
||||
static void top_toolbar_tool_update_land(sint16 x, sint16 y){
|
||||
map_invalidate_selection_rect();
|
||||
|
||||
if (gCurrentToolId == 3){
|
||||
|
|
@ -1968,7 +1968,7 @@ void top_toolbar_tool_update_land(sint16 x, sint16 y){
|
|||
*
|
||||
* rct2: 0x006E6BDC
|
||||
*/
|
||||
void top_toolbar_tool_update_water(sint16 x, sint16 y){
|
||||
static void top_toolbar_tool_update_water(sint16 x, sint16 y){
|
||||
map_invalidate_selection_rect();
|
||||
|
||||
if (gCurrentToolId == 3){
|
||||
|
|
@ -2101,7 +2101,7 @@ void top_toolbar_tool_update_water(sint16 x, sint16 y){
|
|||
* On failure returns MONEY32_UNDEFINED
|
||||
* On success places ghost scenery and returns cost to place proper
|
||||
*/
|
||||
money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 parameter_2, uint32 parameter_3, uint16 selected_tab){
|
||||
static money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 parameter_2, uint32 parameter_3, uint16 selected_tab){
|
||||
scenery_remove_ghost_tool_placement();
|
||||
|
||||
uint8 scenery_type = (selected_tab & 0xFF00) >> 8;
|
||||
|
|
@ -2260,7 +2260,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa
|
|||
*
|
||||
* rct2: 0x006E287B
|
||||
*/
|
||||
void top_toolbar_tool_update_scenery(sint16 x, sint16 y){
|
||||
static void top_toolbar_tool_update_scenery(sint16 x, sint16 y){
|
||||
map_invalidate_selection_rect();
|
||||
map_invalidate_map_selection_tiles();
|
||||
|
||||
|
|
@ -2641,7 +2641,7 @@ money32 selection_lower_land(uint8 flags)
|
|||
* part of window_top_toolbar_tool_drag(0x0066CB4E)
|
||||
* rct2: 0x00664454
|
||||
*/
|
||||
void window_top_toolbar_land_tool_drag(short x, short y)
|
||||
static void window_top_toolbar_land_tool_drag(short x, short y)
|
||||
{
|
||||
rct_window *window = window_find_from_point(x, y);
|
||||
if (!window)
|
||||
|
|
@ -2680,7 +2680,7 @@ void window_top_toolbar_land_tool_drag(short x, short y)
|
|||
* part of window_top_toolbar_tool_drag(0x0066CB4E)
|
||||
* rct2: 0x006E6D4B
|
||||
*/
|
||||
void window_top_toolbar_water_tool_drag(short x, short y)
|
||||
static void window_top_toolbar_water_tool_drag(short x, short y)
|
||||
{
|
||||
rct_window *window = window_find_from_point(x, y);
|
||||
if (!window)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ void create_balloon(int x, int y, int z, int colour, uint8 bl)
|
|||
}
|
||||
}
|
||||
|
||||
void balloon_pop(rct_balloon *balloon)
|
||||
static void balloon_pop(rct_balloon *balloon)
|
||||
{
|
||||
balloon->popped = 1;
|
||||
balloon->frame = 0;
|
||||
|
|
|
|||
|
|
@ -49,5 +49,6 @@ 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);
|
||||
void fix_banner_count();
|
||||
void game_command_callback_place_banner(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ void climate_reset(int climate)
|
|||
climate_determine_future_weather(util_rand());
|
||||
}
|
||||
|
||||
sint8 step_weather_level(sint8 cur_weather_level, sint8 next_weather_level) {
|
||||
static sint8 step_weather_level(sint8 cur_weather_level, sint8 next_weather_level) {
|
||||
if (next_weather_level > cur_weather_level) {
|
||||
return cur_weather_level + 1;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ static void automatically_set_peep_spawn(int x, int y, int z)
|
|||
peepSpawn->z = z;
|
||||
}
|
||||
|
||||
rct_map_element *map_get_footpath_element(int x, int y, int z)
|
||||
static rct_map_element *map_get_footpath_element(int x, int y, int z)
|
||||
{
|
||||
rct_map_element *mapElement;
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ rct_map_element *map_get_footpath_element(int x, int y, int z)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
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(int x, int y, int z, int slope)
|
||||
{
|
||||
rct_map_element *mapElement;
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ static money32 footpath_place_real(int type, int x, int y, int z, int slope, int
|
|||
*
|
||||
* rct2: 0x006BA23E
|
||||
*/
|
||||
void remove_banners_at_element(int x, int y, rct_map_element* mapElement){
|
||||
static void remove_banners_at_element(int x, int 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;
|
||||
|
|
@ -842,7 +842,7 @@ bool fence_in_the_way(int x, int y, int z0, int z1, int direction)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool map_is_edge(int x, int y)
|
||||
static bool map_is_edge(int x, int y)
|
||||
{
|
||||
return (
|
||||
x < 32 ||
|
||||
|
|
@ -1484,7 +1484,7 @@ static void footpath_unown(int x, int y, rct_map_element *pathElement)
|
|||
map_buy_land_rights(x, y, x, y, 6, 1);
|
||||
}
|
||||
|
||||
bool get_next_direction(int edges, int *direction)
|
||||
static bool get_next_direction(int edges, int *direction)
|
||||
{
|
||||
int index = bitscanforward(edges);
|
||||
if (index == -1)
|
||||
|
|
@ -1501,7 +1501,7 @@ bool get_next_direction(int edges, int *direction)
|
|||
* (1 << 5): Unown
|
||||
* (1 << 7): Ignore no entry signs
|
||||
*/
|
||||
int footpath_is_connected_to_map_edge_recurse(
|
||||
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
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -1288,7 +1288,7 @@ void game_command_set_banner_colour(int* eax, int* ebx, int* ecx, int* edx, int*
|
|||
*
|
||||
* rct2: 0x0068DFE4
|
||||
*/
|
||||
money32 map_clear_scenery_from_tile(int x, int y, int clear, int flags)
|
||||
static money32 map_clear_scenery_from_tile(int x, int y, int clear, int flags)
|
||||
{
|
||||
int type;
|
||||
money32 cost, totalCost;
|
||||
|
|
@ -1379,7 +1379,7 @@ restart_from_beginning:
|
|||
* Function to clear the flag that is set to prevent cost duplication
|
||||
* when using the clear scenery tool with large scenery.
|
||||
*/
|
||||
void map_reset_clear_large_scenery_flag(){
|
||||
static void map_reset_clear_large_scenery_flag(){
|
||||
rct_map_element* mapElement;
|
||||
// TODO: Improve efficiency of this
|
||||
for (int y = 0; y <= 255; y++) {
|
||||
|
|
@ -1465,7 +1465,7 @@ void game_command_clear_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
|
|||
*
|
||||
* rct2: 0x00663CCD
|
||||
*/
|
||||
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(int x0, int y0, int x1, int y1, uint8 surfaceStyle, uint8 edgeStyle, uint8 flags)
|
||||
{
|
||||
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING;
|
||||
|
||||
|
|
@ -1619,7 +1619,7 @@ const uint8 map_element_lower_styles[5][32] = {
|
|||
*
|
||||
* rct2: 0x00663CB9
|
||||
*/
|
||||
int map_set_land_height_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) {
|
||||
static int map_set_land_height_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) {
|
||||
if (map_element_get_type(*map_element) == MAP_ELEMENT_TYPE_SURFACE)
|
||||
return 0;
|
||||
|
||||
|
|
@ -1833,7 +1833,7 @@ void game_command_set_land_height(int *eax, int *ebx, int *ecx, int *edx, int *e
|
|||
);
|
||||
}
|
||||
|
||||
money32 map_set_land_ownership(uint8 flags, sint16 x1, sint16 y1, sint16 x2, sint16 y2, uint8 newOwnership) {
|
||||
static money32 map_set_land_ownership(uint8 flags, sint16 x1, sint16 y1, sint16 x2, sint16 y2, uint8 newOwnership) {
|
||||
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LAND_PURCHASE;
|
||||
|
||||
if (!(flags & GAME_COMMAND_FLAG_APPLY))
|
||||
|
|
@ -1880,7 +1880,7 @@ void game_command_set_land_ownership(int *eax, int *ebx, int *ecx, int *edx, int
|
|||
}
|
||||
|
||||
|
||||
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(int flags, int x, int y, int z, int ax, int ay, int bx, int by, int selectionType)
|
||||
{
|
||||
money32 cost = 0;
|
||||
|
||||
|
|
@ -1942,7 +1942,7 @@ money32 raise_land(int flags, int x, int y, int z, int ax, int ay, int bx, int b
|
|||
return cost;
|
||||
}
|
||||
|
||||
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(int flags, int x, int y, int z, int ax, int ay, int bx, int by, int selectionType)
|
||||
{
|
||||
money32 cost = 0;
|
||||
|
||||
|
|
@ -2310,7 +2310,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);
|
||||
}
|
||||
|
||||
money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int mapTop, int mapRight, int mapBottom, int command)
|
||||
static money32 smooth_land(int flags, int centreX, int centreY, int mapLeft, int mapTop, int mapRight, int mapBottom, int command)
|
||||
{
|
||||
// Cap bounds to map
|
||||
mapLeft = max(mapLeft, 32);
|
||||
|
|
@ -2856,7 +2856,7 @@ void game_command_place_banner(int* eax, int* ebx, int* ecx, int* edx, int* esi,
|
|||
*
|
||||
* rct2: 0x006E0D6E, 0x006B8D88
|
||||
*/
|
||||
int map_place_scenery_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) {
|
||||
static int map_place_scenery_clear_func(rct_map_element** map_element, int x, int y, uint8 flags, money32* price) {
|
||||
if (map_element_get_type(*map_element) != MAP_ELEMENT_TYPE_SCENERY)
|
||||
return 1;
|
||||
|
||||
|
|
@ -3863,7 +3863,7 @@ void map_invalidate_map_selection_tiles()
|
|||
map_invalidate_tile_full(position->x, position->y);
|
||||
}
|
||||
|
||||
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(int ax, int ay, int bx, int by, int *left, int *top, int *right, int *bottom)
|
||||
{
|
||||
int x, y;
|
||||
x = ax;
|
||||
|
|
@ -4798,7 +4798,7 @@ static void translate_3d_to_2d(int rotation, int *x, int *y)
|
|||
*y = ry;
|
||||
}
|
||||
|
||||
void map_invalidate_tile_under_zoom(int x, int y, int z0, int z1, int maxZoom)
|
||||
static void map_invalidate_tile_under_zoom(int x, int y, int z0, int z1, int maxZoom)
|
||||
{
|
||||
if (gOpenRCT2Headless) return;
|
||||
|
||||
|
|
@ -4932,7 +4932,7 @@ void map_clear_all_elements()
|
|||
}
|
||||
}
|
||||
|
||||
money32 place_park_entrance(int flags, sint16 x, sint16 y, sint16 z, uint8 direction) {
|
||||
static money32 place_park_entrance(int flags, sint16 x, sint16 y, sint16 z, uint8 direction) {
|
||||
if (!(gScreenFlags & SCREEN_FLAGS_EDITOR) && !gCheatsSandboxMode) {
|
||||
return MONEY32_UNDEFINED;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ int map_smooth(int l, int t, int r, int b)
|
|||
return raisedLand;
|
||||
}
|
||||
|
||||
int map_get_corner_height(int x, int y, int corner)
|
||||
static int map_get_corner_height(int x, int y, int corner)
|
||||
{
|
||||
rct_map_element *mapElement = map_get_surface_element_at(x, y);
|
||||
int baseHeight = mapElement->base_height;
|
||||
|
|
@ -205,7 +205,7 @@ 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.
|
||||
*/
|
||||
int map_smooth_wavy(int l, int t, int r, int b)
|
||||
static int map_smooth_wavy(int l, int t, int r, int b)
|
||||
{
|
||||
int i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0;
|
||||
rct_map_element *mapElement;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ static const rct_xy16 _moneyEffectMoveOffset[] = {
|
|||
*
|
||||
* rct2: 0x0067351F
|
||||
*/
|
||||
void money_effect_create_at(money32 value, int x, int y, int z)
|
||||
static void money_effect_create_at(money32 value, int x, int y, int z)
|
||||
{
|
||||
rct_money_effect *moneyEffect;
|
||||
rct_string_id stringId;
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ int calculate_park_rating()
|
|||
return result;
|
||||
}
|
||||
|
||||
money32 calculate_ride_value(rct_ride *ride)
|
||||
static money32 calculate_ride_value(rct_ride *ride)
|
||||
{
|
||||
if (ride->type == RIDE_TYPE_NULL)
|
||||
return 0;
|
||||
|
|
@ -795,7 +795,7 @@ void update_park_fences(int x, int y)
|
|||
}
|
||||
}
|
||||
|
||||
void park_remove_entrance_segment(int x, int y, int z)
|
||||
static void park_remove_entrance_segment(int x, int y, int z)
|
||||
{
|
||||
rct_map_element *mapElement;
|
||||
|
||||
|
|
@ -940,7 +940,7 @@ void game_command_set_park_name(int *eax, int *ebx, int *ecx, int *edx, int *esi
|
|||
*ebx = 0;
|
||||
}
|
||||
|
||||
money32 map_buy_land_rights_for_tile(int x, int y, int setting, int flags) {
|
||||
static money32 map_buy_land_rights_for_tile(int x, int y, int setting, int flags) {
|
||||
rct_map_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32);
|
||||
if (surfaceElement == NULL)
|
||||
return MONEY32_UNDEFINED;
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ static void sprite_misc_explosion_flare_update(rct_sprite * sprite)
|
|||
*
|
||||
* rct2: 0x006731CD
|
||||
*/
|
||||
void sprite_misc_update(rct_sprite *sprite)
|
||||
static void sprite_misc_update(rct_sprite *sprite)
|
||||
{
|
||||
switch (sprite->unknown.misc_identifier) {
|
||||
case SPRITE_MISC_STEAM_PARTICLE:
|
||||
|
|
|
|||
Loading…
Reference in New Issue