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

Merge branch 'master' into ride-window

Browse Source 
Conflicts:
	src/peep.c
	src/peep.h
	src/ride.c
	src/ride.h
	src/vehicle.h
This commit is contained in:
IntelOrca
2014-09-19 22:11:20 +01:00
parent fef1427271 78aa9c706b
commit 828dabc9be
39 changed files with 3902 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/window.c
View File

@@ -383,7 +383,7 @@ rct_window *window_create(int x, int y, int width, int height, uint32 *event_han
// Play sounds and flash the window
if (!(flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT))){
w->flags |= WF_WHITE_BORDER_MASK;
sound_play_panned(SOUND_WINDOW_OPEN, x + (width / 2));
sound_play_panned(SOUND_WINDOW_OPEN, x + (width / 2), 0, 0, 0);
}
w->number = 0;