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
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
Ted John
43e78c4dca
Merge pull request #2069 from zsilencer/bugfixes
...
Bugfixes
2015-10-16 11:37:17 +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
Ted John
6068b361bc
Merge Localisation/master into OpenRCT2/develop.
2015-10-16 04:00:16 +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
Michael Steenbeek
eaf23f8e76
Merge pull request #12 from IntelOrca/show-vehicles-from-other-track-types
...
fix dropdown 64 item support and remove old RCT2 addresses
2015-10-15 09:41:29 +02: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
Ted John
e6359f486b
Merge Localisation/master into OpenRCT2/develop.
2015-10-14 04:00:16 +01: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
Ted John
2db3f4ee23
Merge Localisation/master into OpenRCT2/develop.
2015-10-13 04:00:16 +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
Duncan
1629c75fb3
Merge pull request #2054 from CaioAlonso/develop
...
Fixes the portuguese (br) language name
2015-10-11 20:26:09 +01:00
Caio Alonso
63603871ea
fixes the portuguese (br) language name
2015-10-11 15:26:18 -03:00
Ted John
66dd53dd36
Merge pull request #2050 from OpenRCT2/game-command-land-smooth
...
Implement mountain tool + enhanced functionality.
2015-10-11 18:11:18 +01: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
Ted John
fbd2598ac3
Merge Localisation/master into OpenRCT2/develop.
2015-10-11 04:00:16 +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
