mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,100 Commits 7 Branches 39 Tags 347 MiB
Commit Graph

3808 Commits

Author SHA1 Message Date
Aaron van Geffen 36f5d089df Add OS X as a platform. 2015-11-04 18:57:13 +09:00
Ted John d0836ef63b Merge pull request #2188 from kmdreko/decompile_683359 
decompiled sub_683359
 2015-11-04 00:19:35 +00:00
kmdreko 2db198e7c4 Remove unneeded call 2015-11-03 18:14:22 -06:00
kmdreko d951bebf88 move range checks 2015-11-03 18:13:49 -06:00
kmdreko a35472befe properly format function comment 2015-11-03 18:13:11 -06:00
IntelOrca 0b7544dbce fix error in linux.c and double .config/.config 2015-11-03 23:18:10 +00:00
IntelOrca 800e80aeb3 fix demolish track piece as client on multiplayer 2015-11-03 22:58:30 +00:00
IntelOrca e177be305b allow user data path to be specified by command line, closes #2182 
Also changed default path under linux to be ~/.config/OpenRCT2.
 2015-11-03 22:20:35 +00:00
Flukiestemperor c8701ef01e partially fix #2181 
create common function
 2015-11-03 16:11:11 -06:00
duncanspumpkin 5b54ad18e9 Fixed #2082. Sub_6D31A6 now working. 
Small mistake in track previous meant the x/y coordinates didn't match the map element. There were also a few other issues that presented themselves once that was fixed.
 2015-11-03 20:03:21 +00:00
IntelOrca 025f36ec28 fix #2187 
Title sequence now maintains central position from script if window size changes.
 2015-11-03 19:20:32 +00:00
duncanspumpkin d5688cdc4e Fix #2189. Map owned area not shown correctly. 
Issue was caused by doubling up a bit of code and combining it with the next line when implementing it.
 2015-11-03 18:19:23 +00:00
duncanspumpkin 9bf40ffd83 Fix #1504. Correct curvature for previous lift hill piece. 
Note this is an original bug that is fixed in the GOG version.
 2015-11-03 15:20:25 +00:00
duncanspumpkin bbe2a34714 Fix #2151. 
I think this fixes the issue but its hard to understand from the original
issue.
 2015-11-03 14:39:33 +00:00
Ted John dc3542e349 Merge pull request #2119 from e-foley/fix-heartline-twister-airtime-ratings 
fix heartline twister airtime ratings
 2015-11-03 08:15:09 +00:00
kmdreko 1293325699 decompiled sub_683359 2015-11-02 23:30:48 -06:00
e-foley 5f799ac6c4 contain rating mods in pp directives 2015-11-02 20:23:22 -08:00
Michał Janiszewski a911ff09d0 Some more checks, make sure gVehicleHierarchies are counted properly 2015-11-02 22:58:15 +01:00
Michał Janiszewski c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
Michał Janiszewski be32b5e5f4 Init all fields in audio classes 2015-11-02 22:58:15 +01:00
Ted John 51cdf5bc34 Merge pull request #1714 from janisozaur/news_item_fix 
Play sound when message first appears, not later
 2015-11-02 21:35:38 +00:00
IntelOrca a0909a242d fix several safe_strncpy calls 2015-11-02 21:23:01 +00:00
IntelOrca 2c58e1d894 use internal load window for convert saved game to scenario, closes #2121 2015-11-02 21:10:07 +00:00
IntelOrca 45bfdad4e3 fix #1144 2015-11-02 20:43:55 +00:00
duncanspumpkin 4c72710e02 Fix issue introduced in last commit 2015-11-02 20:08:55 +00:00
duncanspumpkin ddd6b63d09 Fix #2173. Entrance fee too high can no longer be a news item if no money is on. 
This is kind of an original bug because the game doesn't check normally to see if money is on during this. I didn't want to reset the entrance fee as then it would be annoying switching between the two states. The peeps don't pay if no money is on so nothing is lost.
 2015-11-02 20:03:06 +00:00
duncanspumpkin eaffec651c Fix #2178. Failure to load a scenario no longer causes intro to be playable. 2015-11-02 19:45:18 +00:00
Ted John 5914558575 Merge pull request #2180 from janisozaur/safe_strncpy 
Fixes to safe_strncpy
 2015-11-01 22:52:17 +00:00
Michał Janiszewski 0f9bc229b4 Fixes to safe_strncpy 
* don't touch memory at all if size passed is 0
* use original address instead of now-changed `destination`
* fix one of the calls having improper size passed
 2015-11-01 23:33:02 +01:00
IntelOrca 61b7c77be3 add colour enum 2015-11-01 22:21:46 +00:00
duncanspumpkin d21e5a3b8c Fix #2136. Issue caused by missing branch. 2015-11-01 21:03:50 +00:00
duncanspumpkin f1cdc99afc Fix #2079. Scroll windows no longer have incorrect tooltips 
There was an issue with forgetting to reset the x/y variable introduced when I fixed a different bug. Possibly fixes #2136
 2015-11-01 20:55:54 +00:00
duncanspumpkin 428613a804 Fix #2122. Mechanics default to blue and guards yellow. 2015-11-01 20:04:24 +00:00
Michał Janiszewski 9a981ef68f Fix variable not being shifted 
When decompiled, at 0x6AA8ED, there's `shr edi,0x4`, which is not
reflected in sources.

The `type` without that shift could easily become a value large enough
to point to memory beyond object entries and modify those values. In my
case, it was modifying `RCT2_ADDRESS_OBJECT_LIST_NO_ITEMS` from 2122 to
2123 (by setting lowest bit), which luckily, is used later in
`setup_in_use_selection_flags`. For this reason, I believe it could be a
major source of other problems, possibly also recent `MAP_ANIMATION`
ones, although I haven't checked.

I also put an assert in place to validate type against max available
count.
 2015-11-01 18:53:47 +01:00
Ted John caa5f870c5 Merge pull request #2175 from zsilencer/network 
Network
 2015-11-01 11:24:04 +00:00
Jonathan Haas d2ec665ae4 Fix Bug #2138 2015-11-01 09:59:13 +01:00
zsilencer 34dff6f46b address #2073, graceful KickPlayer with message, disconnect reason messages, chat player name and text different color 2015-11-01 01:50:44 -06:00
zsilencer d18adc80de fix small error 2015-10-31 17:43:36 -06:00
zsilencer a95357a32d signs and banners editable in multiplayer 2015-10-31 11:07:36 -06:00
zsilencer 6c5acdde6a fix #2161 2015-10-30 19:41:49 -06:00
duncanspumpkin 9a76c59ec9 Fix entrance drawing issue. Fixes #2164. 2015-10-30 23:33:02 +00:00
Michał Janiszewski 45b3d8362d Provide strndup implementation for platforms missing it 2015-10-30 19:14:05 +01:00
Michał Janiszewski 9284930d7e Add safe_strncpy function 
safe_strncpy is similar to strncpy, but makes sure buffer is
null-terminated. Update most of project to use this updated function to
prevent illegal memory accesses.
 2015-10-30 16:01:00 +01:00
Flukiestemperor a819a6f177 Fix crash when map element is null in a save 2015-10-30 06:47:05 -05:00
Michał Janiszewski 1d772b01d0 Plug memory leak and validate getsockopt result 2015-10-29 21:41:49 +01:00
Michał Janiszewski 00a347159c Type fixes, remove unused variable 2015-10-29 21:25:26 +01:00
Ted John ad5869a8a0 Merge pull request #2150 from janisozaur/develop 
Fixes
 2015-10-29 19:38:06 +00:00
Michał Janiszewski 7fcc801d01 Cleanup allocated segments on disposal 2015-10-29 20:26:47 +01:00
Michał Janiszewski 31f412d0e4 Fixes: scope & types, control flow, cmake, platform support 2015-10-29 20:26:47 +01:00
Ted John f1931c2cc4 Merge pull request #2155 from kmdreko/decompile_637ff3 
Decompiled sub_6E7FF3
 2015-10-29 18:31:19 +00:00
Alexander Overvoorde 56645a6941 Revert address constant replacement in ride.h 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 111ddeb445 Replace old RCT2_ADDRESS_RIDE_ENTRIES accesses by GET_RIDE_ENTRY() 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 060d41f5a0 Replace raw addresses in RCT2_ADDRESS() with identifiers 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
kmdreko 115c099e2a Decompiled sub_6E7FF3 2015-10-28 23:26:33 -05:00
duncanspumpkin 930bdc1669 Make suggested changes. Invis huts now correctly remove fence 2015-10-28 19:57:02 +00:00
duncanspumpkin d9b7c1fafd Implement remaining rotations 2015-10-28 19:02:32 +00:00
duncanspumpkin e7c653abf2 Refactor attached ps setup code 2015-10-28 18:44:44 +00:00
duncanspumpkin c62e61bd36 Started implementing rotation 0 2015-10-28 18:44:44 +00:00
duncanspumpkin 330b6b5524 Implemented tables for top spin paint setup 2015-10-28 18:44:43 +00:00
Ted John f233f5c498 Merge pull request #2146 from janisozaur/develop 
Cleanups
 2015-10-28 08:14:03 +00:00
Michał Janiszewski 2f457aeffc Cleanups 
* Remove unused function in config.c
* Check handle *before* it is used
* Provide explicit parentheses around unclear if statements
 2015-10-28 08:06:45 +01:00
Linus Unnebäck 29243780c8 add limits.h include for CHAR_BIT 2015-10-28 07:33:56 +01:00
Ted John df5538e930 Merge pull request #2143 from janisozaur/develop 
Guard against possible NULL dereference
 2015-10-27 17:45:16 +00:00
Michał Janiszewski 0cdaa0b57e Guard against possible NULL dereference 2015-10-27 18:32:39 +01:00
zsilencer 00e2ca43a1 ipv6 support, non-blocking address resolve and connect 2015-10-26 22:35:34 -06:00
Gymnasiast 9504f3f10d Replace missed occurrence of magic numbers with defines 2015-10-26 13:53:26 +01:00
Gymnasiast 61444c8518 Display the visible/practical map size instead of the technical size, fixes #2133 2015-10-26 10:21:04 +01:00
IntelOrca 8d84b540ad add vehicle struct and enum labels from vehicle-update branch. 2015-10-25 21:26:03 +00:00
Gymnasiast 98fd1bf95d Reinstate RCT2_ADDRESS_VEHICLE_SOUND_LIST 2015-10-25 21:42:09 +01:00
Gymnasiast 2b0d5b2470 Remove obsolete sound and config code 2015-10-25 20:54:19 +01:00
Ted John 865c1a68a7 Merge pull request #2130 from Dandandan/readability 
Replace constants in world/sprite.c
 2015-10-25 16:43:59 +00:00
IntelOrca 4ac42ff1b2 add vehicle struct, enum labels and helper functions from implement-ride-create-vehicles branch. 2015-10-25 16:00:21 +00:00
Daniël Heres 358647d07c Replace constants in world/sprite.c 2015-10-25 16:34:01 +01:00
Michał Janiszewski fcd22dd8ca Memory handling fixes 2015-10-25 01:15:52 +02:00
e-foley 73eed6830a remove unnecessary rating conditioning 
Remove old workaround to issue #2064
 2015-10-24 14:59:55 -07:00
e-foley 663e430300 cap airtime bonus 
Caps airtime addition to excitement rating rather than allowing infinite
subtraction
 2015-10-24 14:54:15 -07:00
Ted John 3be4dc748a Merge pull request #2115 from Dandandan/optimize 
Fix assignment
 2015-10-24 20:16:34 +01:00
Daniël Heres 9752d197e6 Fix assignment 2015-10-24 21:02:08 +02:00
Ted John cfa847ee71 Merge pull request #2113 from Broxzier/develop 
Added 10-minute inspections cheat.
 2015-10-24 19:13:30 +01:00
Duncan d7a1747407 Merge pull request #2114 from Dandandan/optimize 
Cache width of line in gfx_bmp_sprite_to_buffer
 2015-10-24 18:16:28 +01:00
Daniël Heres 3ebd576d78 Cache width of line 2015-10-24 18:25:11 +02:00
Hielke Morsink e5ce186534 Wrapped new widget with () 2015-10-24 17:23:34 +02:00
Hielke Morsink dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John 5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas 475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Ted John abdcd50c8e Merge pull request #2112 from Dandandan/optimize 
Low level optimizations
 2015-10-24 11:49:32 +01:00
Daniël Heres 29976790cb Low level optimizations 
* Just memcpy if we don't have to use a pallete and zoom_amount == 1
* Replace some divide operations by right-shifts
* Optimize / simplify sub_68B3FB
 2015-10-24 12:32:56 +02:00
Ted John 1cd1344711 Merge pull request #2109 from Overv/develop 
Disable drawing if the window is minimized or otherwise hidden
 2015-10-23 18:22:31 +01:00
Alexander Overvoorde 8a23aa1bec Change openrct2_loop to not draw if window is minimized or otherwise hidden (fixes #2096) 2015-10-23 17:33:25 +02:00
Michał Janiszewski 79552feb54 Only copy strings when they're different 
When called from window_loadsave_scrollmousedown,
window_loadsave_populate_list will try to strncpy a string over itself.
This commit prevents that.
 2015-10-23 17:22:31 +02:00
Ted John a24b3e114c Merge pull request #2107 from Dandandan/optimizemixer 
Optimize Mixer::EffectPanS16
 2015-10-23 13:28:40 +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
Michał Janiszewski 11fb15bba7 Add casts for types 2015-10-22 23:51:05 +02:00
Michał Janiszewski 10587cb5ab Port non-VS inline asm to AT&T syntax 
This is much more liked by other compilers
 2015-10-22 23:32:27 +02:00
Michał Janiszewski 18c867a6fe Modify inline assembly to properly returns results 
Both RCT2_CALLFUNC_X and RCT2_CALLPROC_X did not really return any
value, even though declared to return an int. The inlines are now
modified to properly return flags (`lahf`), with other contents zeroed
out.
 2015-10-22 20:23:26 +02:00
Ted John 6a33b92725 Merge pull request #2101 from nightroan/develop 
Opening or testing a ride will only that ride's close construction window
 2015-10-22 09:48:10 +01:00
nightroan 2e52fac0ca Testing or opening a ride only closes the construction window for that ride. 2015-10-22 01:27:39 -07:00
Michał Janiszewski 06b13794ea Use const for parameters 
In profiling, gfx_rle_sprite_to_buffer turns out to be a hot spot. Use
const pointers, so compiler can make more assumptions regarding them and
perhaps optimize more heavily.
 2015-10-22 10:15:45 +02:00
IntelOrca 00ff795d04 hide multiplayer button if network is disabled 2015-10-21 21:06:15 +01:00
Ted John 3585a1f99a Merge pull request #2090 from janisozaur/types 
Minor fixes
 2015-10-21 12:55:13 +01:00
Daniël Heres 17b906b3a0 Use SDL_RWsize to get size info 2015-10-21 10:15:02 +02:00
Michał Janiszewski 8e45cccb7a Minor fixes 
Includes (mostly) type fixes, dead code removal, signed vs unsigned
comparison fixes, memory leaks removal.
 2015-10-21 08:47:09 +02:00
IntelOrca be7d3d5b54 do not do any sound / music operations when in headless mode 2015-10-20 22:15:48 +01:00
IntelOrca c097ce5b13 fix #2064 2015-10-20 21:36:09 +01:00
Ted John a292a21e32 Merge pull request #2094 from janisozaur/whitespace 
Strip all whitespace
 2015-10-20 21:29:44 +01:00
duncanspumpkin 610a7d6954 Fix #2095. Bitscanforward needs to return -1 if nothing found. 2015-10-20 20:40:17 +01:00
Michał Janiszewski 7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
Ted John 6fb6bb2556 Merge pull request #2093 from Dandandan/optimizebitscan 
Optimize bitscanforward using intrinsic function
 2015-10-20 17:32:39 +01:00
Ted John 4f7476f8c2 Merge pull request #2092 from Dandandan/optimize 
Optimize peep functions
 2015-10-20 17:24:00 +01:00
Daniël Heres d531243c98 Optimize bitscanforward using intrinsic function 2015-10-20 18:10:05 +02:00
Daniël Heres 5c611dc600 Optimize peep functions 2015-10-20 17:35:31 +02:00
Ted John acca9c869b Merge pull request #2089 from Dandandan/optimize 
Cache expression in gfx_rle_sprite_to_buffer
 2015-10-19 22:10:14 +01:00
Daniël Heres 4f4f434c5a Bit shifting 2015-10-19 22:55:16 +02:00
Daniël Heres 328c42d5d5 Use same naming convention 2015-10-19 20:50:52 +02:00
Daniël Heres 7730665023 Cache expression in gfx_rle_sprite_to_buffer 2015-10-19 20:45:04 +02:00
Michał Janiszewski d570163958 Fix types 
Bunch of type fixes
 2015-10-19 20:30:46 +02:00
Ted John 3f99209219 Refactor calculate_park_rating logic 
...to avoid changing a local variable's meaning.
 2015-10-19 12:20:21 +01:00
Sam Horn 7250adaf71 Identify peep->var_C6 2015-10-19 18:36:45 +10:00
IntelOrca 8c276acde7 fix #2085 2015-10-18 21:16:00 +01:00
Ted John 3fe48a262d Merge pull request #2084 from duncanspumpkin/misc 
Misc
 2015-10-18 14:30:11 +01:00
duncanspumpkin 3ee518bf87 Define CableLiftVehicle structure 2015-10-18 14:01:16 +01:00
Sam Horn 34e1e773a7 Fixes #2080 2015-10-18 22:40:07 +10:00
duncanspumpkin f512c5fad0 Use correct function call for crashed vehicles 2015-10-18 13:18:10 +01:00
duncanspumpkin 7d378a3620 Fix unused variable warnings 2015-10-18 12:46:38 +01:00
duncanspumpkin 0551fb7170 Fix #1914. Removed y variable as it is not part of function call 2015-10-18 12:07:45 +01:00
duncanspumpkin fedd83987e Fix Disable Network build 2015-10-18 12:02:31 +01:00
Duncan 45d3fbf10d Merge pull request #2061 from clamburger/update_peep_on_enter_ride 
Cleaned up peep_on_enter_ride
 2015-10-18 10:21:04 +01:00
zsilencer cf78d76bdf make disable volume on focus lost not reset title music 2015-10-17 11:48:39 -06:00
zsilencer 6449dfd6ea fix #2076 2015-10-17 11:47:04 -06:00
Sam Horn 05f6ea96a0 Fixed inconsistent use of peep->rides_been_on 2015-10-18 02:32:26 +10:00
Sam Horn 8850d1153f Split off independent logic into their own functions 2015-10-18 02:31:17 +10:00
Ted John 7e753afe52 Merge pull request #2074 from duncanspumpkin/fix_2049 
Possible fix to #2049.
 2015-10-17 13:38:56 +01:00
IntelOrca 93e7e219cc fix peep inverted logic from 76252a32d9 2015-10-17 13:35:09 +01:00
duncanspumpkin 4ddca816e0 Possible fix to #2049. 
I need this confirmed as I can't reproduce the issue even when I change the peep logic to always being sick.
 2015-10-16 23:26:55 +01:00
IntelOrca 341b658ed0 add gui option for stay_connected 2015-10-16 22:45:17 +01:00
IntelOrca 6c6fa1d444 add ability for server to kick player, closes #2071 2015-10-16 22:20:16 +01:00
IntelOrca 76252a32d9 fix peep.c warnings 2015-10-16 18:51:25 +01:00
Ted John 5d6fe6f7f0 Merge pull request #2067 from duncanspumpkin/fix_load_landscape 
Fix loadlandscape breaking enabled tabs
 2015-10-16 13:36:12 +01:00
zsilencer ae6c88d1ce remove unused/redundant RCT2_GLOBALS fix #2065 and cleanup 2015-10-16 02:31:31 -06:00
zsilencer 109ebe4f56 fix compiler warning 2015-10-16 01:06:46 -06:00
Duncan 700cb3976d Merge pull request #2055 from ccfreak2k/develop 
Implement sub_69AF1E
 2015-10-16 06:47:09 +01:00
Andrew Waters b959d13c65 Add implementation of sub_69AF1E() 2015-10-15 18:22:51 -07:00
duncanspumpkin ee1e71f287 Fix loadlandscape breaking enabled tabs 
Issue was caused by not calling sub_6DFED0 when loading the landscape. I assume in vanilla this would happen as part of the loading but due to the way loadsave now works it doesn't happen. In the process I also labelled the offset for editor step.
 2015-10-15 22:16:27 +01:00
duncanspumpkin 31e6942ff0 Fix #1761. Issue caused by or = instead of != 2015-10-15 21:03:29 +01:00
Ted John fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types 
Show vehicles from other track types
 2015-10-15 12:57:57 +01:00
IntelOrca 0442f08aae remove redundant dropdown assignment 2015-10-14 21:16:10 +01:00
IntelOrca 3855d70d1a fix dropdown 64 item support and remove old RCT2 addresses 2015-10-14 21:01:04 +01:00
Gymnasiast d71ca1f376 Extend dropdowns to hold up to 64 items (with bugs) 2015-10-14 16:19:50 +02:00
Sam Horn 0a14971cdf Cleaned up peep_on_enter_ride 2015-10-14 23:31:50 +10:00
Ted John 80e973887c Merge pull request #2059 from janisozaur/types 
type and const fixes for sawyercoding
 2015-10-13 19:15:29 +01:00
Michał Janiszewski 9572f1b532 type and const fixes for sawyercoding 2015-10-12 23:09:49 +02:00
Duncan d2398b65bb Merge pull request #2048 from clamburger/update_sub_6960AB 
Clean up sub_6960AB function (peep_should_go_on_ride)
 2015-10-12 21:49:46 +01:00
Gymnasiast a1cc3e4759 Fix vehicle dropdown when 'Select-by-track-type' off and 'Show vehicles from other track types' on 2015-10-12 16:01:58 +02:00
Gymnasiast 105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
Caio Alonso 63603871ea fixes the portuguese (br) language name 2015-10-11 15:26:18 -03:00
IntelOrca 6cd3b41065 fix overflows / underflows with mountain tool 2015-10-11 12:31:57 +01:00
IntelOrca d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
IntelOrca 6c38ab44fa refactor map smooth game command 2015-10-11 11:39:01 +01:00
IntelOrca 969324032e implement map smooth game command 2015-10-11 02:23:39 +01:00
IntelOrca 8ec4d61739 add callfunc wrappers for the last three remaining game commands and remove original call table 2015-10-10 20:26:17 +01:00
Sam Horn 49cf5e3774 Moved the nausea thresholds into a C array 2015-10-11 04:07:14 +10:00
Sam Horn 55d6666f13 Added an enum for flags used in peep_should_go_on_ride 2015-10-11 03:21:33 +10:00
Sam Horn 58b7df8fd7 Renamed ride->first_peep_in_queue to last_peep_in_queue 2015-10-11 03:03:59 +10:00
Sam Horn 3975af93f4 Renamed ride->var_114 to undercover_portion and updated comments 2015-10-11 02:51:03 +10:00
Sam Horn 75263034e5 Use GET_PEEP macro 2015-10-10 23:15:56 +10:00
Sam Horn b0437746a9 Fixed min and max intensity being swapped 2015-10-10 21:34:37 +10:00
Sam Horn 1b2a7e62a2 Identified 0x00982392 as a nausea lookup array 2015-10-10 21:31:56 +10:00
Ted John 6c84b06fbd Merge pull request #2047 from janisozaur/memory 
Memory
 2015-10-10 11:57:51 +01:00
Ted John 06f7740518 Merge pull request #2039 from HaasJona/peep_count 
Recalculate peep count after loading a save
 2015-10-10 11:55:18 +01:00
IntelOrca 955f9a02e9 fix ride rating underflows, #2031 2015-10-10 11:54:19 +01:00
Jonathan Haas 3a11bbb6d4 Recalculate peep count after loading a save 2015-10-10 12:50:29 +02:00
Sam Horn 3f84778369 Removed extra spaces 2015-10-10 19:00:37 +10:00
Sam Horn 2b66253d28 Replaced remaining gotos with function calls 2015-10-10 18:53:48 +10:00
duncanspumpkin 5a59e7fed4 Fix issue with last commit 2015-10-09 22:25:30 +01:00
duncanspumpkin 59cdff7055 Potential fix to #639. 
The scenario name was missing its null to indicate the end of the string. This would cause scenarios to have odd fileNames that are compared against to compare a scenario against the scenario list
 2015-10-09 22:11:28 +01:00
Michał Janiszewski 74d0b033df Name RCT2_ADDRESS_PALETTE 2015-10-09 20:20:05 +02:00
Michał Janiszewski fb9a5833d6 Fix override offsets while loading LanguagePack 
When loading language pack, a check is made not to double entries. This
check was wrong, because it tried to use offsets as pointers to strings.

These offsets are later rewritten to actual pointers in remaining part
of LanguagePack::LanguagePack
 2015-10-09 20:19:58 +02:00
Michał Janiszewski 6dd04bbb1a Don't copy more memory than we own 2015-10-09 20:19:34 +02:00
Sam Horn a5b9b356a0 Cleaned up the queue logic 2015-10-09 22:11:15 +10:00
Sam Horn ceeaa34ac8 Start work on cleaning up sub_6960AB 2015-10-09 17:12:48 +10:00
Gymnasiast 3590b1c1b9 Adjust comment 2015-10-08 10:58:17 +02:00
Gymnasiast dfd0c52b7e Name PEEP_FLAGS_5 2015-10-08 10:47:14 +02:00
zsilencer 468a6c15fa implement peep_give_real_name 2015-10-06 23:52:37 -06:00
Ted John a6a8ea7989 Merge pull request #2030 from duncanspumpkin/fix_1720 
Ride train count miscalculation.
 2015-10-05 00:08:12 +01:00
Ted John 5405cf7efd Merge pull request #2012 from Overv/develop 
Add Steam overlay detection that pauses the game (#1903)
 2015-10-05 00:07:10 +01:00
duncanspumpkin cbbc4edd20 Fix #1720. Ride train count misscalculation. 
Should now correctly allow more trains when car length reduced
 2015-10-04 21:39:02 +01:00
Alexander Overvoorde 609dad157a Optimise Steam overlay check 2015-10-04 22:31:28 +02:00
duncanspumpkin 36917bd75a Fix #1661. Track direction now remembered when deleteing last section 2015-10-04 20:52:27 +01:00
duncanspumpkin 9017e5ff86 Fix #1899. Prevent mountain tool from being possible for land ownership tool. 2015-10-04 20:44:17 +01:00
duncanspumpkin 7297fc86e9 Fix #2029. Issue with 1x1 land ownership tool 2015-10-04 20:22:50 +01:00
Alexander Overvoorde af6a6bb8be Rewrite platform_is_steam_overlay_attached for Unix to detect all possible situations 2015-10-04 16:43:22 +02:00
Alexander Overvoorde 84bf968b23 Fix flags in dlopen call for steam overlay check 2015-10-04 15:46:15 +02:00
Ted John c1ecf3c531 Merge pull request #2024 from duncanspumpkin/set_land_ownership 
Implemented game_command_set_land_ownership.
 2015-10-04 01:06:29 +01:00
duncanspumpkin 625e051d35 Fix #2025. Issue caused by failing to check if coordinates outside of map 2015-10-04 00:35:26 +01:00
duncanspumpkin 3f77a6778a Implemented game_command_set_land_ownership. 
Refactored map buy land rights for tile as it was partially broken and used a very odd style.
 2015-10-04 00:07:22 +01:00
Alexander Overvoorde f6b7121c23 Implement platform_is_steam_overlay_attached for unix 2015-10-03 23:10:56 +02:00
Alexander Overvoorde 51377fc960 Add setting for Steam overlay pausing and add extra check 2015-10-03 23:10:56 +02:00
Alexander Overvoorde c03cec721e Add Steam overlay detection that pauses the game (#1903) 
The Steam overlay is detected by checking if the center pixel of
the framebuffer is changed between rendering and presenting to the
screen. This happens when the Steam overlay draws the gray fade on
the screen.

This does not affect other overlays like FRAPS, MSI Afterburner and
OBS overlays that don't obstruct the center of the screen.
 2015-10-03 23:10:56 +02:00