Commit Graph

8267 Commits

Author SHA1 Message Date
Duncan 133ba62fa1 Merge pull request #4017 from gDanix/refactor-sub_6DAB4C_chunk_2
Refactor sub_6DAB4C_chunk_2 [WIP]
2016-07-10 08:25:53 +01:00
OpenRCT2 git bot b09e678fa9 Merge Localisation/master into OpenRCT2/develop. 2016-07-10 04:00:20 +00:00
Ted John 853e002b4f disable checksum validation 2016-07-10 00:29:32 +01:00
Ted John 66eee6d89d fix reading of large scenery objects 2016-07-10 00:15:27 +01:00
Ted John 324d690eaf fix unloading of null objects 2016-07-10 00:00:23 +01:00
Ted John f7757c7991 fix wall price check 2016-07-09 23:03:30 +01:00
Daniel Trujillo 8eeb6056a1 Fix grammar issues. 2016-07-10 00:01:55 +02:00
Daniel Trujillo 13f6959ae3 Rector block_brake_closed parameter from apply_block_brakes
To remark that is a variable, rather than a constant (closed)
2016-07-09 23:43:04 +02:00
Daniel Trujillo 3e782d9295 Deep splitting and rewriting of the sub_6D... code 2016-07-09 23:43:04 +02:00
Daniel Trujillo a3661e5842 Swapped if/else at line 5402
Applied De Morgan's laws to simplify condition
2016-07-09 23:43:04 +02:00
Daniel Trujillo 453b33a7b7 Move "apply_block_section_stop_site" on top of "check_and_apply...()"
To make it callable from "check_and_apply...()"
2016-07-09 23:43:04 +02:00
Daniel Trujillo 3e0754f14d Rename sub_6DAB4C_chunk_2 2016-07-09 23:43:04 +02:00
Daniel Trujillo 013266c6ae Add needed calls to the new function 2016-07-09 23:43:04 +02:00
Daniel Trujillo ed73a9dfe0 Break vehicle-handling code into another function 2016-07-09 23:43:04 +02:00
Daniel Trujillo efb720326d Add an implicit "else"
After "vehicle->velocity = 0", the sentence:
"vehicle->velocity -= vehicle->velocity >> 3" doesn't have any
effect, so insert an "else" can clarify the code
2016-07-09 23:43:04 +02:00
Daniel Trujillo 95e727d376 Add comments to the code 2016-07-09 23:43:04 +02:00
Daniel Trujillo 92b5e661fb Break an "else" into pieces 2016-07-09 23:43:04 +02:00
Daniel Trujillo f56f7065ac Make more obvious the last "else" previously made with a "return" 2016-07-09 23:43:04 +02:00
Daniel Trujillo cb4fe669a9 Name constant (1 << 5) -> MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED 2016-07-09 23:43:04 +02:00
LRFLEW 50f3ba001e Update Xcode Project for #4024 2016-07-09 22:42:22 +01:00
Ted John 8fd81c3b75 initialise legacy object list on startup 2016-07-09 22:37:22 +01:00
Michał Janiszewski b10b57e9dc add language 8 as a multibyte language 2016-07-09 21:15:02 +01:00
Ted John 3d824142ee clean up init_scenery a bit 2016-07-09 21:06:54 +01:00
Ted John 7b17b603f3 set scenery tab IDs 2016-07-09 20:42:22 +01:00
Ted John 440c021951 create base scenery object for scenery objects 2016-07-09 19:16:38 +01:00
Ted John 234471c3fc cope with same loaded object for multiple slots 2016-07-09 15:57:59 +01:00
Ted John 4de1f2912a remove unnecessary functions 2016-07-09 15:36:48 +01:00
Ted John ce878723d7 add helper methods for object entry names 2016-07-09 15:29:04 +01:00
Ted John 3c64010fe1 Make Console::Error::WriteLine formattable 2016-07-09 15:02:05 +01:00
Ted John 8c2393f5c5 don't export invalid objects 2016-07-09 14:52:56 +01:00
Ted John a25d7aa535 check for LoadObjects failure 2016-07-09 14:13:46 +01:00
Ted John 7d21e10ee8 Merge pull request #4021 from janisozaur/wundef
warn on undefined macros
2016-07-09 12:17:08 +01:00
Michał Janiszewski abda262b13 Add missing override specifier 2016-07-09 12:14:46 +01:00
Michał Janiszewski f2eb63847f Fix missing define checks 2016-07-09 10:24:26 +02:00
Michał Janiszewski f82b4b4425 Add -Wundef to CMake-based builds
Verifies all the defines are checked properly
2016-07-09 10:06:09 +02:00
Michał Janiszewski 639f19adbf Fix define checks in project 2016-07-09 10:05:12 +02:00
Michał Janiszewski 9240280005 Only disable optimisations when using RCT2 segments (#4007) 2016-07-09 09:57:29 +02:00
duncanspumpkin 1d4fb5cb6f Allow rate input by text box 2016-07-09 08:39:45 +01:00
duncanspumpkin 4fa10b049b Fix #3999. Animated objects correctly apply secondary colours 2016-07-09 08:05:25 +01:00
OpenRCT2 git bot 05540cfef0 Merge Localisation/master into OpenRCT2/develop. 2016-07-09 04:00:22 +00:00
Ted John 7c8fbf3588 fix scenery group population 2016-07-09 02:01:27 +01:00
Ted John 5785020b07 fix clip size of preview 2016-07-09 01:28:57 +01:00
Ted John 3d291b027a load objects with larger than expected image data 2016-07-09 01:28:48 +01:00
Ted John 4d3fca767d document and name G1 flags 2016-07-09 00:27:21 +01:00
Ted John a8c1c451d5 fix freeing of non-pointer / union issue 2016-07-08 22:58:38 +01:00
Ted John 78c6b6a251 remove all unnecessary object resets 2016-07-08 22:58:38 +01:00
Ted John 4664b73488 remove object_unload_all 2016-07-08 22:58:38 +01:00
Ted John 8b03b996c0 ensure _objectRepository and _objectManager are freed 2016-07-08 22:58:38 +01:00
Ted John 3f19becc2b remove object_unload_all 2016-07-08 22:58:38 +01:00
Ted John 60098aeef0 remove last use of object_load_chunk 2016-07-08 22:58:38 +01:00