mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity
10,243 Commits 8 Branches 59 Tags
ca27018231ebd032f4cc1e947dfb09fd4750f4c6
Commit Graph

116 Commits

Author SHA1 Message Date
Ted John
abc3835d7b Rename openrct2.c h to OpenRCT2.c h 2016-12-14 00:32:06 +00:00
Michał Janiszewski
1ae2ca54f7 Sort includes 2016-12-01 16:03:16 +01:00
Michał Janiszewski
54e622659d Extract common parts from rct2.h to common.h 2016-12-01 16:03:16 +01:00
Michał Janiszewski
ecec752dec Remove some unused headers 2016-12-01 09:20:56 +01:00
Michał Janiszewski
44e9129af5 Remove unused semicolons after end of function 
[ci skip]
 2016-11-09 13:15:46 +01:00
Michał Janiszewski
b164c2be61 Extract openrct2_assert to guard.h (#4753) 
* Extract openrct2_assert to Guard.hpp

`openrct2_assert` is not defined in util.c and including all of
openrct2.h is unnecessary.
 2016-11-06 21:02:25 +01:00
Alexander Overvoorde
9c52e36332 Fix #4648: Fix title music playing during intro sequence 
The title screen music already started playing during the intro sequence
if it was enabled. This commit changes the behaviour such that the title
music only starts playing once the title screen actually shows up.
 2016-10-18 17:35:51 +01:00
Jonathan Haas
e0a166d3a3 Reduce volume of toilet sound 2016-10-17 21:42:32 +02:00
Ted John
862b715003 Fix #4522: Theme music doesn't stop when connected to paused server 
Refactor audio initialisation and stop all music and sounds when the screen mode changes.
 2016-10-03 18:14:34 +01:00
Michał Janiszewski
f8145b6edc Refactor inclusion of addresses.h 
addresses.h is now only included when necessary, limiting scope as much
as possible.
 2016-09-03 21:25:19 +01:00
Ted John
8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Marijn van der Werf
5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Michał Janiszewski
644a36a310 Fixes to -Wall compilation 
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
 2016-06-20 13:46:27 +01:00
Michał Janiszewski
1508e49a28 Change macro to assert_struct_size 2016-06-03 11:29:50 +02:00
Michał Janiszewski
934ce5e84e Fix 64 bit by skipping static_asserts for structs with pointers 2016-06-03 10:55:21 +02:00
Michał Janiszewski
60630b9ad7 Drop PACKED attribute 2016-06-03 10:55:21 +02:00
Michał Janiszewski
df3030e4a9 Provide static_assert for hard-coded struct sizes. 2016-06-03 10:55:21 +02:00
Michał Janiszewski
3907fcd9d2 Explicitly pack structs 2016-06-03 10:55:21 +02:00
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Ted John
98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John
4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Ted John
85c553dc72 fix #3393: prevent crash when title music can't load 2016-04-22 23:46:58 +01:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Yaroslav Tretyakov
90a4cafc87 Fix #3307, ride music discrepancy with original (#3319) 2016-04-16 14:09:22 +01:00
IntelOrca
89ad0cc769 store windows in openrct2 memory and increase max 
Allocate a bigger window list and viewport list in OpenRCT2 static memory and move over all references from RCT2.
This also removes the 'active' viewport pointer list and instead changes everything to just enumerate the whole viewport list
 2016-04-14 23:00:35 +01:00
janisozaur
e61b6ffdde Cleanups, init variables 2016-04-03 14:21:50 +01:00
Michał Janiszewski
c0caf2d222 Minor fixes 2016-02-26 11:40:07 +01:00
IntelOrca
7b97721653 cap sound volume on title screen, closes #2487 2016-02-24 23:21:36 +00:00
IntelOrca
b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
IntelOrca
13921111f3 remove old RCT2 cursor code and RCT2 error location variable 2016-02-16 20:30:43 +00:00
IntelOrca
d67d6a4831 add more core classes 2016-02-03 18:23:41 +00:00
Michał Janiszewski
3bf1e0e06d Rename safe_strncpy to safe_strcpy 2016-01-18 20:49:52 +01:00
IntelOrca
cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
Michał Janiszewski
ac8aec63bc Skip "Default sound device" on Linux 
Sound on Linux is handled by PulseAudio, which creates a sink and offers
a central place to control which sources are distributed how and where.

Applications in general are expected to only offer volume controls.

Tested with 0 A.D., SuperTuxKart and a few media players, none of which
offers selecting sink directly.

As per https://en.wikipedia.org/wiki/PulseAudio#Adoption it should
covert vast majority of uses.
 2016-01-11 13:59:41 +01:00
Michał Janiszewski
e666a24c82 Merge branch 'develop' into vehicle-update 
Conflicts:
	projects/openrct2.vcxproj.filters
	src/audio/mixer.cpp
	src/windows/ride.c
 2015-12-22 14:57:40 +01:00
LRFLEW
d769a13206 Fixed extern and enum name usage 2015-12-16 14:48:27 -06:00
Michał Janiszewski
98e204552a countof with type safety 
For reference see http://www.g-truc.net/post-0708.html and
http://lxr.free-electrons.com/source/include/linux/kernel.h#L54

This will provide a type-safe mechanism for counting elements of array.
If you try passing something which cannot be counted, compiler will
frown at you right away.
 2015-12-15 00:28:58 +01:00
duncanspumpkin
c00669c942 Merge sub_6DAB4C into vehicle-update 2015-12-14 21:56:00 +00:00
Kyle Kirby
caf07c2064 Clean up the comments a litte 
• Make comment heads be /**
• Make rct2 addresses be double spaced indented
• Make there be a space afte rct2: and the address
• Make single-line rct2 addresses be full block comments
• Move description of method to top of comment
 2015-12-11 16:19:46 -06:00
duncanspumpkin
2661622dce Fix some of the sound bugs. Note this has diverged needs attention 2015-12-05 10:49:12 +00:00
IntelOrca
c6056cbb6c Merge branch 'pre-release-0.0.3' into develop 
Conflicts:
	src/audio/audio.c
 2015-11-27 22:05:40 +00:00
duncanspumpkin
5bd3b8d6af Implement util_rand due to rand having a poor range on some platforms 2015-11-20 21:40:36 +00:00
Dom Light
92a30e0a32 Add missing return documentation 
[skip ci]
 2015-11-18 00:20:22 +00:00
Dom Light
a07333aeaf Move memory address documentation to header file 2015-11-18 00:11:31 +00:00
Dom Light
bb62b7561a Replace some uses of play_sound_panned with play_sound_at_location 2015-11-18 00:03:15 +00:00
Dom Light
e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
Dom Light
bbc58830f3 Allow lines to be 128 characters 2015-11-17 20:07:39 +00:00
Dom Light
72b6a1e74b Add parens and use coordinate_3d_to_2d in audio.c 2015-11-17 20:01:30 +00:00
Dom Light
b9d48d2f9b Document audio.h 2015-11-17 01:05:22 +00:00
Dom Light
b736de003e Sanitize audio.c 2015-11-17 01:05:21 +00:00