mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Code Issues Releases Wiki Activity

Merge pull request #10854 from tupaschoal/coords-3

Browse Source 
Increase usage of ScreenCoordsXY on viewport functions and structs
This commit is contained in:
Michael Steenbeek
2020-03-05 12:21:04 +01:00
committed by GitHub
parent 5e2b1180f8 8883f428ba
commit 8351a0477d
92 changed files with 1587 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/ride/Vehicle.cpp
View File

@@ -880,8 +880,8 @@ bool Vehicle::SoundCanPlay() const
if (g_music_tracking_viewport == nullptr)
return false;
int16_t left = g_music_tracking_viewport->view_x;
int16_t bottom = g_music_tracking_viewport->view_y;
int16_t left = g_music_tracking_viewport->viewPos.x;
int16_t bottom = g_music_tracking_viewport->viewPos.y;
int16_t quarter_w = g_music_tracking_viewport->view_width / 4;
int16_t quarter_h = g_music_tracking_viewport->view_height / 4;
@@ -937,9 +937,9 @@ rct_vehicle_sound_params Vehicle::CreateSoundParam(uint16_t priority) const
{
rct_vehicle_sound_params param;
param.priority = priority;
int32_t panX = (sprite_left / 2) + (sprite_right / 2) - g_music_tracking_viewport->view_x;
int32_t panX = (sprite_left / 2) + (sprite_right / 2) - g_music_tracking_viewport->viewPos.x;
panX >>= g_music_tracking_viewport->zoom;
panX += g_music_tracking_viewport->x;
panX += g_music_tracking_viewport->pos.x;
uint16_t screenWidth = context_get_width();
if (screenWidth < 64)
@@ -948,9 +948,9 @@ rct_vehicle_sound_params Vehicle::CreateSoundParam(uint16_t priority) const
}
param.pan_x = ((((panX * 65536) / screenWidth) - 0x8000) >> 4);
int32_t panY = (sprite_top / 2) + (sprite_bottom / 2) - g_music_tracking_viewport->view_y;
int32_t panY = (sprite_top / 2) + (sprite_bottom / 2) - g_music_tracking_viewport->viewPos.y;
panY >>= g_music_tracking_viewport->zoom;
panY += g_music_tracking_viewport->y;
panY += g_music_tracking_viewport->pos.y;
uint16_t screenHeight = context_get_height();
if (screenHeight < 64)