mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 15:23:01 +01:00
Code Issues Releases Wiki Activity

Add parens and use coordinate_3d_to_2d in audio.c

Browse Source
This commit is contained in:
Dom Light
2015-11-17 20:01:30 +00:00
parent b9d48d2f9b
commit 72b6a1e74b
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/audio/audio.c
View File

@@ -111,26 +111,13 @@ int audio_sound_play_panned(int soundId, int ebx, sint16 x, sint16 y, sint16 z)
if (element && (element->base_height * 8) - 5 > z) if (element && (element->base_height * 8) - 5 > z)
volumeDown = 10; volumeDown = 10;
sint16 rx; uint8 rotation = get_current_rotation();
sint16 ry; rct_xyz16 pos3;
switch (get_current_rotation()) { pos3.x = x;
case 0: pos3.y = y;
rx = y - x; pos3.z = z;
ry = ((y + x) / 2) - z;
break; rct_xy16 pos2 = coordinate_3d_to_2d(&pos3, rotation);
case 1:
rx = -x - y;
ry = ((y - x) / 2) - z;
break;
case 2:
rx = x - y;
ry = ((-y - x) / 2) - z;
break;
case 3:
rx = y + x;
ry = ((x - y) / 2) - z;
break;
}
rct_window *window = RCT2_GLOBAL( rct_window *window = RCT2_GLOBAL(
RCT2_ADDRESS_NEW_WINDOW_PTR, RCT2_ADDRESS_NEW_WINDOW_PTR,
@@ -143,8 +130,8 @@ int audio_sound_play_panned(int soundId, int ebx, sint16 x, sint16 y, sint16 z)
} }
rct_viewport *viewport = window->viewport; rct_viewport *viewport = window->viewport;
if (viewport && viewport->flags & VIEWPORT_FLAG_SOUND_ON) { if (viewport && viewport->flags & VIEWPORT_FLAG_SOUND_ON) {
sint16 vy = ry - viewport->view_y; sint16 vy = pos2.y - viewport->view_y;
sint16 vx = rx - viewport->view_x; sint16 vx = pos2.x - viewport->view_x;
ebx = viewport->x + (vx >> viewport->zoom); ebx = viewport->x + (vx >> viewport->zoom);
volume = RCT2_ADDRESS(0x0099282C, int)[soundId] volume = RCT2_ADDRESS(0x0099282C, int)[soundId]
+ ((-1024 * viewport->zoom - 1) << volumeDown) + 1; + ((-1024 * viewport->zoom - 1) << volumeDown) + 1;
@@ -188,7 +175,7 @@ int audio_sound_play_panned(int soundId, int ebx, sint16 x, sint16 y, sint16 z)
*/ */
void audio_start_title_music() void audio_start_title_music()
{ {
if (gGameSoundsOff || !RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TITLE_DEMO) { if (gGameSoundsOff || !(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TITLE_DEMO)) {
audio_stop_title_music(); audio_stop_title_music();
return; return;
} }