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

158 Commits

Author SHA1 Message Date
Michał Janiszewski d19fe0e334 Make sure null ride type gets handled properly 2016-02-24 23:16:25 +01:00
Michał Janiszewski eb645cd4f3 Rename ride_entry functions and provide better logging 
For hacked rides, provide the name of offender in the log.
 2016-02-24 22:23:33 +01:00
Duncan baffb37b34 Merge pull request #2967 from marijnvdwerf/decompile-6CA2DF 
Decompile sub_6CA2DF
 2016-02-22 17:27:26 +00:00
Marijn van der Werf a744f84292 Clean up property calculation 2016-02-20 21:55:12 +01:00
Marijn van der Werf 88d0f8c60b Clean up track retrieval 2016-02-20 17:54:26 +01:00
IntelOrca 3583d601ad name flag: RIDE_TYPE_FLAG_15 2016-02-20 16:37:09 +00:00
IntelOrca caf8b45dc3 remove usages of 0x00F441D2 2016-02-20 15:52:38 +00:00
Marijn van der Werf 9b8b90964e Use TRACK_SLOPE_NONE for comparing with bl 2016-02-19 17:19:34 +01:00
Marijn van der Werf a157a7945c Fix structure of diagonal curves 2016-02-19 16:30:56 +01:00
Marijn van der Werf 7b2c3f5b88 Refactor known input/output combinations to use table 2016-02-19 13:31:00 +01:00
Marijn van der Werf a5ee1ddb56 More fixes 2016-02-19 01:29:30 +01:00
Marijn van der Werf 0b792cb927 Fix conditional 2016-02-19 00:16:03 +01:00
Marijn van der Werf 2b879cd586 [temp] log tracktype conditions 2016-02-18 22:01:54 +01:00
Marijn van der Werf e20f487629 Fix mistakes 2016-02-18 21:44:09 +01:00
Marijn van der Werf 1f2afd6bac Process feedback 2016-02-18 14:24:09 +01:00
Marijn van der Werf b88ac9f26e Apply suggested fixes 2016-02-18 13:55:56 +01:00
Marijn van der Werf 76f0ca9afb Clean logic 2016-02-18 13:31:42 +01:00
Marijn van der Werf 235cc69b88 Decompile function 2016-02-18 13:02:59 +01:00
danidoedel 217047c1a6 Fix #2881 Disable banking for steep to flat track 2016-02-04 21:07:45 +01:00
danidoedel 55aa203aa7 Fix #2882 Helix up didn't work properly 2016-02-04 15:02:40 +01:00
IntelOrca caf9bd9939 get game working with new theme manager 
Theme editor currently unavailable.
 2016-02-03 18:23:44 +00:00
duncanspumpkin ba314c6fc8 Fix dropdown default highlight regression 2016-01-25 17:11:56 +00:00
Michał Janiszewski 6d6f9f3c23 Refactor rides to be only accessible with getters 
This changes how rides are accessed from macros to getter functions.
 2016-01-23 01:13:36 +01:00
Marijn van der Werf 98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
IntelOrca b7484db239 refactor clip_drawpixelinfo to not allocate memory 2016-01-14 20:12:44 +00:00
IntelOrca f4f07ae5bb integrate variable: gInputPlaceObjectModifier 2016-01-05 22:33:47 +00:00
IntelOrca ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction 
also fix ride construction window closing immediately after placing first track piece of a ride for clients
 2016-01-05 20:37:21 +00:00
IntelOrca f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
LRFLEW 50a1f588ec Disable chain button on steep slopes that cannot have one 2015-12-27 17:31:43 -06:00
Aaron van Geffen 9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
Ian Spence 434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence ba038c10ab Automatically open shops & stalls 
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
 2015-12-24 00:00:41 -08:00
IntelOrca db18fa8f14 finally fix #1619: Can't place any path 
RCT2_ADDRESS_TOOL_WIDGETINDEX was being read as an int32 sometimes
 2015-12-21 22:28:34 +00:00
Kyle Kirby caf07c2064 Clean up the comments a litte 
• Make comment heads be /**
• Make rct2 addresses be double spaced indented
• Make there be a space afte rct2: and the address
• Make single-line rct2 addresses be full block comments
• Move description of method to top of comment
 2015-12-11 16:19:46 -06:00
Dom Light bb62b7561a Replace some uses of play_sound_panned with play_sound_at_location 2015-11-18 00:03:15 +00:00
Dom Light e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
Dom Light 3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
duncanspumpkin cd07fd5d4e Fix #1565. Construction window now checks to see if it has control of tool before canceling it 2015-11-15 09:12:19 +00:00
Michał Janiszewski 075b98e209 Minor cleanups 
Mostly just setting variables to better define game state, with one
minor update of decompilation where an `or` instruction was used in
place of `mov` (in `sub_6CBCE2`).
 2015-11-12 12:19:40 +01:00
Alexander Overvoorde 3f00ec42f1 Replace trackPlaceZ RCT2_GLOBALs with define for clarity 2015-11-08 23:44:41 +01:00
Alexander Overvoorde b20a844982 Fix "land not owned" errors being overridden by "can't construct here" 
I'm not entirely sure what the "hmm" check is about, but it caused
track_place() to return early when called from
window_ride_construction_construct(), so I moved up the owned land check
to give it a higher priority.
 2015-11-08 21:47:18 +01:00
Duncan 0f14d33cc6 Merge pull request #2184 from duncanspumpkin/fix_2151 
fix #2151.
 2015-11-04 19:42:34 +00:00
IntelOrca 800e80aeb3 fix demolish track piece as client on multiplayer 2015-11-03 22:58:30 +00:00
Flukiestemperor c8701ef01e partially fix #2181 
create common function
 2015-11-03 16:11:11 -06:00
duncanspumpkin bbe2a34714 Fix #2151. 
I think this fixes the issue but its hard to understand from the original
issue.
 2015-11-03 14:39:33 +00:00
Michał Janiszewski c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
Alexander Overvoorde 01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
Michał Janiszewski 7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
IntelOrca 3855d70d1a fix dropdown 64 item support and remove old RCT2 addresses 2015-10-14 21:01:04 +01:00
Gymnasiast d71ca1f376 Extend dropdowns to hold up to 64 items (with bugs) 2015-10-14 16:19:50 +02:00
duncanspumpkin 36917bd75a Fix #1661. Track direction now remembered when deleteing last section 2015-10-04 20:52:27 +01:00
Jonathan Haas ae82ffcd96 Rename window flags 2015-10-03 17:20:53 +02:00
duncanspumpkin eaa44ab1e1 Fix #1854. Special track elements disable correctly. 
Issue was caused by a change I asked to be done a month back. Dropdowns are awkward windows the global array for dropdown content should be populated before creating them but not anything else as that will get reset. In this case the disabled items were reset. The same happens for highlighted index if that is specified before window creation
 2015-09-27 21:55:48 +01:00
nightroan 8d3f7600fb As a multiplayer client, don't select the next track piece if is is unaffordable. 2015-09-26 16:01:04 -07:00
nightroan bd51c7ed80 Fixed #1939 by adding a callback to delay selection of the next piece until the server sends back the placement command. 2015-09-25 23:57:15 -07:00
YamaArashi 7c8b0641d9 replace viewport flags numeric literals with constants 2015-09-22 15:30:19 -07:00
IntelOrca 4dd95c650b implement RideData4 data 2015-09-10 22:16:41 +01:00
Gymnasiast 308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00
Gymnasiast 11fa6bbab7 Fill ride construction dropdown properly before drawing it, fixes #1793 2015-08-21 09:34:58 +02:00
medsouz 7071bd9353 Document more addresses 
Created defines for all the memory addresses I could find in peep/staff.c
and updated everywhere they're being used.
 2015-08-16 18:25:17 -04:00
zsilencer 584b34e6d5 fix game_command_create_ride for network 2015-08-14 09:13:39 -06:00
Gymnasiast f0054c7307 Fix typo 2015-08-12 00:23:40 +02:00
Gymnasiast fd715c7c5d Name RIDE_TYPE_FLAG_8 and _12 2015-08-12 00:21:53 +02:00
IntelOrca ca0e63f1a1 fix #1598 2015-08-04 02:28:05 +01:00
IntelOrca 801d2ec341 implement window_maze_construction_mousedown 2015-07-25 17:48:00 +01:00
Michał Janiszewski 8f2dc5fd1a sub_0x68615B doesn't really take any params 
In all cases, sub_0x68615B takes a single argument, 0xEE788C.
It now takes 0 arguments and simply knows about its initializing values.
 2015-07-23 20:22:08 +02:00
IntelOrca f35c23bb68 implement window_maze_construction_update 2015-07-21 15:02:53 +01:00
Duncan Frost 1725211713 Fix incorrect widgets enabled in ride construction. 2015-07-20 19:47:54 +01:00
Duncan Frost a877dd4a5b Get the initial maze construct working. 
Note entrances are broken
 2015-07-20 18:03:45 +01:00
Duncan Frost d2bcf096f7 Fix slope end when deleting sections. 
Fixes #1646
 2015-07-19 15:11:24 +01:00
IntelOrca e967e9465f implement sub_68B2B7 2015-07-17 16:00:46 +01:00
IntelOrca 1d9f404b5b implement ride_construction_set_default_next_piece 2015-07-13 12:47:31 +01:00
IntelOrca fbd402eb67 implement remaining screen_get_map_xy... functions 2015-07-11 18:23:59 +01:00
IntelOrca 5724567b15 implement ride_get_place_position_from_screen_position 2015-07-10 14:54:02 +01:00
IntelOrca f906391c9d remove registers from window events and changed to typed signatures 2015-07-10 01:39:16 +01:00
IntelOrca 4acb7ff5e1 fix demolish of flat rides and unable to build it again 2015-07-06 22:53:16 +01:00
Duncan Frost bcd80b3db8 Fix issue with tracks on uneven ground. 
Fixes #1525
 2015-07-06 21:09:01 +01:00
Duncan Frost e0ea2d9817 Implemented track block get next and previous. 
Minor refactor of ride functions as well.
 2015-07-04 22:50:48 +01:00
IntelOrca 19edd8a3bb refactor game command enum 2015-06-29 17:36:07 +01:00
IntelOrca f452b4d39a fix #1506 2015-06-28 13:36:52 +01:00
IntelOrca 48268d50cc implement a couple of ride subroutines and refactor 2015-06-28 13:36:51 +01:00
IntelOrca 36d6ea7a6e fix setting brakes speed on current track and implement game command 2015-06-28 11:44:46 +01:00
IntelOrca b8fa25bcb6 fix brakes speed not being set when building track 2015-06-28 11:44:45 +01:00
IntelOrca 97e4a4d663 add track block and possible ride configuration tables 2015-06-27 22:53:52 +01:00
IntelOrca 57fd914a52 implement ride construction 2015-06-27 15:17:54 +01:00
IntelOrca 87c7a31fa4 fix #1367 2015-06-17 22:13:23 +01:00
IntelOrca dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Robert Jordan dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
Duncan Frost 0701bacc71 Fix yellow arrow when closing construction window. 
Small refactor of map selection globals.
Fixes #1062
 2015-05-17 08:49:39 +01:00
Duncan Frost 9051f13520 Implemented sub_6c683d 
This is some sort of function that gets the map element of the first part of a track segment.
It is also used to update the flashing colour when in construct mode
 2015-05-13 19:19:34 +01:00
zsilencer 68d7f84098 rename 0x80000000 to MONEY32_UNDEFINED 2015-04-25 09:20:46 -06:00
Gericom a64e89ec66 Refactoring window_construction_paint, fixed bugs 2015-02-27 12:49:22 +01:00
Gericom 00dcd4fba8 Implemented window_construction_paint 
Still contains some bug related to drawing the current track piece
 2015-02-27 10:37:17 +01:00
IntelOrca 2ab48c998e Merge branch 'set-ride-status' into develop 
Conflicts:
	src/ride/track.h
 2015-02-17 17:00:47 +00:00
Duncan Frost bc847628cd Labelled track preview offsets 2015-02-09 18:51:58 +00:00
IntelOrca 78e3b1aa95 fix a few errors with check-valid-ride 2015-02-08 16:53:38 +00:00
IntelOrca a6c95f1f38 Merge branch 'develop' into set-ride-status 
Conflicts:
	src/ride/track.c
	src/windows/ride_construction.c
 2015-02-08 16:04:35 +00:00
Duncan Frost 0f6dd51736 Added load_palette. Labelled offset for paused and palette effect frame. Fixed fast moving water. 2015-02-07 17:40:20 +00:00
IntelOrca 5b4ec3621a refactor many functions to use rct_xy_element 2015-01-30 19:20:19 +00:00