mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace 'center' with 'centre' (#5745)

This commit is contained in:
Michael Steenbeek 2017-07-01 00:11:28 +02:00 committed by Ted John
parent f515314a2d
commit 44af1653a6
17 changed files with 120 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
View File

@ -227,7 +227,7 @@ private:
{
ReadCentrePixel(&_pixelAfterOverlay);
// Detect an active Steam overlay by checking if the center pixel is changed by the gray fade.
// Detect an active Steam overlay by checking if the centre pixel is changed by the gray fade.
// Will not be triggered by applications rendering to corners, like FRAPS, MSI Afterburner and Friends popups.
bool newOverlayActive = _pixelBeforeOverlay != _pixelAfterOverlay;

39
src/openrct2/interface/viewport.c
View File

@ -103,7 +103,7 @@ void viewport_init_all()
}
/**
* Converts between 3d point of a sprite to 2d coordinates for centering on that
* Converts between 3d point of a sprite to 2d coordinates for centring on that
* sprite
* rct2: 0x006EB0C1
* x : ax
@ -112,7 +112,7 @@ void viewport_init_all()
* out_x : ax
* out_y : bx
*/
void center_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32* out_x, sint32* out_y, rct_viewport* viewport){
void centre_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32 * out_x, sint32 * out_y, rct_viewport * viewport){
sint32 start_x = x;
rct_xyz16 coord_3d = {
@ -146,14 +146,14 @@ void center_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32* out_x, sint32*
* width: bx
* height: ebx (top 16)
* zoom: cl (8 bits)
* center_x: edx lower 16 bits
* center_y: edx upper 16 bits
* center_z: ecx upper 16 bits
* centre_x: edx lower 16 bits
* centre_y: edx upper 16 bits
* centre_z: ecx upper 16 bits
* sprite: edx lower 16 bits
* flags: edx top most 2 bits 0b_X1 for zoom clear see below for 2nd bit.
* w: esi
*/
void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 height, sint32 zoom, sint32 center_x, sint32 center_y, sint32 center_z, char flags, sint16 sprite)
void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 height, sint32 zoom, sint32 centre_x, sint32 centre_y, sint32 centre_z, char flags, sint16 sprite)
{
rct_viewport* viewport = NULL;
for (sint32 i = 0; i < MAX_VIEWPORT_COUNT; i++) {
@ -187,17 +187,17 @@ void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 hei
if (flags & VIEWPORT_FOCUS_TYPE_SPRITE){
w->viewport_target_sprite = sprite;
rct_sprite* center_sprite = get_sprite(sprite);
center_x = center_sprite->unknown.x;
center_y = center_sprite->unknown.y;
center_z = center_sprite->unknown.z;
rct_sprite* centre_sprite = get_sprite(sprite);
centre_x = centre_sprite->unknown.x;
centre_y = centre_sprite->unknown.y;
centre_z = centre_sprite->unknown.z;
}
else{
w->viewport_target_sprite = SPR_NONE;
}
sint32 view_x, view_y;
center_2d_coordinates(center_x, center_y, center_z, &view_x, &view_y, viewport);
centre_2d_coordinates(centre_x, centre_y, centre_z, &view_x, &view_y, viewport);
w->saved_view_x = view_x;
w->saved_view_y = view_y;
@ -560,7 +560,7 @@ void viewport_update_position(rct_window *window)
// function up.
sint32 zz = map_element_height(x & 0xFFFF, y & 0xFFFF);
sint32 _2d_x, _2d_y;
center_2d_coordinates(x, y, zz, &_2d_x, &_2d_y, viewport);
centre_2d_coordinates(x, y, zz, &_2d_x, &_2d_y, viewport);
if (at_map_edge_x)
window->saved_view_x = _2d_x;
@ -613,10 +613,11 @@ void viewport_update_sprite_follow(rct_window *window)
viewport_set_underground_flag(underground, window, window->viewport);
sint32 center_x, center_y;
center_2d_coordinates(sprite->unknown.x, sprite->unknown.y, sprite->unknown.z, &center_x, &center_y, window->viewport);
sint32 centre_x, centre_y;
centre_2d_coordinates(sprite->unknown.x, sprite->unknown.y, sprite->unknown.z, &centre_x, &centre_y,
window->viewport);
viewport_move(center_x, center_y, window, window->viewport);
viewport_move(centre_x, centre_y, window, window->viewport);
}
}
@ -784,10 +785,10 @@ void screen_pos_to_map_pos(sint16 *x, sint16 *y, sint32 *direction)
return;
sint32 my_direction;
sint32 dist_from_center_x = abs(*x % 32);
sint32 dist_from_center_y = abs(*y % 32);
if (dist_from_center_x > 8 && dist_from_center_x < 24 &&
dist_from_center_y > 8 && dist_from_center_y < 24) {
sint32 dist_from_centre_x = abs(*x % 32);
sint32 dist_from_centre_y = abs(*y % 32);
if (dist_from_centre_x > 8 && dist_from_centre_x < 24 &&
dist_from_centre_y > 8 && dist_from_centre_y < 24) {
my_direction = 4;
} else {
sint16 mod_x = *x & 0x1F;

4
src/openrct2/interface/viewport.h
View File

@ -116,8 +116,8 @@ extern uint32 gCurrentViewportFlags;
#endif
void viewport_init_all();
void center_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32* out_x, sint32* out_y, rct_viewport* viewport);
void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 height, sint32 zoom, sint32 center_x, sint32 center_y, sint32 center_z, char flags, sint16 sprite);
void centre_2d_coordinates(sint32 x, sint32 y, sint32 z, sint32 * out_x, sint32 * out_y, rct_viewport * viewport);
void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 height, sint32 zoom, sint32 centre_x, sint32 centre_y, sint32 centre_z, char flags, sint16 sprite);
void viewport_update_pointers();
void viewport_update_position(rct_window *window);
void viewport_update_sprite_follow(rct_window *window);

8
src/openrct2/interface/window.c
View File

@ -57,7 +57,7 @@ uint16 gWindowMapFlashingFlags;
colour_t gCurrentWindowColours[4];
// converted from uint16 values at 0x009A41EC - 0x009A4230
// these are percentage coordinates of the viewport to center to, if a window is obscuring a location, the next is tried
// these are percentage coordinates of the viewport to centre to, if a window is obscuring a location, the next is tried
float window_scroll_locations[][2] = {
{0.5f, 0.5f},
{0.75f, 0.5f},
@ -1460,7 +1460,7 @@ void window_rotate_camera(rct_window *w, sint32 direction)
gCurrentRotation = (get_current_rotation() + direction) & 3;
sint32 new_x, new_y;
center_2d_coordinates(x, y, z, &new_x, &new_y, viewport);
centre_2d_coordinates(x, y, z, &new_x, &new_y, viewport);
w->saved_view_x = new_x;
w->saved_view_y = new_y;
@ -1485,7 +1485,7 @@ void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint
// Get viewport coordinates centring around the tile.
sint32 base_height = map_element_height(*map_x, *map_y);
sint32 dest_x, dest_y;
center_2d_coordinates(*map_x, *map_y, base_height, &dest_x, &dest_y, w->viewport);
centre_2d_coordinates(*map_x, *map_y, base_height, &dest_x, &dest_y, w->viewport);
// Rebase mouse position onto centre of window, and compensate for zoom level.
sint32 rebased_x = ((w->width >> 1) - mouse_x) * (1 << w->viewport->zoom),
@ -1501,7 +1501,7 @@ void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint
// Get viewport coordinates centring around the tile.
sint32 dest_x, dest_y;
sint32 base_height = map_element_height(map_x, map_y);
center_2d_coordinates(map_x, map_y, base_height, &dest_x, &dest_y, w->viewport);
centre_2d_coordinates(map_x, map_y, base_height, &dest_x, &dest_y, w->viewport);
// Get mouse position to offset against.
sint32 mouse_x, mouse_y;

2
src/openrct2/paint/map_element/scenery_multiple.c
View File

@ -116,7 +116,7 @@ static void scenery_multiple_sign_paint_line(const utf8 *str, rct_large_scenery_
sint32 x_offset = text->offset[(direction & 1)].x;
sint32 acc = y_offset * ((direction & 1) ? -1 : 1);
if (!(text->flags & LARGE_SCENERY_TEXT_FLAG_VERTICAL)) {
// sign is horizontal, center text:
// sign is horizontal, centre text:
x_offset -= (width / 2);
acc -= (width / 2);
}

80
src/openrct2/peep/peep.c
View File

@ -565,8 +565,8 @@ void peep_update_all()
*
* rct2: 0x0069BC9A
*/
static uint8 peep_assess_surroundings(sint16 center_x, sint16 center_y, sint16 center_z){
if ((map_element_height(center_x, center_y) & 0xFFFF) > center_z)
static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 centre_z){
if ((map_element_height(centre_x, centre_y) & 0xFFFF) > centre_z)
return PEEP_THOUGHT_TYPE_NONE;
uint16 num_scenery = 0;
@ -574,10 +574,10 @@ static uint8 peep_assess_surroundings(sint16 center_x, sint16 center_y, sint16 c
uint16 nearby_music = 0;
uint16 num_rubbish = 0;
sint16 initial_x = max(center_x - 160, 0);
sint16 initial_y = max(center_y - 160, 0);
sint16 final_x = min(center_x + 160, 8192);
sint16 final_y = min(center_y + 160, 8192);
sint16 initial_x = max(centre_x - 160, 0);
sint16 initial_y = max(centre_y - 160, 0);
sint16 final_x = min(centre_x + 160, 8192);
sint16 final_y = min(centre_y + 160, 8192);
for (sint16 x = initial_x; x < final_x; x += 32){
for (sint16 y = initial_y; y < final_y; y += 32){
@ -644,8 +644,8 @@ static uint8 peep_assess_surroundings(sint16 center_x, sint16 center_y, sint16 c
for (uint16 sprite_idx = gSpriteListHead[SPRITE_LIST_LITTER]; sprite_idx != SPRITE_INDEX_NULL; sprite_idx = litter->next) {
litter = &(get_sprite(sprite_idx)->litter);
sint16 dist_x = abs(litter->x - center_x);
sint16 dist_y = abs(litter->y - center_y);
sint16 dist_x = abs(litter->x - centre_x);
sint16 dist_y = abs(litter->y - centre_y);
if (max(dist_x, dist_y) <= 160) {
num_rubbish++;
}
@ -2179,7 +2179,7 @@ static void peep_try_get_up_from_sitting(rct_peep* peep){
peep->state = PEEP_STATE_WALKING;
peep_window_state_update(peep);
// Set destination to the center of the tile.
// Set destination to the centre of the tile.
peep->destination_x = (peep->x & 0xFFE0) + 16;
peep->destination_y = (peep->y & 0xFFE0) + 16;
peep->destination_tolerence = 5;
@ -2245,7 +2245,7 @@ static void peep_update_sitting(rct_peep* peep){
peep->state = PEEP_STATE_WALKING;
peep_window_state_update(peep);
// Set destination to the center of the tile
// Set destination to the centre of the tile
peep->destination_x = (peep->x & 0xFFE0) + 16;
peep->destination_y = (peep->y & 0xFFE0) + 16;
peep->destination_tolerence = 5;
@ -5310,7 +5310,7 @@ static void peep_update_watching(rct_peep* peep){
peep->state = PEEP_STATE_WALKING;
peep_window_state_update(peep);
peep_update_sprite_type(peep);
// Send peep to the center of current tile.
// Send peep to the centre of current tile.
peep->destination_x = (peep->x & 0xFFE0) + 16;
peep->destination_y = (peep->y & 0xFFE0) + 16;
peep->destination_tolerence = 5;
@ -7933,7 +7933,7 @@ static sint32 peep_update_queue_position(rct_peep* peep, uint8 previous_action){
*
* rct2: 0x00693EF2
*/
static sint32 peep_return_to_center_of_tile(rct_peep* peep){
static sint32 peep_return_to_centre_of_tile(rct_peep* peep){
peep->direction ^= (1 << 1);
peep->destination_x = (peep->x & 0xFFE0) + 16;
peep->destination_y = (peep->y & 0xFFE0) + 16;
@ -7965,7 +7965,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
// Default guest/staff behaviour attempting to enter a
// ride exit is to turn around.
peep->interaction_ride_index = 0xFF;
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
if (entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE){
@ -7973,7 +7973,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
// Default staff behaviour attempting to enter a
// ride entrance is to turn around.
peep->interaction_ride_index = 0xFF;
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
if (peep->state == PEEP_STATE_QUEUING){
@ -7989,7 +7989,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
// the path tile and without trying any other ride
// attached to this path tile. i.e. stick with the
// peeps previous decision not to go on the ride.
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
peep->var_F4 = 0;
uint8 stationNum = (map_element->properties.entrance.index >> 4) & 0x7;
@ -8000,7 +8000,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
// Peep remembers that this is the last ride they
// considered while on this path tile.
peep->interaction_ride_index = rideIndex;
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
// Guest has decided to go on the ride.
@ -8036,24 +8036,24 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
// PARK_ENTRANCE
if (peep->type == PEEP_TYPE_STAFF)
// Staff cannot leave the park, so go back.
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
// If not the center of the entrance arch
// If not the centre of the entrance arch
if (map_element->properties.entrance.index & 0xF)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
uint8 entranceDirection = map_element->type & MAP_ELEMENT_DIRECTION_MASK;
if (entranceDirection != peep->direction){
if ((entranceDirection ^ (1 << 1)) != peep->direction)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
// Peep is leaving the park.
if (peep->state != PEEP_STATE_WALKING)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)){
// If the park is open and leaving flag isn't set return to center
// If the park is open and leaving flag isn't set return to centre
if (gParkFlags & PARK_FLAGS_PARK_OPEN)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
peep->destination_x += TileDirectionDelta[peep->direction].x;
@ -8081,14 +8081,14 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
// Peep is entering the park.
if (peep->state != PEEP_STATE_ENTERING_PARK)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
if (!(gParkFlags & PARK_FLAGS_PARK_OPEN)){
peep->state = PEEP_STATE_LEAVING_PARK;
peep->var_37 = 1;
decrement_guests_heading_for_park();
peep_window_state_update(peep);
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
uint8 entranceIndex = 0;
@ -8145,7 +8145,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
peep->var_37 = 1;
decrement_guests_heading_for_park();
peep_window_state_update(peep);
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
money16 entranceFee = park_get_entrance_fee();
@ -8167,7 +8167,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc
peep->var_37 = 1;
decrement_guests_heading_for_park();
peep_window_state_update(peep);
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
gTotalIncomeFromAdmissions += entranceFee;
@ -8345,11 +8345,11 @@ static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_ma
sint16 z = map_element->base_height * 8;
if (!map_is_location_owned(x, y, z)){
if (peep->outside_of_park == 0)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
else{
if (peep->outside_of_park == 1)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
if (peep->type == PEEP_TYPE_GUEST &&
@ -8384,7 +8384,7 @@ static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_ma
* Decide whether to go on the ride. */
if (!peep_should_go_on_ride(peep, rideIndex, stationNum, PEEP_RIDE_DECISION_AT_QUEUE)){
// Peep has decided not to go on the ride.
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
}
else {
@ -8449,23 +8449,23 @@ static sint32 peep_interact_with_shop(rct_peep* peep, sint16 x, sint16 y, rct_ma
return 0;
if (peep->type == PEEP_TYPE_STAFF)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
peep->var_F4 = 0;
if (ride->status != RIDE_STATUS_OPEN)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
if (peep->interaction_ride_index == rideIndex)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_PEEP_SHOULD_GO_INSIDE_FACILITY)){
peep->var_F4 = 0;
if (!peep_should_go_on_ride(peep, rideIndex, 0, 0))
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
money16 cost = ride->price;
if (cost != 0 && !(gParkFlags & PARK_FLAGS_NO_MONEY)) {
@ -10461,7 +10461,7 @@ static sint32 peep_perform_next_action(rct_peep *peep)
if (peep->outside_of_park == 1){
_unk_F1EE18 |= F1EE18_OUTSIDE_PARK;
}
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32);
@ -10503,16 +10503,16 @@ static sint32 peep_perform_next_action(rct_peep *peep)
}
if (!map_is_location_in_park(x & 0xFFE0, y & 0xFFE0)){
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
mapElement = map_get_surface_element_at(x / 32, y / 32);
if (mapElement == NULL)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
sint16 water_height = mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK;
if (water_height)
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
peep->next_x = x & 0xFFE0;
peep->next_y = y & 0xFFE0;
@ -10526,7 +10526,7 @@ static sint32 peep_perform_next_action(rct_peep *peep)
return 1;
}
}
return peep_return_to_center_of_tile(peep);
return peep_return_to_centre_of_tile(peep);
}
/**

6
src/openrct2/peep/peep.h
View File

@ -464,16 +464,16 @@ typedef struct rct_peep {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18

18
src/openrct2/rct1.h
View File

@ -209,16 +209,16 @@ typedef struct rct1_unk_sprite {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18
@ -242,16 +242,16 @@ typedef struct rct1_vehicle {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18
@ -358,16 +358,16 @@ typedef struct rct1_peep {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18

8
src/openrct2/ride/gentle/maze.c
View File

@ -31,14 +31,14 @@ enum {
};
enum {
SPR_MAZE_OFFSET_WALL_CENTER = 0,
SPR_MAZE_OFFSET_WALL_CENTRE = 0,
SPR_MAZE_OFFSET_WALL_INNER_NE_SW,
SPR_MAZE_OFFSET_WALL_INNER_NW_SE,
SPR_MAZE_OFFSET_WALL_TOP_LEFT,
SPR_MAZE_OFFSET_WALL_TOP_RIGHT,
SPR_MAZE_OFFSET_WALL_BOTTOM_RIGHT,
SPR_MAZE_OFFSET_WALL_BOTTOM_LEFT,
SPR_MAZE_OFFSET_COLUMN_CENTER,
SPR_MAZE_OFFSET_COLUMN_CENTRE,
SPR_MAZE_OFFSET_COLUMN_TOP_RIGHT,
SPR_MAZE_OFFSET_COLUMN_TOP_LEFT,
SPR_MAZE_OFFSET_COLUMN_BOTTOM_LEFT,
@ -73,7 +73,7 @@ static void maze_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 directi
base_image_id |= gTrackColours[SCHEME_MISC];
image_id = base_image_id + SPR_MAZE_OFFSET_WALL_CENTER;
image_id = base_image_id + SPR_MAZE_OFFSET_WALL_CENTRE;
if (maze_entry & (1 << 3))
sub_98197C(image_id, 2, 2, 10, 10, 9, height, 3, 3, height + 2, rotation);
@ -166,7 +166,7 @@ static void maze_paint_setup(uint8 rideIndex, uint8 trackSequence, uint8 directi
if (maze_entry & (1 << 2 | 1 << 6 | 1 << 10 | 1 << 14)) {
sub_98197C(base_image_id + SPR_MAZE_OFFSET_COLUMN_CENTER, 14, 14, 2, 2, 8, height, 15, 15, height + 2, rotation);
sub_98197C(base_image_id + SPR_MAZE_OFFSET_COLUMN_CENTRE, 14, 14, 2, 2, 8, height, 15, 15, height + 2, rotation);
paint_util_set_segment_support_height(SEGMENT_C4, height + 12, 0x20);
}

16
src/openrct2/ride/gentle/spiral_slide.c
View File

@ -22,19 +22,19 @@
enum {
SPIRAL_SLIDE_LEFT_R0 = 20548,
SPIRAL_SLIDE_CENTER_R0 = 20549,
SPIRAL_SLIDE_CENTRE_R0 = 20549,
SPIRAL_SLIDE_RIGHT_R0 = 20550,
SPIRAL_SLIDE_LEFT_R1 = 20551,
SPIRAL_SLIDE_CENTER_R1 = 20552,
SPIRAL_SLIDE_CENTRE_R1 = 20552,
SPIRAL_SLIDE_RIGHT_R1 = 20553,
SPIRAL_SLIDE_LEFT_R2 = 20554,
SPIRAL_SLIDE_CENTER_R2 = 20555,
SPIRAL_SLIDE_CENTRE_R2 = 20555,
SPIRAL_SLIDE_RIGHT_R2 = 20556,
SPIRAL_SLIDE_LEFT_R3 = 20557,
SPIRAL_SLIDE_CENTER_R3 = 20558,
SPIRAL_SLIDE_CENTRE_R3 = 20558,
SPIRAL_SLIDE_RIGHT_R3 = 20559,
SPIRAL_SLIDE_INSIDE_R1 = 20560,
@ -88,16 +88,16 @@ static void spiral_slide_paint_tile_front(uint8 rideIndex, uint8 trackSequence,
}
if (direction == 0) {
image_id = SPIRAL_SLIDE_CENTER_R0 | gTrackColours[SCHEME_TRACK];
image_id = SPIRAL_SLIDE_CENTRE_R0 | gTrackColours[SCHEME_TRACK];
sub_98197C(image_id, 16, 16, 16, 8, 108, height, 0, 8, height + 3, get_current_rotation());
} else if (direction == 1) {
image_id = SPIRAL_SLIDE_CENTER_R1 | gTrackColours[SCHEME_TRACK];
image_id = SPIRAL_SLIDE_CENTRE_R1 | gTrackColours[SCHEME_TRACK];
sub_98197C(image_id, 16, 16, 2, 16, 108, height, 14, 0, height + 3, get_current_rotation());
} else if (direction == 2) {
image_id = SPIRAL_SLIDE_CENTER_R2 | gTrackColours[SCHEME_TRACK];
image_id = SPIRAL_SLIDE_CENTRE_R2 | gTrackColours[SCHEME_TRACK];
sub_98197C(image_id, 16, 16, 16, 2, 108, height, 0, 14, height + 3, get_current_rotation());
} else if (direction == 3) {
image_id = SPIRAL_SLIDE_CENTER_R3 | gTrackColours[SCHEME_TRACK];
image_id = SPIRAL_SLIDE_CENTRE_R3 | gTrackColours[SCHEME_TRACK];
sub_98197C(image_id, 16, 16, 8, 16, 108, height, 8, 0, height + 3, get_current_rotation());
}

6
src/openrct2/ride/vehicle.h
View File

@ -92,16 +92,16 @@ typedef struct rct_vehicle {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18

2
src/openrct2/windows/guest.c
View File

@ -1003,7 +1003,7 @@ void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
}
// Draw the centered label
// Draw the centred label
uint32 argument1, argument2;
rct_peep* peep = GET_PEEP(w->number);
get_arguments_from_action(peep, &argument1, &argument2);

16
src/openrct2/windows/map.c
View File

@ -176,7 +176,7 @@ static uint8 (*_mapImageData)[MAP_WINDOW_MAP_SIZE][MAP_WINDOW_MAP_SIZE];
static sint32 _nextPeepSpawnIndex = 0;
static void window_map_init_map();
static void window_map_center_on_view_point();
static void window_map_centre_on_view_point();
static void window_map_show_default_scenario_editor_buttons(rct_window *w);
static void window_map_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi);
static void window_map_paint_peep_overlay(rct_drawpixelinfo *dpi);
@ -250,7 +250,7 @@ void window_map_open()
window_map_init_map();
gWindowSceneryRotation = 0;
window_map_center_on_view_point();
window_map_centre_on_view_point();
// Reset land tool size
gLandToolSize = 1;
@ -267,7 +267,7 @@ void window_map_reset()
}
window_map_init_map();
window_map_center_on_view_point();
window_map_centre_on_view_point();
}
/**
@ -431,7 +431,7 @@ static void window_map_update(rct_window *w)
if (get_current_rotation() != w->map.rotation) {
w->map.rotation = get_current_rotation();
window_map_init_map();
window_map_center_on_view_point();
window_map_centre_on_view_point();
}
for (sint32 i = 0; i < 16; i++)
@ -913,7 +913,7 @@ static void window_map_init_map()
*
* rct2: 0x0068C990
*/
static void window_map_center_on_view_point()
static void window_map_centre_on_view_point()
{
rct_window *w = window_get_main();
rct_window *w_map;
@ -929,7 +929,7 @@ static void window_map_center_on_view_point()
rct_xy16 offset = MiniMapOffsets[get_current_rotation()];
// calculate center view point of viewport and transform it to minimap coordinates
// calculate centre view point of viewport and transform it to minimap coordinates
cx = ((w->viewport->view_width >> 1) + w->viewport->view_x) >> 5;
dx = ((w->viewport->view_height >> 1) + w->viewport->view_y) >> 4;
@ -1401,7 +1401,7 @@ static void map_window_increase_map_size()
gMapSizeMaxXY = ((gMapSize - 1) * 32) - 1;
map_extend_boundary_surface();
window_map_init_map();
window_map_center_on_view_point();
window_map_centre_on_view_point();
gfx_invalidate_screen();
}
@ -1422,7 +1422,7 @@ static void map_window_decrease_map_size()
gMapSizeMaxXY = ((gMapSize - 1) * 32) - 1;
map_remove_out_of_range_elements();
window_map_init_map();
window_map_center_on_view_point();
window_map_centre_on_view_point();
gfx_invalidate_screen();
}

2
src/openrct2/windows/player.c
View File

@ -613,7 +613,7 @@ static void window_player_update_viewport(rct_window *w, bool scroll)
rct_xyz16 coord = network_get_player_last_action_coord(playerIndex);
if (coord.x != 0 || coord.y != 0 || coord.z != 0) {
sint32 viewX, viewY;
center_2d_coordinates(coord.x, coord.y, coord.z, &viewX, &viewY, viewport);
centre_2d_coordinates(coord.x, coord.y, coord.z, &viewX, &viewY, viewport);
// Don't scroll if the view was originally undefined
if (w->var_492 == -1) {

2
src/openrct2/windows/staff.c
View File

@ -915,7 +915,7 @@ void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
}
// Draw the centered label
// Draw the centred label
uint32 argument1, argument2;
rct_peep* peep = GET_PEEP(w->number);
get_arguments_from_action(peep, &argument1, &argument2);

4
src/openrct2/windows/text_input.c
View File

@ -127,7 +127,7 @@ void window_text_input_open(rct_window* call_w, rct_widgetindex call_widget, rct
sint32 height = no_lines * 10 + WH;
// Window will be in the center of the screen
// Window will be in the centre of the screen
rct_window* w = window_create_centred(
WW,
height,
@ -188,7 +188,7 @@ void window_text_input_raw_open(rct_window* call_w, rct_widgetindex call_widget,
sint32 height = no_lines * 10 + WH;
// Window will be in the center of the screen
// Window will be in the centre of the screen
rct_window* w = window_create_centred(
WW,
height,

24
src/openrct2/world/sprite.h
View File

@ -51,16 +51,16 @@ typedef struct rct_unk_sprite {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18
@ -245,16 +245,16 @@ typedef struct rct_crashed_vehicle_particle {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18
@ -288,16 +288,16 @@ typedef struct rct_crash_splash {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18
@ -318,16 +318,16 @@ typedef struct rct_steam_particle {
uint16 next; // 0x04
uint16 previous; // 0x06
uint8 linked_list_type_offset; // 0x08 Valid values are SPRITE_LINKEDLIST_OFFSET_...
// Height from center of sprite to bottom
// Height from centre of sprite to bottom
uint8 sprite_height_negative; // 0x09
uint16 sprite_index; // 0x0A
uint16 flags; // 0x0C
sint16 x; // 0x0E
sint16 y; // 0x10
sint16 z; // 0x12
// Width from center of sprite to edge
// Width from centre of sprite to edge
uint8 sprite_width; // 0x14
// Height from center of sprite to top
// Height from centre of sprite to top
uint8 sprite_height_positive; // 0x15
sint16 sprite_left; // 0x16
sint16 sprite_top; // 0x18