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

673 Commits

Author SHA1 Message Date
Ted John e6e503a853 Move path related functions to Context.cpp 
- rct2_init_directories
- get_file_path
 2017-07-29 20:29:26 +01:00
Ted John 8bc4e52ae9 Move rct2_quit to Context 2017-07-29 20:28:18 +01:00
Ted John 0d1d4960c1 Move get_file_extension_type to FileClassifier.h 2017-07-29 20:28:18 +01:00
Michael Steenbeek 8c48b5a249 Fix #6026: 'Select ride to advertise' dropdown does not display all items (#6032) 
Show up to 128 open rides in the New Campaign dropdown.
 2017-07-29 09:44:51 +01:00
Gymnasiast 3cf463b379 Name some window flag aliases 2017-07-28 13:09:32 +02:00
Gymnasiast 38c504685e Define constants for max energy and happiness, cap energy to 128 instead of 255 2017-07-27 21:44:46 +02:00
Gymnasiast 2b540b9da1 Remove direct access to small scenery's colour_1 and _2 fields 2017-07-27 21:37:34 +02:00
Gymnasiast db438a27b7 Use map_element_get_direction in more places, create map_element_get_direction_with_offset() 2017-07-27 21:23:26 +02:00
Michael Steenbeek 46de90df86 Create map_get_water_height() 2017-07-27 17:15:56 +02:00
Michael Steenbeek 41b5e8bbca Remove direct usage of map element track sequence field 2017-07-27 16:19:01 +02:00
Gymnasiast d936b23072 Get and set map element station index via helper functions 2017-07-27 14:13:16 +02:00
wolfreak99 30b907f0e8 Fix #6017: ride type spinner not working in multiplayer 2017-07-26 23:15:33 +02:00
Kuriibo 59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
Gymnasiast 894d010439 Name map element track sequence flags and use them 2017-07-26 14:41:04 +02:00
Richard Jenkins a2f8720143 Fix #5981: Ride list doesn't update after using quick demolish 2017-07-26 11:07:12 +02:00
Gymnasiast 271e6837e9 Refactor byte_F4414E into separate local bools 2017-07-26 09:17:43 +02:00
Duncan 9a49490a0a Refactor of scenery elements (#5308) 
Label scenery flags, vars and refactor small scenery into cpp file.
 2017-07-25 22:26:43 +01:00
wolfreak99 6ec89fa78b Implement dropdown/spinner combo for changing ride type 2017-07-25 13:25:31 +02:00
Gymnasiast 274abcb071 Clean up track designs a bit 2017-07-25 11:04:40 +02:00
wolfreak99 77035b0993 Move braces onto their own line 2017-07-25 10:45:38 +02:00
wolfreak99 7c6e260f77 Revise dividing by zero guards 2017-07-25 10:45:38 +02:00
wolfreak99 150cc90f89 fix empty dropdowns 2017-07-25 10:45:38 +02:00
Gymnasiast 3c3094fa83 Raise dropdown limit to 128 2017-07-24 21:49:24 +02:00
Gymnasiast 346c9e1359 Fix #5985: Entertainer custome dropdown has no checked item 2017-07-24 14:10:23 +02:00
Gymnasiast 8473a40bc4 Make gDropdownItemsChecked and gDropdownItemsDisabled static 2017-07-24 14:10:23 +02:00
Gymnasiast 50ba63df0e Clean up dropdowns 
Uses constants in more places.
Most of the changes were taken from a PR by @wolfreak99
 2017-07-24 10:33:46 +02:00
wolfreak99 47a89c4cf3 Add "Ignore research status" cheat 2017-07-23 12:09:29 +02:00
wolfreak99 ed69983354 Overflow dropdowns with 32+items into columns 
After about 32+ items, lists can sometimes go off screen. This commit
modifies the text based dropdowns loosely based off the code from the
image dropdowns. I've also added _dropdown_list_vertically to allow text
lists to continue to remain in an up-to-down format and images to remain
in a left-to-right format.
 2017-07-23 11:56:42 +02:00
wolfreak99 32fbf31777 Define DROPDOWN_ITEMS_MAX_SIZE 
This defines the current limitation of dropdown items.
 2017-07-23 11:56:42 +02:00
Ted John bc88cb9c2b Make TitleScreen a class (#5971) 2017-07-22 23:42:14 +01:00
Tomas Dittmann 32ffc194b9 Fix #4455: Crash in window_sign_invalidate due to original bug (#5969) 
Add missing `& MAP_ELEMENT_LARGE_TYPE_MASK`
 2017-07-22 14:15:13 +01:00
Michael Steenbeek 367efa2020 Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places 2017-07-20 20:56:29 +02:00
Michael Steenbeek bb09019d9b Name and fix vehicle entry and tertiary colour flags 2017-07-20 12:57:37 +02:00
Richard Jenkins fab8efbe2a Implement #5855: Display source game in missing obj window 2017-07-19 11:04:00 +02:00
Gymnasiast 6dddd5b76c Clean up enabledPieces usage 2017-07-18 18:13:00 +02:00
Michael Steenbeek 7a4e7e17a1 Fix incorrect terminology 2017-07-18 18:07:43 +02:00
wolfreak99 c11e925f40 Change CHEATS_MONEY_DEFAULT, CHEATS_MONEY_INCREMENT 2017-07-18 14:57:53 +02:00
wolfreak99 5d1ffd76b5 Move windows/cheats.c/MONEY_DIGITS to localisation.h/MONEY_STRING_MAXLENGTH 2017-07-18 14:57:53 +02:00
wolfreak99 adeaaa8560 Remove extra CHEATS_MONEY_INCREMENT, prefix MONEY_DEFAULT/etc with CHEATS_ 2017-07-18 14:57:53 +02:00
Gymnasiast 50b993386a Change station_starts to an rct_xy8 2017-07-18 13:12:34 +02:00
Michael Steenbeek ec55224f38 Change ride->overallview to an rct_xy8 2017-07-18 12:22:39 +02:00
Ted John d5732fdf38 Merge pull request #5906 from IntelOrca/refactor/rct2 
Move functions out of rct2.c
 2017-07-18 09:55:02 +01:00
Gymnasiast c96ef96edb Clean up rct_ride and rct1_ride structs and usage 2017-07-18 10:50:28 +02:00
Richard Jenkins 2cfe2e323c Fix #5849: Missing object window cannot be closed with KB shortcut (#5929) 2017-07-17 22:29:28 +01:00
Gymnasiast 7b8248cca7 Change ride->exit into an rct_xy8, cleanup 2017-07-17 20:41:03 +02:00
Gymnasiast c12113475b Turn ride->entrances into an rct_xy8 2017-07-17 19:27:38 +02:00
Hielke Morsink 489c74518c Fix #5920: set correct next peep spawn index 2017-07-17 15:15:31 +02:00
Ted John c33a9f06d9 Remove subsitute_path and refactor gScenarioFilename 2017-07-16 23:25:11 +01:00
Gymnasiast 587d354717 Fix #5895: Publisher credits window scrolls too far 2017-07-15 14:26:21 +02:00
wolfreak99 68756498f8 Fixed rebase 2017-07-15 12:02:51 +02:00
wolfreak99 7d09486744 Make land tool size holdable 2017-07-15 12:02:51 +02:00
wolfreak99 15cc2a0230 Rename some small scenery flags, tidy up sub_6E1F34 2017-07-15 11:55:20 +02:00
William Wallace ae110a9159 Allow switching between OpenGL and other renderers without restarting 2017-07-13 19:04:37 +01:00
wolfreak99 e7bacc6d84 Apply new mousedown event parameters to windows 2017-07-13 10:15:34 +02:00
Tomas Dittmann 90bb6320e5 Guard against invalid sprite access crashes (#5867) 
ride->num_vehicles not matching ride->vehicles[] in
ride_prepare_breakdown() and window_ride_maintenance_dropdown().
 2017-07-12 21:23:50 +02:00
spacek531 c73e17f02b move the zoom case up to handle it as it was 2017-07-07 17:35:33 +01:00
spacek531 7ecf049e87 add janisozar suggestion 
[ci skip]
 2017-07-07 17:35:33 +01:00
spacek531 668366bf6b Revert "upgrade save format from uint16 to uint32" 
This reverts commit 85757d9fefbacf8b7d07cec9cd9714e2f70f2faa.
 2017-07-07 17:35:33 +01:00
spacek531 78ab94b12a upgrade save format from uint16 to uint32 2017-07-07 17:35:33 +01:00
spacek531 bec8b73506 fix saving of milliseconds, loading still beyond knowledge 
[ci skip]
 2017-07-07 17:35:32 +01:00
spacek531 97bf67e605 add missing curly bracket 2017-07-07 17:35:32 +01:00
spacek531 16167d84f0 clarified comments, changed TITLE_COMMAND_ORDER command to uint16 2017-07-07 17:35:32 +01:00
spacek531 78e25e381c modify saving, add comments 
[ci skip]
 2017-07-07 17:35:32 +01:00
spacek531 a3acfb4312 Increase digits from 4 to 5 
I'm not used to string lengths that are one shorter
 2017-07-07 17:35:32 +01:00
spacek531 c1ac654916 fix order of rotate, zoom in clamping 2017-07-07 17:35:32 +01:00
spacek531 c302bec47a fix rotate being able to be set to 0 2017-07-07 17:35:32 +01:00
spacek531 fc71361a9e increase digits for wait, decrease digits for rotate, zoom 2017-07-07 17:35:32 +01:00
spacek531 ef38a66cc2 begin update editor for ms values 
[ci skip]
 2017-07-07 17:35:31 +01:00
spacek531 d5610ece54 Remove duplicate line 2017-07-07 17:35:31 +01:00
spacek531 c815a427c0 Change Seconds (internal) to Milliseconds, en-GB too 2017-07-07 17:35:31 +01:00
rwjuk cc95aa0433 Fix visual corruption caused by zero sprite dimensions 
Sprite corruption issue highlight

Fix already bugged saves

Fix visual corruption caused by zero sprite dimensions
 2017-07-06 13:22:24 +01:00
Richard Jenkins 4e4022d693 Fix #5790: Ride list window does not force refresh on view change (#5791) 2017-07-04 23:03:43 +01:00
Ted John a558423794 Invalidate missing object list on item click 2017-07-04 21:52:11 +01:00
Gymnasiast b0fece095c Raise maximum entrance fee to £200 
It could even be higher, depending on the initial guest cash, but this should do for now
 2017-07-04 15:23:12 +02:00
Ted John 0422699539 Fix #5381: Game crashes in editor when scenery or pathing is clicked 
Add more defensive checks for when there are no objects loaded.
- Do not open footpath window if there are no footpath objects loaded.
- Prevent crash in scenery window if no scenery groups loaded.
 2017-07-03 21:46:07 +01:00
rwjuk a941400403 Refactor window_ride_list_refresh_list() to single loop 2017-07-02 21:32:20 +01:00
rwjuk 398004901b Only refresh ride list window every 64 ticks for perf. 2017-07-02 20:49:39 +01:00
Ted John fd2eda921f Merge pull request #5705 from Broxzier/hardcoded-values 
Replace -1 with SPR_NONE for viewport sprite, sort some includes
 2017-07-02 00:08:33 +01:00
Ted John ddb96ec267 Refactor load park result 
Use a C++ struct and pass that to C.
 2017-07-01 01:29:35 +01:00
rwjuk ab38c07fb9 Make object window work with S4s and scenarios 2017-07-01 01:29:34 +01:00
rwjuk 214bf3988b Implement 'missing objects' window 
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
 2017-07-01 01:28:51 +01:00
Michael Steenbeek 44af1653a6 Replace 'center' with 'centre' (#5745) 2017-06-30 23:11:28 +01:00
Gymnasiast fea2c66036 Name remaining TRACK_ELEM_FLAGs 2017-06-30 14:37:26 +02:00
Gymnasiast 4e87ad6ac3 Properly check 'Finish 5 roller coasters' criteria, fixes #597 
This fixes the following things:
- The objective was not available when using money (despite it being used on such scenarios in RCT1)
- The scenario editor set the 'partially finished flag' on every single ride
- The scenario editor did not check if there were five finished roller coasters
- When checking the goal, there was no check if the ride was a roller coaster
- When checking the goal, there was no check if the ride was one of the roller coasters to be completed
 2017-06-29 17:32:12 +02:00
Richard Jenkins 74a14505cd Fix #578: Ride ghosts show up in ride list during construction 2017-06-29 16:39:48 +02:00
Gymnasiast 194cc4dcb3 Fix #5730: Unable to uncheck 'No money' in the Scenario Editor 2017-06-29 12:01:30 +02:00
Gymnasiast 51f5a4ff7b Fix whitespace 2017-06-26 20:59:52 +02:00
Gymnasiast 65a3d4551b Name buy land rights flags 2017-06-26 20:56:32 +02:00
Gymnasiast b806ded6a4 Refactor land rights window 2017-06-26 20:01:35 +02:00
Gymnasiast 9b25a45e90 Remove call to non-existant window class 77 2017-06-26 16:07:42 +02:00
wolfreak99 27f5773e4d rename event unknown_14 to viewport_rotate 2017-06-26 10:06:58 +02:00
Broxzier 9e204c11a9 Replace newly added SPR_NONE's with SPRITE_INDEX_NULL, remove new includes 
needed to change its type to match .
 2017-06-25 22:44:58 +02:00
Broxzier 71a922b3f5 Replace 4 more occurances of -1 with SPR_NONE 2017-06-25 21:37:51 +02:00
Ted John f275e5ba9b Remove all platform.h includes from header files 
System headers, particularly windows.h polute the namespace too much with macros and unwanted definitions. Do not use them in header files.
 2017-06-25 18:59:56 +01:00
Ted John 9c269ae94b Fix #5489: Sprite index crash for car view on car ride 2017-06-25 17:53:51 +01:00
Michael Steenbeek 8333266ca5 Name several ride construction flags, clean up ride_data.c, fix "mini coaster" boosters 2017-06-25 12:14:39 +02:00
Matte A a1c456f607 Fix clipping in text for some translations (#5692) 2017-06-23 09:54:05 +02:00
Matte A 92426994af Giving the cheat "Own all land" a tool-tip 2017-06-23 08:18:45 +02:00
Michael Steenbeek fef10c1f60 Clean up windows using land tools 2017-06-22 20:49:13 +02:00
Michael Steenbeek 1f00469b26 Replace free+null with SafeFree, allow freeing NULL 
free(NULL) is perfectly fine, no need to check
 2017-06-22 12:49:33 +02:00
Gymnasiast 77481847ca Refactor Giga and Junior booster speed factor 2017-06-20 19:12:49 +02:00
Gymnasiast 8b6ecc76d2 Clean up boosters 2017-06-20 14:24:10 +02:00
Gymnasiast f2f8cec944 Clean up dropdowns 2017-06-20 13:38:51 +02:00
Gymnasiast 5db6e5afa1 Use constants for number of marketing campaigns and expenditure table 2017-06-19 22:17:05 +02:00
Gymnasiast 65806a55db Create and use defines for the amount of surface and edge textures 2017-06-19 22:16:34 +02:00
Gymnasiast 595e73e2d9 Name GAME_COMMAND_FLAG_7 2017-06-18 18:25:49 +02:00
Richard Jenkins 312adaf8e7 Merge pull request #5644 from Gymnasiast/max-stations 
Add define for number of colour schemes, correct several cases of max stations per ride
 2017-06-17 14:32:36 +01:00
Gymnasiast 631f4d8907 Add a constant for RIDE_ENTRY_INDEX_NULL 2017-06-17 14:32:15 +02:00
Gymnasiast ed905f3c68 Add define for number of colour schemes, correct several cases of max stations per ride 2017-06-17 14:31:48 +02:00
Gymnasiast 26cd0da5be Check the first non-null ride type in object selection 2017-06-17 13:52:17 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +02:00
Gymnasiast d782018a8f Fix trailing whitespace and RIDE_TYPE_NULL in new_ride.c 2017-06-17 13:33:25 +02:00
ZehM4tt f05e94c1c6 Fixed a desync that would happen when having the guests list open. (#5632) 
* Fixed a desync that would happen when having the guests list open.
* Refactored the flashing state of peeps to not affect the flags.
* Added deprecation info for SPRITE_FLAGS_PEEP_FLASHING.
* Removed unused line that used the old flag.
* Update network version
 2017-06-17 12:55:41 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Christian F. Coors c506c4be2d Add defines for scenery IDs 2017-06-14 16:06:43 +02:00
Gymnasiast 4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek 96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode 
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
 2017-06-14 13:31:27 +02:00
Ted John 7e9f7df7d1 Use standard platform defines 2017-06-12 18:01:51 +01:00
Ted John 25b6c613b9 Merge pull request #5597 from IntelOrca/refactor/nosdl/remaining-platform 
Remove remaining SDL from platform code
 2017-06-12 17:52:11 +01:00
Richard Jenkins 4c67ef1d6a Implement persistent 'real names of guests' setting 2017-06-12 14:05:19 +02:00
Richard Jenkins 5db340743f Merge pull request #5599 from Gymnasiast/fix/5596 
Fix #5596: Incorrect colours in the Map window
 2017-06-12 11:26:11 +01:00
Gymnasiast a586a6e15d Fix #5596: Incorrect colours in the Map window 2017-06-12 11:59:53 +02:00
Michał Janiszewski 0757582c93 Add missing include 2017-06-12 11:53:26 +02:00
Michał Janiszewski 4547dfab95 Prevent a crash in headless mode when showing error 2017-06-12 11:52:04 +02:00
Ted John 902bba6906 Fix compiler errors, add ctype.h in required source files 2017-06-11 23:43:28 +01:00
Ted John ee7c97b7be Move scancode to key to openrct2ui 2017-06-11 23:22:32 +01:00
Ted John cbd53f920c Create IWindowManager to open window from libopenrct2 2017-06-11 17:23:51 +01:00
Ted John dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00
Ted John b32f0b276d Merge pull request #5574 from IntelOrca/fix/screenshot 
Fix screenshot command and refactor drawing engine
 2017-06-10 20:06:26 +01:00
Ted John a52190ae44 Create C version of FULLSCREEN_MODE enum 2017-06-10 17:14:07 +01:00
Ted John 97d68957f0 Fix segfault in screenshot command 2017-06-10 15:48:05 +01:00
Jeremy Herbert ac99683955 Add cheat to disable ride value ageing 2017-06-07 21:52:47 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces 
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
 2017-06-06 23:46:14 +02:00
delebota f69e7ac89e Setup server action logging for server admins in multiplayer 
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
 2017-06-06 23:07:54 +02:00
wolfreak99 07d1ba4f8c Create "Own all land" cheat functionality (#5056) 
Implement "Own all land" cheat into cheat window

Restore only valid peep spawn points

Code improvements

Update to use PEEP_SPAWN / PARK_ENTRANCE defines
 2017-06-06 21:50:42 +01:00
rwjuk ea96ab0225 Name sub_6CA162() 2017-06-06 01:02:34 +01:00
rwjuk ee637b8a33 Name sub_6B2FA9() 2017-06-06 00:51:34 +01:00
rwjuk a03699839c Name sub_666EEF() 2017-06-06 00:51:34 +01:00
Richard Jenkins b492aa544f Name sub_684AC3() 2017-06-06 00:47:08 +01:00
Richard Jenkins d2fa8bab14 Name sub_6C96C0() 2017-06-06 00:47:08 +01:00
Richard Jenkins 1d2ced2ad7 Name sub_6CC3FB() 2017-06-06 00:47:07 +01:00
Richard Jenkins 5c28e66aa2 Name sub_6D01B3() 2017-06-06 00:47:07 +01:00
Richard Jenkins d191aaa1ef Name sub_6C9627() 2017-06-06 00:47:07 +01:00
Richard Jenkins 4893521bea Name sub_6C84CE() 2017-06-06 00:47:07 +01:00
Ted John cd330ede53 Merge pull request #5133 from samhorlbeck/develop 
Add enhancement to show money effect when peeps make purchases
 2017-06-05 22:39:29 +01:00
Ted John 1d5c12d2ae Merge branch 'fix/rating-overflow' into develop 2017-06-05 22:31:44 +01:00
wolfreak99 8006bbb9d5 Select previous element after removing in tile inspector 2017-06-05 22:59:15 +02:00
Sam Olsen b9e9b8320f Add enhancement to show money effect when peeps make purchases 2017-06-05 21:02:05 +01:00
Ted John 463fadbcf6 Protect ride rating names from extreme numbers 2017-06-05 20:16:28 +01:00
wolfreak99 36ca5b30ac Mark selected save file in load/save window 2017-06-05 15:45:36 +02:00
Ted John eb0b29bcfe Merge pull request #5531 from Gymnasiast/fix/837 
Create define for top toolbar clearance and fix #837
 2017-06-04 00:51:13 +01:00
Leurak 112f7b7a0d Add address parameter in network_begin_server 2017-06-04 00:42:13 +01:00
Richard Jenkins acd3b09c80 Name sub_6DFED0(), remove magic numbers, minor refactor to research 2017-06-03 23:21:47 +02:00
Michał Janiszewski c136dc85d2 Provide define for maximum map edge size 2017-06-03 12:52:34 +02:00
Gymnasiast dd8a0847e1 Replace TOP_TOOLBAR_CLEARANCE with TOP_TOOLBAR_HEIGHT 2017-06-02 16:34:30 +02:00
Marijn van der Werf 2e40d90f5f Replace more occurences of 28 2017-06-01 22:38:35 +02:00
Michael Steenbeek 7d9acca1e0 Create define for max ride types per ride entry, closes #5524 2017-06-01 22:00:11 +02:00
Michał Janiszewski 79d76759bb Fix #5516: Update copyrights for 2017 
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
 2017-06-01 21:55:10 +02:00
Richard Jenkins 3761104ee2 Fix #5511: Backspace behaves inconsistently in track manager 2017-06-01 20:23:23 +02:00
Gymnasiast a43ee2b987 Fix copyright year and comment 2017-05-29 22:39:19 +02:00
Ted John 61228fc4e8 Add all files filter 2017-05-29 22:39:19 +02:00
Ted John f998172674 Fix IME text input 2017-05-29 22:38:46 +02:00
Richard Jenkins e8ec7ee58f Implement building of libopenrct2 and OpenRCT-UI for macOS 
Initial setup of xcode for multiple targets

libopenrct2 partially working

Restore macOS mach_info init

Get macOS OpenRCT2-ui working if hackish

Implement UiContext for macOS properly

Put tabbing cancellation code back
 2017-05-29 22:38:45 +02:00
Michał Janiszewski 423028dac9 Fix some warnings with clang and GCC 2017-05-29 22:38:44 +02:00
Ted John fc19b57c09 Fix build after rebase 2017-05-29 22:38:44 +02:00
Ted John 3fcd42fe2b Move more window code to UiContext 2017-05-29 22:38:43 +02:00
Ted John 0440c3deea Clean up audio.cpp 2017-05-29 22:38:43 +02:00
Ted John bd9839ff50 Get the game working 
Mostly just needed to resolve screen size which is now retrieved via ui context.
 2017-05-29 22:38:43 +02:00
Ted John 9d24e47e6f Fix build 2017-05-29 22:38:42 +02:00
wolfreak99 3d50ab56c8 Support mouse dragging when selecting ride design scenery 
Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
 2017-05-29 22:34:33 +02:00
Marijn van der Werf eaf93430d5 Remove some string additions 2017-05-28 19:49:32 +02:00
Daniel Kamil Kozar a64e08f997 Don't flash the white frame around network status windows 
This commit turns off the white border for all network status windows. This is
mostly evident when downloading a map from the server before starting a
multiplayer game, as the window is repeatedly brought to the front with a white
border. This results in needlessly flashing the border, since
window_network_status_open is called for every chunk of data received from the
network socket.
 2017-05-26 15:58:54 +02:00
Marijn van der Werf 53b023612d Show uses of raw palette indices 2017-05-21 00:01:45 +02:00
Hielke Morsink bfa03583fa Apply window themes only when created or when the selected theme is changed 2017-05-17 13:19:42 +02:00
Michael Steenbeek 6bd34c1e55 Clean up sub_69101A, use constants for undefined excitement ratings, fixes #5481 2017-05-16 22:36:48 +02:00
Michael Steenbeek e725672d23 Clean up alternative track pieces and types, remove remnants of researched track pieces 2017-05-16 19:11:51 +02:00
Gymnasiast d5f1e22a56 Name RIDE_TYPE_FLAG4 flags 2017-05-16 16:37:23 +02:00
wolfreak99 471f0c3230 Allow loading bmp files as heightmap using the native file browser 
Upon playing with the heightmap tool, i realized that the feature actually supports bmp files as well, and they are even listed in the in-game load/save dialog, but they are not shown when using a native file browser. This fixes that.
 2017-05-15 16:02:15 +02:00
CraigCraig 26287f5a3e More readability, grammar, spelling fixes 2017-05-15 09:28:43 +02:00
Richard Jenkins eb868089c8 Fix #5470: Available construction rights only displays once (#5476) 2017-05-14 23:45:44 +01:00
CraigCraig 58deb3a54a Grammar, readability, and spelling fixes 
[ci skip]
 2017-05-11 11:45:59 +02:00
Richard Jenkins 86d8863496 Fix #5456: Paths with non-ASCII characters mishandled on macOS (#5463) 2017-05-11 09:43:53 +02:00
Michael Steenbeek a53b01d5b9 Remove magic numbers and Americanisms 2017-05-08 23:54:38 +02:00
Ted John f9acdcb02d Use callback mechanism in case server rejects command 2017-05-08 23:46:50 +02:00
Gymnasiast 2bb3a297b4 Do not close new campaign window when starting a campaign results in an error, fixes #4810 2017-05-08 23:46:50 +02:00
Craig Craig 9dd820e2e7 Spelling fixes 2017-05-08 08:30:50 +02:00
Richard Jenkins fc873f2ce0 Fix #4748: No way to see owned rights after #4701 
This partially reverts #4701 - the land rights button in the park window will always be visible, and if no construction rights are available to buy, all owned rights will be displayed.
 2017-05-06 19:14:04 +01:00
Ted John b8931bd503 Use C++ mutex instead of SDL for server_list.cpp 2017-05-04 17:29:05 +01:00
Ted John ec3652152a Quick port of server_list window to C++ 
So that C++ mutex can be used.
 2017-05-04 17:29:04 +01:00
Marijn van der Werf a0259b79d4 Use rct_widgetindex type 2017-05-03 22:43:33 +02:00
Marijn van der Werf 31e8b510ec Use constants for maze construction 2017-05-03 16:09:21 +02:00
Marijn van der Werf 927190103b Use enum for tools 2017-05-03 16:09:21 +02:00
Marijn van der Werf 2b54032b8e Replace magic numbers in windows with constants 2017-05-02 14:41:53 +02:00
Marijn van der Werf 3cf725745d Add compile-time checked constants for widget ids 2017-05-02 09:58:25 +02:00
Ted John 4288e13947 Change mute widget index to its more logical position 2017-04-30 22:35:47 +01:00
Ted John ae8aa2d466 Fix top toolbar tool switching 
Moved tool active checks to top toolbar so that it can use constants.
 2017-04-30 22:33:19 +01:00
Ted John 75e0c94082 Fix mute / unmute logic 2017-04-30 18:03:25 +01:00
Ted John 21bf897bda Adjust group box on interface options page 2017-04-30 17:46:23 +01:00
Pulkit 970614bd51 WIDX_MUTE Improvements 2017-04-30 17:36:38 +01:00
Pulkit 89baa54633 Fixed the whitespaces 2017-04-30 17:33:26 +01:00
Pulkit dff1d724a0 Updated the location of the mute button 2017-04-30 17:33:26 +01:00
Pulkit daf968161e Added the mute option in the toolbar 2017-04-30 17:33:26 +01:00
Pulkit f7d01e3983 Modified the Mute button Like the Cheat 
I implemented the Mute button but for some reason I am unable to enable
the checkbox. Could someone kindly look into it
 2017-04-30 17:33:26 +01:00
Pulkit 0ca023a459 Few Corrections, in the code. 2017-04-30 17:33:26 +01:00
Pulkit a0f6a3b61b Updated Position of the Mute Button 2017-04-30 17:33:25 +01:00
Pulkit ffa3896b24 Mute Button Implemented like in RCT1 
Added the Mute button, like requested in the Issue #1421.
 2017-04-30 17:33:21 +01:00
CraigCraig e0b875398b Tons of spelling fixes (#5413) 
[ci skip]
 2017-04-30 06:39:24 +02:00
Michael Steenbeek 92e110195e Define native file dialog strings when loading heightmap, to avoid crashes 
Thanks to @wolfreak99 for the fix.
 2017-04-27 16:02:35 +02:00
Michał Janiszewski dcb1b8651b Fix scenery eye dropper checks 2017-04-24 23:25:21 +02:00
Broxzier b456fe2a4d Copy argument to buffer since it may be freed, add missing break 2017-04-24 23:19:51 +02:00
Broxzier 52ef6c8e34 Pass arguments with correct type for {COMMA16} 2017-04-24 23:19:51 +02:00
Broxzier 2cd4a686f6 Disable page widgets until a map is loaded 
A few strings have their {WINDOW_COLOUR_2} setting removed, since this
prevented strings from being market as inset. All uses of these strings
have been checked.
 2017-04-24 23:19:51 +02:00
Broxzier 03bfc68250 Loading height map into memory 2017-04-24 23:19:51 +02:00
Broxzier 0d07ea69f8 Add support for loading PNG files 
This needs to be refactored
 2017-04-24 23:19:51 +02:00
Broxzier 624f3e3298 Fix smooth-tiles checkbox not being invalidated; updated default height values 2017-04-24 23:19:51 +02:00
Broxzier 810103b90f Use loadsave window for selecting the heightmap 2017-04-24 23:19:51 +02:00
Broxzier 6edea503b2 Refactored mapgen window file 
- Removed duplicated code
- Moved shared widgets to define
- Moved shared widget handling code to function
 2017-04-24 23:19:51 +02:00
Broxzier c6e3ecd5ed Better widget behaviour and fixes 
- Inset text for disabled labels and values
- Spinners can be held down

Other fixes:

- Use correct types for widget indices
- Use WINDOW_MAPGEN_PAGE_COUNT for arrays (when a new page is added in the
  future, the compiler will warn about all the arrays having an invalid
  size)
- Sort code so that related arrays are placed near each other
 2017-04-24 23:19:51 +02:00
Broxzier 55c1787a13 Add heightmap smoothing 
Fixed underflow error that was visible for non-tilable maps.
Reordered widgets to reflect the same order of the algorithm.
Always regenerate the map when a setting is changed.
 2017-04-24 23:19:51 +02:00
Broxzier 26989ea8f6 Add smoothing height map option 2017-04-24 23:19:51 +02:00
Broxzier edfe997e78 Add option to normalize height map 2017-04-24 23:19:51 +02:00
Broxzier fda415cd44 Add settings to heightmap tab 2017-04-24 23:19:51 +02:00
Broxzier 702d99e1e3 Initial prototype of loading heightmaps 
Adds new strings and string ids for some future commits too.
 2017-04-24 23:19:51 +02:00
Michał Janiszewski f4b1c010e1 Fix uninitialised variable 2017-04-24 21:59:01 +02:00
Michał Janiszewski ea26ae9866 Explicitly initialise globals in entrance.cpp 2017-04-24 21:47:33 +02:00
Hielke Morsink 9314b8b793 Fix #5375: Use mask for fetching large scenery id, fix picking banner elements 2017-04-19 07:56:46 +02:00
Michał Janiszewski d53f276207 Fix scenery eye dropper interaction with footpaths 2017-04-18 22:49:33 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
Ted John d06208a521 Fix scenery window height and list calculation 2017-04-14 18:59:21 +01:00
Michał Janiszewski b87a8095d1 Make input buffers' sizes consistent 2017-04-14 19:17:38 +02:00
Michael Steenbeek 400a2cc9c7 Merge pull request #5354 from rwjuk/fix5350 
Make boosters on Twister and Giga Coaster more practical (#5350)
 2017-04-13 22:19:25 +02:00
Richard Jenkins 194afc7b49 Halve Junior RC booster values, and update construction window to match 2017-04-13 21:05:52 +01:00
Gymnasiast 18aa462f9a Fix booster speed when right-clicking a part 2017-04-13 21:37:14 +02:00
Richard Jenkins 2ca500ad1e Adjust track build window for Giga Coaster to reflect doubled boost speed 2017-04-13 20:16:36 +01:00
Ted John ff350f3769 Fix #5338: Scenery eyedropper hides the third colour picker 2017-04-13 17:01:44 +01:00
Gymnasiast c8ecd98737 Check for both csg1.1 and csg1.dat when looking for RCT1 graphics 2017-04-12 20:08:31 +02:00
wolfreak99 fcafd9576a Replace FALSE/TRUE with 0/1 2017-04-11 14:26:36 +02:00
wolfreak99 d22ad8abb5 Sync "Set guest generation higher difficult level" 2017-04-11 14:26:35 +02:00
wolfreak99 d6dfb3e079 Sync "Set park rating higher difficult level" 2017-04-11 14:26:35 +02:00
wolfreak99 8f56f60841 Sync "Set forbid high construction" 2017-04-11 14:26:35 +02:00
wolfreak99 9ae00d92a0 Sync "Set forbid landscape changes" 2017-04-11 14:26:35 +02:00
wolfreak99 bc8cf81ff1 Sync "Set forbid tree removal" 2017-04-11 14:26:34 +02:00
wolfreak99 44c4328b36 Sync "Set pay for park or rides" 2017-04-11 14:26:34 +02:00
wolfreak99 527cce062f Sync "Raise / lower park entry fee" 2017-04-11 14:26:34 +02:00
wolfreak99 e5fac3c765 Sync "Raise / lower cost to buy construction rights" 2017-04-11 14:26:33 +02:00
wolfreak99 5616b1f260 Sync "Raise / lower cost to buy land" 2017-04-11 14:26:33 +02:00
wolfreak99 8b3f0a4df8 Sync "Set guests prefer less/more intense rides" 2017-04-11 14:26:33 +02:00
wolfreak99 33bc414bab Sync "Raise / lower initial guest thirst" 2017-04-11 14:26:33 +02:00
wolfreak99 6baf971eba Sync "Raise / lower guest initial hunger" 2017-04-11 14:26:32 +02:00
wolfreak99 48ad60308e Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 c0dc1718a4 Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 d21d500b4a Sync "Set forbid marketing campaigns" 2017-04-11 14:26:32 +02:00
wolfreak99 2a8481bd48 Sync "Raise / lower interest rate" 2017-04-11 14:26:31 +02:00
wolfreak99 8c07613eed Sync "Raise / lower maximum loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 e096314f89 Sync "Raise / lower initial loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 0932854f7c Sync "Raise / lower initial cash" 2017-04-11 14:26:30 +02:00
wolfreak99 a3b1175ed6 Sync "Set no money" 2017-04-11 14:26:30 +02:00
wolfreak99 28c61e7068 Prepare scenario options sync 2017-04-11 14:26:25 +02:00
wolfreak99 fb62ed8ae2 Add "Quick demolish mode" to the Rides List 
Taken from the "Quick fire mode" on the Staff List
 2017-04-11 10:16:44 +02:00
Martin Müller ae0c85f009 Add tooltip to the label and warn that restart is required 2017-04-10 14:10:54 +02:00
Martin Müller b1bd899fb8 Add menu option for path to RCT 1 2017-04-10 14:08:58 +02:00
Tom Delebo e9c4365aa2 Add description and greeting textbox to server start menu 2017-04-06 14:31:36 +02:00
Richard Jenkins 1cfc1b003b Fix scenery eyedropper not picking up selected item's rotation (referenced in #5339) (#5344) 2017-04-05 12:33:59 +01:00
Ted John 9c4c7e7b23 Merge pull request #5319 from IntelOrca/refactor/fountain-cpp 
Refactor fountain to C++
 2017-04-03 21:53:33 +01:00
Michael Steenbeek c9c3025e2e Merge pull request #5305 from IntelOrca/feature/scenery-eyedropper-tool 
Add scenery eyedropper tool
 2017-04-02 22:45:28 +02:00
Gymnasiast 9efbf9c60e Only show 'Force breakdown' when not in network mode, fixes #5199 2017-04-02 19:35:25 +02:00
Richard Jenkins ccce7b0432 Pass selected colour to the create banner command, fixes #5316 2017-03-26 15:31:21 +02:00
Ted John 7fb653d1a7 Remove platform include from game.h 2017-03-23 18:34:32 +00:00
Michał Janiszewski 0471d4ccf6 Guard access to ride_type field in ride.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski ddc2a708d4 Don't test unsigned value for being negative 2017-03-18 23:23:23 +01:00
Michael Steenbeek 2bafea9551 Merge pull request #5303 from Broxzier/use-widget-defines 
Replace hardcoded values in window files
 2017-03-13 23:01:47 +01:00
Ted John 6429ccd9df Implement scenery eye dropper 2017-03-13 19:27:20 +00:00
Ted John 6e7c5b7031 Add scenery eyedropper button 2017-03-13 18:05:13 +00:00
duncanspumpkin 60fb821675 More refactoring 2017-03-13 17:33:50 +00:00
duncanspumpkin 652cf510e5 Continue refactor. Fix bug with provisional tracks. 
Note this might bring back #4728.
 2017-03-13 17:33:48 +00:00
duncanspumpkin 9725e6b647 Apply the cpp style guide 2017-03-13 17:33:47 +00:00
duncanspumpkin ffeb1fa527 Initial refactor of entrance 2017-03-13 17:33:46 +00:00
Ted John bcc0bfa485 Rename climate.h to Climate.h 2017-03-11 22:59:33 +00:00
Ted John 04a3c73c59 Refactor climate.h structs 2017-03-11 22:59:32 +00:00
Ted John 0d722d55e1 Refactor climate to C++ 2017-03-11 22:59:32 +00:00
Broxzier 06c195dd3c Fix error in setting pressed tab 2017-03-11 23:49:39 +01:00
Broxzier c0962a56a8 Use widget index in new ride window 2017-03-11 23:49:38 +01:00
Broxzier f688a2c9db Add and use widget index for exit and option button 2017-03-11 23:49:37 +01:00
Broxzier 4cd39babbb Replace hardcoded value in various windows 2017-03-11 23:49:32 +01:00
Broxzier f9e2a74c4d Replace hardcode value and better readibility in ride.c 2017-03-11 23:42:33 +01:00
wolfreak99 56a1dbb54c Replace magic values for enabled widgets in Ride window (#5278) 2017-03-11 22:29:39 +01:00
wolfreak99 2fe134fd5f Make shortcut keys window bigger and resizable 2017-03-11 22:09:24 +01:00
Michał Janiszewski 00b6fb53c6 Fix #5299: Scenario editor crash when placing peep spawn 2017-03-10 23:02:04 +01:00
Michał Janiszewski 7341f4aadd Remove trailing whitespace 
[ci skip]
 2017-03-07 20:38:11 +01:00
Joël Troch 8167ff9678 Fix #1730: Add keyboard shortcuts for track construction (#5200) 2017-03-03 09:35:42 +01:00
wolfreak99 38f264cce8 Allow for more peep spawns in the future 2017-03-02 23:02:54 +01:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor 
Refactor fence to wall
 2017-02-28 06:56:06 +00:00
Michał Janiszewski 7f48df20ec Refactor input 2017-02-27 20:20:41 +01:00
Hielke Morsink 4ea29bbf80 Close conflicting windows in main menu 
* The main buttons close the other main windows in the main menu

* Only close other windows if the next is not open already
 2017-02-26 13:24:35 +01:00
duncanspumpkin 7691dc3c10 Use functions to set and get secondary colour 2017-02-25 09:19:31 +00:00
duncanspumpkin 69af723972 Remove more fences 2017-02-21 20:22:03 +00:00
duncanspumpkin 810bf301f3 Rename map element fence to wall 2017-02-20 21:10:49 +00:00
duncanspumpkin f54c71b61c Rename functions to wall. Refactor game commands 2017-02-20 21:02:19 +00:00
duncanspumpkin 133266deb0 Label fence offsets 2017-02-19 11:03:05 +00:00
Ted John fb2c835d52 Include new config header 2017-02-18 15:45:10 +00:00