mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 15:54:31 +01:00
Code Issues Releases Wiki Activity

Refactor peep struct

Browse Source
This commit is contained in:
Ted John
2019-02-28 19:28:58 +00:00
committed by Michael Steenbeek
parent 453855993d
commit cdec457abd
61 changed files with 855 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -373,7 +373,7 @@ static int32_t cc_staff(InteractiveConsole& console, const arguments_t& argv)
{
if (argv[0] == "list")
{
rct_peep* peep;
Peep* peep;
int32_t i;
FOR_ALL_STAFF (i, peep)
{
@@ -409,7 +409,7 @@ static int32_t cc_staff(InteractiveConsole& console, const arguments_t& argv)
if (int_valid[0] && int_valid[1] && ((GET_PEEP(int_val[0])) != nullptr))
{
rct_peep* peep = GET_PEEP(int_val[0]);
Peep* peep = GET_PEEP(int_val[0]);
peep->energy = int_val[1];
peep->energy_target = int_val[1];
@@ -421,7 +421,7 @@ static int32_t cc_staff(InteractiveConsole& console, const arguments_t& argv)
bool int_valid[2] = { false };
int_val[0] = console_parse_int(argv[2], &int_valid[0]);
int_val[1] = console_parse_int(argv[3], &int_valid[1]);
rct_peep* peep = nullptr;
Peep* peep = nullptr;
if (!int_valid[0])
{
console.WriteLineError("Invalid staff ID");

6
src/openrct2/interface/Viewport.cpp
View File

@@ -661,7 +661,7 @@ void viewport_update_smart_sprite_follow(rct_window* window)
}
else if (sprite->generic.sprite_identifier == SPRITE_IDENTIFIER_PEEP)
{
rct_peep* peep = GET_PEEP(window->viewport_smart_follow_sprite);
Peep* peep = GET_PEEP(window->viewport_smart_follow_sprite);
if (peep->type == PEEP_TYPE_GUEST)
viewport_update_smart_guest_follow(window, peep);
@@ -686,7 +686,7 @@ void viewport_update_smart_sprite_follow(rct_window* window)
}
}
void viewport_update_smart_guest_follow(rct_window* window, rct_peep* peep)
void viewport_update_smart_guest_follow(rct_window* window, Peep* peep)
{
union
{
@@ -748,7 +748,7 @@ void viewport_update_smart_guest_follow(rct_window* window, rct_peep* peep)
window->viewport_target_sprite = window->viewport_focus_sprite.sprite_id;
}
void viewport_update_smart_staff_follow(rct_window* window, rct_peep* peep)
void viewport_update_smart_staff_follow(rct_window* window, Peep* peep)
{
sprite_focus focus = {};

8
src/openrct2/interface/Viewport.h
View File

@@ -18,7 +18,7 @@
struct paint_session;
struct paint_struct;
struct rct_drawpixelinfo;
struct rct_peep;
struct Peep;
struct TileElement;
struct rct_vehicle;
struct rct_window;
@@ -91,7 +91,7 @@ struct viewport_interaction_info
{
TileElement* tileElement;
rct_sprite* sprite;
rct_peep* peep;
Peep* peep;
rct_vehicle* vehicle;
};
};
@@ -126,8 +126,8 @@ void viewport_create(
void viewport_update_position(rct_window* window);
void viewport_update_sprite_follow(rct_window* window);
void viewport_update_smart_sprite_follow(rct_window* window);
void viewport_update_smart_guest_follow(rct_window* window, rct_peep* peep);
void viewport_update_smart_staff_follow(rct_window* window, rct_peep* peep);
void viewport_update_smart_guest_follow(rct_window* window, Peep* peep);
void viewport_update_smart_staff_follow(rct_window* window, Peep* peep);
void viewport_update_smart_vehicle_follow(rct_window* window);
void viewport_render(
rct_drawpixelinfo* dpi, rct_viewport* viewport, int32_t left, int32_t top, int32_t right, int32_t bottom,