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
duncanspumpkin
843b588b15 Remove redundant callproc code / comments. 2016-02-14 09:34:30 +00:00
Duncan
0e75efc1eb Merge pull request #2927 from OpenRCT2/clear_funcs 
Implement Clear funcs
 2016-02-14 07:19:33 +00:00
duncanspumpkin
9c3055224d Refactor clear funcs 2016-02-13 21:01:36 +00:00
duncanspumpkin
305ae76346 Implement clear funcs for remaining functions 2016-02-13 20:26:22 +00:00
Ted John
703e9c3153 Merge pull request #2839 from anyc/develop 
Linux: use zenity or kdialog to show user dialogs
 2016-02-13 12:15:41 +00:00
Duncan
b0c5b85765 Merge pull request #2784 from marijnvdwerf/decompile-attempt 
[WIP] Attempt at decompiling `game_command_set_maze_track`
 2016-02-01 16:01:45 +00:00
Marijn van der Werf
a926783164 Decompile game_command_set_maze_track 2016-02-01 14:03:56 +01:00
duncanspumpkin
b8c4c46f32 Minor refactor of map location compare flags. 
Labelled ELEMENT_IS_UNDERGROUND.
 2016-01-31 16:58:38 +00:00
anyc
ffafd07c90 use enum to specify file dialog type 2016-01-29 19:03:09 +01:00
Marijn van der Werf
8f8d0e2473 Fixes #2828: shifting by wrong number of bits 2016-01-28 21:40:06 +01:00
Michał Janiszewski
ec2387082c Remove cheats from config 2016-01-25 21:44:13 +01:00
zsilencer
32f1aa064d more accurate last player action location 2016-01-24 21:00:31 -07:00
Michał Janiszewski
95e3895b89 Game commands' argument validation 2016-01-24 19:31:40 +01:00
Ted John
6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer 
MP groups and permissions
 2016-01-24 12:29:27 +00:00
zsilencer
5a72cb02f1 fix small issue caused by some RCT2_ADDRESS_COMMAND_MAP being used as 32 bit vars 2016-01-23 14:42:36 -07: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
IntelOrca
f8507ec93e implement place_maze_design 2016-01-17 22:26:15 +00:00
duncanspumpkin
06fd1436ca Fix #2741. 2 functions were missed during object_load refactor. 2016-01-16 10:21:15 +00:00
Marijn van der Werf
98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
duncanspumpkin
268e2d34ce Merge branch 'develop' into vehicle-update 
Conflicts:
 object.c
 2016-01-09 16:51:23 +00:00
IntelOrca
40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +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
Michał Janiszewski
133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
Michał Janiszewski
9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01:00
Hielke Morsink
bc2ac2e28b Split extension setter into two functions 2016-01-02 20:45:00 +01:00
Hielke Morsink
f31a5f2248 More secure checks for removing and setting file extensions. 2016-01-02 18:57:11 +01:00
Michał Janiszewski
5f66cd48f8 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
 2015-12-31 11:41:23 +01:00
Ted John
69f0e9d55d Merge pull request #2398 from Broxzier/comments_and_optimizations 
Refactored some util functions and some minor tweaks for saving tracks
 2015-12-29 11:31:58 +00:00
Michał Janiszewski
cd2ec16290 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
	projects/openrct2.vcxproj
 2015-12-23 19:47:16 +01:00
Aaron van Geffen
2c5651614c Corrected misspellings of "substitute". 2015-12-23 00:40:36 +09:00
Michał Janiszewski
e666a24c82 Merge branch 'develop' into vehicle-update 
Conflicts:
	projects/openrct2.vcxproj.filters
	src/audio/mixer.cpp
	src/windows/ride.c
 2015-12-22 14:57:40 +01:00
Ted John
f93bc91510 Merge pull request #2462 from duncanspumpkin/fix_trackSave 
Fix Track Saving
 2015-12-19 12:13:03 +00:00
duncanspumpkin
0f3fe73e63 Fix more vehicle bugs. Changed sub_6DD078 to change the collide vehicle 2015-12-18 20:33:45 +00:00
Gymnasiast
e2ccfc1cb8 Only check if ride mode exists when placing new track design, fixes #2445 2015-12-15 15:09:39 +01:00
IntelOrca
2aeeb08af3 implement more sub_6DAB4C 2015-12-14 15:18:34 +00:00
IntelOrca
e8a78f0e2a implement more sub_6DAB4C 2015-12-14 15:18:23 +00:00
IntelOrca
1252ac6f7f implement more sub_6DAB4C 2015-12-14 15:18:22 +00:00
IntelOrca
eaef1bf08e implement more sub_6DAB4C 2015-12-14 15:18:22 +00:00
IntelOrca
4f56709455 implement more sub_6DAB4C 2015-12-14 15:18:19 +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
Kyle Kirby
8e5355640f Convert spaces to tabs 2015-12-11 06:28:35 -06:00
duncanspumpkin
9f1b38f337 Track saving was broken due to using wrong coordinates 2015-12-11 09:57:08 +00:00
Linus Unnebäck
4bfbe27116 use larger integers in ride/track.c 2015-12-06 18:56:09 +01:00
Hielke Morsink
415f55d38d Removed '.TD6' part from being added automatically when saving a new track 2015-11-29 16:45:02 +01:00
Hielke Morsink
5ca371c5c5 Displaying full track filename excluding the real extension 2015-11-29 16:36:46 +01:00
Dom Light
3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
duncanspumpkin
13e43b779b Refactor large scenery placement 2015-11-14 16:44:03 +00:00
duncanspumpkin
6a00482d1f Fix #1834 & #2288. Non complete circuit tracks now save correctly. 
Issue was caused by a bit of code not iterating correctly backwards.
 2015-11-11 19:44:53 +00:00
Alexander Overvoorde
6114aa5dac Rename hmm variable to something more descriptive 2015-11-08 22:30:51 +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
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