1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Commit Graph

3505 Commits

Author SHA1 Message Date
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
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
Duncan
7e8ed696a0 Merge pull request #2019 from zsilencer/develop
fix #2009
2015-10-03 22:04:55 +01:00
Andrew Waters
b77e8f5146 Fixed typo of peep_udpate_ride_sub_state_13 2015-10-03 13:39:15 -07:00