Commit graph

304 commits

Author SHA1 Message Date
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
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
7297fc86e9 Fix #2029. Issue with 1x1 land ownership tool 2015-10-04 20:22:50 +01:00
Ted John
c1ecf3c531 Merge pull request #2024 from duncanspumpkin/set_land_ownership
Implemented game_command_set_land_ownership.
2015-10-04 01:06:29 +01:00
duncanspumpkin
625e051d35 Fix #2025. Issue caused by failing to check if coordinates outside of map 2015-10-04 00:35:26 +01:00
duncanspumpkin
3f77a6778a Implemented game_command_set_land_ownership.
Refactored map buy land rights for tile as it was partially broken and used a very odd style.
2015-10-04 00:07:22 +01:00
duncanspumpkin
33e04b8bd6 Implement game_command_place_park_entrance 2015-10-01 21:24:24 +01:00
zsilencer
0af364a9b6 fix #1944 2015-09-21 10:41:09 -06:00
IntelOrca
4dd95c650b implement RideData4 data 2015-09-10 22:16:41 +01:00
IntelOrca
efada641a5 implement map_place_fence_check_obstruction 2015-09-06 17:36:55 +01:00
IntelOrca
2753af893b implement map_obstruction_set_error_text 2015-09-06 13:37:00 +01:00
Gymnasiast
87eb6335ea Remove unused variable 2015-09-04 15:10:09 +02:00
Gymnasiast
03034e7e2a Clear all map elements beforing generating a new map, fixes #1762 2015-08-31 12:42:46 +02:00
Gymnasiast
308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00
Ted John
6a88ca17d0 Merge pull request #1835 from medsouz/cleanupscenery
Add names for all memory addresses in world/scenery.c
2015-08-22 17:43:28 +01:00
Runelaenen
fb5921db6d First headless version 2015-08-19 18:07:04 +02:00
medsouz
4207b41855 Name more addresses 2015-08-18 23:53:24 -04: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
IntelOrca
3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
zsilencer
c1e802e361 fix text for utf8 2015-08-14 09:15:07 -06:00
zsilencer
56f8954e27 fix clear scenery for network 2015-08-14 09:13:39 -06:00
Gymnasiast
810bd0620a Fix Clear Scenery tool in Scenario Editor 2015-08-11 17:54:21 +02:00
IntelOrca
cb3abcb0ca fix #1612 2015-08-05 21:49:44 +01:00
IntelOrca
2419c6629e improve clear scenery tool 2015-08-04 16:01:31 +01:00
olegv11
8ea6adc555 Implemented sub_6A87BB (now update_path_wide_flags), sub_6A8ACF and sub_6A8B12 2015-07-31 13:38:34 +03:00
IntelOrca
3a07af140b Implement more peep path finding 2015-07-28 18:33:46 +01:00
zsilencer
c4a8d27648 fix couple of bugs 2015-07-25 08:50:59 -06:00
Ted John
2d11e54fa7 Merge pull request #1670 from duncanspumpkin/peep
Peep
2015-07-25 11:32:25 +01:00
Duncan Frost
812010001d Implement guest surface path finding 2015-07-25 11:16:59 +01:00
zsilencer
bb46510def implement map_can_construct_with_clear_at 2015-07-24 20:52:14 -06:00
IntelOrca
faacd66ad9 allow trees to be raised if supports limits are disabled, close #1663 2015-07-23 18:55:51 +01:00
IntelOrca
cde0cece16 implement rct1_fix_walls 2015-07-14 23:15:21 +01:00
IntelOrca
345b71f8a4 implement rct1_clear_extra_sprite_entries and rct1_clear_extra_tile_entries 2015-07-13 23:49:39 +01:00
IntelOrca
3ffffc699c clean up and remove various callprocs 2015-07-12 01:46:52 +01:00
IntelOrca
9e9eb6a833 implement banner_get_closest_ride_index 2015-07-11 20:24:27 +01:00
IntelOrca
fbd402eb67 implement remaining screen_get_map_xy... functions 2015-07-11 18:23:59 +01:00
zsilencer
aeeca2454a fixed source of non-deterministicness 2015-07-11 12:31:11 +01:00
IntelOrca
4fceb28017 fix sandbox variable rename 2015-07-10 21:32:12 +01:00
Duncan Frost
4d56572fd4 Fix large scenery ghost issue. 2015-07-10 21:32:11 +01:00
IntelOrca
d5ffaefdf0 add better disable clearance cheat 2015-07-10 21:32:11 +01:00
zsilencer
451bf7100b fix #1570 and possibly #1572 2015-07-09 09:04:24 -06: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
IntelOrca
0def7c0883 refactor invalidation of map tiles and viewports 2015-07-06 18:57:36 +01:00
IntelOrca
9e26a6149f implement sign_set_colour and fix gfx_invalidate_viewport_tile 2015-07-06 17:59:55 +01:00
IntelOrca
6de7a38f53 implement finish-map-window part 4 2015-07-02 00:37:55 +01:00
IntelOrca
c441ee2d1b implement finish-map-window part 2 2015-07-01 15:17:25 +01:00
Duncan Frost
0b60465b65 Fix map element reorganise crash.
Fixes #1518. I've also refactored the code slightly. Issue was caused by memsetting the wrong buffer.
2015-06-30 18:08:49 +01:00
zsilencer
9578606251 implement game_command_set_water_height 2015-06-29 11:49:17 -06: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
Duncan Frost
2c3c8dc188 Fix incorrect pointer maths. Fixes #1511. 2015-06-28 19:46:08 +01:00
IntelOrca
ed41c2b995 fix map_reorganise_elements 2015-06-28 18:59:55 +01:00
Ted John
b1b61e7df5 Merge pull request #1509 from duncanspumpkin/map_functions
Map functions
2015-06-28 18:03:53 +01:00
IntelOrca
e2a694b96e implement format_string_toupper and litter_create 2015-06-28 17:45:19 +01:00
Duncan Frost
33c4698e06 Implemented map_reorganise_elements.
Fixed a potential issue that would cause cursors to become stuck.
2015-06-28 16:50:21 +01:00
Duncan Frost
8167c24526 Implemented sub_68B044 some sort of check to make sure there is space for new element.
If there isn't then it will try reorganise the elements to make room.
2015-06-28 13:53:24 +01:00
Duncan Frost
5e3df22414 Implemented map element remove. Small tidy of functions in game.c. 2015-06-28 13:31:46 +01:00
IntelOrca
57fd914a52 implement ride construction 2015-06-27 15:17:54 +01:00
IntelOrca
086370a7fc fix #1429 2015-06-23 02:58:15 +01:00
IntelOrca
9701b1e0f6 fix warnings 2015-06-23 02:58:14 +01:00
Duncan Frost
d5c19437ac Make generic version of 98197C rotations. Refactor.
I've added a new function coordinate 3d to 2d. There are still quite a few different versions of this same code throughout the project that should be changed to use this function.
2015-06-21 16:23:25 +01:00
Duncan Frost
9958ffc0f7 Started refactor of viewport drawing
Renabled banner paint setup
2015-06-21 16:23:16 +01:00
IntelOrca
c6b7ab2ff4 Merge branch 'pre-release-0.0.2' into develop 2015-06-21 13:56:07 +01:00
IntelOrca
d193348792 fix game_command_set_fence_colour 2015-06-21 12:42:31 +01:00
Gymnasiast
858faa3303 Adjust game_command_place_fence for sandbox mode and build in pause mode. 2015-06-21 13:40:44 +02:00
Duncan Frost
b1183757ec Fix banner bug. Small refactor 2015-06-21 12:07:44 +01: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
IntelOrca
926f6838b4 Merge branch 'pre-release-0.0.2' into develop 2015-06-20 16:26:56 +01:00
IntelOrca
b5fcdcf32a fix placement of large scenery 2015-06-20 16:26:42 +01:00
IntelOrca
18f33f806c implement sub_68ADBC 2015-06-20 16:24:38 +01:00
zsilencer
2a82491514 #1396 2015-06-19 10:26:22 -06:00
IntelOrca
4ebf6dd913 fix #1374 2015-06-17 16:32:50 +01:00
IntelOrca
32046c3c0a improve saving of S6 data and remove ghost banners / user strings 2015-06-15 22:08:03 +01:00
IntelOrca
b206a31cae fix #1145 by removing ghost map elements and trackless rides when saving 2015-06-15 17:27:11 +01:00
zsilencer
28f58b768c fix animation invalidation in large scenery 2015-06-14 15:59:34 -06:00
zsilencer
9419e3a2ec fix a crash in large scenery placement 2015-06-14 14:23:18 -06:00
Gymnasiast
95966f6346 Allow building large scenery outside park borders in sandbox mode. 2015-06-14 15:07:08 +02: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
IntelOrca
a24ffd1f79 fix refactor error in lower_water 2015-06-10 16:38:27 +01:00
IntelOrca
91c73836a3 fix and improve raise and lower land / water / clear scenery 2015-06-10 15:41:50 +01:00
Ted John
dbb7ae8e15 Merge pull request #1284 from trigger-death/decompile-toggle-price
Decompiled toggle ride price and fixed ride price
2015-06-09 23:07:20 +01:00
Robert Jordan
0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
Gymnasiast
7ed434a804 Rework land ownership cheat into sandbox mode 2015-06-09 17:19:05 +02:00
IntelOrca
dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
IntelOrca
ed86db0635 fix sign issues with selection rectangle 2015-06-09 14:47:26 +01:00
oli414
a09b103895 Fixed crash when using land/water tool outside map 2015-06-09 14:24:02 +02:00
IntelOrca
eb654a220d implement sub_6A7594 2015-06-09 02:36:02 +01:00
IntelOrca
12b01d6521 implement footpath_remove_litter and footpath_interrupt_peeps 2015-06-09 02:09:18 +01:00
IntelOrca
acfcf2c33b implement a bit of sub_66397F for sandbox mode 2015-06-08 22:19:06 +01:00
Robert Jordan
83fda8fc56 Clear scenery tool now as options
Can now choose to clear small scenery, large scenery, and/or footpaths.
2015-06-05 12:38:52 -04:00
Ted John
b7d293f4dd Merge pull request #1171 from duncanspumpkin/toolbar_funcs
Toolbar Update Functions
2015-05-30 13:00:25 +01:00
Duncan Frost
b2caeaf531 Refactor of code slightly
Since get_map_coordinates_from_pos returns sint16 values I changed it so that it didn't use sint32 values.
2015-05-30 06:27:52 +01:00
Duncan Frost
a59fd26b3d Added update_water
Refactored up/down water commands so that it used more standard layout.
Not tested.
2015-05-30 06:27:51 +01:00
Duncan Frost
573a632e43 Fix bugs in scenery_clear update
Note make a new version of land update to fix cost issue
2015-05-30 06:27:48 +01:00
zsilencer
5c7dc6bb9a #1165 2015-05-29 21:50:32 -06:00
zsilencer
28c2451d97 move data into code, cleanup 2015-05-20 19:21:13 -06:00
zsilencer
9ee4b64fa1 game_command_place_scenery 2015-05-20 19:21:13 -06:00