mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,859 Commits 8 Branches 40 Tags 367 MiB
Commit Graph

3631 Commits

Author SHA1 Message Date
Duncan f34902f5cf Merge pull request #1989 from duncanspumpkin/footpath_from_track 
Implement game command footpath from track.
 2015-09-30 20:48:07 +01:00
duncanspumpkin ecc2f74b63 Implement game command footpath from track. 
Fixes #1954
 2015-09-29 23:07:07 +01:00
Michał Janiszewski 89846a088a platform time functions 2015-09-29 23:35:15 +02:00
Ted John 78e43e7ca4 Merge pull request #1983 from janisozaur/docker32 
Docker32
 2015-09-28 23:23:09 +01:00
Michał Janiszewski 9e62198546 Partially revert c93c1c7, for mingw builds only 
Conditionally restore old functionality which got broken for mingw
builds with commit c93c1c7. Allow building with old version of code, but
generate a warning when doing so.
 2015-09-29 00:13:27 +02:00
Michał Janiszewski a16de307d7 Refactor project build scripts 
This is mostly refactoring of cmake scripts, but also touches build.sh
and install.sh. The cmake should be much more palatable now for major
Linux distributions.

At the same time, new configuration is introduced to Linux version, one
with Twitch enabled.

Please note, however, this change requires update of orctlibs.zip for
mingw builds.
 2015-09-28 21:10:21 +02:00
Michał Janiszewski 5d1beb14c0 Platform, memory fixes 2015-09-28 19:35:06 +02:00
IntelOrca c6b0d0919d fix #1982 2015-09-28 18:10:41 +01:00
duncanspumpkin eaa44ab1e1 Fix #1854. Special track elements disable correctly. 
Issue was caused by a change I asked to be done a month back. Dropdowns are awkward windows the global array for dropdown content should be populated before creating them but not anything else as that will get reset. In this case the disabled items were reset. The same happens for highlighted index if that is specified before window creation
 2015-09-27 21:55:48 +01:00
duncanspumpkin 9e1e0748f3 Fix #1947. Maze entrances no longer modify hedges wrong. 
> Issue was caused by incorrectly translating btr and bts to C. In addition the operation was on a word and not a byte so it wouldn't change the maze correctly for all rotations. I've also refactored the code to make it a bit easier to follow.
 2015-09-27 21:33:19 +01:00
duncanspumpkin a697606211 Fix #1718. Incorrect cursors on scroll widgets. 
Issue was being caused by passing the incorrect x and y parameters due to missing a widget dereference. I've also moved the x/y coordinates of the hand open/close to closer match what it feels like.
 2015-09-27 16:55:34 +01:00
duncanspumpkin 1a0fc46559 Fix #1723 issue caused by failing to return. 
The logic would fall through to the ending code so that it would just make a beeline to the exit after walking to one corner.
 2015-09-27 16:21:45 +01:00
nightroan 8d3f7600fb As a multiplayer client, don't select the next track piece if is is unaffordable. 2015-09-26 16:01:04 -07:00
IntelOrca a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
IntelOrca 015c41f6ef fix #1744 2015-09-26 14:07:17 +01:00
IntelOrca 3835c8c109 fix inet_ntop signature issues 2015-09-26 13:48:24 +01:00
nightroan bd51c7ed80 Fixed #1939 by adding a callback to delay selection of the next piece until the server sends back the placement command. 2015-09-25 23:57:15 -07:00
IntelOrca 077f3a1995 refactor RCT2 PE setup. 2015-09-24 19:03:11 +01:00
zsilencer 266f1c1e37 make multiplayer work in linux 2015-09-24 18:39:15 +01:00
IntelOrca c93c1c738a fix network warnings by using new functions over deprecated 2015-09-24 18:30:14 +01:00
zsilencer 9ac89c2b5e remove directsound and get sound working for linux native 2015-09-23 09:42:55 -06:00
YamaArashi bc8bf39e1b paint setup current type constant 2015-09-22 15:43:42 -07:00
YamaArashi 7c8b0641d9 replace viewport flags numeric literals with constants 2015-09-22 15:30:19 -07: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 52e0b737be Drop initial null check from SafeFree 
Both free and delete treat nullptr the same way: as a no-op [1][2].

Get rid of checking if the pointer passed is a null one before acting on
it.

See stackoverflow.com/q/154136/do-while-and-if-else-statements-in in
case you are wondering why is it done this way.

[1] http://www.cplusplus.com/reference/cstdlib/free/
[2] http://www.cplusplus.com/reference/new/operator%20delete/
 2015-09-22 22:58:34 +02:00
Michał Janiszewski a3d407079f fix windows position clamping 2015-09-22 22:58:34 +02:00
Michał Janiszewski 8ec1054477 add missing parntheses 2015-09-22 22:58:34 +02:00
Michał Janiszewski 33d5e0b79f fix loop counter 2015-09-22 22:58:34 +02:00
Michał Janiszewski cf7c827d0d Fix possible null dereference and resource leak 2015-09-22 22:58:20 +02:00
Michał Janiszewski 5ceafd66a3 Fix memory leak in screenshot.c and guest.c 2015-09-22 22:58:20 +02:00
Michał Janiszewski 16eb4666ee Safely handle 'file not found' or wrong parameters 
`platform_enumerate_files_begin` (and it directory counterpart) can
return `-1`, make sure we handle that value properly when passed on
to `platform_enumerate_files_next` and `platform_enumerate_files_end`
 2015-09-22 08:33:40 +02:00
zsilencer 0af364a9b6 fix #1944 2015-09-21 10:41:09 -06:00
Michał Janiszewski 4ce0e3a8b2 Linux platform file 
Add bulk of the platform file for linux, change the compilation target
from shared library to executable for linux, provide necessary changes
to make it compile & load the stub of a process.

Make sure functions are marked as stubs where needed, and implementation
is expected.
 2015-09-20 23:19:08 +02:00
FlynnsPixel 5b99a587d5 Stopped infinite loop in boat_hire_return_point 2015-09-20 17:44:20 +10:00
Michał Janiszewski e0860bc3ab Make file paths use platform-specific separators 2015-09-19 09:29:39 +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
Ted John a762390abe Merge pull request #1936 from Gymnasiast/operating-modes 
Add cheat option to show all operating modes; cleanup
 2015-09-18 12:44:38 +01:00
Gymnasiast e2ec6e0970 Move 'show all operating modes' to Cheats window 2015-09-18 11:55:52 +02:00
Gymnasiast 4909272a44 Add cheat option to show all operating modes; cleanup 2015-09-18 10:54:48 +02:00
Michał Janiszewski ee96aaec8e reduce amount of times the pointer is freed to one 
track_list_cache is being free()d as part of track_load_list, which
is a better place to do so, as it has full ownership of that pointer.
 2015-09-15 00:23:46 +02:00
Michał Janiszewski 3ea534f758 make sure strings are properly terminated 2015-09-15 00:03:47 +02:00
Michał Janiszewski 02d83f860e In case any memory was allocated for lang pack, free it 2015-09-14 23:03:03 +02:00
Michał Janiszewski 34f56a262b Null-terminate buffer read from language packs 2015-09-14 22:59:44 +02:00
Michał Janiszewski d58b4e3589 memory safeness 
Just some more memory checks.

One memset appears to be wrong, is fixed now.

I think this might fix #1928, but please check.
 2015-09-13 21:45:57 +02:00
IntelOrca f988f69ae0 implement sub_6D31A6 2015-09-13 03:00:03 +01:00
Michał Janiszewski 42691726fc workaround for mingw bug 
For some reason mingw or sdl has trouble providing proper HWND, which
in turn prevents opening up a window for selecting file to save when
trying to convert save game to scenario.

Fixes #1486.
 2015-09-12 23:46:40 +02:00
IntelOrca 72398151a7 implement ride_create_cable_lift 2015-09-12 18:17:35 +01:00
Ted John daf61d0ca5 Merge pull request #1920 from Gymnasiast/fix-warnings-2 
Fix more warnings
 2015-09-12 13:54:22 +01:00
Michał Janiszewski 788e988992 Memory access fixes 2015-09-12 00:16:05 +02:00
Michał Janiszewski 27ea266de1 Incrementation of paint_struct pointer looks bogus 
Since the value incremented is a pointer, pointer arithmetics apply,
so instead of incrementing by 52, incrementation by 52^2 = 2704 takes
place, which was confirmed by inspecting generated listing.
 2015-09-11 22:53:01 +02:00
Ted John 94fe643b4c Merge pull request #1921 from Gymnasiast/fix-filters-in-rc-designer-2 
Fix filter buttons in RC designer and TD manager, clean up some strings
 2015-09-11 17:40:34 +01:00
Gymnasiast a6ee08de11 Fix filter buttons in RC designer and TD manager, clean up some strings 2015-09-11 16:21:27 +02:00
Gymnasiast 68fc066fc5 Fix two more warnings 2015-09-11 15:23:11 +02:00
Gymnasiast 6bd003c67f Fix more warnings 2015-09-11 15:13:54 +02:00
Gymnasiast 7e67f0381e Extend build-in-pause-mode to entrances and exits, clear up some flags, fix ghost sticking in pause mode, fixes #1918 2015-09-11 14:38:45 +02:00
IntelOrca 4dd95c650b implement RideData4 data 2015-09-10 22:16:41 +01:00
IntelOrca bda7550e33 fix #1913 2015-09-10 20:06:13 +01:00
Michał Janiszewski 17e635b8af In C++11 use actual pointer types instead of C's defines 
This is mostly `NULL` -> `nullptr` in cpp files, but I only noticed
because `LanguagePack::GetObjectOverride` and
`LanguagePack::GetScenarioOverride` were returning false instead of real
pointer.

Also fixes some whitespaces, you can `w=1` to github's URL to make it
skip these.
 2015-09-10 08:22:36 +02:00
IntelOrca 72b153115b fix #1909 2015-09-09 22:56:40 +01:00
IntelOrca b55d81e561 implement ride_set_start_finish_points 2015-09-09 22:14:43 +01:00
IntelOrca 88db4f12aa fix #1910 2015-09-09 20:25:34 +01:00
IntelOrca 289555c082 fix #1908 2015-09-09 19:22:41 +01:00
IntelOrca fddf057d68 add scenario overrides 2015-09-08 21:37:25 +01:00
Gymnasiast 188978936b Fix Math.Clamp definition 2015-09-08 21:37:24 +01:00
IntelOrca fc65a92275 fix object override strings for scenario editor and plugin.dat 2015-09-08 21:37:24 +01:00
IntelOrca fe7879f0a3 add capacity overriding 2015-09-08 21:37:23 +01:00
IntelOrca 34cd6a9242 fix GCC compile issue 2015-09-08 21:37:22 +01:00
IntelOrca 8085abadd3 add basic support for localisation object string overriding 2015-09-08 21:37:22 +01:00
IntelOrca 7a0478404e add new C++ memory utility functions 2015-09-08 21:37:21 +01:00
IntelOrca 952a4abdd1 implement DAT translation, part 1 2015-09-08 21:37:20 +01:00
IntelOrca 8ec51b6fc1 add FileStream, IStream and IDisposable 2015-09-08 21:37:20 +01:00
Ted John 2a0366721e Merge pull request #1896 from janisozaur/some_fixes 
assorted fixes
 2015-09-07 20:11:29 +01:00
Michał Janiszewski 52252f82b3 assorted fixes 2015-09-07 20:51:21 +02:00
IntelOrca f2beefb33b fix #1886 2015-09-07 18:43:31 +01:00
IntelOrca af39fcd35f fix #1873 2015-09-07 18:18:52 +01:00
IntelOrca 72000196dd use English UK DAT strings instead of RCT2 Korean strings until fix or workaround is available #1898 2015-09-07 17:35:39 +01:00
Gymnasiast 3ddddec21c Fix some warnings 2015-09-07 14:57:39 +02:00
IntelOrca efada641a5 implement map_place_fence_check_obstruction 2015-09-06 17:36:55 +01:00
IntelOrca 2753af893b implement map_obstruction_set_error_text 2015-09-06 13:37:00 +01:00
IntelOrca ed824d36b0 refactor two CALLPROC functions in track.c 2015-09-05 20:34:56 +01:00
IntelOrca 8c44ddac17 fix 2nd problem of #1848 2015-09-05 20:06:58 +01:00
IntelOrca c3fbdf78c0 fix writing null terminators in config file 2015-09-05 19:32:01 +01:00
IntelOrca 85181b5ed3 add stay_connected config option 2015-09-05 18:46:13 +01:00
IntelOrca 6901c04f24 implement track_save_add_map_element and track_save_remove_map_element 2015-09-05 18:21:36 +01:00
IntelOrca 7228e42768 implement litter_remove_at 2015-09-05 13:59:12 +01:00
IntelOrca e136923437 fix #1890 2015-09-05 13:18:31 +01:00
Gymnasiast 87eb6335ea Remove unused variable 2015-09-04 15:10:09 +02:00
IntelOrca 42cc5555be add Korean language descriptor 2015-09-03 19:57:24 +01:00
Gator96100 c3ffd221de Added support for hostnames 2015-09-03 19:49:14 +02:00
Gymnasiast feebb7b39d Take on-ride photos into account when calculating profit per hour, fixes #1877 2015-09-03 15:08:33 +02:00
Ted John e6f1b6cd38 Merge pull request #1883 from Gymnasiast/fix-1870 
Check if the game is in title sequence mode before loading it, fixes #1870
 2015-09-03 12:17:45 +01:00
Gymnasiast 2729531e0e Cleaner fix 2015-09-03 13:13:50 +02:00
Ted John 081ebeccf4 Merge pull request #1881 from zsilencer/develop 
disable naggle
 2015-09-03 12:01:40 +01:00
Gymnasiast d849e3378c Keep track list responsive in pause mode, fixes #1493 2015-09-03 12:12:21 +02:00
Gymnasiast ba1101e012 Check if the game is in title sequence mode before loading it, fixes #1870 2015-09-03 11:08:23 +02:00
zsilencer 6ea9b6666c disable naggle 2015-09-02 20:41:17 -06:00
Ted John a8fbc479d0 Merge pull request #1869 from LRFLEW/color_labels 
Added tooltip to colour selector
 2015-09-02 17:49:33 +01:00
Gymnasiast ea9f87d0f3 Remove faulty copy-and-pasted check on secondary items, fixes #1866 2015-09-02 12:42:43 +02:00
LRFLEW 7ef15a4326 Added tooltip to colour selector 2015-09-01 00:08:28 -06:00
Ted John e80d935964 Merge pull request #1867 from Gymnasiast/fix-select-by-track-type-research 
Don't apply select by track type to research, fixes #1733
 2015-08-31 20:06:00 +01:00
Gymnasiast 8490a19328 Don't apply select by track type to research, fixes #1733 2015-08-31 20:20:36 +02:00
IntelOrca f629e64387 implement sprite_remove 2015-08-31 16:20:56 +01:00
IntelOrca afb3aabb49 implement sub_666D6F 2015-08-31 16:02:50 +01:00
IntelOrca 05132b2e04 implement sub_666CBE 2015-08-31 15:57:50 +01:00
IntelOrca 064cdf4d06 implement ride_set_vehicle_colours_to_random_preset 2015-08-31 15:00:11 +01:00
Ted John 6451f9d771 Merge pull request #1865 from Gymnasiast/fix-td4-river-rapids-colours 
Fix seat colour of TD4 River Rapids, fixes #1695
 2015-08-31 12:32:08 +01:00
Ted John 1cd2383a70 Merge pull request #1864 from Gymnasiast/fix-map-elements-generation 
Clear all map elements before generating a new map, fixes #1762
 2015-08-31 12:31:37 +01:00
IntelOrca 5508ba5874 fix #1841 2015-08-31 12:27:02 +01:00
Gymnasiast d49c99e020 Fix seat colour of TD4 River Rapids, fixes #1695 2015-08-31 13:23:52 +02:00
Gymnasiast 03034e7e2a Clear all map elements beforing generating a new map, fixes #1762 2015-08-31 12:42:46 +02:00
Ted John ce64c02872 Merge pull request #1863 from Gymnasiast/disable-vandalism-cheat 
Add cheat to disable vandalism
 2015-08-31 11:12:27 +01:00
IntelOrca 5f342eeb05 fix flag value 2015-08-31 11:11:02 +01:00
Gymnasiast 2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
IntelOrca dd5d607724 fix typo 2015-08-31 00:41:58 +01:00
IntelOrca 401a389e73 fix #1843 2015-08-30 23:45:45 +01:00
IntelOrca 0c0847160d fix #1857 2015-08-30 22:57:29 +01:00
IntelOrca be3c54d266 fix #1859 2015-08-30 14:25:56 +01: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
Gymnasiast 20c7267b53 Don't show the Network status toolbar button in the Editors 2015-08-28 23:27:31 +02:00
IntelOrca 7a4c418d9e fix #1487 2015-08-28 17:55:50 +01:00
Ted John cfecc817f2 Merge pull request #1853 from Gymnasiast/fix-banner-count 
Add a console option to fix the banner count, fixes #667
 2015-08-28 12:35:05 +01:00
Ted John 0c3fd7cd2f Merge pull request #1851 from Gymnasiast/network-button 
Move network button to first group and adjust colours, fix debug menu colours, closes #1850
 2015-08-27 17:17:12 +01:00
Gymnasiast e9b5282486 Add a console option to fix the banner count, fixes #667 2015-08-27 17:24:23 +02:00
Gymnasiast 4d7a81bfe0 Remove unnecessary duplicate address, use more string constants 2015-08-27 16:44:18 +02:00
Gymnasiast 592b6f578d Fix oversight in string order 2015-08-27 16:27:05 +02:00
Gymnasiast 308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00
Gymnasiast cc705d9a1f Move network button to first group and adjust colours, fix debug menu colours 2015-08-27 13:27:46 +02:00
Gymnasiast 4733979df5 Fix crash when attempting to build a new ride when having the Ride construction window open, fixes #1844 2015-08-25 19:08:17 +02:00
Ted John 6a88ca17d0 Merge pull request #1835 from medsouz/cleanupscenery 
Add names for all memory addresses in world/scenery.c
 2015-08-22 17:43:28 +01:00
medsouz e9269cb882 Finish naming scenery.c addresses 2015-08-22 12:03:40 -04:00
IntelOrca 745365ca69 implement crash particles 2015-08-22 16:39:24 +01:00
IntelOrca 3062bbf3b6 refactor balloon, duck and money effect 2015-08-22 12:11:20 +01:00
IntelOrca 1a877e637d refactor sprite_invalidate 2015-08-22 11:56:32 +01:00
Gymnasiast 11fa6bbab7 Fill ride construction dropdown properly before drawing it, fixes #1793 2015-08-21 09:34:58 +02:00
LRFLEW 5d19c44e46 Fixed autosaves preventing saving before quitting dialog from appearing 2015-08-20 20:57:09 -05:00
Gymnasiast f384a9cbf8 Remove test code 2015-08-20 13:23:07 +02:00
Gymnasiast 93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
zsilencer 720076acb5 fix cmake error 2015-08-19 22:59:55 -06:00
zsilencer 7322307a04 fix issues with pausing in multiplayer 2015-08-19 20:34:52 -06:00
zsilencer 5bb3218d4c make desync detection work again 2015-08-19 19:07:11 -06:00
zsilencer abcd0afa9a make setting player name actually work 2015-08-19 18:26:42 -06:00
zsilencer be42f10d7a fix crash in server_list_save_saved_servers 2015-08-19 18:13:38 -06:00
Runelaenen 3b1708f1be Wrong logging fixed 2015-08-19 23:09:54 +02:00
Runelaenen 6ec01c6d65 Changed localisation strings 2015-08-19 22:35:20 +02:00
Runelaenen d34a446d61 Easier saving 
Replace Save game functionality and add 'save game as' function
 2015-08-19 22:02:06 +02:00
Runelaenen fb5921db6d First headless version 2015-08-19 18:07:04 +02:00
IntelOrca 408628c80c fix building on VS 2015-08-19 07:47:21 +01:00
medsouz 4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
Michał Janiszewski fc533c92c4 Add switch to disable network at compile-time 2015-08-19 01:47:33 +02:00
Gymnasiast 59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Ted John 4ee28af18c Merge pull request #1816 from Gymnasiast/allow-incorrect-checksum 
Add option to allow loading scenarios with an incorrect checksum, closes #1790
 2015-08-18 19:52:46 +01:00
Gymnasiast 9c23414fbe Keep the same orientation as in the preview when placing track, fixes #1817 2015-08-18 18:22:23 +02:00
Gymnasiast e8cc1738ca Fix saving of feature 2015-08-18 15:49:16 +02:00
Gymnasiast 8cf34ca662 Add option the Options window, clean up some string ids in that window 2015-08-18 11:58:47 +02:00
Gymnasiast 4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00
medsouz 958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -04:00
xperia64 a6043c6f78 Re-add PLUGIN.DAT 2015-08-17 20:48:18 -04:00
Ted John c5d2023a47 Merge pull request #1775 from Gymnasiast/obsolete-config-code 
Remove / comment out obsolete config code and unused file references
 2015-08-17 20:13:42 +01:00
IntelOrca 23fcefd7eb fix saving of servers 2015-08-17 08:13:39 +01:00
medsouz 3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
medsouz 719b897936 Named addresses in staff.c globals 2015-08-16 18:37:57 -04:00
medsouz 02e2ebec9a Restore globals 2015-08-16 18:35:47 -04:00
medsouz 7071bd9353 Document more addresses 
Created defines for all the memory addresses I could find in peep/staff.c
and updated everywhere they're being used.
 2015-08-16 18:25:17 -04:00
Gymnasiast 99dd05176f Use a define the number of default music tracks 2015-08-16 22:26:17 +02:00
xperia64 4607659149 Rebase 2015-08-16 16:06:21 -04:00
xperia64 9af5f029aa Rebase 2015-08-16 16:04:21 -04:00
xperia64 a629de4666 Correct String IDs 2015-08-16 16:03:23 -04:00
xperia64 4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
medsouz 150fe74e4e Remove unused code 
0x009DEA5C is set but never read
0x009AAC73 is normally set to 0 when the screen resolution is changed to
delay saving the config. This is no longer neccesary in OpenRCT2
 2015-08-16 15:30:37 -04:00
Gymnasiast 6a23e28670 Refactored music file list, removed some extra unused code, clear up some comments 2015-08-16 21:29:10 +02:00
Gymnasiast fcb74d13b2 Get rid of unused file references, comment out unused obsolete config file code 2015-08-16 20:45:23 +02:00
Gymnasiast 4d81eb578e Remove long-disabled config code 2015-08-16 20:45:23 +02:00
xperia64 7a30f614a1 Correct String IDs 2015-08-16 14:16:45 -04:00
Ted John 5452eb9b73 Merge pull request #1798 from medsouz/documentaddresses 
Document various memory addresses
 2015-08-16 18:43:20 +01:00
IntelOrca 90bf4c6836 fix #1797 2015-08-16 18:42:30 +01:00
medsouz ca1a1e0ddd Document various memory addresses 2015-08-16 13:05:49 -04:00
IntelOrca 4f8e289e79 finish server list and fix a couple of multiplayer issues 2015-08-16 17:29:47 +01:00
IntelOrca 094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
Ted John 43489db6a2 Merge pull request #1796 from Gymnasiast/chosen-name-in-use 
Add console option to reset all user strings
 2015-08-16 16:32:11 +01:00
Gymnasiast eeeb7927eb Reset ride names to their defaults when using reset_user_strings 2015-08-16 17:16:16 +02:00
IntelOrca a3450a4bf8 add loading / saving of servers 2015-08-16 15:27:21 +01:00
Gymnasiast 7449deeffe Add console option to reset all user strings 2015-08-16 15:31:59 +02:00
Gymnasiast c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
IntelOrca f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca 9746bccbf6 improve multiplayer 2015-08-15 23:19:15 +01:00
xperia64 a18dc9dc61 Add a cheat so guests ignore intensity and nausea ratings 2015-08-15 14:42:53 -04:00
IntelOrca 3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
IntelOrca 90fcc6f18e only show desync on network games 2015-08-14 16:59:27 +01:00
zsilencer c1e802e361 fix text for utf8 2015-08-14 09:15:07 -06:00
zsilencer ad70dbb84c map load on join 2015-08-14 09:13:40 -06:00
zsilencer a4267990b8 detect desyncs 2015-08-14 09:13:40 -06:00
zsilencer 111a2e8198 fix another source of nondeterminism 2015-08-14 09:13:40 -06:00
zsilencer 5dab3be1d7 fix view position when loading map over network 2015-08-14 09:13:40 -06:00
zsilencer 3a26f56000 fix path placement for network 2015-08-14 09:13:40 -06:00
zsilencer 584b34e6d5 fix game_command_create_ride for network 2015-08-14 09:13:39 -06:00
zsilencer 3b4a4fcdac network status window 2015-08-14 09:13:39 -06:00
zsilencer 1d811a5692 improve chat feature 2015-08-14 09:13:39 -06:00
zsilencer 56f8954e27 fix clear scenery for network 2015-08-14 09:13:39 -06:00
zsilencer 04dedbcec4 fix scenery placement issue over network 2015-08-14 09:13:39 -06:00
zsilencer d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer 7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
zsilencer c0dc591152 refactor and add network authorization 2015-08-14 09:13:31 -06:00
zsilencer 71f20b44aa endian-safe packet streams 2015-08-14 09:13:30 -06:00
zsilencer 149b3d86af network refactoring 2015-08-14 09:13:30 -06:00
zsilencer 73211b4215 fix chat window for new window code 2015-08-14 09:13:30 -06:00
zsilencer f7be55eb9d fix cmake compile errors 
fix cmake compile errors
 2015-08-14 09:13:30 -06:00
zsilencer f883e7a8da get game commands working a bit better 2015-08-14 09:13:30 -06:00
zsilencer 802ccfd98e allow multiple client connections 2015-08-14 09:13:30 -06:00
zsilencer 21334e307c move chat window to separate file 2015-08-14 09:13:30 -06:00
zsilencer 6c571bab00 convert network to c++ 2015-08-14 09:13:30 -06:00
zsilencer df7f576e05 map loading over network 2015-08-14 09:13:29 -06:00
IntelOrca 99f2b87043 add chat feature 2015-08-14 09:13:29 -06:00
IntelOrca 196e6eb675 get basic network game working 2015-08-14 09:13:17 -06:00
IntelOrca 7e23d2d013 add basic server connection functions 2015-08-14 09:13:17 -06:00
Gymnasiast 5a6b011d24 Remove anti-cheat code that slashes reliability for hacked rides, fixes #1780 2015-08-14 14:33:45 +02:00
Gymnasiast 86bcbafc01 Rename finance_mark_loan_settings_as_legitimate() to finance_update_loan_hash() 2015-08-13 09:00:49 +02:00
Gymnasiast d04d2f5069 Silently update invented items when using Inventions List in-game 2015-08-12 16:21:16 +02:00
Gymnasiast e9637978a1 Fix cheat detection when using Scenario Options in-game, rename sub_69E869() 2015-08-12 16:12:34 +02:00
Gymnasiast d01a53bd16 Add Inventions List and Scenario Options to the Debug menu 2015-08-12 15:31:52 +02:00
Ted John e53aebc904 Merge pull request #1772 from Gymnasiast/refactor-map-window 
Refactor map window
 2015-08-12 13:43:52 +01:00
Gymnasiast 7db2008472 Fix minimum tool sizes 2015-08-12 14:24:20 +02:00
Gymnasiast 6ec3838b0b Refactor map window 2015-08-12 14:23:13 +02:00
Gymnasiast a0f75fbda2 Turn minimum and maximum tool sizes into defines 2015-08-12 14:07:16 +02:00
Gymnasiast f0054c7307 Fix typo 2015-08-12 00:23:40 +02:00
Gymnasiast fd715c7c5d Name RIDE_TYPE_FLAG_8 and _12 2015-08-12 00:21:53 +02:00
Gymnasiast 7fe0284917 Refactor land, water and land rights windows 2015-08-11 23:09:39 +02:00
Ted John 4a7147c9ae Merge pull request #1764 from Gymnasiast/fix-clear-scenery-in-scenario-editor 
Fix Clear Scenery tool in Scenario Editor, fixes #1763
 2015-08-11 18:42:39 +01:00
Gymnasiast 23d4084332 Refactor Clear Scenery window and raise size limit to 64 2015-08-11 18:26:39 +02:00
Gymnasiast 810bd0620a Fix Clear Scenery tool in Scenario Editor 2015-08-11 17:54:21 +02:00
medsouz 58aeb6c911 Changed the wrong boolean 
I should probably sleep more...
 2015-08-11 07:17:06 -04:00
medsouz db9ea4cdf3 Added toggle for audio disable on focus lost 
This closes #1758
 2015-08-11 07:06:00 -04:00
medsouz 6caa48d3c3 Make all game sounds respect gGameSoundsOff 2015-08-11 06:29:21 -04:00
medsouz 3ce6d7020b Pause audio when tabbing out 
TODO: Figure out why title music and toilet sounds are still playing

Add an option to disable this feature so that people can jam out to the
carousel music while tabbed out.
 2015-08-11 00:42:18 -04:00
medsouz 72f3d1ace3 Fix scrollbar integer overflow 
Fixes #1752
 2015-08-10 18:15:31 -04:00
LRFLEW b2bb862f75 Fix #1756 2015-08-10 11:01:35 -05:00
IntelOrca b7f037fe60 use TTFFontSimSun for Chinese (Simplified) and fix config value reading 2015-08-10 12:31:39 +01:00
LRFLEW d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Ted John 3bc58b7d7f Merge pull request #1751 from Gymnasiast/extra-languages 
Add Simplified Chinese and Finnish as selectable languages
 2015-08-09 23:17:52 +01:00
Gymnasiast 959b492330 Add Simplified Chinese and Finnish as selectable languages 2015-08-09 21:29:42 +02:00
Gymnasiast 46a0529f40 Add comment to clarify that non-inventioned rides are skipped 2015-08-07 22:34:15 +02:00
IntelOrca f43c7f6ac1 implement viewport_vehicle_paint_setup 2015-08-07 02:47:57 +01:00
IntelOrca 5e804463c8 fix #1740 2015-08-07 02:04:44 +01:00
Michał Janiszewski fd6ddb7120 Prevent accessing memory we don't own 
In case where strlen(propertyName) < strlen(name) we are accessing
memory from stack mapping possibly outside our ownership.

Prevent such behaviour by clamping the check to valid range only.
 2015-08-07 00:42:51 +02:00
IntelOrca d0827bd9d8 implement window_maze_construction_resize and window_maze_construction_construct 2015-08-06 02:12:36 +01:00
IntelOrca 4f77cc8df3 implement gfx_draw_sprite_raw_masked 2015-08-06 01:00:03 +01:00
IntelOrca cb3abcb0ca fix #1612 2015-08-05 21:49:44 +01:00
IntelOrca 1496f2404d fix #1736 2015-08-05 21:36:58 +01:00
Maikel Stuivenberg d12b75acc2 hide non-applicable marketing campaigns, closes #1516, closes #1454, fixes #1510 2015-08-05 21:18:56 +01:00
IntelOrca 6b72f9a555 refactor shop item strings 2015-08-05 19:17:37 +01:00