mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity

Remove stub functions from new_game_command_table[]

Browse Source
This commit is contained in:
Gymnasiast
2019-05-13 22:51:41 +02:00
parent 8d9645a382
commit 4e23c42d38
7 changed files with 20 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2/Game.cpp
View File

@@ -1161,24 +1161,6 @@ GAME_COMMAND_POINTER* new_game_command_table[GAME_COMMAND_COUNT] = {
nullptr,
nullptr,
nullptr,
game_command_create_ride,
game_command_demolish_ride,
game_command_set_ride_status,
nullptr,
game_command_set_ride_name,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
game_command_set_guest_name,
game_command_set_staff_name,
nullptr,
nullptr,
nullptr,
@@ -1192,9 +1174,27 @@ GAME_COMMAND_POINTER* new_game_command_table[GAME_COMMAND_COUNT] = {
nullptr,
nullptr,
nullptr,
game_command_place_park_entrance,
nullptr,
game_command_set_maze_track,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
game_command_set_park_entrance_fee,
nullptr,
nullptr,

85
src/openrct2/actions/GameActionCompat.cpp
View File

@@ -35,17 +35,6 @@ money32 place_park_entrance(int16_t x, int16_t y, int16_t z, uint8_t direction)
}
}
/**
*
* rct2: 0x006666E7
*/
void game_command_place_park_entrance(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_PLACE_PARK_ENTRANCE DEPRECATED");
}
/**
*
* rct2: 0x00666F4E
@@ -135,17 +124,6 @@ money32 ride_create_command(int32_t type, int32_t subType, int32_t flags, ride_i
return res->Cost;
}
/**
*
* rct2: 0x006B3F0F
*/
void game_command_create_ride(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_CREATE_RIDE DEPRECATED");
}
#pragma endregion
#pragma region RideSetStatusAction
@@ -156,17 +134,6 @@ void ride_set_status(Ride* ride, int32_t status)
GameActions::Execute(&gameAction);
}
/**
*
* rct2: 0x006B4EA6
*/
void game_command_set_ride_status(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_SET_RIDE_STATUS DEPRECATED");
}
#pragma endregion
#pragma region RideSetNameAction
@@ -176,17 +143,6 @@ void ride_set_name(Ride* ride, const char* name, uint32_t flags)
gameAction.SetFlags(flags);
GameActions::Execute(&gameAction);
}
/**
*
* rct2: 0x006B578B
*/
void game_command_set_ride_name(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_SET_RIDE_NAME DEPRECATED");
}
#pragma endregion
#pragma region RideModifyAction
@@ -197,17 +153,6 @@ void ride_action_modify(Ride* ride, int32_t modifyType, int32_t flags)
GameActions::Execute(&gameAction);
}
/**
*
* rct2: 0x006B49D9
*/
void game_command_demolish_ride(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_DEMOLISH_RIDE DEPRECATED");
}
#pragma endregion
#pragma region GuestSetName
@@ -217,18 +162,6 @@ void guest_set_name(uint16_t spriteIndex, const char* name)
auto gameAction = GuestSetNameAction(spriteIndex, name);
GameActions::Execute(&gameAction);
}
/**
*
* rct2: 0x00698D6C
*/
void game_command_set_guest_name(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_SET_GUEST_NAME DEPRECATED");
}
#pragma endregion
#pragma region StaffSetName
@@ -238,13 +171,6 @@ void staff_set_name(uint16_t spriteIndex, const char* name)
auto gameAction = StaffSetNameAction(spriteIndex, name);
GameActions::Execute(&gameAction);
}
void game_command_set_staff_name(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_SET_STAFF_NAME DEPRECATED");
}
#pragma endregion
#pragma region PlacePeepSpawn
@@ -283,15 +209,4 @@ money32 maze_set_track(
return res->Cost;
}
/**
*
* rct2: 0x006CD8CE
*/
void game_command_set_maze_track(
[[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
[[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
{
Guard::Assert(false, "GAME_COMMAND_SET_MAZE_TRACK DEPRECATED");
}
#pragma endregion

2
src/openrct2/peep/Peep.h
View File

@@ -976,8 +976,6 @@ void peep_update_names(bool realNames);
void guest_set_name(uint16_t spriteIndex, const char* name);
void peep_handle_easteregg_name(Peep* peep);
void game_command_set_guest_name(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, Peep* peep);
void peep_reset_pathfind_goal(Peep* peep);

2
src/openrct2/peep/Staff.h
View File

@@ -71,8 +71,6 @@ extern colour_t gStaffHandymanColour;
extern colour_t gStaffMechanicColour;
extern colour_t gStaffSecurityColour;
void game_command_set_staff_name(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
void game_command_pickup_staff(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);

7
src/openrct2/ride/Ride.h
View File

@@ -1088,18 +1088,11 @@ void ride_prepare_breakdown(Ride* ride, int32_t breakdownReason);
TileElement* ride_get_station_start_track_element(Ride* ride, int32_t stationIndex);
TileElement* ride_get_station_exit_element(int32_t x, int32_t y, int32_t z);
void ride_set_status(Ride* ride, int32_t status);
void game_command_set_ride_status(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
void ride_set_name(Ride* ride, const char* name, uint32_t flags);
void game_command_set_ride_name(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
int32_t ride_get_refund_price(const Ride* ride);
int32_t ride_get_random_colour_preset_index(uint8_t ride_type);
money32 ride_get_common_price(Ride* forRide);
rct_ride_name get_ride_naming(const uint8_t rideType, rct_ride_entry* rideEntry);
void game_command_create_ride(int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
void game_command_demolish_ride(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
money32 ride_create_command(int32_t type, int32_t subType, int32_t flags, ride_id_t* outRideIndex, uint8_t* outRideColour);
void ride_set_name_to_default(Ride* ride, rct_ride_entry* rideEntry);

2
src/openrct2/ride/Track.h
View File

@@ -547,8 +547,6 @@ int32_t track_get_actual_bank_3(rct_vehicle* vehicle, TileElement* tileElement);
bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags);
bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, ride_id_t rideIndex, int32_t flags);
void game_command_set_maze_track(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
money32 maze_set_track(
uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, ride_id_t rideIndex,
uint8_t mode);

2
src/openrct2/world/Map.h
View File

@@ -187,8 +187,6 @@ int32_t map_can_construct_at(int32_t x, int32_t y, int32_t zLow, int32_t zHigh,
void rotate_map_coordinates(int16_t* x, int16_t* y, int32_t rotation);
LocationXY16 coordinate_3d_to_2d(const LocationXYZ16* coordinate_3d, int32_t rotation);
void game_command_place_park_entrance(
int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
void game_command_modify_tile(int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
struct tile_element_iterator