mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,102 Commits 9 Branches 41 Tags 386 MiB
Commit Graph

5303 Commits

Author SHA1 Message Date
Gymnasiast 57d2618fb5 Use gFirstTimeSave 2016-04-25 19:16:58 +02:00
Gymnasiast 7521a70ac8 Use get_file_extension_type() 2016-04-25 19:11:51 +02:00
Gymnasiast 8dc7fdcec2 Enable SV4 files to be loaded from the native load/save dialog 2016-04-25 15:38:44 +02:00
marcovmun 4149bcdd30 Fix: #2579 queue lines of 2 rides merge (#3409) 2016-04-25 12:12:12 +01:00
Ted John 45843ec1d5 fix sub directory search for Windows 
Fixes a small issue related to #3408
 2016-04-24 23:55:28 +01:00
Ted John 99223d5d04 fix #3407: rides were not removed in editor 2016-04-24 23:48:33 +01:00
Ted John 171c4f20b7 fix tautology bug 2016-04-24 22:25:32 +01:00
Ted John 652b1c83db integrate variables for lightning and toolbar dirty flags 2016-04-24 21:49:09 +01:00
Nubbie 44a92e3f6b Explain what 'Advertise' means, fixes #3382 2016-04-24 21:24:28 +02: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 0a80e7a737 integrate pickup peep variables 2016-04-24 10:28:08 +01:00
Ted John e7f62bf014 integrate game palette variables 2016-04-24 02:02:56 +01:00
Ted John a97533228c integrate window DPI variable 2016-04-24 01:40:55 +01:00
Ted John 19662a091c integrate rain drawing variables 2016-04-24 01:39:33 +01:00
Ted John 98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John a1150d31cf add global macros for more scenario variables 2016-04-23 18:07:07 +01:00
Ted John ef7dd83735 add pointer variables for scenario name and details 2016-04-23 17:53:25 +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
Michał Janiszewski 4f72b82ea0 Fix warnings in clang, gcc 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 28aa9fe707 fix tautology bug in Twitch logic 2016-04-23 13:05:09 +01:00
Yaroslav Tretyakov 3f76d09f38 Decompile vehicle_visual_roto_drop function (#3363) 2016-04-23 12:17:15 +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
Duncan d408cf4eea Metal a support (#3405) 
* Implement start of metal a supports

* Finish implementing metal a supports

* Fix bugs.
 2016-04-23 10:58:23 +01:00
Ted John 3bd21240ed add global macros for climate variables 2016-04-23 10:53:48 +01:00
Duncan ffcb01da91 Merge pull request #3381 from Wirlie/develop 
Revert uint assignment from 7eb3a90, Fixes #3367
 2016-04-23 07:47:51 +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 463a2f4533 add global macro: gScenarioObjectiveCurrency 2016-04-23 02:23:17 +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 5cb25c390f add global macro: gBankLoanInterestRate 2016-04-23 02:06:56 +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
Ted John ddd0f07127 fix #3321: can't rotate pre-built rides 2016-04-22 23:59:16 +01:00
Ted John 85c553dc72 fix #3393: prevent crash when title music can't load 2016-04-22 23:46:58 +01:00
Ted John 6a1500a1af Merge pull request #3320 from OpenRCT2/rct1-import 
Import RCT1 saved games / scenarios
 2016-04-22 22:14:14 +01:00
Wirlie 1112112157 Revert uint assignment from 7eb3a90. 
For solve the another problem (the reason of that this code has been modified at 7eb3a90), I replaced the left shift operator with a multiply (suggested by zsilencer) to prevent a 'undefined behaviour', Fixes #3367.
 2016-04-22 16:00:05 -05:00
Ted John e9f755c947 Merge pull request #3385 from janisozaur/highscores 
Don't parse invalid names from highscores fixes #3333
 2016-04-22 21:16:00 +01:00
Michał Janiszewski 65ca8b9cb1 Test for object validity 
Apparently it can fail for some:
https://openrct2.org/forums/topic/1175-wont-open-on-mac/#comment-5742
 2016-04-22 22:07:42 +02:00
Michał Janiszewski 9956b804d2 Don't parse invalid names from highscores fixes #3333 2016-04-22 22:07:42 +02:00
Ted John a6ca76813d rename import.h and remove includes 2016-04-22 20:14:29 +01:00
Ted John 25958b0d30 remove old RCT1 import code 2016-04-22 19:26:15 +01:00
Ted John 67da464e08 use correct logic for function name 2016-04-22 18:39:00 +01:00
Ted John bed916e4aa use correct constant 2016-04-22 18:37:04 +01:00
Ted John 3992ca22e4 import lots of game variables 2016-04-22 18:26:29 +01:00
Ted John 6a48bed4ad organise order of preset scenery groups and paths 2016-04-22 18:26:28 +01:00
Ted John ff1de46ca6 improve List::AddRange performance 2016-04-22 18:26:28 +01:00
Ted John f3356caa39 add a CLI command for converting saved games <-> scenarios 2016-04-22 18:26:27 +01:00
Ted John a438e7be24 fix queue colours 2016-04-22 18:25:29 +01:00
Ted John 6086771988 extract code to new method 2016-04-22 18:25:28 +01:00
Ted John fb192bba0e prevent adding duplicate footpath entries 2016-04-22 18:25:28 +01:00
Ted John 228af15a30 add path object import 2016-04-22 18:25:27 +01:00
Ted John b888466fa1 fix loading of AA/LL scenarios 2016-04-22 18:25:26 +01:00
Ted John 486c10a9f1 add RCT1 path type enums 2016-04-22 18:25:26 +01:00
Ted John 26ce06a1c7 only import required path additions 2016-04-22 18:25:25 +01:00
Ted John 9d44aaa8a8 fix broken path additions import 2016-04-22 18:25:24 +01:00
Ted John c6615b942e fix fences type mapping 2016-04-22 18:25:23 +01:00
Ted John b93429052c fix more import bugs 2016-04-22 18:25:23 +01:00
Ted John 7401b5cf39 import default objects and themes 2016-04-22 18:25:22 +01:00
Ted John 92973c692d import more flags and finance correctly 2016-04-22 18:25:21 +01:00
Ted John ba90d2a55a fix RCT1 vehicle object table 2016-04-22 18:25:21 +01:00
Ted John 512ed6ce98 fix compile issues and bugs 2016-04-22 18:25:20 +01:00
Ted John 7754204a25 finish conversion of RCT1 import to c++ 2016-04-22 18:25:19 +01:00
Ted John cf7b81fd3a start moving RCT1 importer to C++ 2016-04-22 18:24:54 +01:00
Ted John 72e625c5a3 import research list as best as possible 2016-04-22 18:23:57 +01:00
Ted John 88a26f17b0 refactor colours, use constants 2016-04-22 18:23:57 +01:00
Ted John 17abf1d970 use localised strings for RCT1 scenarios 2016-04-22 18:23:55 +01:00
Gymnasiast 086ba6909f Fix Junior RC import, use constants 2016-04-22 18:23:55 +01:00
IntelOrca 3c347c2e10 fix rebase / compile error 2016-04-22 18:23:54 +01:00
Gymnasiast 41a84e899b Import with correct launch mode, better grey roof replacement 2016-04-22 18:23:53 +01:00
Gymnasiast e7c7dcda61 Import banners correctly, use some constants 2016-04-22 18:23:52 +01:00
Gymnasiast f3ec92a426 Initial support for importing SV4 and importing more park flags 2016-04-22 18:23:52 +01:00
Gymnasiast 705f264cf8 Import music, entrance style, some flags and park open status 2016-04-22 18:23:51 +01:00
Gymnasiast e27e0611ae Fix vehicles in imported S4's not leaving the station 2016-04-22 18:23:50 +01:00
Gymnasiast c72a4caa75 Fix number of trains and number of cars per train 2016-04-22 18:23:50 +01:00
Gymnasiast 15d077410e Fixed object selection and lift hill speeds 2016-04-22 18:23:49 +01:00
Gymnasiast 6ba69c52ca Use a define to specify the default vehicle should be used 2016-04-22 18:23:48 +01:00
Gymnasiast caefc1d9cc Define RCT1 vehicles as constants and use a lookup table 2016-04-22 18:23:48 +01:00
Gymnasiast 74d0c2aed8 Fix import of alternative vehicles 2016-04-22 18:23:47 +01:00
duncanspumpkin 3b2fade400 Fix rebase issues 2016-04-22 18:23:46 +01:00
Gymnasiast 2d3dfd8834 Move RCT1 file version detection to its own function 2016-04-22 18:23:46 +01:00
Gymnasiast a28ba1d4d8 Also take AA in account when importing merry-go-rounds and make version detection more robust 2016-04-22 18:23:45 +01:00
Gymnasiast 5ad1c224a6 Fix import of Merry-go-round colours 2016-04-22 18:23:44 +01:00
Gymnasiast 8169969756 Fix typo 2016-04-22 18:23:43 +01:00
IntelOrca 1873d659a9 RCT1 import: import vehicle colours, scenario descriptions and animations 2016-04-22 18:23:43 +01:00
IntelOrca 3e9d56a284 RCT1 import: fix for Junior Roller Coaster 2016-04-22 18:23:42 +01:00
IntelOrca e319df533e rct1 import, fix peeps entering rides 2016-04-22 18:23:41 +01:00
IntelOrca 0e1f0cbbe8 improve RCT1 ride import 2016-04-22 18:23:41 +01:00
IntelOrca a90a59c39c rct1 import: fix colouring 2016-04-22 18:23:40 +01:00
IntelOrca f0382b9ab2 implement import of rct1 scenarios, part 1 2016-04-22 18:23:40 +01:00
Marijn van der Werf 7728a96e96 Update signature 2016-04-22 14:05:51 +02:00
janisozaur 7d2e62ba56 Fix typo introduced in 288d11a, fixes #3376 (#3379) 
See https://sourceforge.net/p/predef/wiki/Architectures/

This reverts commit 67a86fe22f.
 2016-04-22 07:59:50 +01:00
Ted John 2329972b58 Merge pull request #3371 from Broxzier/no_money_checks 
Check the no money flag in more places in case the price field is not free.
 2016-04-22 00:00:40 +01:00
Ted John 571907eabb Merge pull request #3374 from IntelOrca/feature/file-associations 
Register file associations on Windows
 2016-04-21 23:55:14 +01:00
Ted John 57301def05 disable register-shell for mingw 2016-04-21 23:48:58 +01:00
Ted John 3f1e49d510 use unicode for registering file associations 2016-04-21 23:03:25 +01:00
Ted John c51f9a8ecc register file associations on Windows 2016-04-21 21:41:53 +01:00
Michał Janiszewski b7f9af41a8 Only initialize structs with compile-time consts 
See https://stackoverflow.com/a/32584666
 2016-04-21 22:20:24 +02:00
Michał Janiszewski 288d11a196 Add platform define for x86 2016-04-21 22:18:59 +02:00
Ted John b499a4589f embed OpenRCT2 icon for Windows (#3372) 
Embeds the OpenRCT2 icon file using Win32 native resources and sets the window icon to it.
 2016-04-21 19:17:26 +01:00
Hielke Morsink 87953f34db Checking for no_money flag when checking ride price 2016-04-21 19:21:09 +02:00
Hielke Morsink 09688b427e Fix #3238 - Guest refusing to pay that much in no money scenarios 2016-04-21 19:09:41 +02:00
duncanspumpkin d7cd3d0662 Fix #3345. Put banners back in their bounding box. 2016-04-21 17:19:16 +01:00
Marijn van der Werf 701dd77b54 Decompile paint function for rides 50, 52, 53, 54 2016-04-21 15:05:47 +02:00
Wirlie 407359e82b Fix #3318. Mine/Mouse train now can swing on turns. 2016-04-20 22:32:36 -05:00
janisozaur 7eb3a90cea Fixes for values being shifted (#3362) 2016-04-20 23:57:54 +01:00
Ted John 60ac228c51 Merge pull request #3277 from IntelOrca/refactor-twitch 
Refactor and clean up twitch.cpp
 2016-04-20 22:12:57 +01:00
Gymnasiast 548bee8325 Fix formatting and rebase 2016-04-20 20:14:07 +02:00
Rune Laenen e0c103031e Add shortcut to mute sound 2016-04-20 19:56:57 +02:00
IntelOrca f10d79c63c refactor and clean up twitch.cpp 2016-04-20 18:11:07 +01:00
IntelOrca 4b2776f266 move code from Diagnostics and Guard to cpp 2016-04-20 18:11:06 +01:00
janisozaur e9bf2a742f widget_index is sint16, make sure the check is valid (#3335) 2016-04-20 18:08:05 +01:00
IntelOrca 94ecc1da40 fix #3282: improve launched freefall ratings 
When the ride mode is in downward launch mode, the intensity and nausea were fixed regardless of how high the ride is. To improve the rating calculations, alter the ratings in a similar fashion to roto-drop which is a similar mechanic.
 2016-04-20 17:33:55 +01:00
janisozaur 44717cfe2a Add console command to set ride type (#3273) 2016-04-20 12:37:31 +01:00
Marijn van der Werf 8fc897522b Clean up paint setup rotation (#3343) 
* Use passed rotation
* Replace fixed 0 rotations
 2016-04-20 12:33:42 +01:00
zsilencer 3ba7d54247 Fix reconnect issue caused by inboundpacket not being cleared 2016-04-20 01:49:16 -06:00
zsilencer 0ceff7fd90 More efficient map transfers 2016-04-20 01:49:15 -06:00
zsilencer 82e02e7cf8 String ids got switched around from the language files. 2016-04-20 01:49:15 -06:00
zsilencer e742e96461 Fix bug that gave error when trying to join saved server 2016-04-20 01:49:15 -06:00
zsilencer e582a8f47f Stop constantly resizing vector 2016-04-20 01:49:15 -06:00
zsilencer b257e431d9 Get rid of using user_strings for interface 2016-04-20 01:49:15 -06:00