1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 17:24:47 +01:00
Commit Graph

531 Commits

Author SHA1 Message Date
Michael Steenbeek
af845beb61 Replace mapElement with tileElement 2017-10-31 19:59:06 +01:00
Michael Steenbeek
ce8d9cc71b Rename map_element to tile_element 2017-10-31 19:59:06 +01:00
Cody Jung
cc82fceaef Fix #6199: Inverted hairpin coaster vehicle tab has vehicle too low 2017-10-27 11:25:18 +02:00
Michał Janiszewski
90a14205c8 Compile track_data.c as C++ 2017-10-25 23:53:47 +02:00
Michael Steenbeek
887ec16b53 Split off ride_get_rotated_coords() 2017-10-24 10:11:48 +02:00
Aaron van Geffen
0a6e780fe6 Add extra padding to the listings in the ride window. 2017-10-22 22:00:49 +02:00
Aaron van Geffen
ac8eaaee62 Add extra padding to dropdowns and menus. 2017-10-22 22:00:49 +02:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512)
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
2017-10-19 10:01:05 +02:00
Duncan
d224f1219e Reintroduce error titles to game actions. Small refactor. (#6462)
* Reintroduce error title to game actions. Small refactor.

Removed setting error titles in any calling functions.
Refactored place park entrance result to conform with other game actions.

* Remove unread variable (fixing Travis)
2017-10-18 19:57:36 +01:00
Michael Steenbeek
ac7652f61d Create define for MONEY16_UNDEFINED 2017-10-18 08:06:16 +02:00
Christian F. Coors
e5ce3859a3 Fix Intent pointers/strings 2017-10-17 22:31:05 +02:00
Michael Steenbeek
bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +02:00
Tomas Dittmann
e393ff1f22 Stop using (void*)-1 for invalid pointers 2017-10-15 15:53:16 +02:00
Michael Steenbeek
7f9c25a7a9 Use constant for LOCATION_NULL, split off location stuff to Location.h 2017-10-13 22:23:07 +02:00
Michał Janiszewski
ab3835719a Compile peep and staff logic as C++ 2017-10-13 10:06:36 +02:00
Michael Steenbeek
202244eda6 Revert "Remember last used rotation for rides with no tracks."
This reverts commit 7dc6e4e9c3.
This commit caused hacked rides (like rollercoasters set to Crooked House) to crash
2017-10-12 23:24:51 +02:00
Michael Steenbeek
3a9dc3f491 Ensure that get_ride_entry returns NULL on invalid ride entries 2017-10-12 21:07:35 +02:00
ZehMatt
7dc6e4e9c3 Remember last used rotation for rides with no tracks. 2017-10-12 21:06:04 +02:00
Michael Steenbeek
42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +02:00
Michael Steenbeek
17557569d0 Turn 'unlock all prices' into a regular option
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
2017-10-11 08:33:17 +02:00
Michał Janiszewski
c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
Marijn van der Werf
ebb4bbe5d5 Move ride list window to UI module (#6412) 2017-10-08 22:15:41 +02:00
Marijn van der Werf
d02976695d Move new ride and research windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
eef3bd9af5 Move staff and guest windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
8569a7fe2f Move map window 2017-10-07 22:24:14 +02:00
Christian F. Coors
f98a240c5a Fix Intent string retrieval 2017-10-07 21:53:00 +02:00
ZehMatt
6fd2eb91a2 Fix demolishing rides causing errors. 2017-10-07 20:15:01 +02:00
Christian F. Coors
72b3896fec Fix strings in Intent 2017-10-07 19:21:56 +02:00
Michael Steenbeek
4224193d68 Clean up ride groups 2017-10-06 10:29:24 +02:00
Oli414
d39c80da42 Fix code style. Fix error text 2017-10-05 10:42:44 +02:00
Oli414
8fa82493cb Move set_staff_name game command functionality to game action 2017-10-05 10:42:44 +02:00
Oli414
14f59c3d9b Move set_guest_name game command functionality to game action 2017-10-05 10:42:44 +02:00
ZehMatt
d8d7d97f74 Fix references on deprecated GAME_COMMAND_DEMOLISH_RIDE 2017-10-05 10:42:44 +02:00
Ted John
4e765a81b1 Tabs to spaces
[ci skip]
2017-10-05 10:42:44 +02:00
duncanspumpkin
205a1c9e12 Depreciate game command. Fix error messages 2017-10-05 10:42:39 +02:00
Michael Steenbeek
055ecccf36 Clean up more track flags 2017-10-04 17:14:53 +02:00
Michael Steenbeek
0c4d184a9a Use constants for map elements and the scenery window 2017-09-29 20:25:17 +02:00
Olivier Wervers
f2c9fc58d5 Implement #1329: Add remove-unused-objects command (#6324) 2017-09-29 16:32:30 +02:00
Michael Steenbeek
950ab0062f Unify "separate ride" and "separate ride name" flags
They're always set together, and only setting one will probably cause undefined behaviour. Deprecate the "separate ride name" flag and instead check the "separate ride" flag in all places.
2017-09-28 17:37:07 +02:00
Marijn van der Werf
09517caa88 Fix #6300: Saving track triggers assertion 2017-09-25 22:14:50 +02:00
Marijn van der Werf
8a47308786 Check whether intent data is set before accessing 2017-09-24 22:41:49 +02:00
Marijn van der Werf
efa87bf931 Try different opaque pointer 2017-09-24 22:41:49 +02:00
Marijn van der Werf
9d80f7efed Apply recommended fixes 2017-09-24 22:41:49 +02:00
Marijn van der Werf
7795ec35dd Add assertions to Intent 2017-09-24 22:41:49 +02:00
Marijn van der Werf
34ee3df318 Refactor intent 2017-09-24 22:41:49 +02:00
Marijn van der Werf
b7164c5eac Rename intent extra keys 2017-09-24 22:41:49 +02:00
Marijn van der Werf
619733ba05 Move track design windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf
d18e59ff17 Move loadsave dialog 2017-09-24 22:41:49 +02:00
Marijn van der Werf
9b1b2b5c62 WIP window moving 2017-09-24 22:41:49 +02:00
Marijn van der Werf
59e1a8ac25 Trying to use intents 2017-09-24 22:41:49 +02:00