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

1857 Commits

Author SHA1 Message Date
Sijmen Schoon 70b2779654 Add a failsave to the parent directory code 2016-07-14 20:45:34 +02:00
Sijmen Schoon 95a081bf38 Fix drive listing on Windows 2016-07-14 20:45:34 +02:00
Sijmen Schoon 53e469834b Clean up window_loadsave_populate_list 2016-07-14 20:45:34 +02:00
Sijmen Schoon bf51ae7e26 Refactor rest of window_loadsave_mouseup 2016-07-14 20:45:34 +02:00
Sijmen Schoon 58964cb301 Refactor WIDX_UP and WIDX_NEW 2016-07-14 20:45:34 +02:00
Sijmen Schoon 446db73dc2 Fix refactoring oversight in window_loadsave_open 2016-07-14 20:45:34 +02:00
Sijmen Schoon a26ad34ecd Remove unused function has_extension 2016-07-14 20:45:34 +02:00
Sijmen Schoon 0100ae7cd3 Refactor window_loadsave_open 2016-07-14 20:45:34 +02:00
Michał Janiszewski a6d0e6916e Fix function definitions to match their declarations 
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
 2016-07-14 14:11:49 +02:00
Marijn van der Werf 5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Sijmen Schoon fb456a86ea Fix #4061: Wrong error message when opening all rides with unfinished rides 
Show the proper error when opening all rides goes wrong.
 2016-07-14 11:26:12 +01:00
Ted John 04340021f6 Fix #4071: Guests paid when free entry park flag 
Make most usages of park entrance fee use a common function which does the necessary checks.
 2016-07-13 19:48:42 +01:00
Ted John dca816cfd3 Merge pull request #4024 from IntelOrca/refactor/object-list 
Refactor and improve the object system:
- Objects are now exported to user directory under 'object'.
- Object directories are scanned recursively.
- Improves reliability of object loading and handling of bad objects.
- Improve performance of object scanning.
- Only load new objects when loading a new game.
- Improve changing language experience.
 2016-07-11 23:45:45 +01:00
Ted John edb4a4a822 fix get capacity string for vehicles 2016-07-11 22:50:55 +01:00
Ted John 4bf9748143 fix drawing of object preview 
We can't use dpi->width and dpi->height as they only define the clip region, not the viewport
 2016-07-11 22:09:15 +01:00
Sijmen Schoon 38f402f156 Remove variable that became unused because of 06de7b 2016-07-11 19:26:25 +02:00
Sijmen Schoon 06de7bc1e1 Set default track folder to user track directory 
Fixes #4019
 2016-07-11 19:13:30 +02:00
Sijmen Schoon 773c7e04ef Remove stray space 2016-07-11 19:13:30 +02:00
Sijmen Schoon d8bc890d0a Exit scenery selection mode when done saving 2016-07-11 19:13:30 +02:00
Sijmen Schoon 79a85cd659 Save track designs as td6 file 2016-07-11 19:13:30 +02:00
Sijmen Schoon 9d1ae9b576 Fix track save system dialog crash 2016-07-11 19:13:30 +02:00
Sijmen Schoon a194c91997 Use OpenRCT2 dialog for saving tracks 2016-07-11 19:13:30 +02:00
Ted John f5391a366f Merge pull request #4048 from Goddesen/fix_4037_utf8_cursor 
Use UTF-8 to measure cursor size in text input.
 2016-07-11 18:00:17 +01:00
Ted John 7ae7c4f498 Merge pull request #4020 from duncanspumpkin/rate_input 
Allow rate input by text box
 2016-07-11 17:58:38 +01:00
Josue Acevedo cc2d91a642 Fix #4042: Park name isn't shown in objective selection 2016-07-11 09:54:37 +01:00
Josue Acevedo c17a89707c Fix #4031: Costs of land rights not displayed when hovering a tile 2016-07-11 09:31:42 +01:00
Goddesen 555eb227a8 Remove uint32 cast - size_t can be safely compared to size_t. 2016-07-11 02:15:15 +02:00
Goddesen 23e4fe63d0 Use utf8 to measure cursor size in text input. 2016-07-11 02:15:15 +02:00
duncanspumpkin 50c2e52b57 Use better text descriptions. Holding down rate buttons now increase/decrease 2016-07-10 09:26:23 +01:00
Ted John 3d824142ee clean up init_scenery a bit 2016-07-09 21:06:54 +01:00
duncanspumpkin 1d4fb5cb6f Allow rate input by text box 2016-07-09 08:39:45 +01:00
Ted John 5785020b07 fix clip size of preview 2016-07-09 01:28:57 +01:00
Ted John 78c6b6a251 remove all unnecessary object resets 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
Ted John 9801e92d79 fix track manager object filtering 2016-07-08 22:58:38 +01:00
Ted John d7e1933f12 fix track manager preview 2016-07-08 22:58:38 +01:00
Ted John f59d6b7a00 implement unloading arbitrary objects 2016-07-08 22:58:38 +01:00
Ted John 488da7942c use object_manager_get_loaded_object instead 2016-07-08 22:58:38 +01:00
Ted John 42ad4ddfd1 fix minor errors 2016-07-08 22:58:38 +01:00
Ted John e8635c1307 prepare for better object loading 2016-07-08 22:58:38 +01:00
Ted John faf1f08b7f fix loading object via console 2016-07-08 22:58:38 +01:00
Ted John 8d168fb2ce remove more old object code 2016-07-08 22:58:38 +01:00
Ted John a47c039f22 remove lots of old object code 2016-07-08 22:58:38 +01:00
Ted John 7e1f948e19 remove required flag (unused) and fix scenery selection 2016-07-08 22:58:38 +01:00
Ted John 4bed693344 fix basic object selection 2016-07-08 22:58:38 +01:00
Ted John ebcbb085d2 add ride previews 2016-07-08 22:58:38 +01:00
Ted John 52c11267bc add small scenery preview 2016-07-08 22:58:38 +01:00
Ted John 13a560fb1d fix ride type sorting and add water preview 2016-07-08 22:58:38 +01:00
Ted John f6d6d93580 fix highlight object in object selection 2016-07-08 22:58:38 +01:00
Ted John 554d445db4 migrate more of object selection 2016-07-08 22:58:38 +01:00
Ted John 343623c815 move more code from old object list to new repository 2016-07-08 22:58:38 +01:00
Ted John db304cdfcb fix filtering on object selection 2016-07-08 22:58:38 +01:00
Ted John 76b2621a51 Merge pull request #4000 from SijmenSchoon/develop 
Add a "default" button to the loadsave window
 2016-07-08 22:58:07 +01:00
Josue Acevedo bfce74f905 Minor fix: guest list not contain any guest. (#4016) 
Mistake that I made accidentally in #4006, caused because selected page takes the -1 value if the num of pages is 0 (it only happens if the num of guests is 0).
 2016-07-08 23:57:26 +02:00
Josue Acevedo 68794c8ab8 Fix: page dropdown doesn't appear in guest list window. (#4006) 2016-07-08 20:17:56 +02:00
Sijmen Schoon 66628e5131 Remove unused variable 2016-07-08 11:32:34 +02:00
Sijmen Schoon 662d92be74 Fix track load/save last-dir storing 
Doesn't really belong to this PR, but it's needed anyway
 2016-07-08 11:29:45 +02:00
Sijmen Schoon 47d69998e7 Straighten up window_loadsave_widgets 2016-07-07 11:50:06 +02:00
Sijmen Schoon 127d94d451 Add a default button to the loadsave window 2016-07-07 11:29:22 +02:00
Ted John 6a5ecf04de Merge pull request #3998 from gDanix/fix-3324 
Fix #3324: Opening tile inspector then footpath closes both windows.
 2016-07-06 20:59:54 +01:00
Daniel Trujillo 966fbe812c Refactorize "update" callback to match coding standards. 2016-07-06 19:33:12 +02:00
Daniel Trujillo 2ea8ab1441 Fix #3324 
This commit fixes a bug involving tool windows being closed when the
tile inspector was opened. This was caused by calling tool_cancel()
from wrong places, causing all tool windows being closed.
 2016-07-06 19:26:14 +02:00
Sijmen Schoon fcf4008395 Remember previous save/load location 
Works for games, landscapes, scenarios and tracks (but this is commented out due to tracks not being separated or something?)
 2016-07-06 18:22:08 +02:00
Daniel Trujillo fc6f4929b7 Refactor for compliance with coding standards. 2016-07-01 22:02:28 +02:00
Daniel Trujillo f61da89410 Delete useless 'invalidate' function. 2016-07-01 22:02:28 +02:00
Daniel Trujillo 036b09d916 Several fixes. 
· Delete 1 remaining useless comment
 · Move static function definitions above window events definition
 · Replaced 'invalidate' function with window_invalidate_all()
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 6a3210b7b7 Remove useless comments. 2016-07-01 22:02:28 +02:00
Daniel Trujillo dfd78ec359 Perform a refactor for compliance with conding style. 2016-07-01 22:02:28 +02:00
Daniel Trujillo cb1f9269a6 Hide useless decimals in custom currency configuration window 2016-07-01 22:02:28 +02:00
Daniel Trujillo 6ce4584842 Fix the currency equivalence bug 
The custom currency configuration window was showing an incorrectly
equivalence ratio between GBP and the custom currency.
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 8ef1e1669d Add a missing include. 
That was preventing from building on OSX and Win
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 4a28f7f6aa Clean code in custom_currency.c 
To make it more OpenRCT coding style compliant
 2016-07-01 22:02:28 +02:00
Daniel Trujillo b12e5443e9 Add configuration support for the custom currency 
This commit do several things:
 · Add proper entries to config.c file
 · Load custom currency definition at start time
 · Save every change made from the custom currency configuration window
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 71a32a8750 Create custom currency configuration window 2016-07-01 22:02:28 +02:00
Daniel Trujillo 187499fd72 Fix currency dropdown not showing checked custom currency. 
Due to the dropdown separator before custom currency entry, the selected
item index was incorrectly assigned to the separator.
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 9355eef5d4 Add custom currency option 
Add custom currency entry to the dropdown menu of the options window
 2016-07-01 22:02:28 +02:00
Duncan 5fb99b037f Merge pull request #3893 from wolfreak99/ObjectSelectionFilters 
Filter Object Selection Window by "Selected only" and "Non-selected only"
 2016-06-27 21:07:57 +02:00
wolfreak99 f9f0df82e5 refactor dropdown index to enum 2016-06-27 13:32:43 -04:00
wolfreak99 2960338268 numObjects to gInstalledObjectsCount 2016-06-21 15:15:01 -04:00
wolfreak99 08b5a1dc22 Switch from bools to filter_flags 2016-06-21 14:59:13 -04:00
wolfreak99 b587b15ddd Formatting improvements (pt 1) 2016-06-21 14:30:07 -04:00
wolfreak99 4afdf20f14 Do not show selected and non-selected in track manager mode (as track manager is a single-select interface) 2016-06-21 10:16:51 -04:00
Michał Janiszewski 402e5a32a0 Integrate path variables used by game 2016-06-19 23:52:20 +02:00
Josue Acevedo 425fc73979 Fix #3839: Chains can be set on stores if 'Allowing chain lifts for all pieces' is on 
Show widget if the ride has track when the cheat is enabled
This stops the chain lift button showing for shops and flat rides.
 2016-06-18 15:13:17 +01:00
wolfreak99 332e62b296 Add seperator to filter dropdown 2016-06-17 07:57:04 -04:00
wolfreak99 b66129db7b Filter Object Selection by "Selected only" and "Non-selected only" 2016-06-17 04:46:30 -04:00
Ted John ad1b9265dc integrate variables for various drawing pointers 2016-06-16 11:36:15 +02:00
Ted John d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
Ted John 4b2f0b4119 fix #3825: Multiplayer crashes with UI buttons 
Window was measuring number of lines of user's config server description rather than the connected server's description
 2016-06-13 19:02:37 +01:00
Ted John bd6986cd3f fix #3858: Tooltip showed when hovering over title logo 2016-06-12 17:19:31 +01:00
Ted John 79292b56ad allow disabling of OpenGL 2016-06-07 22:47:31 +01:00
Ted John 3b627651aa add drawing engine config 2016-06-07 22:47:31 +01:00
X123M3-256 706b3db99e Chain lift cheat (#3818) 
* Fix conflict with disable plant aging cheat

* Allow chain lift on any piece

* Keep chain toggled while building

* Ignore current chain lift state when cheat enabled

* Update string ids to one not already used

* Implement command for toggling cheat

* Allow chain on steep tracks when cheat is enabled

* Add checkbox for chain cheat

* Fix spacing

* Send cheat over network

* Change label for checkbox

* Replaced tabs with spaces
 2016-06-07 22:08:38 +01:00
Goddesen bfd0a405ee Reformatted cheats misc. array to be consistent with other tabs 2016-06-04 22:05:30 +02:00
Goddesen 8cfddca5a9 Widen textbox for neverending marketing to full width 2016-06-04 22:00:58 +02:00
Ted John 82dd7601eb Merge pull request #3782 from janisozaur/desyncs 
synchronise reset_0x69EBE4 over network
 2016-06-03 10:47:01 +01:00
Michał Janiszewski 1508e49a28 Change macro to assert_struct_size 2016-06-03 11:29:50 +02:00
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
Goddesen 809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
Ted John 27d846c2f4 fix #3786: Wrong server provider information 2016-05-31 19:24:07 +01:00
Ted John c66a755ef7 request server gameinfo for window 2016-05-31 17:16:08 +01:00
Ted John 7157199b45 add information tab to multiplayer 2016-05-31 17:16:08 +01:00
Ted John feb65ea93c add option to log chat history 2016-05-30 18:01:17 +01:00
Duncan 8e8474c400 Modify object selection to only research selected item when adding new objects during a game. (#3762) 2016-05-28 09:30:31 +01:00
Ted John 6acbfa0248 sort multiplayer servers 2016-05-27 22:17:26 +01:00
Ted John 62636f39b6 move allow known keys option to new tab... 
on multiplayer window
 2016-05-27 20:28:34 +02:00
Ted John 7b09b16255 use a different image for permissions tab 2016-05-27 20:28:34 +02:00
Michał Janiszewski 80a90624b9 Add option to only allow known keys to login 2016-05-27 20:28:34 +02:00
Yaroslav Tretyakov 8ee923f33d Fix #3735: Advertisement campaign window bug (#3745) 2016-05-26 19:43:53 +01:00
jensj12 f4690fb879 Remove duplicate check (#3743) 2016-05-26 15:56:57 +01:00
CraigCraig 3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
Marijn van der Werf a96ccbf21c Add shortcut for switching between paint modes (#3714) 2016-05-24 19:59:37 +01:00
Hielke Morsink 15f3dcefd9 Fixes #3635 - Crash when inspecting paths (#3712) 2016-05-23 19:11:35 +01:00
Ted John 25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
Martin Černáč 4d5b9c97fd Fix #3685. Also refactor related enum value. (#3686) 2016-05-20 22:29:33 +01:00
Martin Černáč 4944fe1836 Fix a Copy-paste induced mistake (#3679) 2016-05-20 09:49:08 +01:00
Martin Černáč 6e9d1bf1ea Refactor more string & sprite hard-coded ids (#3670) 2016-05-19 18:22:24 +01:00
Martin Černáč c8b8f0f226 Refactor and add better operation-mode bound checks (#3600) 2016-05-19 18:21:36 +01:00
Martin Černáč 01edc0ff19 Fix #3661 (#3662) 2016-05-19 07:55:41 +01:00
Ted John 3fd252a8c3 integrate some staff variables 2016-05-18 23:46:46 +01:00
Duncan 163c695a13 Merge pull request #3538 from marijnvdwerf/paint-setup/submarine-ride 
Paint Submarine Ride
 2016-05-18 22:06:03 +01:00
Ted John 16dbed03b5 Merge pull request #3498 from marijnvdwerf/paint-setup/wall 
Paint walls/fences
 2016-05-18 22:04:44 +01:00
Marijn van der Werf 1bf9dc26f9 Rename entrance flags to base_image_id 2016-05-18 23:00:26 +02:00
Ted John dd03cfc36f integrate more ride entrance / exit place variables 2016-05-18 21:52:39 +01:00
Martin Černáč 3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Marijn van der Werf 44021fdb0a Rename flag 2016-05-18 22:46:24 +02:00
Martin Černáč 2b6770bfad Fix redundat separator in ride's measurement & test data window tab (#3654) 2016-05-18 21:04:57 +01:00
Ted John d27658ca27 integrate entrance / exit place variables 2016-05-18 20:50:45 +01:00
Martin Černáč feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
Ted John 8efe699754 integrate gMapTooltipFormatArgs 2016-05-18 00:02:26 +01:00
Ted John 8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John 51f01c3341 use set_format_arg instead of RCT2_GLOBAL 2016-05-17 23:29:33 +01:00
Ted John c879638f22 integrate ground flag variables 2016-05-17 20:51:11 +01:00
Ted John 52a92fa6f1 fix #3623: initialise _loadedTrackDesignIndex to UNLOADED 2016-05-17 19:55:07 +01:00
Ted John eb19ca8626 integrate variable: gFootpathPrice 2016-05-16 19:05:37 +01:00
Ted John 0293218890 fix #3633: scenery tool, CTRL does not work correctly 2016-05-16 18:24:36 +01:00
Ted John cbf9a393f1 remove use of get_format_arg 
Because of strict aliasing, we must use memcpy in some cases.
 2016-05-15 22:40:25 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 6df1b9ac98 stop resetting the selected footpath 
Fixes #2931 - in multiplayer when client joins
Fixes #3606 - on autosave
 2016-05-15 19:08:02 +01:00
Ted John 2fadc8d2be remove redundant global usages 2016-05-15 17:19:32 +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
Hielke Morsink 8c1395bd46 declaring local variables where needed instead of at the top (#3599) 2016-05-15 10:25:24 +01:00
Ted John 81efb92d53 integrate map selection variables 2016-05-14 00:54:13 +01:00
Ted John 3fcb337c7b integrate variable: gWindowMapFlashingFlags 2016-05-13 22:51:16 +01:00
Ted John b58766aa3f clean up the logo and make it scalable 
- fixes #1776: graphical glitches on intro
- fixes #708: screen turns white when resizing intro
 2016-05-13 21:36:07 +01:00
janisozaur ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
janisozaur feb140b84c Revert part of last commit unsuitable for older compilers (#3584) 
Also initialise all the items in gResearchedTrackTypesA and
gResearchedTrackTypesB
 2016-05-13 10:36:24 +01:00
janisozaur 87d05f8a89 Fix compiler warnings (#3583) 
Includes:
* type casting
* properly counting fields to initialise
 2016-05-13 08:05:12 +01:00
janisozaur 658e877955 Name all the typdef-ed structs (#3581) 2016-05-12 22:57:40 +01:00
Ted John 0f1028c92c add global for gResearchedSceneryItems 2016-05-11 19:41:33 +01:00
marcovmun d979e2b607 Scenery window scrolls wrongly fixes #3210 (#3215) 2016-05-10 20:58:24 +01:00
Ted John aa929e1593 add globals for researched things, cleanup 2016-05-10 00:00:59 +01:00
Ted John 5162bc5a0e add global macro for a few ride variables and expenditure table 2016-05-09 22:11:56 +01:00
Ted John 3c3a37073d add global macro for gSamePriceThroughoutPark 2016-05-09 21:18:44 +01:00
Ted John 275f7c6723 add global macro for gCurrentExpenditure, gCurrentProfit 2016-05-09 21:12:01 +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
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
Steven Vascellaro dbb64f8ea3 Added additional tooltips for options menu (#3394) 
Added tooltips for every selectable item in the options menu, as well as some minor variable renaming and vertical alignment
 2016-05-08 17:22:48 +01:00
Ted John 87d4a9dab9 use track rather than tracks for user directory 2016-05-08 14:04:12 +01:00
Ted John 70d613ede2 prevent crash in some place track design case 2016-05-08 14:04:10 +01:00
Ted John d4c30ea5ec fix warnings 2016-05-08 14:04:09 +01:00
Ted John 6797753e18 refactor track_place_ride 2016-05-08 14:04:04 +01:00
Ted John f9074485f9 integrate more variables 2016-05-08 14:04:04 +01:00
Ted John cbc1848db4 refactor track design save: _trackSavedMapElements 2016-05-08 14:04:00 +01:00
Ted John c0fa762fa5 integrate some unknown variables 2016-05-08 14:04:00 +01:00
Ted John 9afdd7b514 refactor track_design_draw_preview 2016-05-08 14:03:58 +01:00
Ted John 7c0d3a9077 fix install track 2016-05-08 14:03:57 +01:00
Ted John 231ea9e97c fix rename and delete track design 2016-05-08 14:03:56 +01:00
Ted John f4f8801f2b fix memory issue and add variable for scenery toggle 2016-05-08 14:03:55 +01:00
Ted John feb34660e3 fix up track manage window 2016-05-08 14:03:54 +01:00
Ted John a19e5feadf fix track design mirror and ride name 2016-05-08 14:03:53 +01:00
Ted John 02a979cad5 refactor track design functions 2016-05-08 14:03:52 +01:00
Ted John 993ef35508 reduce use of gActiveTrackDesign 2016-05-08 14:03:51 +01:00
Ted John f00d7daef5 fix track design preview, place and refactor 2016-05-08 14:03:50 +01:00
Ted John 3c95562efd fix new ride design count and track design listing 2016-05-08 14:03:49 +01:00
Ted John 1908743c71 refactor track save, move into own source 2016-05-08 14:03:49 +01:00
Ted John 77e7313540 move track design related functions to new source 2016-05-08 14:03:48 +01:00
Ted John e9935fee09 refactor some of the track design place code 2016-05-08 14:02:48 +01:00
Ted John 68520765fc attempt to pass TD6 more for preview 
Currently breaks preview.
Construction kind of works but has bad settings and crashes for some ride types
 2016-05-08 14:02:48 +01:00
Ted John b2cc98da91 change track list window to use new index 2016-05-08 14:02:47 +01:00
Ted John ae526f96d7 Merge pull request #3486 from Gymnasiast/remove-station-length-limit 
Increase station length limit to 32
 2016-05-07 10:05:23 +01:00
Matte A 9421cc0bd4 Add shortcut for the Multiplayer window (#3509) 2016-05-06 21:14:49 +01:00
Gymnasiast 17626dbb1a Increase station limit to 32, fix display of plural 2016-05-06 18:30:44 +02:00
duncanspumpkin 72ca648135 Move painter functions into paint.c. Fix mistake in paint_attach_to_previous_ps 2016-05-04 18:54:42 +01:00
janisozaur 68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Michael Steenbeek 142c54852d Clean up some residual usages of old config (#3484) 2016-05-03 22:36:29 +01:00
Patrick de Wit 13701660c9 Implement customizable toggle windowed mode shortcut (#3462) 
Implement customizable toggle windowed mode shortcut
 2016-05-03 20:07:33 +01:00
Patrick de Wit 60579932ef Fix overflow in ride_mode_tweak (#3478) 
Fixes #2529: Time overflow when unlocking dodgems' operating limits
Fixes #3424: Max. people on ride overflows when operating limit is unlocked
 2016-05-03 14:44:54 +01:00
Matte A 45234d1afb Add description for Disable train length limit and align the button (#3480) 2016-05-03 10:16:38 +02:00
Gymnasiast 5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Michał Janiszewski 1cd1144dd5 Janitorial fixes 
Mostly style fixes, includes minor change to make sure spinner's down
button gets shown, update to string IDs, network version and making sure
correct string gets selected based on car count.
 2016-05-02 22:35:08 +02:00
X7123M3-256 4089538c78 Fix inconsistent spacing 2016-05-02 21:42:14 +02:00
X7123M3-256 0efd6ca88b Remove unused local variables 2016-05-02 21:37:10 +02:00
X7123M3-256 102521d131 Replace dropdowns with spinners 2016-05-02 21:37:09 +02:00
X7123M3-256 3a4139eea0 Prevent car count being incorrectly updated 2016-05-02 21:37:09 +02:00
X7123M3-256 fd5bb09271 Remove calls to ride_entry_get_train_layout and replace with calls to ride_entry_get_vehicle_at_position 2016-05-02 21:37:08 +02:00
X7123M3-256 34a67436cd Fix spacing around operator 2016-05-02 21:37:08 +02:00
X7123M3-256 9d618231fb Add disable train length limits checkbox to cheat window 2016-05-02 21:37:08 +02:00
X7123M3-256 35ccd0b8e1 Implement disable train length limits cheat 2016-05-02 21:37:08 +02:00
Patrick de Wit 7656cfdcbe Add rides amount to ride_list window. (#3461) 2016-04-30 17:12:12 +01:00
Gymnasiast f2a3c21beb Check if peep is guest or staff, refactor 2016-04-28 21:26:58 +02:00
Nubbie 339f0aba10 Make renaming staff use staff permissions, fixes #3243 2016-04-28 19:33:50 +02:00
Kradmoa d749848ff6 Fix missing Twister coaster piece. #3361 (#3369) 
Fix missing Twister coaster piece. #3361
 2016-04-27 18:54:07 +01:00
Nubbie 54f11e66cb Normalised tooltip string IDs (#3420) 
* Moving all 'TIP' to the end

Searched for all _TIP_ strings and moved them to the end as it's more efficient to find them that way+ Gymnasiast told me '>We always put TIP at the end'

* Changed the tip strings + fixed the spacings (#23)

* Fixing the comma

* Reverting changes to cheats.c to start over

* Add Re-named strings in Cheats.c + align desc.

This is the second attempt, this time I've just changed the strings to match `src/localisation/string_ids.h`, the only thing aligned is the descriptions with newly added tips that got miss-aligned
 2016-04-26 11:28:12 +01: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
Ted John b1f704dac4 add global macros for more finance variables 2016-04-25 22:38:09 +01:00
Ted John 870a8b55e5 add global macros for viewport variables 2016-04-25 21:53:21 +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 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 0a80e7a737 integrate pickup peep variables 2016-04-24 10:28:08 +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 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 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 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 25958b0d30 remove old RCT1 import code 2016-04-22 19:26:15 +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
janisozaur 7eb3a90cea Fixes for values being shifted (#3362) 2016-04-20 23:57:54 +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
zsilencer e742e96461 Fix bug that gave error when trying to join saved server 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
Michał Janiszewski fb8646e66f Fix typo in variable name 2016-04-19 21:15:48 +02:00
Michał Janiszewski b2a3b82d08 Show network version to client if mismatched 
This will let players know which version should they be using to connect
to server. Also prevents users from even trying to join servers running
versions we already know are incompatible.
 2016-04-19 21:15:23 +02:00
Ted John cec7e54dd8 Merge pull request #3325 from Broxzier/rotate_map_elements 
Rotate map elements
 2016-04-19 19:37:19 +01:00
Michael Steenbeek b13d0aa2d3 Fix ride window height definition, fixes #3347 (#3348) 2016-04-19 19:08:24 +01:00
Hielke Morsink 2713c999c5 Cleaning up and updated changelog 2016-04-19 19:25:31 +02:00
Hielke Morsink d08dd70406 Static functions. 2016-04-19 19:25:29 +02:00
Hielke Morsink fd7fe4ed5a Fix redraw issue when clicking on a list item. 2016-04-19 19:25:28 +02:00
Hielke Morsink 6fbdb46d37 Enabling and disabling the rotation button based on selected element type. 2016-04-19 19:25:27 +02:00
Hielke Morsink 992a830622 Fix: Invalidating tiles correctly from the tile inspector. 2016-04-19 19:25:25 +02:00
Hielke Morsink 048b7ff30c Added button to reotate map elements in tile inspector - closes #3106 2016-04-19 19:25:24 +02:00
Derek Lee c4226235e3 Add cheat to disable littering 
Add cheat and increment NETWORK_STREAM_VERSION
 2016-04-18 23:34:10 -07:00
Yaroslav Tretyakov c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Ted John e5666f214b Merge pull request #3313 from IntelOrca/integrate-ride-session-vars 
Integrate ride construction session variables
 2016-04-16 14:10:05 +01:00
Ted John 63f008566c Merge branch 'master' into develop 2016-04-15 23:25:45 +01:00
Ted John 7b248f0079 integrate ride construction variables 
- _currentTrackPrice
- _numCurrentPossibleRideConfigurations
- _numCurrentPossibleSpecialTrackPieces
- _currentTrackCurve
- _currentTrackEndX
- _currentTrackEndY
- _rideConstructionState
- _currentRideIndex
- _currentTrackBeginX
- _currentTrackBeginY
- _currentTrackBeginZ
- _currentTrackPieceDirection
- _currentTrackPieceType
- _currentTrackSelectionFlags
- _rideConstructionArrowPulseTime
- _currentTrackSlopeEnd
- _currentTrackBankEnd
- _currentTrackLiftHill
- _currentTrackCovered
- _previousTrackBankEnd
- _previousTrackSlopeEnd
- _previousTrackPieceX
- _previousTrackPieceY
- _previousTrackPieceZ
- _currentSeatRotationAngle
 2016-04-15 20:56:48 +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 84edd049d9 integrate current tool variables: 
- gCurrentToolId
- gCurrentToolWidget
 2016-04-15 18:26:47 +01:00
Ted John 1b3f46f960 integrate game command error string variables 
- gGameCommandErrorTitle
- gGameCommandErrorText
 2016-04-15 17:54:46 +01:00
duncanspumpkin 51ba0b2e1d Fix #3302. Max ride mode tweak has been broken since a refactor. 2016-04-14 20:27:09 +01:00
Duncan 9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs 
Clean up data use
 2016-04-13 12:38:58 +01:00
wolfreak99 1947b1dd30 require special permission for cluster building, closes #3045 2016-04-10 11:52:34 +01:00
IntelOrca 8494eb9ff3 fix ride list dropdown, re-regression of #2080 2016-04-09 14:04:09 +01:00
Nubbie 3017607521 Add 3 MORE descriptions for cheats 2016-04-06 18:08:14 +01:00
Nubbie 68d21e22a1 Improve descriptions for cheats 
Note: Language IDs have changed slightly
 2016-04-04 17:35:05 +01:00
Michał Janiszewski 83a543c86f Make sure shifted value can fit in uint32 2016-04-03 17:49:50 +02:00
Michał Janiszewski f5f2f62507 Cap dropdown items count to 64 2016-04-03 17:38:57 +02:00
Marijn van der Werf 0fd42f408a Extract new struct 2016-04-03 14:53:17 +02:00
Marijn van der Werf e4fadc5a66 Include struct at `0x0097DD78` 2016-04-03 13:56:06 +02:00
Ted John f02238e0a2 Merge pull request #3203 from marcovmun/Fix-3198 
Fix vehicles appearing separate in the research tree, fixes #3198
 2016-04-02 00:02:42 +01:00
Michał Janiszewski 888f485690 Allocate enough memory for server entries, fix #3144 2016-04-01 19:57:18 +02:00
IntelOrca 16527e749a remove network type from loadsave 
Fixes a crash that happened when loading a saved game from the start server window.
 2016-03-31 20:42:21 +01:00
IntelOrca 40fcfbb405 use localised strings for native file dialogs 2016-03-31 20:41:49 +01:00
IntelOrca d865e4d453 pass better data in struct to file dialog function 2016-03-31 20:41:47 +01:00
Marco van Munster 8db1f27534 Fix bug 3198 different vehicles research tree 2016-03-30 22:33:26 +02:00