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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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;