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

712 Commits

Author SHA1 Message Date
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
Michał Janiszewski 4955279b7b Synchronise reset_0x69EBE4 over network 
Clients calling reset_0x69EBE4 not in sync is a major cause of desyncs,
this change tries to force sync across clients
 2016-06-03 00:33:15 +02:00
Goddesen 809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
Hugo Wallenburg 9eab82a7d9 Update height check for slopes to match new limits. Fixes #3792. (#3799) 2016-06-02 19:34:37 +02:00
Ted John 2a614ec4d9 rename path bits (var_06) to (flags) 2016-05-30 23:39:43 +01:00
Ted John 3e307b8e2a name path addition flags 2016-05-30 23:31:36 +01:00
CraigCraig c946d2fb06 Various Spelling Fixes - 5/29/16 (#3770) 2016-05-29 10:00:38 +01:00
Michael Steenbeek 1d14f21e25 Allow raising terrain to 64 in-game units, fixes #3568, fixes #3455 (#3764) 2016-05-28 12:24:11 +01:00
CraigCraig 3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
zsilencer 1c5a73db54 integrate ScenerySubTileOffsets 2016-05-25 00:03:25 -06:00
zsilencer a963935c11 Decompile scenery_multiple_paint 2016-05-22 08:23:03 -06:00
Ted John 25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
Ted John 9a09cb5dad Merge pull request #3639 from zsilencer/paint-setup/scenery 
Decompile scenery_paint
 2016-05-20 08:12:26 +01:00
Michał Janiszewski 9081ddcc5d Take care not to dereference NULL element (#3137) 2016-05-19 23:57:56 +01:00
zsilencer c0e187a023 Decompile scenery_paint 2016-05-18 16:23:48 -06:00
Marijn van der Werf 44021fdb0a Rename flag 2016-05-18 22:46:24 +02:00
Ted John 6510de394b remove use of 0x00F1AEE0 in footpath_is_connected_to_map_edge 2016-05-17 22:03:06 +01:00
Ted John e73aeb9a42 integrate gGameCommandNestLevel 2016-05-17 21:47:14 +01:00
Ted John 4847cfe84f clean up footpath_get_coordinates_from_pos 2016-05-17 21:42:46 +01:00
Ted John 14825a8dbc integrate queue chain and refactor 2016-05-17 21:29:05 +01:00
Ted John c879638f22 integrate ground flag variables 2016-05-17 20:51:11 +01:00
Ted John eb19ca8626 integrate variable: gFootpathPrice 2016-05-16 19:05:37 +01:00
Michał Janiszewski d4394c73d3 Limit what is considered a valid tile (#3631) 
`smooth_land_tile` already calls to `map_is_location_valid`, but the
latter allows for elements that are clearly outside the range.

Fixes #3549
 2016-05-16 10:32:08 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 72957660ef integrate window scenery variables 2016-05-15 17:16:21 +01:00
Ted John 5fe612acd7 integrate scenery place variables 2016-05-15 17:10:25 +01:00
Ted John 6f7db1f9b6 rename rct_path_type to rct_footpath_entry 2016-05-15 16:11:34 +01:00
Ted John 3d47f9869f write get entry methods for scenery and path 2016-05-15 16:09:26 +01:00
Ted John 81efb92d53 integrate map selection variables 2016-05-14 00:54:13 +01:00
Ted John 0710eb7e87 Merge pull request #3585 from janisozaur/fixes 2016-05-13 18:22:20 +01:00
janisozaur ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
Michał Janiszewski 4d05c939cf Cache accesses to get_current_rotation() 2016-05-13 13:34:27 +02:00
janisozaur 658e877955 Name all the typdef-ed structs (#3581) 2016-05-12 22:57:40 +01:00
Ted John 30a044ae72 add globals for gWeeklyProfitAverage... 2016-05-11 19:41:34 +01:00
Ted John 0f1028c92c add global for gResearchedSceneryItems 2016-05-11 19:41:33 +01:00
duncanspumpkin e47684bf53 Fix image offset by 1 error. 2016-05-10 20:43:18 +01:00
Ted John aa929e1593 add globals for researched things, cleanup 2016-05-10 00:00:59 +01:00
Ted John b5c0913b76 add global macros for a few more things, ride rating related and misc 2016-05-09 22:54:22 +01:00
Ted John 3c3a37073d add global macro for gSamePriceThroughoutPark 2016-05-09 21:18:44 +01:00
Ted John 3105d62d3b add global macro for gTotalAdmissions, gTotalIncomeFromAdmissions 2016-05-09 21:05:17 +01:00
Ted John be2d1127f5 add global macro for gResearchLastItemSubject 2016-05-09 20:38:26 +01:00
janisozaur 8d0481deba Make sure to only update valid vehicles (#3543) 
Lets us load parks like Six Flags Carolina:
http://www.nedesigns.com/park/1571/six-flags-carolina/
 2016-05-09 15:52:03 +01:00
Ted John d2c5501eea refactor sprite heads and counts 2016-05-09 00:08:03 +01:00
Ted John 5ccfd83dea add global macro for gScenarioTicks 2016-05-08 23:20:42 +01:00
Ted John f9074485f9 integrate more variables 2016-05-08 14:04:04 +01:00
Ted John a19e5feadf fix track design mirror and ride name 2016-05-08 14:03:53 +01:00
Ted John 1908743c71 refactor track save, move into own source 2016-05-08 14:03:49 +01:00
Ted John e9935fee09 refactor some of the track design place code 2016-05-08 14:02:48 +01:00
Ted John 2ecbcfc4c9 Merge pull request #3165 from marijnvdwerf/spiral-slide-paint-setup 2016-05-07 18:05:05 +01:00
Marijn van der Werf e3161d66d0 Implement misc_paint 2016-05-06 00:06:52 +02:00
janisozaur 68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Gymnasiast 5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Marijn van der Werf 724089b8da draw fences 2016-04-27 23:15:17 +02:00
Ted John 83acafe05a add global macros for research variables 2016-04-25 23:26:26 +01:00
Ted John 489ea66cc9 add global macro for gCurrentFontSpriteBase and gCurrentFontFlags 2016-04-25 23:00:58 +01:00
marcovmun 4149bcdd30 Fix: #2579 queue lines of 2 rides merge (#3409) 2016-04-25 12:12:12 +01:00
Ted John 652b1c83db integrate variables for lightning and toolbar dirty flags 2016-04-24 21:49:09 +01:00
Ted John cea0f30121 integrate variable: gLandToolSize 2016-04-24 18:02:37 +01:00
Ted John 1fcefcfa7e integrate variables for water tool 2016-04-24 17:58:26 +01:00
Ted John fc938892d8 integrate variables for command position and expenditure 2016-04-24 17:53:39 +01:00
Ted John b9944dd33a integrate land tool variables 2016-04-24 17:28:12 +01:00
Ted John 15031b9511 add global macro: gGrassSceneryTileLoopPosition 2016-04-24 14:33:43 +01:00
Ted John d18ea8570d add global macro: gNextFreeMapElement 2016-04-24 14:30:21 +01:00
Ted John 0f6e64ac76 add global macros for map size and tile loop 2016-04-24 14:00:26 +01:00
Ted John 5ccbf08ac9 add global macros for staff colours 2016-04-24 11:12:24 +01:00
Ted John 0ffca3a4fc use gPeepSpawns for remaining non-refactored usages 2016-04-24 11:01:19 +01:00
Ted John 6c25c85363 add variable pointers for park entrance position 2016-04-24 10:53:04 +01:00
Ted John bac5538178 add global macro: gTotalRideValue 2016-04-24 10:36:56 +01:00
Ted John 6453bcbc46 Merge pull request #3406 from janisozaur/warnings 
Fix warnings in clang, gcc
 2016-04-23 14:08:27 +01:00
Michał Janiszewski d23cbe5722 Fix invalid left-shift 
Suffers from the same problems as #3381
 2016-04-23 14:58:24 +02:00
Ted John ee509caf35 integrate game paused variable and refactor 2016-04-23 13:34:55 +01:00
Ted John 4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Ted John 1950fad315 add global macros for date 2016-04-23 11:03:34 +01:00
Ted John 3bd21240ed add global macros for climate variables 2016-04-23 10:53:48 +01:00
Ted John c9adf50716 add global macro: gNumGuestsHeadingForPark 2016-04-23 02:56:55 +01:00
Ted John 7905757923 add global macro: gNumGuestsInParkLastWeek 2016-04-23 02:55:14 +01:00
Ted John 65d749de7b add global macro: gGuestChangeModifier 2016-04-23 02:51:38 +01:00
Ted John 467513616d add global macro: gCurrentTicks 2016-04-23 02:49:24 +01:00
Ted John 0c90c165a2 add global macro: gGuestInitialThirst 2016-04-23 02:38:51 +01:00
Ted John a819819ff4 add global macro: gGuestInitialHunger 2016-04-23 02:37:33 +01:00
Ted John 727a568e32 add global macro: gGuestInitialHappiness 2016-04-23 02:36:24 +01:00
Ted John 8509927dc7 add global macro: gGuestInitialCash 2016-04-23 02:35:03 +01:00
Ted John 66855e41e5 add global macro: gParkNameArgs 2016-04-23 02:28:11 +01:00
Ted John 1f6081c0d9 add global macro: gScenarioObjectiveNumGuests 2016-04-23 02:18:45 +01:00
Ted John 17f5d8cb48 add global macro: gScenarioObjectiveYear 2016-04-23 02:16:32 +01:00
Ted John 35e5c49454 add global macro: gScenarioObjectiveType 2016-04-23 02:14:14 +01:00
Ted John 3c52983178 add global macro: gBankLoan 2016-04-23 02:00:44 +01:00
Ted John 11a2ba0133 add global macro: gCashEncrypted 2016-04-23 01:58:54 +01:00
Ted John 253f411075 add global macro: gCompanyValue 2016-04-23 01:53:35 +01:00
Ted John b4b3dc7dbe add global macro: gParkValue 2016-04-23 01:50:12 +01:00
Ted John 0971d8ad51 add global macro: gParkRating 2016-04-23 01:47:03 +01:00
Ted John fda4542d63 add global macro: gParkName 2016-04-23 01:40:11 +01:00
Ted John 2b702d89c6 add global macros: gLandPrice, gConstructionRightsPrice 2016-04-23 01:37:10 +01:00
Ted John 171388e9a3 integrate park entrance ghost variables 2016-04-23 01:21:00 +01:00
Ted John b59f5c17ca add global macros for park... 
- gParkSize
- gParkEntranceFee
- gNumGuestsInPark
 2016-04-23 01:00:00 +01:00
Ted John 307cb9e08b add global macro: gParkFlags 2016-04-23 00:51:22 +01:00
Derek Lee c4226235e3 Add cheat to disable littering 
Add cheat and increment NETWORK_STREAM_VERSION
 2016-04-18 23:34:10 -07:00
Hielke Morsink 1dbd313fb4 Moved logic from window to map, inside loops that already existed. 2016-04-18 20:28:34 +02:00
Hielke Morsink 15727b68a9 Recalculating the fences when resizing the map 2016-04-18 20:28:34 +02:00
Gymnasiast ed9334f944 Rename sub_68AE2A to clear_elements_at 2016-04-18 20:28:34 +02:00
Gymnasiast 01c4c0adc5 Allow setting ownership of map edges 2016-04-18 20:28:34 +02:00
Yaroslav Tretyakov c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Ted John 681961eaec change ride construction addresses to defines 2016-04-15 20:35:27 +01:00
Ted John f73e3ab0e1 integrate footpath construction variables 
- uint8 gFootpathProvisionalFlags
- rct_xyz16 gFootpathProvisionalPosition
- uint8 gFootpathConstructionMode
- uint16 gFootpathSelectedId
- uint8 gFootpathSelectedType
- rct_xyz16 gFootpathConstructFromPosition
- uint8 gFootpathConstructDirection
- uint8 gFootpathConstructSlope
- uint8 gFootpathConstructValidDirections

Also fix some previous variable integrations that had been forgotten to change.
 2016-04-15 19:16:48 +01:00
Ted John 1b3f46f960 integrate game command error string variables 
- gGameCommandErrorTitle
- gGameCommandErrorText
 2016-04-15 17:54:46 +01:00
IntelOrca 89ad0cc769 store windows in openrct2 memory and increase max 
Allocate a bigger window list and viewport list in OpenRCT2 static memory and move over all references from RCT2.
This also removes the 'active' viewport pointer list and instead changes everything to just enumerate the whole viewport list
 2016-04-14 23:00:35 +01:00
Duncan 9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs 
Clean up data use
 2016-04-13 12:38:58 +01:00
duncanspumpkin be8c84f1c1 Fix grass growth mistake 
Nibbles are only 4 bits not 8
 2016-04-11 20:04:03 +01:00
IntelOrca 37d759ffb7 fix #3268: water tool sound even when no change 2016-04-10 13:05:16 +01:00
duncanspumpkin f251ddd5a9 Fix grass growing underneath objects. 2016-04-10 10:14:06 +01:00
Marijn van der Werf 0fd42f408a Extract new struct 2016-04-03 14:53:17 +02:00
Michał Janiszewski 331f9fe03b Secure memory accesses, initialise variables 2016-04-01 09:38:40 +02:00
IntelOrca 6f2d91cc7e land and water now obey disable clearance, closes #3196 2016-03-31 21:57:22 +01:00
IntelOrca a2fda29d92 validate park entrances and land ownership tools 2016-03-22 22:55:13 +00:00
duncanspumpkin e30c2aeea8 Fix #3123 and refactor of banner placement. 
This fix needs testing as it might mess up nested game commands.
 2016-03-13 18:40:50 +00:00
Alexander Overvoorde 76a65ee4dd Fix thunderstorm visuals being tied to sound update function (fixes #3088) 2016-03-07 20:38:22 +01:00
duncanspumpkin ff6bfdced3 Revert #3104. Fix #3100 2016-03-07 19:04:48 +00:00
Josue Acevedo 21c55fda03 Fix a bug that prevents connect footpaths to ride. 
Fix a bug that prevents connect footpaths to the ride entrance/exit with multiple stations (Fixes #3100).
 2016-03-07 10:18:53 -06:00
danidoedel 57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
duncanspumpkin 1033e988d3 Fix #2887. Queues now correctly invalidate when breaking a chain 2016-03-03 22:01:11 +00:00
Gymnasiast ddf3d7a03d Consistently use 'colour' rather than 'color' 2016-02-28 20:32:02 +01:00
Gymnasiast 55a2b25f0f Name PARK_FLAGS_8 and stop checking it 2016-02-27 20:55:49 +01:00
Michał Janiszewski aa8437cb9d Minor fixes 2016-02-26 20:49:01 +01:00
Michał Janiszewski 6b514d1e3a Fix possible issues highlighted at higher warn levels 
Mostly possibly uninitialized values and signedness
 2016-02-26 12:54:00 +01:00
Michał Janiszewski fc2bba3047 Fixes for upcoming GCC6 & Clang 3.8 2016-02-25 19:35:18 +01:00
Ted John 74973a4a97 Merge pull request #2950 from janisozaur/ride-names 
Rename ride_entry functions and provide better logging
 2016-02-25 12:43:19 +00:00
Michał Janiszewski 14bff0c66f Rename rct_ride_type to rct_ride_entry 2016-02-25 13:33:19 +01:00
IntelOrca b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
Michał Janiszewski eb645cd4f3 Rename ride_entry functions and provide better logging 
For hacked rides, provide the name of offender in the log.
 2016-02-24 22:23:33 +01:00
duncanspumpkin 53df541a39 Relabelled sprite_flags to flags. Relabelled peep/fountain flags 2016-02-23 17:22:19 +00:00
duncanspumpkin 5340af4a12 Refactor sprite_flags 2016-02-23 17:09:53 +00:00
Michał Janiszewski d375015975 Mark map element getters const 
While it doesn't change a lot in terms of performance, it helps out
compiler being a bit smarter about inlining and reordering things (as
evidenced by generated assembly).
 2016-02-23 15:12:48 +01:00
duncanspumpkin f267af3356 Fix chairlift bullwheel rotation animation. 
Issue caused by incorrect check for breakdown
 2016-02-18 20:32:04 +00:00
Martin Černáč aff8cec48c Refactor freeze climate cheat 2016-02-17 17:39:33 +01:00
Marijn van der Werf 9c456c6bf5 Add development suggestions 2016-02-17 13:31:03 +01:00
IntelOrca 5cf0c4bd07 remove commented out callproc/funcs 2016-02-16 20:10:24 +00:00
IntelOrca 8268f607cd implement track_remove_station_element 2016-02-14 17:37:28 +00:00
Duncan 0e75efc1eb Merge pull request #2927 from OpenRCT2/clear_funcs 
Implement Clear funcs
 2016-02-14 07:19:33 +00:00
duncanspumpkin 53689349f9 Fix mistake added in refactor. 
Also remove redundant global variable setting
 2016-02-13 21:55:00 +00:00
duncanspumpkin 9c3055224d Refactor clear funcs 2016-02-13 21:01:36 +00:00
duncanspumpkin 305ae76346 Implement clear funcs for remaining functions 2016-02-13 20:26:22 +00:00
duncanspumpkin f6797181b5 Start implementing clear_funcs 2016-02-13 13:10:55 +00:00
Marijn van der Werf 7565a7ba69 Implement substate 9 2016-02-13 00:01:15 +01:00
Marijn van der Werf 6c601170f0 Add documentation to functions 2016-02-12 00:06:03 +01:00
Marijn van der Werf cba820b7a2 Decompile function 2016-02-12 00:05:47 +01:00
zsilencer b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
zsilencer b23748c015 fix 2 sources of very common desyncs 2016-02-02 14:08:59 -07:00
Duncan b0c5b85765 Merge pull request #2784 from marijnvdwerf/decompile-attempt 
[WIP] Attempt at decompiling `game_command_set_maze_track`
 2016-02-01 16:01:45 +00:00