mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,902 Commits 8 Branches 40 Tags 367 MiB
Commit Graph

365 Commits

Author SHA1 Message Date
Ted John 6a0f934a5f Tabs to spaces for sprite.cpp 2017-02-09 17:59:17 +00:00
Ted John 6ea4e4987d Turn sprite.c into sprite.cpp 2017-02-09 17:59:17 +00:00
Ted John e649e7ad4a Move creation of version string to Version.cpp 2017-02-09 17:58:19 +00:00
Ted John f59afb8c44 Use constant for assertion message 2017-02-09 17:57:39 +00:00
Ted John 3a4bc87198 Allow control of assertion behaviour 
This allows tests to change the behaviour at runtime so that OpenRCT2 aborts instead of showing a message box.
 2017-02-09 17:57:39 +00:00
Ted John c4e89278c1 Merge pull request #5194 from IntelOrca/refactor/more-istream 
Use IStream instead of SDL in more places
 2017-02-09 17:56:55 +00:00
Ted John d0a05df106 Move Convert definitions to TcpSocket.h 2017-02-09 12:33:44 +00:00
wolfreak99 f85dc8ced0 Code fixups 2017-02-08 21:46:54 -05:00
Ted John b3b5631f07 Merge pull request #5163 from Broxzier/tile_inspector_fixes 
Minor tile inspector improvements
 2017-02-08 22:26:42 +00:00
wolfreak99 54504cc75f remove excess generate_new_guest, make park_generate_new_guest public 
I noticed there is an extra generate_new_guest which calls park_generate_new_guest. This can be removed in favor of just making park_generate_new_guest public.

This also allows potential in the future for customized trams, such as a group of angry people arriving to trash the park or something like that.
 2017-02-08 22:26:04 +00:00
Marijn van der Werf 5504471715 Fix #5188: Clicking on a Magic Carpet doesn't open the ride window 2017-02-08 22:22:25 +00:00
Ted John 5787a0bf90 Use S6Exporter for crash handler 2017-02-08 22:17:01 +00:00
Ted John e2aebb2236 Use streams for reading title sequence scripts 2017-02-08 22:11:46 +00:00
Ted John 410376356d Remove scenario_load_rw, no longer used 2017-02-08 22:06:27 +00:00
Ted John c379347d59 Use stream for chat log 2017-02-08 22:00:04 +00:00
Ted John ad1634631f Fix MemoryStream::EnsureCapacity 2017-02-08 21:53:37 +00:00
Ted John d124f4fad0 Use streams for network load and save 2017-02-08 18:16:33 +00:00
wolfreak99 b0cc772990 Replace gParkEntranceX/Y/Z/Direction with rct_xyzd16 gParkEntrance 2017-02-08 09:39:04 -05:00
Ted John de0e6bf521 Use IStream for network code 2017-02-08 12:53:00 +00:00
Ted John 61b69546fa Fix convert command 2017-02-08 12:06:08 +00:00
Ted John c80021d9da Remove use of RWops from ConvertCommand 2017-02-08 12:06:08 +00:00
Ted John 4a6905d1eb Remove object_read_and_load_entries 2017-02-08 12:06:08 +00:00
Ted John 811ab88660 Refactor CreateObjectFromLegacyFile to use FileStream 2017-02-08 12:06:07 +00:00
Ted John 2a11bc97fd Merge pull request #5179 from IntelOrca/refactor/sc-chunk-writer 
Use streams for SV6 export
 2017-02-08 12:01:38 +00:00
Ted John 629ccec466 Use write extended mode to fix checksum calculation 
[ci skip]
 2017-02-07 20:14:31 +00:00
Michał Janiszewski 7cb9d10d72 Fix wrong #define checks for DEBUG macro 2017-02-07 21:01:07 +01:00
Yaroslav Tretyakov 546aace3dd Fix invalid desync checks 
#5185
 2017-02-07 12:04:41 +00:00
Michael Steenbeek 528843184c Fix RCT1 research import, fixes #5014 2017-02-05 20:54:01 +01:00
Ted John 2518362112 Use streams for SV6 export 2017-02-05 15:45:23 +00:00
Michael Steenbeek f0f26ee297 Fix one failing testpaint test 2017-02-05 12:41:37 +00:00
Ted John 0dcab94411 Remove chunk code from SawyerEncoding 2017-02-05 12:26:52 +00:00
Ted John 5eee31f69a Use SawyerChunkReader instead of SawyerEncoding 2017-02-05 12:18:07 +00:00
Ted John 7ab2723936 Create a reader class for sawyer encoded chunks. 2017-02-05 02:40:50 +00:00
Ted John 652cad15c4 Refactor memory stream 
Clean up a few things.
 2017-02-05 02:40:16 +00:00
Ted John b21378b7f5 Fix #4689: Object selection tabs sometimes flicker 
8466de7cbf only reset w->frame on object type tabs. This also does it does it for the ride type filter tabs.
 2017-02-04 11:31:07 +00:00
Ted John 94bde929e7 Fix nullptr access when removing banners 2017-02-04 11:24:20 +00:00
Duncan b1ffe19a74 Merge pull request #5172 from duncanspumpkin/refactor 
Flags Refactor
 2017-02-04 11:12:35 +00:00
Ted John 601a8e633c Fix #5171: Latest build doesn't allow server connection 
Network park streams do not have checksums so do not try to validate.
 2017-02-04 11:05:25 +00:00
duncanspumpkin fef7445f0c Use flags where known. Refactor large 3d signs slightly 2017-02-04 08:12:44 +00:00
Ted John afc8943e34 Fix #5169: Parks containing packed objects fail to open 
Regression from 3b02b05dc6. Forgot to implement reading packed objects with IStream.
 2017-02-04 00:34:14 +00:00
Broxzier 5fef1a5d0b fix paste button becomes active after sorting tile 
Remove unneeded call to window_tileinspector_set_page
 2017-02-03 21:10:20 +01:00
Ted John 44120b2e7e Fix build issues 2017-02-02 22:00:01 +00:00
Ted John bb62bbebb3 Re-introduce checksum validation 2017-02-02 22:00:01 +00:00
Ted John fed4c248e3 Remove use of SDL RWOps from title sequence player 2017-02-02 22:00:01 +00:00
Ted John 5d7a712672 Use new S6 importer for title screen and fix issues 2017-02-02 22:00:01 +00:00
Ted John 8998b2ae18 Refactor S6 importer to use IParkImporter interface 2017-02-02 22:00:01 +00:00
Ted John 5c1f2f4c43 Replace IS4Importer with IParkImporter 2017-02-02 22:00:01 +00:00
Ted John 2b045ddb9b Use streams for reading parks in S4 importer 2017-02-02 22:00:01 +00:00
Ted John f30a3b315c Add common load method for S4 importer 2017-02-02 22:00:01 +00:00
Michał Janiszewski 04a2734593 Merge pull request #5162 from duncanspumpkin/refactor 
Small refactor of world files
 2017-02-02 22:53:37 +01:00
Michał Janiszewski 6ac6b272c4 Bump network version 2017-02-02 22:46:37 +01:00
Ted John 676903e65c Reduce false positive desync 
The staff list window modifies the sprites purely for local state causing a false positive desync warning to pop up in multiplayer. This now causes it to only happen if the map window is also open. This is also a performance improvement.

#5164
 2017-02-02 21:31:36 +00:00
Michael Steenbeek 695f7c33bf Fix all known incorrect land ownership in RCT1 2017-02-02 22:21:05 +01:00
Michael Steenbeek cad39c788a Remove more magic values from metal_a_supports_paint_setup 2017-02-02 21:54:19 +01:00
Broxzier 81a8a1a939 Minor tile inspector improvements 
- Fix tile unselectable after closing the window
- Remove unused code (scenery has no dropdown)
- Drawing dashes in X/Y spinners when no tile is selected
 2017-02-02 21:28:18 +01:00
duncanspumpkin e384b9a508 Label known offsets and flags of wall/fence 2017-02-02 18:52:35 +00:00
duncanspumpkin e1ea820111 Remove unnecessery read. Add offsets 2017-02-02 18:20:16 +00:00
duncanspumpkin 6a9cddf2d8 Label water object offsets 2017-02-02 18:13:51 +00:00
duncanspumpkin e749285e48 Label PARK_FLAGS_18 and adjust SCENARIO_NO_MONEY comment 2017-02-02 17:59:23 +00:00
Gymnasiast 2381bd5cfb Fix RCT1 Splash Boats import 2017-02-02 15:47:08 +01:00
Michael Steenbeek eb45ec95ce Merge pull request #5145 from IntelOrca/feature/rct1-scenario-select 
Enable RCT1 SC4s for scenario select
 2017-02-01 18:32:45 +01:00
muemart a64dae573a Fix data path command line on windows 2017-01-31 19:41:26 +00:00
Ted John 72800acd5c Fix std::string used as char * 2017-01-31 17:59:42 +00:00
Ted John 4670d2f770 Fix some SC enum items missing prefix 2017-01-31 17:57:10 +00:00
Ted John 612e268e5f Allow SC4s to be loaded by title seq player 2017-01-31 17:54:39 +00:00
Ted John daaf6c69a3 Use missing SC IDs in scenario sources 2017-01-31 17:54:39 +00:00
Ted John a8e329ef99 Implement getting sc entries from SC4s 2017-01-31 17:54:39 +00:00
Ted John c9d7cd8216 Refactor loading of SC6 information when scanning scenarios 2017-01-31 17:54:39 +00:00
Michael Steenbeek 94d38b9f7a Don't remove vehicles when removing all guests, name some interaction fields 2017-01-30 23:51:01 +01:00
Michał Janiszewski bde17f2b30 Start v0.0.7 2017-01-29 23:35:17 +00:00
wolfreak99 99c68439b1 define MAX_PEEP_SPAWNS and MAX_PARK_ENTRANCES (#5119) 2017-01-29 22:27:14 +01:00
wolfreak99 70a855c395 Fix #5029: Invalid window limit can cause crash 
#5121
 2017-01-29 18:03:23 +00:00
duncanspumpkin 35b91037e8 Refactor of footpath labeling enums 2017-01-29 10:15:29 +00:00
duncanspumpkin e2efb66d3d Minor refactor of banner and footpath enums 2017-01-29 09:40:43 +00:00
Michał Janiszewski 723e13cb16 Prevent some crashes when title sequence is not present 2017-01-28 21:13:36 +00:00
Michał Janiszewski f6cc743da6 Fix #5096: Crash on park with out of bounds sprite coordinates 2017-01-28 21:12:07 +00:00
Michał Janiszewski cb1911280a Don't crash if path to RCT2 is NULL 
This can happen when `game_path` entry gets removed from `config.ini`
 2017-01-28 21:31:33 +01:00
Michał Janiszewski 404fceaed9 Guard against invalid fence better 2017-01-28 21:04:08 +01:00
duncanspumpkin 3633b86405 Minor refactor of track design to label enums 2017-01-28 09:28:11 +00:00
Michał Janiszewski 0e7c94d98a Guard fence from null entry 
Allows loading
http://www.nedesigns.com/park/3626/mediterranean-mysteries/
 2017-01-28 00:12:49 +01:00
Michał Janiszewski 834cee311b Fix typos in RCT1-related code 2017-01-27 22:13:49 +01:00
Michał Janiszewski 51523df50a Fix left-shifts in research.c 2017-01-27 21:46:10 +01:00
Ted John 233a3040e1 Merge pull request #5007 from IntelOrca/feature/rct1/import-vehicles 
RCT1: import vehicles
 2017-01-27 07:49:20 +00:00
Michał Janiszewski 6bd9e3eca8 Make sure various fields are initialised properly 2017-01-27 07:35:48 +01:00
Gymnasiast 24b546b789 Fix import of peep sprites 2017-01-27 00:50:49 +01:00
Ted John e115227c08 Sort includes 2017-01-26 23:36:33 +00:00
Ted John b5505c9fc9 Improve function names 2017-01-26 23:36:21 +00:00
Ted John f019aa5db5 Remove commented out code 2017-01-26 23:35:01 +00:00
Ted John f3fc09cb9a Fix switch brace syntax 2017-01-26 23:32:46 +00:00
Ted John 438926c08c Protect ride_mechanic_status_update from null mechanic 2017-01-26 23:30:16 +00:00
Gymnasiast 2da90b9808 Fix erroneous messages about stalling 2017-01-26 23:30:16 +00:00
Ted John c24127bafe Fix loading scenario details from SV4 2017-01-26 23:30:16 +00:00
Gymnasiast c92792a973 Also import news items in S4 files correctly 2017-01-26 23:30:16 +00:00
Gymnasiast 6d8a617712 Count block sections when importing an SC4/SV4 file 2017-01-26 23:30:16 +00:00
Gymnasiast a7e91ad556 Use the actual scenario number in the S4 file rather than the file name 2017-01-26 23:30:16 +00:00
Gymnasiast bd68624c92 Fix unbuyable land tiles in Katie's Dreamland 2017-01-26 23:30:16 +00:00
Gymnasiast 84754ec30f Correctly import Heide-Parks Compact Inverted Coaster 2017-01-26 23:30:16 +00:00
Gymnasiast 585e28b67f Temporarily fix non-ascii import 2017-01-26 23:30:16 +00:00
Gymnasiast e621cd37cc Fix mechanics facing the wrong direction 2017-01-26 23:30:16 +00:00
Ted John 1cb6dbbe1f Convert RCT1 strings to UTF-8 2017-01-26 23:30:16 +00:00