mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-09-10 19:42:46 +02:00
Code Issues Projects Releases Wiki Activity
7471 commits 9 branches 42 tags 369 MiB
Commit graph

256 commits

Author SHA1 Message Date
Alexander Overvoorde
d1a6b65049 Fix supports error appearing when building outside of owned land 
This was caused by ride_construction_toolupdate_construct() pointlessly
trying to fix the "building outside owned land" error by increasing the Z.
 2015-11-08 21:47:17 +01:00
duncanspumpkin
96a1f0c6f7 Refactor. 
Labelled the known flags and used functions for setting and clearing them.
 2015-11-04 19:28:45 +00:00
duncanspumpkin
5b54ad18e9 Fixed #2082. Sub_6D31A6 now working. 
Small mistake in track previous meant the x/y coordinates didn't match the map element. There were also a few other issues that presented themselves once that was fixed.
 2015-11-03 20:03:21 +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
IntelOrca
4ac42ff1b2 add vehicle struct, enum labels and helper functions from implement-ride-create-vehicles branch. 2015-10-25 16:00:21 +00:00
Michał Janiszewski
8e45cccb7a Minor fixes 
Includes (mostly) type fixes, dead code removal, signed vs unsigned
comparison fixes, memory leaks removal.
 2015-10-21 08:47:09 +02:00
Michał Janiszewski
d570163958 Fix types 
Bunch of type fixes
 2015-10-19 20:30:46 +02:00
IntelOrca
8ec4d61739 add callfunc wrappers for the last three remaining game commands and remove original call table 2015-10-10 20:26:17 +01:00
duncanspumpkin
ecc2f74b63 Implement game command footpath from track. 
Fixes #1954
 2015-09-29 23:07:07 +01:00
Michał Janiszewski
5d1beb14c0 Platform, memory fixes 2015-09-28 19:35:06 +02:00
Michał Janiszewski
ee96aaec8e reduce amount of times the pointer is freed to one 
track_list_cache is being free()d as part of track_load_list, which
is a better place to do so, as it has full ownership of that pointer.
 2015-09-15 00:23:46 +02:00
IntelOrca
f988f69ae0 implement sub_6D31A6 2015-09-13 03:00:03 +01:00
IntelOrca
72398151a7 implement ride_create_cable_lift 2015-09-12 18:17:35 +01:00
Michał Janiszewski
788e988992 Memory access fixes 2015-09-12 00:16:05 +02:00
IntelOrca
4dd95c650b implement RideData4 data 2015-09-10 22:16:41 +01:00
Ted John
2a0366721e Merge pull request #1896 from janisozaur/some_fixes 
assorted fixes
 2015-09-07 20:11:29 +01:00
Michał Janiszewski
52252f82b3 assorted fixes 2015-09-07 20:51:21 +02:00
IntelOrca
af39fcd35f fix #1873 2015-09-07 18:18:52 +01:00
IntelOrca
ed824d36b0 refactor two CALLPROC functions in track.c 2015-09-05 20:34:56 +01:00
IntelOrca
6901c04f24 implement track_save_add_map_element and track_save_remove_map_element 2015-09-05 18:21:36 +01:00
Gymnasiast
d49c99e020 Fix seat colour of TD4 River Rapids, fixes #1695 2015-08-31 13:23:52 +02:00
IntelOrca
0c0847160d fix #1857 2015-08-30 22:57:29 +01:00
IntelOrca
bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
Gymnasiast
308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +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
3a26f56000 fix path placement for network 2015-08-14 09:13:40 -06:00
zsilencer
584b34e6d5 fix game_command_create_ride for network 2015-08-14 09:13:39 -06:00
IntelOrca
1496f2404d fix #1736 2015-08-05 21:36:58 +01:00
IntelOrca
be4ee45d66 convert more platform functions over to utf8 and close #1713 2015-08-04 21:41:45 +01:00
Michał Janiszewski
7afb7e2dfd Portability fixes 2015-08-04 19:31:21 +02:00
IntelOrca
ca0e63f1a1 fix #1598 2015-08-04 02:28:05 +01:00
IntelOrca
a9e6f8c3db implement utf8, part 12 2015-08-01 10:20:55 +01:00
Gymnasiast
f12cbeb22b Rename var_6C to flags2 and put all know flags of it into an enum 2015-07-29 08:43:04 +02:00
Gymnasiast
5ed8948e4f Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag 2015-07-27 21:47:55 +02:00
IntelOrca
50187adc37 enable debug configuration and add optimisations to release configuration 2015-07-24 23:48:23 +01:00
Duncan Frost
82217d0053 Fix support cost multiplier underground. 
Fixes #1651
 2015-07-20 17:21:32 +01:00
Gymnasiast
3e5e4431c0 Rename sub_6B59C6() to invalidate_test_results() 2015-07-17 13:49:36 +02:00
IntelOrca
8acd9e73ca implement rct1_fix_colours 2015-07-14 21:58:45 +01:00
Duncan Frost
8504486b28 Fix entrance/exit placement. 
Fixes #1591
 2015-07-13 21:09:36 +01:00
IntelOrca
b2d620bb9d implement window_ride_measurements_tooldown and refactor track save scenery 2015-07-13 20:43:17 +01:00
IntelOrca
1d9f404b5b implement ride_construction_set_default_next_piece 2015-07-13 12:47:31 +01:00
IntelOrca
ed5c6eb866 implement ride_check_start_and_end_is_station and fix #1575 2015-07-12 14:26:14 +01:00
IntelOrca
6acf52ce63 implement ride_check_track_contains_inversions, ride_check_track_contains_banked, refactor track circuit iteration and fix window event bug with hook 2015-07-11 22:51:11 +01:00
Duncan Frost
38986c5852 Added sandbox mode and pause cheats to track place/remove 2015-07-10 21:38:07 +01:00
Duncan Frost
529a4da8e3 Added zero clearance to track placement. 
Due to how track placement works you need to hold down shift when placing the track. Ignore the ghost placement. Also disable support limits is enabled.
 2015-07-10 21:33:33 +01:00
Duncan Frost
728e5d5e1c Fix multiple station platforms. 
Small mistake was causing multiple station platforms to not be properly deleted from a rct_ride. Fixes #1566
 2015-07-08 18:46:32 +01:00
IntelOrca
0ab33d67e8 implement footpath_connect_edges 2015-07-07 19:09:48 +01:00
IntelOrca
f859eefc4b implement footpath_remove_edges_at 2015-07-06 22:13:04 +01:00
IntelOrca
181a2e6209 implement map_remove_walls_at 2015-07-06 20:30:03 +01:00
Duncan Frost
e898e4dfc4 Fix track bugs. 
Fixed issue with ride demolishing where only the first tile of a ride would get demolished causing issues when the ride entries were removed.
Fixed issue with rotation 3 track pieces where invalid memory would be accessed.

Fixes #1506
Fixes #1556
 2015-07-06 18:21:42 +01:00
Duncan Frost
da0368d1a3 Fix bug in track remove. 
Fixes #1552
 2015-07-05 20:57:14 +01:00
Duncan Frost
b374899bc8 Fix finance issues. Small refactor. 
Fixes #1524
 2015-07-05 16:13:04 +01:00
Duncan Frost
4acb73abfe Fix incorrect refund price for tracks. 
Fixes #1548.
 2015-07-05 15:22:56 +01:00
Duncan Frost
20f6b8731f Implemented track_remove 2015-07-05 11:50:43 +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
Duncan Frost
b947d11442 Fix animated track elements. 2015-07-03 21:40:26 +01:00
Duncan Frost
709a2c5ef1 Implement track_place. 2015-07-03 21:14:26 +01:00
IntelOrca
19edd8a3bb refactor game command enum 2015-06-29 17:36:07 +01:00
IntelOrca
40ba6a3efa remove various callprocs 2015-06-29 17:22:01 +01:00
IntelOrca
4ada15c972 implement ride_update_max_vehicles 2015-06-29 15:13:42 +01:00
IntelOrca
3e200d0bd2 implement ride_fix_breakdown 2015-06-28 18:36:46 +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
97e4a4d663 add track block and possible ride configuration tables 2015-06-27 22:53:52 +01:00
IntelOrca
457e7862b3 prepare track place and remove game commands 2015-06-27 17:53:28 +01:00
IntelOrca
57fd914a52 implement ride construction 2015-06-27 15:17:54 +01:00
Ted John
a0f3438538 Merge pull request #1469 from Gymnasiast/fix-remove-all-guests 
Fix remove all guests cheat, improve select by track type, fixes #1462, fixes #1388
 2015-06-25 16:12:15 +01:00
Gymnasiast
ca1b88fc53 Don't modify flags when in select_by_track_type mode; make it switchable in-game again. 2015-06-25 11:46:17 +02:00
Krutonium
5895dcd9b1 Corrected issue with saving tracks not having file extensions when user removes it from the save dialog. Fixes #1467 2015-06-24 20:26:50 -04:00
Gymnasiast
a6225ebf06 Add option to select by track type (RCT1 style); correct misspellings of 'separate' 2015-06-24 12:41:19 +02:00
Gymnasiast
7ed390b8c4 Fix wrong colours in TD4 import, fixes #1420 2015-06-22 15:12:19 +02:00
Gymnasiast
98253c8d21 Keep RCT1 launch modes on TD4 import 2015-06-22 08:41:47 +02:00
Duncan Frost
f36d17651d Implemented game_command_place_fence. 
There are a couple of bugs involveing signs.
 2015-06-21 11:43:52 +01:00
zsilencer
d2b565b283 game_command_place_large_scenery 2015-06-14 05:56:41 -06:00
IntelOrca
ee7a2c47f4 refactor map size 2015-06-13 19:11:26 +01:00
Gymnasiast
732319514f Allow building in pause mode via a cheat 2015-06-10 19:35:53 +02:00
Robert Jordan
0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
IntelOrca
dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
IntelOrca
eb654a220d implement sub_6A7594 2015-06-09 02:36:02 +01:00
Duncan Frost
97966ac707 Implemented scenery_set_setup for research. 
I've also labelled ride_type->flags.
 2015-06-07 19:19:16 +01:00
IntelOrca
65377629e4 implement track save select nearby scenery 2015-06-07 16:02:43 +01:00
IntelOrca
1d622ed3e2 add more ride rating calculations and refactor ride operation mode 2015-06-02 19:59:55 +01:00
zsilencer
9ee4b64fa1 game_command_place_scenery 2015-05-20 19:21:13 -06:00
Duncan Frost
5e1ec9134d Fix #1102 
Fixed tracks from failing to save due to mistake in reversing.
 2015-05-19 21:22:09 +01: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
328abd1d45 Fix out of bounds errors 
Changed get_surface_element to bubble up the null mapElement to be taken care of by the calling function.
Added checks on the track functions to ensure that invalid coordinates do not call get_surface_element_at.
Fixes #1066 and Fixes #1057
 2015-05-17 07:58:51 +01:00
Duncan Frost
aacdc12733 Finished mirror code. 2015-05-14 18:00:49 +01:00
Duncan Frost
caa6547650 Started implementing track_mirror. 
Ride and maze mirror already works.
Scenery still requires work.
 2015-05-13 20:15:48 +01:00
Duncan Frost
88a43b34b0 Finish maze track placement 
Fixed bugs related with maze placement as well.
 2015-05-13 19:19:46 +01:00
Duncan Frost
fbdc2dad7b Added start of maze placement. Refactored slightly. 2015-05-13 19:19:45 +01:00
Duncan Frost
1f02b47a6c Implemented large/small scenery placement. Fix bugs. 
There was a bug that was causing track creation to place scenery items in the incorrect location. This was caused by assuming a global variable was no longer in use.
 2015-05-13 19:19:45 +01:00
Duncan Frost
ac55dd3e04 Add wall scenery support 2015-05-13 19:19:44 +01:00
Duncan Frost
9603e35834 Fix bugs in path placement 2015-05-13 19:19:43 +01:00
Duncan Frost
ed685688e2 More scenery_place. 
There is a bug in the path code
 2015-05-13 19:19:43 +01:00
Duncan Frost
49e02fdab8 Added more of scenery place 2015-05-13 19:19:42 +01:00
Duncan Frost
054bc8cac2 Started scenery placement 2015-05-13 19:19:41 +01:00
Duncan Frost
d7db2e27e0 Added entrance/exit placement. 2015-05-13 19:19:41 +01:00
Duncan Frost
01eb40de08 Fix bugs in ride placement 
Tracks should now place and remove correctly.
Next task will be entrances/exits followed by scenery.
 2015-05-13 19:19:40 +01:00
Duncan Frost
69c708b75d Added more to track_place 2015-05-13 19:19:39 +01:00
Duncan Frost
a8912e0696 Added more of track_place 2015-05-13 19:19:39 +01:00
Duncan
f367746964 Fix small mistake in flags 2015-05-13 19:19:38 +01:00
Duncan Frost
7d13cb9ac3 Started track_place 2015-05-13 19:19:38 +01:00
Duncan Frost
822c3f6932 Added game_command_place_track 
Requires extensive testing.
Fixed a bug in the tracks.idx that would cause crash on track load fail.
 2015-05-13 19:19:37 +01:00
Duncan Frost
66de066901 Added save_track_file. Fixed bugs. 
Encountered bug where incorrect tracks would be displayed if the loading process failed.
Added checksum validation to loading code.
Increased the max rle length to match rct2.
 2015-05-13 19:19:36 +01:00
Duncan Frost
64374e5ac4 Added maze to td6 code. 
Small refactor of td6 struct to use flags with a note.
Refactor to split up td6 creation code
 2015-05-13 19:19:35 +01:00
Duncan Frost
7418c74c9a Finished save track for tracked rides. 
Still needs mazes to be done.
No noticable bugs so far.
 2015-05-13 19:19:35 +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
Duncan Frost
f6f671e27f Started .TD6 creation function. 
Labelled known offsets from compare to ride structure.
 2015-05-13 19:19:34 +01:00
Duncan Frost
dde9611343 Added td4 booster check. 
Small refactor to use known structures
 2015-05-13 19:19:33 +01:00
zsilencer
68d7f84098 rename 0x80000000 to MONEY32_UNDEFINED 2015-04-25 09:20:46 -06:00
Timmy Weerwag
930a9d61dd Fixes for a couple of warnings 2015-04-12 23:26:15 +02:00
Duncan Frost
cfeb039ad2 Added install_track window 2015-04-02 22:00:59 +01:00
Duncan Frost
352d6215ff Fix track save at rotation 1 and 3 2015-03-26 18:16:32 +00:00
Duncan Frost
b7bd2aee1f Fix mistake introduced when refactoring. Caused infinite loop 2015-03-21 09:58:54 +00:00
IntelOrca
488282d653 name some of the ride type flags 2015-03-07 19:56:30 +00:00
IntelOrca
6ae0c10350 refactor ride type flag checks 2015-03-07 19:15:47 +00:00
Duncan Frost
936f2f127f Refactor of object_list.c 2015-03-07 11:13:10 +00:00
Duncan Frost
e0d5979e4c Fix certain rides not being savable 2015-02-28 16:04:31 +00:00
Duncan Frost
4c527225fb Refactor. Now uses same code for scenery_tracks and just tracks 2015-02-27 13:04:48 +00:00
Duncan Frost
b72ffb43db Finish track_save_scenery. Design cancel now called after save 2015-02-27 13:04:45 +00:00
Duncan Frost
189d5d2f08 Add more to the ride track save 2015-02-27 13:04:44 +00:00
Duncan Frost
054d91f0ce Started implementing track_save 2015-02-27 13:04:43 +00:00
Adrian Wielgosik
534b5e9e0b Fixed ride price approximations being truncated; fixes #850. 2015-02-22 15:17:45 +01:00
IntelOrca
2ab48c998e Merge branch 'set-ride-status' into develop 
Conflicts:
	src/ride/track.h
 2015-02-17 17:00:47 +00:00
IntelOrca
ac4cd56b63 add new load / save window, closes #580 2015-02-14 02:16:03 +00:00
IntelOrca
a66b29076b move osinterface code to shared or windows 2015-02-12 20:51:40 +00:00
Duncan Frost
12cf791254 Fixed track delete. 2015-02-12 18:40:07 +00:00
Duncan Frost
715c8bcf0f Fixed track rename. 2015-02-12 18:35:41 +00:00
IntelOrca
2bbaa0fc4c Merge branch 'object-selection-window' into develop 2015-02-11 21:05:05 +00:00
IntelOrca
fadeff9dda fix a few issues with object selection and track manage 2015-02-11 21:03:23 +00:00
Duncan Frost
3436e5133f Fix #773. Issue caused by missing some allocations of the map size. 2015-02-11 20:25:11 +00:00
Duncan Frost
5fb09400e7 Fix track name null 2015-02-09 18:52:00 +00:00
Duncan Frost
bc847628cd Labelled track preview offsets 2015-02-09 18:51:58 +00:00
Duncan Frost
3e047d7c8c Fix track place bug. Add all remaining view directions 2015-02-09 18:51:57 +00:00
Duncan Frost
04e7ff76e4 Added start of actual paint code. Bugs encountered 2015-02-09 18:51:57 +00:00
Duncan Frost
6943c7dce0 Finished sub_6D2189 2015-02-09 18:51:56 +00:00
Duncan Frost
df723b871c Added more of 6d2189 2015-02-09 18:51:55 +00:00
Duncan Frost
88a22a9283 started sub_6d2189 2015-02-09 18:51:54 +00:00
Duncan
3eb5350fb1 Added reload map backup. 2015-02-09 18:51:54 +00:00
Duncan Frost
aeb3764ab5 Added load track objects 2015-02-09 18:51:53 +00:00
Duncan Frost
7598904073 Added blank_map() 2015-02-09 18:51:52 +00:00
Duncan Frost
f8f1019c34 Added backup_map 2015-02-09 18:51:52 +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
1fc525214d Refactor track_load. Relabeled address' 2015-02-02 18:52:50 +00:00
Duncan Frost
fc8728aa9d Refactor of editor window. Added object_selection_close and load_selected_objects. Fix small display bugs. 2015-02-02 18:49:07 +00:00
Duncan Frost
186499c0eb Finished track_load_list. Requires refactor. 2015-02-02 18:44:19 +00:00
Duncan Frost
b7470447e8 Refactor track_list using TD4 knowledge 2015-02-02 18:43:02 +00:00
IntelOrca
0e6a90c5de further testing and progress on set_ride_status 2015-01-29 21:10:34 +00:00
Duncan Frost
007817f967 Fix bug in vehicle dropdown. Refactor track more 2015-01-22 21:08:45 +00:00