1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Commit Graph

55 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
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
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
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
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
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
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
d67d6a4831 add more core classes 2016-02-03 18:23:41 +00: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
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
2661622dce Fix some of the sound bugs. Note this has diverged needs attention 2015-12-05 10:49:12 +00:00
Dom Light
3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
Michał Janiszewski
2b02a04114 Use C++'s std::abs instead of C's to get floats
C's abs() will only work on int values, only std::abs will get floats.
2015-11-11 08:16:36 +01:00
Michał Janiszewski
be32b5e5f4 Init all fields in audio classes 2015-11-02 22:58:15 +01:00
Daniël Heres
fdbd08e306 Calculate correct d_left / d_right 2015-10-23 14:06:38 +02:00
Daniël Heres
831dc631c8 Optimize Mixer::EffectPanS16 2015-10-23 12:40:35 +02:00
IntelOrca
be7d3d5b54 do not do any sound / music operations when in headless mode 2015-10-20 22:15:48 +01:00
Michał Janiszewski
7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
zsilencer
cf78d76bdf make disable volume on focus lost not reset title music 2015-10-17 11:48:39 -06:00
zsilencer
9ac89c2b5e remove directsound and get sound working for linux native 2015-09-23 09:42:55 -06:00
Michał Janiszewski
1bd8e11c0f Make it work on Linux
Right now the project is decompiled to the point where it is feasible to
try porting it to another platform. It doesn't work 100% correctly, but
it's nearing this state.

To port it to Linux I mmapped the openrct2.exe into expected places,
disabled two offending calls (RCT2_CALLPROC_EBPSAFE(0x0040701D) and
RCT2_CALLPROC_X(0x006E7FF3…)), replaced memory management routines
with generic ones and removed all the function-pointer calls.

A basic, non-exhaustive check is included to verify that memory is
loaded correctly in place.

That last bit is probably the most intrusive one, but had to be done, as
the calling convention on Linux differs from the one on Windows. It
could possibly be emulated (just like RCT2_CALLFUNC_X) until dependency
on exe is dropped.

It is possible to completely remove calls out to original code by
commenting out contents of RCT2_CALLFUNC_X, right now this will yield
working UI, but no rendering of peeps, rides or rest of world. This can
be used as a benchmark or test platform for correctness of
implementation. The data sections will still be required for now.

Assets are expected to be in specific places, so to launch it, following
needs to satisified:
* $build/data/ has to have contents of $RCT2/Data/
* $build/data/ (same as above) has to have contents of $repo/data/
* $build/ObjData/ has to have contents of $RCT2/ObjData/
* $build/../openrct2.exe has to be $repo/openrct2.exe (as of 976ea0d)
Keep in mind you can symlink stuff and that filesystems are case
sensitive!
You can copy more of required data to possibly improve your experience.

Pretty much all of this commit will possibly have to be reverted by the
time OpenRCT2 gains independence.

Remember to build with -DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON
2015-09-23 00:04:40 +02:00
Michał Janiszewski
4df8761831 remove windows-only code
Step 1 on road towards Linux.

Remove windows-specific code, stub it out where needed and make sure we
can still compile it the way it is.

Take care of Travis' build matrix to include new build configuration.

Install new packages.
2015-09-18 16:01:38 +02:00
IntelOrca
bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
IntelOrca
f0100a71a7 use windows lean and mean to reduce definition conflicts 2015-08-29 13:13:22 +01:00
zsilencer
1d811a5692 improve chat feature 2015-08-14 09:13:39 -06:00
IntelOrca
cac0f2ab52 upgrade to VS2015 compiler 2015-08-03 23:16:30 +01:00
zsilencer
ca6c3d68aa fix #1155 2015-07-14 16:45:25 -06:00
zsilencer
b876591543 use SDL_RWops for save games 2015-07-11 12:27:46 +01:00
zsilencer
71ae580483 fixes #1230 and #1212 2015-06-05 01:02:02 -06:00
zsilencer
c6e63d5d25 add volume control in options 2015-06-04 16:31:54 -06:00
zsilencer
86ce94f8e9 fix #1101 and reorganize the tune lists 2015-05-20 18:25:26 -06:00
zsilencer
bcad8c200e #1042 2015-05-06 19:15:00 -06:00
zsilencer
9296cfd334 fix audio panning 2015-05-06 19:15:00 -06:00
zsilencer
71e21c2a6c refactor mixer, add support for streamed music 2015-04-25 09:28:28 -06:00
IntelOrca
e4914085ad convert Windows-1252 to UTF8 where necessary, fixes #744 2015-02-05 17:34:51 +00:00
IntelOrca
4fc91adce2 fix error that occured when samples failed to load 2015-02-04 19:11:41 +00:00
zsilencer
2dcd3b4935 use mixer for ride music 2014-11-13 19:51:02 -07:00
zsilencer
98d27b44fd fix things 2014-10-15 20:03:15 -06:00
zsilencer
6628a4eace 0x006BC3AC, 0x00405199, 0x00404E0D, sort audio functions by address, volume fading 2014-10-15 20:03:15 -06:00
IntelOrca
71e508c416 refactor various platform functions and includes 2014-10-09 14:03:54 +01:00
zsilencer
6d2616b0ca fix #513 2014-10-08 12:15:16 -06:00