Commit graph

304 commits

Author SHA1 Message Date
IntelOrca
89ad0cc769 store windows in openrct2 memory and increase max
Allocate a bigger window list and viewport list in OpenRCT2 static memory and move over all references from RCT2.
This also removes the 'active' viewport pointer list and instead changes everything to just enumerate the whole viewport list
2016-04-14 23:00:35 +01:00
Duncan
9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs
Clean up data use
2016-04-13 12:38:58 +01:00
duncanspumpkin
be8c84f1c1 Fix grass growth mistake
Nibbles are only 4 bits not 8
2016-04-11 20:04:03 +01:00
IntelOrca
37d759ffb7 fix #3268: water tool sound even when no change 2016-04-10 13:05:16 +01:00
duncanspumpkin
f251ddd5a9 Fix grass growing underneath objects. 2016-04-10 10:14:06 +01:00
Marijn van der Werf
0fd42f408a Extract new struct 2016-04-03 14:53:17 +02:00
IntelOrca
6f2d91cc7e land and water now obey disable clearance, closes #3196 2016-03-31 21:57:22 +01:00
IntelOrca
a2fda29d92 validate park entrances and land ownership tools 2016-03-22 22:55:13 +00:00
duncanspumpkin
e30c2aeea8 Fix #3123 and refactor of banner placement.
This fix needs testing as it might mess up nested game commands.
2016-03-13 18:40:50 +00:00
Gymnasiast
ddf3d7a03d Consistently use 'colour' rather than 'color' 2016-02-28 20:32:02 +01:00
Michał Janiszewski
aa8437cb9d Minor fixes 2016-02-26 20:49:01 +01:00
Michał Janiszewski
6b514d1e3a Fix possible issues highlighted at higher warn levels
Mostly possibly uninitialized values and signedness
2016-02-26 12:54:00 +01:00
Michał Janiszewski
fc2bba3047 Fixes for upcoming GCC6 & Clang 3.8 2016-02-25 19:35:18 +01:00
Michał Janiszewski
14bff0c66f Rename rct_ride_type to rct_ride_entry 2016-02-25 13:33:19 +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
Michał Janiszewski
d375015975 Mark map element getters const
While it doesn't change a lot in terms of performance, it helps out
compiler being a bit smarter about inlining and reordering things (as
evidenced by generated assembly).
2016-02-23 15:12:48 +01:00
IntelOrca
5cf0c4bd07 remove commented out callproc/funcs 2016-02-16 20:10:24 +00:00
IntelOrca
8268f607cd implement track_remove_station_element 2016-02-14 17:37:28 +00:00
Duncan
0e75efc1eb Merge pull request #2927 from OpenRCT2/clear_funcs
Implement Clear funcs
2016-02-14 07:19:33 +00:00
duncanspumpkin
53689349f9 Fix mistake added in refactor.
Also remove redundant global variable setting
2016-02-13 21:55:00 +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
duncanspumpkin
f6797181b5 Start implementing clear_funcs 2016-02-13 13:10:55 +00:00
Marijn van der Werf
7565a7ba69 Implement substate 9 2016-02-13 00:01:15 +01: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
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
8c608b6f6c fix issues with a few game commands 2016-01-23 17:33:08 -07: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
IntelOrca
62eeaaf405 fix severe regression from #2787, use object entry array instead of ride entry array 2016-01-23 12:47:04 +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
IntelOrca
0584de1501 fix part of #2747: mistake in map coordinate clamping for set ownership 2016-01-17 12:44:16 +00:00
duncanspumpkin
0f6c8b8760 Refactor get small scenery to prevent repeats of #2735. 2016-01-16 11:04:06 +00:00
duncanspumpkin
3865bf9381 Fix #2735. 1/4 tile scenery can now correctly be recoloured.
Issue was caused by an assumption made during writing this function.
2016-01-16 10:55:36 +00:00
Ted John
e69e384d43 Merge pull request #2692 from marijnvdwerf/use-named-addresses
Replace known addresses with constants, globals and wrapper functions
2016-01-15 22:59:13 +00:00
Michał Janiszewski
17fb150ec0 Limit arguments to map functions
While there is nothing wrong with the code as it is now, some
unexpected arguments can cause entering a loop which will flood the
log and possibly stall the game.
2016-01-15 23:29:51 +01:00
Marijn van der Werf
98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
IntelOrca
730463dbbb remove rct2_malloc, rct2_realloc and rct2_free 2016-01-14 20:18:55 +00:00
Marijn van der Werf
ef9ac11e52 Remove direct usage of RCT2_ADDRESS_LARGE_SCENERY_ENTRIES 2016-01-11 21:00:22 +01:00
duncanspumpkin
2bd6dac20f Merge branch 'develop' into vehicle-update
Conflicts:
 openrct2.vcxproj
2016-01-10 08:57:41 +00:00
Gymnasiast
03c35ab0b6 Don't remove walls when raising/lowering land/water, fixes #2681 2016-01-09 23:46:08 +01: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
Michał Janiszewski
2b1b0f76f3 Whitespace fixes.
This is just whitespace fixup for all files affected in vehcile-update
branch.
2016-01-03 00:59:10 +01:00
Michał Janiszewski
5f66cd48f8 Merge branch 'develop' into vehicle-update
Conflicts:
	openrct2.vcxproj.filters
2015-12-31 11:41:23 +01:00
IntelOrca
64b589770a remove obsolete callprocs 2015-12-29 11:57:47 +00:00
IntelOrca
4f56709455 implement more sub_6DAB4C 2015-12-14 15:18:19 +00:00
Duncan
0604068aac Merge pull request #2440 from LinusU/world-map-fixes
small fixes to world/map.c
2015-12-13 21:27:40 +00:00
Linus Unnebäck
017899c0d9 small fixes to world/map.c 2015-12-13 21:45:58 +01:00
Kyle Kirbatski
4f03530e48 Clean up instances of 0x.. & 0x.. to 0x.., 0x.. 2015-12-12 14:08:09 -06: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
Duncan
396e6f8fee Merge pull request #2297 from osconnoisseur/decompile-map_set_land_height
Decompilation of map_set_land_height
2015-11-30 20:35:50 +00:00
IntelOrca
c6056cbb6c Merge branch 'pre-release-0.0.3' into develop
Conflicts:
	src/audio/audio.c
2015-11-27 22:05:40 +00:00
duncanspumpkin
843999997b Fix #2375. Issue caused by invalid z coordinate for invalidate.
Also fixed a couple other functions which were calling with the incorrect z value
2015-11-27 19:17:35 +00:00
duncanspumpkin
e05475cb38 Fix #2342. Accidentally disabled pause mode building for large scenery 2015-11-18 22:32:23 +00:00
Duncan
e36ed5e732 Merge pull request #2325 from BodrickLight/refactor
Refactor audio.c and audio.h
2015-11-18 17:33:21 +00: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
duncanspumpkin
6d3eaafe2f Fix #2327. Fix no entry signs.
Issue was caused by mistakenly not stopping searching for tiles after finding the correct one. Mistake made during refactoring
2015-11-17 19:04:43 +00:00
Dom Light
3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
duncanspumpkin
c1ed727067 Fix #2305. Fences now build correctly with shift.
Issue was caused by failing to reinitialise a variable and reusing a variable name for two different purposes. It has been fixed by nameing the variable and also initialising it.
2015-11-16 20:19:58 +00:00
U-ASUS-EEEPC\Cameron Hall
da79f706f3 Hoist gCheatsDisableSupportLimits check outside of loop 2015-11-16 12:09:11 -06:00
zsilencer
292b67874f Fix #2311. Water no longer is able to be raised above existing map elements. 2015-11-16 10:38:20 -07:00
Cameron
763a5f2938 Restore newline at end of file 2015-11-15 15:50:36 -06:00
Cameron
1fc7793c2a Clean up and match coding style 2015-11-15 15:48:27 -06:00
duncanspumpkin
82498c4a57 Fix #1922. Corrected invalid viewport code.
ACTIVE_VIEWPORT_PTR_ARRAY should be iterated along checking for a NULL pointer. To indicate the list end. Removed NEW_VIEWPORT macro as its description was incorrect.
2015-11-15 21:05:30 +00:00
U-HP-Pavilion-PC\Cameron
e5ad14e3f5 Finished decompiling 2015-11-15 12:20:01 -06:00
U-HP-Pavilion-PC\Cameron
cfdc0cf057 More refactoring 2015-11-15 11:01:34 -06:00
U-HP-Pavilion-PC\Cameron
0a824d0957 saving my work 2015-11-14 22:45:13 -06:00
duncanspumpkin
8d2641a2a1 Fix mistake in last commit 2015-11-14 16:45:42 +00:00
duncanspumpkin
13e43b779b Refactor large scenery placement 2015-11-14 16:44:03 +00:00
duncanspumpkin
331d75e5f7 Fix signs. Broken by #2172 2015-11-14 12:40:40 +00:00
duncanspumpkin
bdd29107e6 Refactoring 2015-11-14 11:56:13 +00:00
U-HP-Pavilion-PC\Cameron
f9b1a9eeb4 Refactor some more and fix #2264 2015-11-13 19:50:20 -06:00
duncanspumpkin
954d6348b2 Fix change in function name 2015-11-14 00:12:19 +00:00
duncanspumpkin
d0332c81d8 Refactor and move wide flag code. 2015-11-14 00:08:31 +00:00
U-ASUS-EEEPC\Cameron Hall
2cd40b025a Fixed one of my bugs and did some refactoring. Still more refactoring to do... 2015-11-13 13:48:21 -06:00
duncanspumpkin
aa55ca6b62 Refactor banner_remove. Fixed an original bug.
Banners that are placed on two different heights that face the same direction will end up bugging out. This has now been fixed. This required modification of the top toolbar code in order to correctly set the z variable.
2015-11-13 18:30:14 +00:00
U-HP-Pavilion-PC\Cameron
0757b09781 refactor 2015-11-12 22:47:36 -06:00
U-ASUS-EEEPC\Cameron Hall
9cf2783785 Initial work. Decompiled up to 0x663BE4 2015-11-12 17:02:04 -06:00
duncanspumpkin
a0014eee09 Refactor set scenery and fence. 2015-11-12 19:22:08 +00:00
duncanspumpkin
e857f2d3c8 Refactor set_banner and set_large_scenery 2015-11-11 20:24:59 +00:00
duncanspumpkin
77699e99e5 Final fix of #2151.
Large Scenery, land, water now also force a retry of track placement. Small scenery, walls do not block tracks so do not require this.
2015-11-10 21:34:09 +00:00
duncanspumpkin
026dba0348 Fix issue with last commit.
If large scenery was outside of selection area it would not have its flag reset. Now it will clear the flag for all large tiles. This could do with improving at some point in the future
2015-11-10 19:38:48 +00:00
duncanspumpkin
e6c08fcdf4 Fix #1539. This is an alternative to @warp-10 's technique.
Sets a flag when using the clear large scenery to prevent profit when destroying large scenery.
2015-11-10 19:04:36 +00:00
Michał Janiszewski
c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
zsilencer
a95357a32d signs and banners editable in multiplayer 2015-10-31 11:07:36 -06: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
2f457aeffc Cleanups
* Remove unused function in config.c
* Check handle *before* it is used
* Provide explicit parentheses around unclear if statements
2015-10-28 08:06:45 +01:00
IntelOrca
8d84b540ad add vehicle struct and enum labels from vehicle-update branch. 2015-10-25 21:26:03 +00: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
7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
IntelOrca
6cd3b41065 fix overflows / underflows with mountain tool 2015-10-11 12:31:57 +01:00
IntelOrca
d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
IntelOrca
6c38ab44fa refactor map smooth game command 2015-10-11 11:39:01 +01:00
IntelOrca
969324032e implement map smooth game command 2015-10-11 02:23:39 +01:00