mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-09-05 17:11:15 +02:00
Code Issues Projects Releases Wiki Activity
19018 commits 9 branches 42 tags 353 MiB
Commit graph

14658 commits

Author SHA1 Message Date
Michael Steenbeek
b4a763c751
Move naming convention to RTD (#11319) 2020-04-18 12:12:07 +02:00
duncanspumpkin
f9ae3dd980 Make review changes 2020-04-18 10:34:41 +01:00
ThomasZ
401504aff9 Fix #11075: SpriteListHead Refactor 
Refactor "for (spriteIndex = gSpriteListHead[SPRITE_LIST_PEEP]; spriteIndex != SPRITE_INDEX_NULL; spriteIndex = nextSpriteIndex)" like for loops across files with replacing them by FOR_ALL_PEEPS(sprite_index, peep). The same for FOR_ALL_STAFF, FOR_ALL_GUESTS where necessary.

modify incorrect codestyle

modifying incorrect codestyle of the first attempted PR of issue 11075 (missing space after FOR_ALL_GUEST, FOR_ALL_STUFF ...)

modify codestyle further

Forgot to add one more space, correcting it.

another codestyle correction

apparently there is someting wrong with src/openrct2/peep/Peeps.cpp adding a newline after i = 0;

event further modifying codestyle

changing i = 0; to int i = 0;

another codestyle modification, at this point just trying to pass CI clang

adding another newline

another modification
 2020-04-18 10:31:02 +01:00
duncanspumpkin
d75fc6945e Increment network version 2020-04-18 08:16:26 +01:00
Gymnasiast
a295f3c003 Fix #11315: Never opened ride shown as favourite ride of 74 guests 2020-04-18 07:39:24 +01:00
Olivier Wervers
506b06bd73
Fix #11072: Land and water tools work out of bounds (#11179) 
Tool tried to act out of bounds, where it shouldn't do anything
 2020-04-17 19:34:32 -03:00
Tulio Leao
c17127f65b
Use named casts on openrct2 root folder (#11139) 2020-04-17 21:36:25 +02:00
Tulio Leao
64e4a8420e
Use named casts on openrct2/world (#11141) 2020-04-17 21:08:22 +02:00
Michael Steenbeek
ffa9996336
Reimplement landscape door drawing (#11233) 2020-04-17 19:59:38 +02:00
Tulio Leao
b449e445f7
Use named casts on openrct2/ride (#11163) 
Excluding subfolders
 2020-04-17 19:53:33 +02:00
Tulio Leao
116bcb5ccb
Use named casts on openrct2/(util|windows|scenario|title) (#11146) 2020-04-17 19:45:19 +02:00
Tulio Leao
fd69886350
Use named casts on openrct2/ride/* (#11168) 2020-04-17 19:39:18 +02:00
Aaron van Geffen
fe24a84dc4 Make use of extra horizontal space when shortcut window is resized. 2020-04-17 18:35:06 +02:00
Aaron van Geffen
2e55b621f0 Reorder keyboard shortcuts per Umdlye's suggestions. 2020-04-17 18:35:06 +02:00
Aaron van Geffen
77776cd6c8 Allow adding separators between listed shortcuts. 2020-04-17 18:35:06 +02:00
Aaron van Geffen
d1a314b0f7 Decouple shortcut window order from internal order. 2020-04-17 18:35:06 +02:00
Michael Steenbeek
777201c7fd
Return false for non-existing ride types 
Co-Authored-By: Tulio Leao <tupaschoal@gmail.com>
 2020-04-17 17:05:16 +02:00
Gymnasiast
20fd115d8d
Group some common flag combination into constexprs 2020-04-17 17:03:34 +02:00
Gymnasiast
9044d0a263
Fix failing tests 2020-04-17 17:03:33 +02:00
Gymnasiast
edd31d9f16
Move flags to RideTypeDescriptors 2020-04-17 17:03:33 +02:00
Gymnasiast
6c3c857dfa
Release v0.2.6 
- Feature: [#10925] Show hovered values on finance charts.
- Feature: [#11013] Ctrl+C copies input dialog text to clipboard.
- Feature: [#11218] load_park command for console
- Feature: [#11272] Option for toggling notifications for 'Ride casualties' and 'Stuck or stalled vehicles'.
- Feature: [#11281] add_news_item command for console
- Feature: [#11300] Add powered launch and reverse incline launched shuttle mode to the Stand-Up Roller Coaster (for RCT1 parity).
- Fix: [#475] Water sides drawn incorrectly (original bug).
- Fix: [#6123, #7907, #9472, #11028] Cannot build some track designs with 4 stations (original bug).
- Fix: [#6238] Invalid tile elem iteration in Guest::UpdateUsingBin
- Fix: [#7094] Back wall edge texture in water missing.
- Fix: [#9719] Hacked walls in RCT1 saves are imported incorrectly.
- Fix: [#10372, #10509, #10806] Lift base sections incorrectly exporting, causing various lift related bugs.
- Fix: [#10928] File browser's date column is too narrow.
- Fix: [#10951, #11160] Attempting to place park entrances creates ghost entrances in random locations.
- Fix: [#11005] Company value overflows.
- Fix: [#11027] Third color on walls becomes black when saving.
- Fix: [#11063] Scrolling position persists when switching tabs in the scenery window.
- Fix: [#11106] Crash on getting invalid vehicle index.
- Fix: [#11126] Cannot place Frightmare track design.
- Fix: [#11208] Cannot export parks with RCT2 DLC objects.
- Fix: [#11230] Seat Rotation not imported correctly for hacked rides.
- Fix: [#11225] Replay manager cannot handle track designs.
- Fix: [#11246] Fix Various Import/Export issues with Boat locations, balloon frame number.
- Fix: [#11258] Properly remove format codes from imported strings.
- Fix: [#11286] Fix banner tooltip colour.
- Fix: Small red gardens in RCT1 saves are imported in the wrong colour.
- Improved: [#11157] Slimmer virtual floor lines.
 2020-04-17 16:13:30 +02:00
Tulio Leao
d342423b24
Address string ids skipped in #11273 (#11310) 2020-04-17 10:06:15 +02:00
Michael Stowe
163119ea3b
Fix #11275: Crashes that kill only 1 peep create grammatically incorrect messages (#11278) 
Fix #11275: Crashes that kill only 1 peep create grammatically incorrect messages (#11278)

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-04-16 21:04:12 -03:00
Duncan
4a81219521
Merge pull request #11291 from brenoguim/fix_banner_string_coloring 
Fix coloring of Banners on tooltip
 2020-04-16 22:27:27 +01:00
Duncan
92449773c5
Fix #11106: Crash on getting invalid vehicle index (#11305) 
* Fix #11106: Fix crash on bad value prev_vehicle

This allows Thorpe Park to be loaded again. This is ultimately not a great fix. In the future it should be made so that the vehicle pointers are validated on load to ensure there are no loops or bad values.
 2020-04-16 18:24:07 -03:00
Julian
a6684603d8
Load_Park feature for headless server (#11218) 
* Load_Park feature

New feature "load_park name" from "save" folder.

* Fix codestyle

-

* Fix codestyle

-

* Fixed typo for load_park 

load_park is now <name> instead of [name]

* improve load_park command

allow to specify park via absolute path
make .sv6 filename extension optional
support .sc6 filename extension, but default to .sv6

* report success or failure of load_park to console

Co-authored-by: quadratrund <56112624+quadratrund@users.noreply.github.com>
 2020-04-16 16:36:00 +02:00
Michał Janiszewski
46f8c1458e
Add add_news_item to the console (#11281) 2020-04-16 16:27:48 +02:00
Aaron van Geffen
a81488d704
Fix #11272: Make casualty and stalled vehicle notifications optional 2020-04-16 14:41:39 +02:00
Aaron van Geffen
2d0f62e903
Open about window when clicking the title screen logo 2020-04-16 13:18:09 +02:00
Breno Rodrigues Guimarães
10ab9e4528
Make ParkLoadResult move friendly (#11297) 
This patch changes the member of ParkLoadResult to not be const. Const members cannot be moved so trying to move ParkLoadResult actually causes a copy.
It also adds std::move to move the parameter to the member, otherwise a copy happens.

See: https://godbolt.org/z/L4Wakb
 2020-04-16 13:13:13 +02:00
Fred-1044276
a80905e30d
Implement #11300: Add RCT1 operating modes to Stand-up Roller Coaster 2020-04-16 13:12:43 +02:00
Breno Guimaraes
347c402984 Fix #11286: Fix coloring of banners on tooltip 
This patch moves the function that adds coloring to the buffer text into the Buffer struct with a flag.
It also changes both Banner printing and Banner tooltip to use the colored version
 2020-04-16 08:06:07 -03:00
Gymnasiast
10f43766ef
Rename i to stationIndex 2020-04-16 12:44:25 +02:00
Breno Rodrigues Guimarães
174a480870
Use utf8_remove_format_codes to remove format codes from user strings (#11289) 
The previous code used RCT12::RemoveFormatCodes to remove format codes from RCT strings. But that function uses utf8 methods to identify format codes. In this new version, rct2_to_utf8 is called first to obtain an utf8 string, and then utf8_remove_format_codes can be used.
 2020-04-15 07:17:43 +02:00
Michał Janiszewski
1ffd92839e
Merge pull request #11228 from duncanspumpkin/fix_replay 
Fix replay manager checksums
 2020-04-14 23:01:34 +02:00
duncanspumpkin
9c5a4b8561 Add exception handler to prevent 32bit OS read problems 2020-04-12 10:56:19 +01:00
duncanspumpkin
501e5e2b34 Fix formatting 2020-04-12 10:54:17 +01:00
duncanspumpkin
59723cc7c3 Rework game state snapshots for variable amounts 
Added a check that ensures that the log is not created unless there is a difference
 2020-04-12 10:54:17 +01:00
duncanspumpkin
e5d68cacc9 Make snapshots at start and end of replay 2020-04-12 10:54:17 +01:00
duncanspumpkin
1395b9a9c1 Fix normalisation writing files to unknown location 2020-04-12 10:54:17 +01:00
duncanspumpkin
4f0d9a6363 Remove SpriteSpatialData from replays 2020-04-12 10:54:17 +01:00
duncanspumpkin
53672c0519 Introduce a GameStateSnapshot to the replay file 2020-04-12 10:54:17 +01:00
duncanspumpkin
5b0015bbf3 Fix replay manager checksums 2020-04-12 10:54:17 +01:00
Aaron van Geffen
0cbd700290
Warn to console if no autosave could be saved (#11255) 
* Warn to console if no autosave could be saved.

* Use std::fprintf as suggested.

* Update src/openrct2/Game.cpp

Co-Authored-By: Michał Janiszewski <janisozaur@users.noreply.github.com>

Co-authored-by: Michał Janiszewski <janisozaur@users.noreply.github.com>
 2020-04-12 11:32:39 +02:00
duncanspumpkin
b01e9381f7 Update network version. Add changelog entry 2020-04-11 09:07:02 +01:00
duncanspumpkin
d4998a0ade Fix #10372, #10509, #10806. Lift base sections did not export correctly 
Mistake made whilst refactoring that assumed that station indexes are set on only station pieces.
 2020-04-11 08:16:53 +01:00
Duncan
fdf98060cf
Change the spatial insert to make it ordered (#11252) 
* Change the spatial insert to make it ordered

This is so that the spatial index can be rebuilt and gauranteed to be in the correct order

* Increment Network Version

* Make review changes

* Remove the gSpriteSpatialIndex from the network

* Use safer get function

* Final little tweak
 2020-04-09 10:46:26 +01:00
Hielke Morsink
c0486e250e
Fix: config and park files not selected on crash (#11251) 2020-04-08 20:00:02 +02:00
Michał Janiszewski
a197e529e8
Fix #6238: Invalid tile elem iteration in Guest::UpdateUsingBin (#11248) 2020-04-08 01:03:02 +02:00
duncanspumpkin
d9ebec6690 Increment network version 2020-04-07 20:19:35 +01:00
duncanspumpkin
54a058ca6c Fix boat location import/export/update. 
After a refactoring to split off the boat location the import/export functions meant incorrect information could be loaded into the s6 file for boats that had not left the station. Boats that had left the station had other fields clobbered for the same reason
 2020-04-07 20:19:26 +01:00
duncanspumpkin
18a21a73ab Fix balloons import/export issue 2020-04-07 20:08:47 +01:00
Michał Janiszewski
328856a933 Add MISC spirtes to comparison as well 2020-04-07 20:07:37 +01:00
Michał Janiszewski
50541a2cc7 Fix GameStateSnapshot comparators 2020-04-07 20:07:37 +01:00
duncanspumpkin
b857792f23 Fix vehicles changing state on export/import 2020-04-07 20:07:37 +01:00
Michał Janiszewski
914f68dcef Bump network version after fixes reverted in #11190 are reintroduced 2020-04-06 22:32:27 +02:00
Michael Steenbeek
d91173060a Guard against null banners (#11078) 2020-04-06 22:32:27 +02:00
Michał Janiszewski
94f6d70ac7 Fix #11084: null broken vehicle (#11090) 2020-04-06 22:32:27 +02:00
Michael Steenbeek
3a47e3b309 Fix #11166: Null pointer read in Guest::UpdateRideAdvanceThroughEntrance (#11182) 2020-04-06 22:32:27 +02:00
Michał Janiszewski
63c11ab8fd Fix #11128: null tile element in track_block_get_previous (#11144) 2020-04-06 22:32:27 +02:00
Duncan
a613ec39c8
Merge pull request #11187 from duncanspumpkin/fix_11174 
Fix format string
 2020-04-06 07:43:40 +01:00
Duncan
919a70361b
Fix incorrect saves in backtrace (#11229) 2020-04-05 21:54:11 +02:00
Duncan
53b948299a
Merge pull request #11226 from duncanspumpkin/fix_trackdesign 
Fix track design replays.
 2020-04-05 13:08:27 +01:00
Michael Steenbeek
8a12ad8f6b
Fix #9719: Hacked walls in RCT1 saves are imported incorrectly (#11222) 2020-04-05 13:49:36 +02:00
duncanspumpkin
4fcecba5fe Increment Network Version 2020-04-05 12:49:14 +01:00
duncanspumpkin
de7051d940 Fix #11225: Track design replays. 
The replay state was not being passed to all sub actions this prevented the replay from working. Note replays made before this still work its just they couldn't be replayed.

name the flag

Update changelog
 2020-04-05 12:48:42 +01:00
Gymnasiast
cfdc8567f7
Fix #11230: Seat Rotation not imported correctly for hacked rides 2020-04-05 12:29:07 +02:00
Michał Janiszewski
12ab701a0f
Add missing Expenditure type setting in LargeSceneryPlaceAction (#11224) 
Claiming first bounty of #11190
 2020-04-05 06:45:00 +02:00
Michael Steenbeek
13a2f67400
Fix #11208: Cannot export parks with RCT2 DLC objects (#11212) 
* Do not try to export official objects

* Do not override legacy object's source games

* Amend changelog
 2020-04-04 07:06:34 +01:00
Michał Janiszewski
89ae2b51d6
Update error message for unsuccessful crash uploads (#11217) 
The upload will be rejected to a disabled submission token, which we sometimes do.
 2020-04-03 22:48:27 +02:00
Michael Steenbeek
87dd126e2a
Fix small red gardens getting imported incorrectly from S4 (#11215) 2020-04-03 19:55:39 +02:00
Michał Janiszewski
15a532725a
Change backtrace.io submission token (#11216) 
This is to cut off v0.2.5 traces of which we have plenty and collect
ones that have #11190 in them.
 2020-04-03 19:44:11 +02:00
Duncan
38e82800be
Merge pull request #11190 from janisozaur/silent-record 
Upload park recording in case of crash
 2020-04-03 15:29:33 +01:00
Tulio Leao
6cf113ae6f
Improve bound checking on scenery invention (#11171) 2020-04-03 13:31:13 +02:00
Michał Janiszewski
54ae98af68 Increase network version 2020-04-03 09:58:24 +02:00
Michał Janiszewski
85d6fa8c8b Revert "Guard against null banners (#11078)" 
This is being reverted now that we have replay records uploaded as part
of the backtrace.io information to try figuring out the root cause.

This reverts commit 47b6139546.
 2020-04-03 09:56:51 +02:00
Michał Janiszewski
27da48336a Revert "Fix #11084: null broken vehicle (#11090)" 
This is being reverted now that we have replay records uploaded as part
of the backtrace.io information to try figuring out the root cause.

This reverts commit 24edada2d8.
 2020-04-03 09:53:36 +02:00
Michał Janiszewski
971db142a5 Revert "Fix #11166: Null pointer read in Guest::UpdateRideAdvanceThroughEntrance (#11182)" 
This is being reverted now that we have replay records uploaded as part
of the backtrace.io information to try figuring out the root cause.

This reverts commit 598b85d0ca.
 2020-04-03 09:51:32 +02:00
Michał Janiszewski
620be75285 Revert "Fix #11128: null tile element in track_block_get_previous (#11144)" 
This is being reverted now that we have replay records uploaded as part
of the backtrace.io information to try figuring out the root cause.

This reverts commit d1faa228c5.
 2020-04-03 09:49:58 +02:00
Michał Janiszewski
e19eaa6a98 Upload park recording in case of crash 2020-04-02 23:44:59 +02:00
Michael Steenbeek
1e70c4806e
Fix #11126: Cannot place Frightmare track design (#11186) 2020-04-01 17:37:09 +02:00
Michael Steenbeek
e1e8e2bec0
Add drawing code for ō (#11201) 2020-04-01 14:31:53 +02:00
Michael Steenbeek
598b85d0ca
Fix #11166: Null pointer read in Guest::UpdateRideAdvanceThroughEntrance (#11182) 2020-04-01 12:45:08 +02:00
Michael Steenbeek
c1e2c7cc5a
Fix mistake made in #10579 (#11184) 2020-03-31 20:56:47 +02:00
duncanspumpkin
0fd793504e Additional validation 2020-03-31 19:13:13 +01:00
duncanspumpkin
6560de0705 Potential fix #11174, #11175. Use Strnlen 
Unsure if this will fix the issue as not reproducable. It is possible
that the pointer passed to this function is bad
 2020-03-31 19:11:17 +01:00
Michał Janiszewski
4be3050e74
Update network version after #11180 2020-03-31 16:05:50 +02:00
jeysbach
e9611ffaff
Fix #11063: Exchange hack for call to update_scroll (#11178) 2020-03-31 16:03:14 +02:00
Michael Steenbeek
41bf6def69
Fix #10951, #11160: Placing park entrances creates bugged ghosts (#11180) 2020-03-31 13:47:37 +01:00
Aaron van Geffen
503fbefbeb Harmonise date and time gaps / anchors. 
Introduces the DATE_TIME_GAP constant.
 2020-03-30 22:44:08 +02:00
Aaron van Geffen
56216fd026 Add an additional check for locales that do not use leading zeros for dates. 2020-03-30 22:42:58 +02:00
Aaron van Geffen
484956e006 Fix #10928: File browser's date column is too narrow. 2020-03-30 22:42:58 +02:00
Aaron van Geffen
28d14517e1
Introduce a constant for scrollbar width and height (#11152) 2020-03-30 22:41:49 +02:00
Tulio Leao
3d223b0843
Fix dereference on null iterator (#11154) 2020-03-30 18:05:38 +01:00
pkubaj
c8f9324e41
Fix build on FreeBSD (#11145) 
FreeBSD doesn't use libstdc++, but libc++. stdc++fs doesn't exist in libc++.
 2020-03-29 23:36:50 +02:00
Michał Janiszewski
d1faa228c5
Fix #11128: null tile element in track_block_get_previous (#11144) 2020-03-29 22:01:13 +01:00
Duncan
87b90f2304
Fix #11109. Incorrect drawing of staff list after refactor. (#11134) 
Looks like I just completely forgot to implement the required changes to the drawing code. Drawing code now uses the new StaffList.
 2020-03-29 22:00:28 +01:00
Michał Janiszewski
920150b06d
Fix #11140: exclude thirdparty headers from headers-check target (#11142) 2020-03-29 22:43:37 +02:00
Duncan
f64ea65d03
Rename SPRITE_LIST_TRAIN_HEAD to reduce car head confusion (#11105) 
A single car on a coaster can comprise of multiple vehicles. One of those vehicles will be the car head vehicle. The train can comprise of multiple cars. Therefore not all vehicle->IsHead 's will be in SPRITE_LIST_TRAIN_HEAD. This rename makes that slightly more clear
 2020-03-29 09:23:24 +01:00
Michael Steenbeek
b5bcd0c2aa
Merge pull request #11122 from tupaschoal/reduce-c-casts 
Reduce c-style cast
 2020-03-28 22:47:14 +01:00
Michael Steenbeek
09cd6a82ee
Merge pull request #11123 from tupaschoal/reduce-c-casts-2 
Reduce c-style cast on openrct2-ui/(input/interface/title)
 2020-03-28 22:40:33 +01:00
Tulio Leao
abfd41c35f Use named casts in openrct2-ui/drawing 2020-03-28 17:18:21 -03:00
Tulio Leao
57886ad0c7 Use named casts in openrct2-ui/audio/ 2020-03-28 17:18:15 -03:00
Tulio Leao
fe6ff2ac94 Use named casts in openrct2-ui/audio/AudioChannel.cpp 2020-03-28 17:18:07 -03:00
Tulio Leao
bb052a784a Use named casts in openrct2-ui/audio/AudioMixer 2020-03-28 17:17:57 -03:00
Tulio Leao
b0e12ebc8f Use named casts on openrct2-ui/title 2020-03-28 17:04:33 -03:00
Tulio Leao
b579771364 Use named casts on openrct2-ui/interface 2020-03-28 17:04:33 -03:00
Tulio Leao
8823658972 Use named casts on openrct2-ui/input 2020-03-28 17:04:29 -03:00
Aaron van Geffen
a028bcbb64
Fix #11111: Finance graph hover values are glitchy with software renderer 2020-03-28 20:42:45 +01:00
Tulio Leao
2bb3a34274 Convert C-style pointer casts to named casts 2020-03-28 16:41:23 -03:00
Duncan
8920c36170
Fix #11107. Guestlist refresh issues after refactor (#11108) 
Another little oversite on the guestlist preventing full functionality of the guestlist. Also fixed the map flashing
 2020-03-28 16:21:01 +00:00
Duncan
2806104db0
Remove peep sort (#11088) 
* Remove peep sort. No longer required.

Peeps are now only sorted in a temporary vector when the staff or guest list is open. This allows for simpler allocation of sprites

* Increment Network Version
 2020-03-28 12:37:01 +00:00
Duncan
e7d0043756
Rework StaffList to use a vector (#11059) 
* Rework StaffList to use a vector

This is a part of a reworking that removes the need for the peep list to be sorted by name/number order. Ultimately simplifying the sprite create code

* Remove unused variable setting
 2020-03-28 12:12:53 +00:00
Tulio Leao
fc645180be
Ammend #11090 for consistency on nullptr check (#11104) 2020-03-28 11:39:59 +00:00
Michał Janiszewski
24edada2d8
Fix #11084: null broken vehicle (#11090) 2020-03-28 10:21:24 +00:00
Peter Ryszkiewicz
fa1ddbd9e3
Show hovered values on finance charts (#10925) 2020-03-28 11:03:10 +01:00
Duncan
a33fbfa234
Fix guest list when in filtered mode. (#11102) 
Mistake during refactor didn't consider that find_groups resets global vars.
 2020-03-28 11:02:26 +01:00
Thijs Versfelt
3613c660a0
Fix #11005: Company value overflows (#11012) 
* Clamp park value to prevent integer overflow.

* Replace casting with built-in clamping.

* Add changlog entry for #11005.

* Modify casting to prevent skewed company value.

* Increment network version

Co-authored-by: Michał Janiszewski <janisozaur@gmail.com>
 2020-03-27 13:25:16 +01:00
Michael Steenbeek
47b6139546
Guard against null banners (#11078) 2020-03-27 13:04:45 +01:00
Michael Steenbeek
c6e42ac313
Avoid assertion getting hit in scenery_is_invented() (#11079) 2020-03-27 12:53:18 +01:00
Michael Steenbeek
b70c5cefd6
Use station index in a few more places (#11066) 2020-03-27 11:13:02 +01:00
Michał Janiszewski
56e6ec2c23
Fix #11068: segfault when trying to clear empty list (#11069) 
The report in #11068 was using track designs manager with "Boat hire"
ride, for which there were no designs and selecting "Clear" button on
the list accessed empty vector in `_filteredTrackIds`.
 2020-03-26 23:49:10 +01:00
Michał Janiszewski
5276ce767a
Add missing check for valid scenery type (#11067) 2020-03-26 22:44:41 +01:00
Michael Steenbeek
cfb405f0ed
Use StationIndex in many more places (#10992) 2020-03-26 21:38:26 +01:00
Michael Steenbeek
357044171d
Merge pull request #11061 from Gymnasiast/fix/7094 
Fix #7094: Back wall edge texture in water missing
 2020-03-26 21:04:32 +01:00
Michael Steenbeek
81c6bb26e9
Prepare guest counters for more than 32767 guests (#10989) 2020-03-26 20:02:15 +01:00
Gymnasiast
905ba0c47b
Fix #475: GFX water sides drawn incorrectly 2020-03-26 20:01:25 +01:00
Gymnasiast
aeb1b32078
Fix #7094: Back wall edge texture in water missing 2020-03-26 20:00:53 +01:00
Gymnasiast
6c0de27d54
Change calls to tile side drawing to use big Z 2020-03-26 20:00:53 +01:00
Daan de Heij
9035ba2827
Simple implementation of copy input to clipboard (Ctrl+C) (#11013) 
This is a simple implementation of copying all current input text to the clipboard using ctrl+c. A simple dialog acknowledges that text is copied. This commit includes a new string ID for the text in this dialog.
 2020-03-26 17:53:34 +01:00
Gymnasiast
da2ba0b023
snake_case to camelCase 
This is mostly to trigger a rebuild for openrct2.org
 2020-03-26 14:12:01 +01:00
Daan de Heij
9eee58622e
Docs: Add missing directories in readme.md (#11006) 
Add missing directories in the source directory structure readme, with a short description to each. Additionally, change the order of 'management' and 'order' such that they are now in alphabetical order.
 2020-03-26 12:23:57 +01:00
Duncan
40160892a9
Rework GuestList to use a vector. (#11014) 
* Rework GuestList to use a vector.

This is part of a chain of refactors that will be used to rework peep order in the sprite list

* Apply comments. Remove setting var_492 as no longer required
 2020-03-26 07:23:30 +00:00
Michael Steenbeek
9dfe5af851
Add remark about track designs with 5 stations (#11051) 2020-03-26 05:53:49 +00:00
Michał Janiszewski
95e2590207
Fix #11043: Null banner object had method called on itself (#11049) 2020-03-25 22:57:15 +01:00
Michael Steenbeek
268e81c21b
Fix mistake in #11029 (#11044) 2020-03-25 20:52:08 +00:00
Michael Steenbeek
3f473ec3f0
Fix #6123: Cannot build some track designs with 4 stations (#11031) 2020-03-25 14:20:29 +01:00
Michael Steenbeek
766339d771
Fix #11027: Third color on walls becomes black when saving (#11029) 2020-03-25 13:57:15 +01:00
Aaron van Geffen
302fe1cb2b
Merge pull request #10926 from IntelOrca/zoom-refactor 
Zoom refactor
 2020-03-24 23:28:32 +01:00
Michał Janiszewski
4f6e77e30a Release 0.2.5 
- Feature: [#3154] Use a random title sequence each time it is shown.
- Feature: [#6553] Android version now runs in full screen.
- Feature: [#7865] Transport rides can now be synchronised.
- Feature: [#9073] Shortcut keys for the Tile Inspector.
- Feature: [#10305] Add two shortcuts for increasing and decreasing the scaling factor.
- Feature: [#10189] Make Track Designs work in multiplayer.
- Feature: [#10357] Added window for scenery scatter tool, allowing for area and density selection.
- Feature: [#10637] Console command to remove all floating objects.
- Change: [#1164] Use available translations for shortcut key bindings.
- Change: [#10997] Speed is automatically reset to normal upon scenario completion.
- Fix: [#2485] Hide Vertical Faces not applied to the edges of water.
- Fix: [#5249] No collision detection when building ride entrance at heights > 85.5m.
- Fix: [#6766] Changelog window doesn't open on some platforms.
- Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour.
- Fix: [#7854] Cannot build a custom spiral roller coaster design.
- Fix: [#7854] Empty entries in spiral roller coaster designs list.
- Fix: [#8151] Game freezes upon demolishing mazes at odd heights.
- Fix: [#8875] RCT1 competition scenarios are classified incorrectly.
- Fix: [#10176] Mistake in the sprite for the land tool's 6x6 grid.
- Fix: [#10196] Doors unable to be placed at end of track corners.
- Fix: [#10228] Can't import RCT1 Deluxe from Steam.
- Fix: [#10313] Path furniture can be placed on level crossings.
- Fix: [#10325] Crash when banners have no text.
- Fix: [#10376] No ratings generated when a shop and track intersect.
- Fix: [#10420] Money effect causing false positive desync.
- Fix: [#10477] Large Scenery cannot be placed higher using SHIFT.
- Fix: [#10489] Hosts last player action not being synchronized.
- Fix: [#10543] Secondary shop item prices are not imported correctly from RCT1 saves.
- Fix: [#10547] RCT1 parks have too many rides available.
- Fix: [#10587] Update last action coordinates on correct player.
- Fix: [#10631] Game bugs out and crashes if you get too many stations via copying stations with the tile inspector.
- Fix: [#10662] Duck cheat tooltips look odd and do not explain anything.
- Fix: [#10694] The lift hill speed of the flying roller coaster cannot be changed (original bug).
- Fix: [#10705] Apply multithreaded rendering to all viewports.
- Fix: [#10739] Mountain tool overlay for even-numbered selections.
- Fix: [#10752] Mute button state not correctly set at startup.
- Fix: [#10822] Can place too many peep spawns.
- Fix: [#10898] Banner text has an offset in tile inspector window.
- Fix: [#10904] RCT1/LL-scenarios with red water won't open.
- Fix: [#10941] The Clear Scenery tool gives refunds for ghost elements.
- Fix: [#10963] Light effects are drawn off-centre in some rotations.
- Fix: [#10993] Bottom toolbar not refreshing when a guest leaves the park.
- Fix: [#11001] Rides list does not use natural sorting.
- Fix: [objects#54] Stage Coach cars are not considered covered by the game.
- Fix: [objects#56] Handymen cut grass incorrectly.
- Improved: [#682] The staff patrol area is now drawn on the water, instead of on the surface under water.
- Improved: [#10858] Added horizontal grid lines to finance charts.
- Improved: [#10884] Added y-axes and labels to park window charts.
- Improved: [#10970] Introduced optional light effects for vehicles at night.
- Removed: [#6898] LOADMM and LOADRCT1 title sequence commands (use LOADSC instead).
 2020-03-24 21:46:30 +01:00
Daan de Heij
3dc0110fe1
Fix #10993: Guest Count Intent Not Listened To (#11008) 
* Fix #10993: Guest Count Intent Not Listened To

Because of a missing intent case, the guest count did not redraw whenever a guest leaves.

* Update changelog.

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-03-24 18:35:00 +00:00
Tulio Leao
3e2533ac50
Fix #11001: Rides list does not use natural sorting (#11007) 2020-03-23 22:33:57 +01:00
Michael Steenbeek
e66a6754f5
Remove some hardcoded numbers (#11004) 2020-03-23 19:12:57 +01:00
Aaron van Geffen
34d8572d85 Patch GCC9 in more places. 2020-03-23 17:42:16 +01:00
Ted John
bd0265f1bc Fix GCC9 2020-03-23 16:37:18 +00:00
Ted John
b5c6b968df Remove printf comment 2020-03-23 15:54:04 +00:00
Ted John
c93edb9749 Update min zoom 2020-03-23 15:54:04 +00:00
Ted John
0e539fffe0 Make constructor default 2020-03-23 15:54:04 +00:00
Ted John
1af2720518 Create stub magnify versions of software blitters 2020-03-23 15:54:04 +00:00
Ted John
6e7a7c23c9 Fix odd issues at certain positions of the map 2020-03-23 15:54:03 +00:00
Ted John
d34dec9c27 Create ZoomLevel struct to add two new zoom levels 2020-03-23 15:54:03 +00:00
Aaron van Geffen
a2f8e8c72b
Automatically reset speed to normal upon scenario completion. (#10998) 2020-03-22 23:22:28 +01:00
Gymnasiast
0f8fec1413
Fix #10631: Assertion fails when modifying copied station pieces 2020-03-21 18:43:34 +01:00
Gymnasiast
2f7a26e8da
Refactor station index a bit 2020-03-21 17:05:16 +01:00
Michael Steenbeek
32e589efbe
Make _appropriateImageDropdownItemsPerRow a constexpr (#10990) 2020-03-21 15:22:18 +01:00
Gymnasiast
ceec430ae1
Raise max size of dropdowns to 512 items 2020-03-20 21:48:27 +01:00
Gymnasiast
416dc22f35
Guard access to appriopriate image items per row 2020-03-20 21:48:27 +01:00
Michael Steenbeek
ab50c888ff
Merge pull request #10981 from Gymnasiast/fix/8151 
Fix #8151: Game freezes upon demolishing mazes at odd heights
 2020-03-20 21:38:12 +01:00
Gymnasiast
cd18697d31
Bump network version 2020-03-20 21:37:57 +01:00
Michael Steenbeek
5d87ea3a43
Convert objects limits to constexpr (#10984) 2020-03-20 21:10:07 +01:00
Duncan
7c03e0b589
Merge pull request #10974 from Gymnasiast/refactor/replace-some-register-usage 
Replace some register usage
 2020-03-20 20:08:28 +00:00
Michael Steenbeek
ef1906d452
Use constants for max sprites and spatial index (#10983) 2020-03-20 20:16:38 +01:00
Michael Steenbeek
c519512cfe
Create ObjectEntryIndex (#10980) 2020-03-20 19:28:39 +01:00
Ted John
c89cecb2b5
Refactor the ride type to entry map (#10967) 
Use C++ vectors and allow larger ride entry indices (> 256)
 2020-03-20 18:07:31 +01:00
Gymnasiast
e433ed7d7c
Fix #8151: Game freezes upon demolishing mazes at odd heights 
Co-Authored-By: Felix Pelletier <felixpelletier@users.noreply.github.com>
 2020-03-20 16:06:12 +01:00
Michael Steenbeek
4cc2bc469a
Fix station number check (#10979) 2020-03-20 13:10:40 +01:00
WantDiscussion
828eef7411
Introduced optional light effects for vehicles at night. (#10970) 2020-03-20 11:47:31 +01:00
Michael Steenbeek
ba8a4e6183
Fix date display for non-American locales on *nix (#10949) 2020-03-20 00:10:15 +01:00
Gymnasiast
ff28654af0
Replace registers in surface paint 2020-03-19 17:21:06 +01:00
Gymnasiast
04a6eaea3f
Replace registers in vehicle_update_track_motion_forwards_get_new_track() 2020-03-19 17:20:44 +01:00
Aaron van Geffen
91301eb0d0
Add Noto Sans as a TTF font alternative for Japanese. (#10971) 2020-03-19 12:36:33 +01:00
Michael Steenbeek
cb40a726ad
Bump network version 2020-03-19 10:49:18 +01:00
Michael Steenbeek
b73098ba21
Fix #10902: Resetting ride let guest out in the air (#10968) 2020-03-18 22:22:25 +01:00
Michael Steenbeek
d86dce17e8
Prepare object indices for uint16_t (part 2) (#10966) 2020-03-18 21:27:53 +01:00
Michael Steenbeek
ae6e53153b
Merge pull request #10922 from Gymnasiast/cleanup-scenery 
Cleanup scenery
 2020-03-18 18:44:27 +01:00
Gymnasiast
459a0318cf
Implement review requests 2020-03-18 16:22:08 +01:00
WantDiscussion
d6c7aaf69c
Fix: Light effects are drawn off-centre in some rotations 2020-03-18 15:04:57 +01:00
Aaron van Geffen
e27a1a230a
Fix regression in boat hire pathfinding (#10958) 
This doesn't fix the guests falling into the water (#10902), but it does fix the spotty pathfinding.
 2020-03-18 10:52:27 +01:00
Aaron van Geffen
a56a3fb804
Fix #6766: Changelog window won't open (#10954) 2020-03-17 21:38:15 +01:00
Aaron van Geffen
2f05033f14 Position dropdown and spinner label texts vertically, too. 2020-03-17 00:35:25 +01:00
Aaron van Geffen
340f6522dd Increase the height of various price/loan/duration spinner widgets. 2020-03-16 23:46:33 +01:00
Aaron van Geffen
f3765646c5 Increase height for button heights in text input window. 
Also fixes the formatting for the widgets array.
 2020-03-16 23:46:17 +01:00
Aaron van Geffen
8c0186d9a4 Make file window button captions fit in more languages. 
The window is made 10px wider to accommodate button captions in languages like Japanese.
 2020-03-16 22:56:04 +01:00
Aaron van Geffen
fc70d6c851 Increase research dropdown heights. 2020-03-16 22:56:04 +01:00
Michael Steenbeek
fd91c41a76
Name remaining ride type flags (#10947) 2020-03-16 22:52:06 +01:00
Aaron van Geffen
dbeef78778
Fix #10914: Missing sounds, including guest purchase sound (#10948) 
Regression from 09fad0ef7f (part of #10854).
 2020-03-16 22:51:32 +01:00
Michael Steenbeek
9fda7762e5
Fix #10942: Cut-away view is broken (#10945) 2020-03-16 21:47:38 +01:00
Michael Steenbeek
25358374b2
Bump network version 2020-03-16 19:45:39 +01:00
Gymnasiast
be4f723287
Avoid writing outside _researchedSceneryItems bounds 2020-03-16 14:04:02 +01:00
jeysbach
568b19e7b3
Feature #10637: Console command for removing floating objects 2020-03-16 09:48:26 +01:00
Michael Steenbeek
e32518208f
Fix Clear Scenery refunding ghost tile elements (#10941) 2020-03-15 23:26:32 +01:00
Gymnasiast
2d5e2bb149
Fix copyright date 2020-03-15 18:04:39 +01:00
X123M3-256
7219c880e2
Allow opening rides with unsuitable track when "Enable all drawable track pieces" cheat is on. (#10923) 
Co-authored-by: Edward Calver <hx010973@reading.ac.uk>
 2020-03-15 14:11:04 +01:00
Aaron van Geffen
1331283f9a
Update third-party ghc::filesystem to version 1.3.0. (#10939) 2020-03-15 13:50:56 +01:00
Gymnasiast
567e70bfb6
Pass ScenerySelection as const & 2020-03-15 13:28:20 +01:00
Gymnasiast
5ba5daca42
Make ScenerySelection implementation a bit cleaner 2020-03-15 13:19:26 +01:00
Gymnasiast
70e287b076
Clean up scenery handling 2020-03-15 12:15:12 +01:00
Michael Steenbeek
18ebe73dfa
Replace object_entry_get_type() with method (#10937) 2020-03-15 12:07:04 +01:00
Michael Steenbeek
c31ef8e635
Extract vehicle subposition data to its own file (#10912) 2020-03-15 11:27:45 +01:00
Gymnasiast
bdf681f440
Clean up many other coordinates 2020-03-13 12:03:43 +01:00
Gymnasiast
3412c47a9e
Convert some Guest functions to methods 2020-03-13 10:50:22 +01:00
Gymnasiast
cf945f7656
Clean up collide coords 2020-03-13 10:36:45 +01:00
Michael Steenbeek
9b5e8140f9
Fix #10919: Crash when assertion fails in heavily damaged park (#10921) 2020-03-13 10:35:03 +01:00
Duncan
3003e1de75
Fix #10602: Error adding track scenery additions far from station start 
Issue caused due to stuffing a temporary unsigned variable in a signed variable. This fix is not a permanent fix and this field in the future should be split up into two separate fields: tile position and relative tile position.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2020-03-13 09:32:05 +01:00
Michael Steenbeek
de6e6e9d8f
Bump network version 2020-03-12 22:45:40 +01:00
Michael Steenbeek
5d5284cc22
Merge pull request #10886 from Gymnasiast/refactor/more-big-coords 
Refactor/more big coords
 2020-03-12 15:39:53 +01:00
Gymnasiast
9fd2b883a8
Apply review request 2020-03-12 15:27:58 +01:00
Michael Steenbeek
e29149e455
Deduplicate flat/regular ride track blocks (#10911) 2020-03-12 11:04:52 +01:00
Aaron van Geffen
dfe1c8dea8 Use COMMA32 instead of UINT16 for future-proofing; amend changelog. 2020-03-11 19:25:32 +01:00
Aaron van Geffen
64e2edd285 Add y-axis labels and guides to park guests chart. 2020-03-11 19:24:37 +01:00
Aaron van Geffen
7be46934ea Add y-axis labels and guides to park rating chart. 2020-03-11 19:24:36 +01:00
Aaron van Geffen
9c5f1248d5 Resize park rating and guests' tabs to accomodate y axis labels. 2020-03-11 19:24:36 +01:00
Michael Steenbeek
8113c89f9b
Fix #10904: RCT1/LL-scenarios with red water won't open (#10905) 
Co-authored-by: Ted John <ted@brambles.org>
 2020-03-11 19:21:02 +01:00
Michael Steenbeek
e441019b04
Refactor rct_track_preview flags (#10906) 
* Refactor rct_track_preview flags

* Zero-index rct_track_preview flags
 2020-03-11 15:53:16 +00:00
Aaron van Geffen
aef748af14
Merge pull request #10901 from Gymnasiast/refactor/guest-window-many-pages 
Prepare guest window for more than 5 pages
 2020-03-10 20:05:19 +01:00
Michael Steenbeek
3791de21c8
Fix #10871: Building tall pieces underground results in 'Too high!' (#10907) 2020-03-09 22:11:47 +01:00
Michael Steenbeek
e1427df59f
Fix #10899: Position of money animation is incorrect (#10903) 2020-03-09 15:00:13 +01:00
Gymnasiast
a0e14a66d9
Prepare guest window for more than 5 pages 2020-03-09 11:54:49 +01:00
Hielke Morsink
8737d3c2f0
Fix #10898: banner text has an offset in tile inspector window (#10900) 
Interesting how this only gets reported now, it has been broken for 8 months already. It's likely a copy-paste error from 61d64ab8c5.
 2020-03-08 23:02:55 +01:00
Michael Steenbeek
60f768e966
Fix #10822: Can place too many peep spawns (#10889) 2020-03-08 21:17:41 +01:00
Michael Steenbeek
bc3d87e476
Bump network version 
https://github.com/OpenRCT2/OpenRCT2/pull/10866 should have bumped this.
 2020-03-08 12:50:35 +01:00
Michael Steenbeek
ba49850195
Fix errors and apply requests 2020-03-08 11:23:20 +01:00
Gymnasiast
02c135e4fa
Clean up many staff functions 2020-03-07 23:07:47 +01:00
Gymnasiast
5f96a121ae
Apply ScreenCoordsXY to some functions 2020-03-07 22:25:42 +01:00
Gymnasiast
27af60f062
More CoordsXYZ(D) conversion 2020-03-07 22:14:29 +01:00
Gymnasiast
ad91654a3d
Use big Z in more places 2020-03-07 21:54:47 +01:00
Gymnasiast
7759b54c2f
Make PeepPickupAction *actually* take a CoordsXYZ 2020-03-07 21:34:04 +01:00
Gymnasiast
5dc4b3e136
Make tile_element_insert take CoordsXYZ 2020-03-07 21:28:36 +01:00
Michael Steenbeek
be13c1fc87
Refactor more TileCoords 2020-03-07 21:07:18 +01:00
Michael Steenbeek
4f86d0115c
Merge pull request #10866 from Gymnasiast/refactor/more-tile-element-prep 
Refactor/more tile element prep
 2020-03-06 09:25:32 +01:00
Michael Steenbeek
d64b73c29a
Clean up RCT1/2 constants (#10855) 2020-03-05 22:49:16 +01:00
Michael Steenbeek
904cad77b5
Merge pull request #10864 from Gymnasiast/refactor/station-starts 
Change station starts to CoordsXY
 2020-03-05 22:48:53 +01:00
Michael Steenbeek
f7151317b4
Translate SV6 object offsets to OpenRCT2 ones (#10881) 2020-03-05 22:14:50 +01:00
Gymnasiast
9c7c57f722
Apply review request 2020-03-05 21:25:58 +01:00
Michael Steenbeek
ae3ca0b2b0
Merge pull request #10880 from Gymnasiast/refactor/some-define 
Replace some hard coded numbers with constants
 2020-03-05 20:53:16 +01:00
Michał Janiszewski
92e5958ab6
Improve WinNT 5.1/MinGW support (#10869) 2020-03-05 19:35:23 +01:00
Gymnasiast
dcf4301559
Use constant for invalid direction 2020-03-05 18:27:36 +01:00
Gymnasiast
33d2155529
Use define for some remapping instructions 2020-03-05 18:15:03 +01:00
Michael Steenbeek
0782692d58
Replace hardcoded scenery offsets (#10879) 2020-03-05 17:54:10 +01:00
Michael Steenbeek
d085a0ed20
Split OBJECT_ENTRY_COUNT into RCT2/OpenRCT2 variants (#10877) 2020-03-05 17:25:57 +01:00
Gymnasiast
2eb967b30d
Change station start to CoordsXY 2020-03-05 12:29:02 +01:00
Michael Steenbeek
8351a0477d
Merge pull request #10854 from tupaschoal/coords-3 
Increase usage of ScreenCoordsXY on viewport functions and structs
 2020-03-05 12:21:04 +01:00
Michael Steenbeek
5e2b1180f8
Fix Viewport.cpp copyright header (#10874) 2020-03-05 12:15:51 +01:00
Gymnasiast
8883f428ba Clean up window vars 2020-03-05 08:03:38 -03:00
Tulio Leao
8056d050c9 Remove unused variables from rct_window 2020-03-05 08:03:38 -03:00
Tulio Leao
d0717c2748 Remove padding from rct_window 2020-03-05 08:03:33 -03:00
Gymnasiast
c9afcaa5b3
Fix errors 2020-03-05 00:09:39 +01:00
Gymnasiast
3ed7694495
Move tile element-specific flags 2020-03-04 22:01:09 +01:00
Gymnasiast
57a40c0657
Extend PathElement 2020-03-04 21:57:42 +01:00
Gymnasiast
383d5d99e1
Change entry index size of Small and Large scenery elements 2020-03-04 15:57:54 +01:00
Gymnasiast
1b38289490
Move scenery_update_age to SmallScenery member function 2020-03-04 15:48:17 +01:00
Michael Steenbeek
22768ea915
Merge pull request #10596 from tupaschoal/pr-10070-copy 
Remove global variable for sound param list
 2020-03-04 11:06:22 +01:00
Daan de Heij
88fcba35ec
Fix #10662: Improve duck cheat tooltips 
Co-authored-by: Thijs Versfelt <40113382+thversfelt@users.noreply.github.com>
 2020-03-03 23:25:22 +01:00
Tulio Leao
724a6d4dcf Make rct_window use ScreenCoordsXY 2020-03-02 20:51:01 -03:00
Tulio Leao
2cfac98342 Make gSavedView use ScreenCoordsXY 2020-03-02 20:51:01 -03:00
Tulio Leao
8b36cce37c Make _lastMainViewport use ScreenCoordsXY 2020-03-02 20:51:01 -03:00
Tulio Leao
09fad0ef7f Change rct_viewport to use ScreenCoordsXY 2020-03-02 20:50:58 -03:00
Tulio Leao
87f724d038 Use Coords objects for viewport_create() 2020-03-02 20:49:59 -03:00
Peter Ryszkiewicz
e322519025
Added horizontal grid lines to finance charts (#10851) 
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-03-02 21:59:05 +01:00
Michael Steenbeek
88a3185715
Make draw_mini_preview_get_pixel_position() take const 2020-03-02 12:36:49 +01:00
Gymnasiast
cded8313d7
Replace many occurrences of LocationXY16 2020-03-01 22:15:28 +01:00
Michael Steenbeek
61175a4fbf
Confine use of LocationXY8 to RCT12 load/save code (#10698) 2020-03-01 21:16:10 +01:00
Michael Steenbeek
d5c4d78d49
Move vehicle track location to CoordsXYZ (#10856) 
* Move vehicle track location to CoordsXYZ

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-03-01 15:45:51 -03:00
Tulio Leao
0aab236c01 Use vector for soundParamList instead of array 2020-03-01 14:29:17 -03:00
UltimaBGD
2d35c50a9a Refactor gVehicleSoundParamsList to use std::array 2020-03-01 14:29:17 -03:00
Michael Steenbeek
5f0db41e48
Process @duncanspumpkin 's feedback on #10830 (#10853) 2020-03-01 14:39:18 +01:00
Michael Steenbeek
e3f5eb7275
Merge pull request #10847 from tupaschoal/const-ref-coords 
Prefer const ref to send (Tile)CoordsXY(ZD) over
 2020-03-01 14:38:39 +01:00
Michael Steenbeek
d395d67b95
Merge pull request #10846 from tupaschoal/const-ref-screencoords 
Prefer const ref to send ScreenCoordsXY over
 2020-03-01 14:17:51 +01:00
Tulio Leao
2da96e8cfc Revert to copy instead of const-ref for functions that edit content 2020-03-01 09:57:03 -03:00
Tulio Leao
91c4735917 Revert to copy instead of const-ref for functions that edit content 2020-03-01 00:49:00 -03:00
Tulio Leao
9bcd20e0e6 Prefer const ref to send ScreenCoordsXY over 2020-02-29 08:25:48 -03:00
Tulio Leao
475eed0a56 Receive CoordsXY by const ref instead of copy 2020-02-29 01:16:19 -03:00
Tulio Leao
b9186f4b0b Receive TileCoordsXYZ by const ref instead of copy 2020-02-29 01:16:16 -03:00
Tulio Leao
181eaf768d Receive CoordsXYZ by const ref instead of copy 2020-02-29 01:14:05 -03:00
Tulio Leao
473bb4683b Receive (Tile)CoordsXYZD by const ref instead of copy 2020-02-29 01:09:24 -03:00
ζeh Matt
b86854a259
Fix #10587: Update last action coordinates on correct player (#10845) 2020-02-28 16:23:41 +01:00
Michael Steenbeek
e36d8f03e6
Implement #10666: ShowMessageBox on Android (#10817) 2020-02-24 13:48:32 +01:00
Michael Steenbeek
938f2a891f
Implement #682: Staff patrol area now drawn on the water (#10830) 2020-02-24 13:47:28 +01:00
Michael Steenbeek
270417f788
Merge pull request #10819 from Gymnasiast/refactor/even-more-rtd 
Move track paint function lookup to RTDs
 2020-02-24 10:56:43 +01:00
pizza2004
57605f36e3
Fix #2485: Hide Vertical Faces not applied to water 2020-02-23 21:32:57 +01:00
Michael Steenbeek
18f60fa987
Merge pull request #10821 from Gymnasiast/refactor/special-pieces-for-track 
Refactor custom track piece handling
 2020-02-23 21:29:12 +01:00
Michael Steenbeek
6d7a2bea69
Merge pull request #10818 from tupaschoal/coords-xy-2 
Use ScreenCoordsXY for some window interactions
 2020-02-23 13:23:50 +01:00
Tulio Leao
98781e7596 Revert change to commented line 2020-02-23 09:19:45 -03:00
Aaron van Geffen
423ed90112
Fix #10815: Vertical alignment of scatter tool area size label. (#10823) 2020-02-23 10:57:38 +01:00
Gymnasiast
93926d5e5d
Move all the ride type-specific track categories to regular ones 2020-02-22 23:20:12 +01:00
Gymnasiast
dc04c5ec95
Refactor custom track piece handling 2020-02-22 23:01:34 +01:00
Michael Steenbeek
e2e7079f17
Fix YaHei detection (#10820) 2020-02-22 22:35:51 +01:00
Gymnasiast
63430412be
Move TrackDataOld.cpp to Testpaint project 2020-02-22 20:29:35 +01:00
Gymnasiast
08ad1816d3
Move track paint function to RTDs 2020-02-22 20:15:00 +01:00
Michael Steenbeek
86a79e742f
Use RideTypeDescriptor for available track pieces 2020-02-22 20:13:44 +01:00
Tulio Leao
1b3f0e9a44 Create ScreenCoordsXY gSavedView from separate x,y variables 2020-02-22 16:01:21 -03:00
Tulio Leao
47025c45b4 Make setMainView() use ScreenCoordsXY 2020-02-22 16:01:21 -03:00
Tulio Leao
826478a8ef Use ScreenCoordsXY on UiContext.cpp 2020-02-22 16:01:20 -03:00
Michael Steenbeek
4c2a0f279b
Fix #10752: Mute button state not correctly set at startup (#10816) 2020-02-22 19:20:14 +01:00
Michael Steenbeek
86c7dbf1d5
Fix #7854: Cannot build custom Spiral RC; dummy entries in track designs list (#10814) 2020-02-22 19:06:57 +01:00
Michael Steenbeek
e16a53df1d
Fix #10694: Lift hill speed of the Flying RC cannot be changed 2020-02-22 18:47:33 +01:00
Aaron van Geffen
9278ef7c61 Move ownership of scatter globals; delegate cleanup to close event. 2020-02-22 17:25:29 +01:00
Aaron van Geffen
5d9bcc083c Remove unused update event. 2020-02-22 17:25:29 +01:00
Aaron van Geffen
aa6d6efe99 Refactor common parts of branched code. 
Change shifts to COORDS_XY_STEP multiplication.
 2020-02-22 17:25:29 +01:00
Aaron van Geffen
2528e94b48 Introduce low, medium, and high density buttons to the scatter tool. 
Change window lay-out to more closely resemble others by introducing
density buttons, along with new sprites.

The amount of elements varies by density as follows:
* Low: number of elements equal to tool size
* Medium: twice as many elements as the tool size
* High: three times as many elements as the tool size.

Remove extraneous 'retry' clause.
 2020-02-22 17:25:19 +01:00
Aaron van Geffen
642de8d11a Change gWindowSceneryScatterEnabled to bool, remove hack. 2020-02-22 17:20:46 +01:00
Aaron van Geffen
cc9498e9a6 Revert changes to default scatter/cluster size. 2020-02-22 16:18:35 +01:00
Aaron van Geffen
6f029055a3 Make scatter window themeable; default to scenario window style. 2020-02-22 16:18:35 +01:00
Anton Scharnowski
e6e48363de Introduce Scenery-Scatter Tool Window. 2020-02-22 16:18:19 +01:00
Tulio Leao
1ea9015315
Use CoordsXY(Z) in more places 2020-02-22 14:20:28 +01:00
ζeh Matt
12ab1e9633
Fix #10713: Correctly encode network ride id over network (#10802) 
It byte swapped uint16_t and then during decode byte swapped it as uint32_t, now it always uses uint32_t for ride/player id. I could use the underlying type but that would require to re-create all replays again.

Closes #10713
 2020-02-21 18:11:26 +01:00
Michael Steenbeek
08ca829ac2
Create RideTypeDescriptors (#10707) 2020-02-20 11:00:03 +01:00
ζeh Matt
1272c0c043
Crash using benchspritesort with dimensions not divisible by 32 (#10743) 
Fixes #10740
 2020-02-19 21:50:13 +01:00
Aaron van Geffen
947903fefb
Mountain tool overlay in land tool window (#10739) 2020-02-19 11:17:11 +01:00
Aaron van Geffen
dd869c8c0a
Fix #10176: Mistake in sprite for the land tool's 6x6 grid. (#10735) 2020-02-19 09:45:00 +01:00
Michael Steenbeek
f41f878581
Replace some usages of LocationXY(Z)16 (#10699) 2020-02-18 22:42:38 +01:00
Ted John
a8b5304786
Remove exe / com wrapper around openrct2.dll for Windows (#10727) 
We get repeated reports of people saying the game is incorrectly reported as a virus. It is becoming more inconvenient for players and even myself, because when we attempt to download a build, it is immediately deleted by scanners (including the default for Windows: Windows Defender).

One scanner is not too much of an issue, but the game is flagged by almost half of available scanners as reported by VirusTotal.

So why is it being flagged?

Windows has a very annoying concept, the subsystem for a binary. The console subsystem allows stdin / stdout as you would expect, just like posix. Unfortunately if a user runs a console subsystem binary from the desktop or explorer, the game will be opened under conhost and thus you get a console showing alongside the game window. This is not a good user experience for most players. To resolve this, you can use the windows subsystem, but this will detach stdin and stdout immediately on launch. There are hacks that can be done in code to allocate a new console but I found this to not work very well with stdin or other terminal emulators.

My solution to the problem was to have two binaries: openrct2.exe and openrct2.com. Both are executable but openrct2.exe is windows subsystem, openrct2.com is console subsystem. The desktop shortcut opens openrct2.exe with no console window showing. Typing openrct2 on the command line will execute openrct2.com (as .com has higher PATH precedence than .exe by default) with working stdin and stdout. In order to reduce the size, I have the entire game inside openrct2.dll and then supply two tiny wrapper EXEs that simply route main(...) into the DLL.

These wrapper EXEs are the problem, they are very small and do nothing but call into a DLL, this must match virus signatures too closely and their size probably reduces the data available for the scanner to analyse.

So as I can not find any other way of achieving my goal of a cli and gui version of OpenRCT2, this changes the build to publish openrct2 as a single executable (rather than a DLL + wrapper EXE), and then duplicate the entire ~10MB exe again and flip the subsystem flag. The installer and zip size won't be affected as this extra size will be completely compressed out, but when unpacked will lead to an extra ~10MB on disc. But I think it is a fair compromise.

VirusTotal now reports all artefacts as safe, for now anyway.
 2020-02-18 11:35:27 +00:00
Michał Janiszewski
d3db4f5cf8
Fix GCC10 warnings (#10703) 
The warnings reported were:
```
../src/openrct2/peep/GuestPathfinding.cpp: In function ‘Direction peep_pathfind_choose_direction(TileCoordsXYZ, Peep*)’:
../src/openrct2/peep/GuestPathfinding.cpp:1371:81: error: ‘void* memset(void*, int, size_t)’ writing to an object of non-trivial type ‘struct<unnamed>’; use assignment instead [-Werror=class-memaccess]
 1371 |             std::memset(_peepPathFindHistory, 0xFF, sizeof(_peepPathFindHistory));
      |                                                                                 ^
../src/openrct2/peep/GuestPathfinding.cpp:35:1: note: ‘struct<unnamed>’ declared here
   35 | {
      | ^

../src/openrct2/world/Sprite.cpp: In function ‘void reset_sprite_list()’:
../src/openrct2/world/Sprite.cpp:152:52: error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type ‘union rct_sprite’; use assignment or value-initialization instead [-Werror=class-memaccess]
  152 |     std::memset(_spriteList, 0, sizeof(_spriteList));
      |                                                    ^
In file included from ../src/openrct2/world/Sprite.cpp:10:
../src/openrct2/world/Sprite.h:117:7: note: ‘union rct_sprite’ declared here
  117 | union rct_sprite
      |       ^~~~~~~~~~
```
 2020-02-18 00:00:19 +01:00
Tulio Leao
0c4623a39f
Replace typedef aliasing by using (#10712) 2020-02-17 11:43:47 +01:00
ζeh Matt
6039191d16
Merge pull request #10715 from ZehMatt/fix-10705 
Fix #10705: Apply multithreaded rendering to all viewports
 2020-02-16 22:23:50 +01:00
Michael Steenbeek
1690361b36
Increase size of ride_id_t to 16 bits 2020-02-16 22:21:17 +01:00
Matt
0f50697ceb
Fix unused variable warning 2020-02-16 15:50:35 +01:00
Matt
c440b8f918
Fix #10705: Apply multithreaded rendering to all viewports 2020-02-16 14:06:08 +01:00
Michał Janiszewski
38907fd0c7
Fix memory leaks around PNG/sprite handling (#10711) 2020-02-16 07:25:30 +01:00
Matt
d6c3373b5e
Remove unused parameter and minor cleanup 2020-02-15 21:28:28 +01:00
Michael Steenbeek
231dd7460a
Use using instead of typedef 
Co-Authored-By: Tulio Leao <tupaschoal@gmail.com>
 2020-02-15 18:17:03 +01:00
Gymnasiast
8c776dd61e
Use C++ way for max uint8 value 2020-02-15 14:18:58 +01:00
Michael Steenbeek
9e79432804 Fix compilation on macOS 2020-02-15 11:58:59 +01:00
Gymnasiast
b59e37284d
Fix private field warning 2020-02-15 11:18:27 +01:00
Gymnasiast
1e6efa6eb4
Extend BannerIndex to 16 bits 2020-02-15 10:37:34 +01:00
Gymnasiast
1077bf0702
Make room for 255 station indexes in Entrance Element 2020-02-15 09:47:37 +01:00
Gymnasiast
e88ee6ee7b
Expand WallElement 2020-02-15 09:47:37 +01:00
Michael Steenbeek
a0fb955102
Merge pull request #10590 from tupaschoal/pr-9432 
Fix #8064 Ride construction errors shown as (undefined string)
 2020-02-14 11:31:43 +01:00
Tulio Leao
60e2546b2d Improve legibility of ride placement # attempt calculation 2020-02-13 23:10:33 -03:00
Michael Steenbeek
dbb89b96fb
Clean up scenery window variables (#10697) 2020-02-13 21:24:37 +01:00
Michael Steenbeek
6d97601d6f
Replace hardcoded occurrences of maximum map size (#10696) 2020-02-13 20:27:13 +01:00
Matt
c381d9ff3f
Remove obsolete construction of CoordsXY object 2020-02-13 12:11:20 +01:00
Matt
758a7e432f
Use const reference instead of copy for location structures 2020-02-13 11:53:14 +01:00
Michael Steenbeek
e53d76ae2e
Fix errors in #10680 (#10692) 2020-02-12 23:11:04 +01:00
Michał Janiszewski
1b7639238a
Fix #9559: benchspritesort is broken after #8481 (#9590) 
* Fix #9559: benchspritesort is broken after #8481

This takes multithreading into account as well

* Apply review fixes

* Fix detection of newer Google Benchmark (>= 1.5.0)

* Review fix
 2020-02-12 22:18:00 +01:00
Michał Janiszewski
962787a854
Hide paint_arrange_structs_helper from global symbols (#10690) 2020-02-12 11:10:06 +01:00
Duncan
b8b539c16e
Modify next_x/y/z to become a CoordsXYZ (#10680) 
* Modify next_x/y/z to become a CoordsXYZ

Should be further scope for refactoring from this.

* Make suggested changes

* Fix default construct issues
 2020-02-11 22:01:14 +00:00
TusharSariya
3df79cb4d5
Part of #9473: Convert vehicle_update to Vehicle struct method (#10677) 
* Issue #9473, moved static void vehicle_update in Vehicle.cpp to a member of the Vehicle struct

* Fix formatting

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-02-11 11:44:05 +00:00
Tulio Leao
d0b255d98b Start zAttemps from 0 2020-02-10 21:55:21 -03:00
Tulio Leao
e79584fe24 Remove superflous if 2020-02-10 21:55:21 -03:00
Tulio Leao
6522b10dfa Make Z attempts crescent 2020-02-10 21:55:21 -03:00
Tulio Leao
fabef9b050 Modify height search to also affect maze construction 2020-02-10 21:55:19 -03:00
aw20368
d2e5c29ce0 review changes (squash) 2020-02-10 21:54:41 -03:00
aw20368
c76378bc8b Fix #8064 Ride construction errors shown as (undefined string) 
The search for height to build track ended at a half-height, leading to (undefined string) error. Changed to always end at whole height and search as high as possible.
 2020-02-10 21:54:26 -03:00
Michael Steenbeek
723f658dbd
Change ride_idnew_t to 16 bit; use it in more places (#10667) 2020-02-10 22:41:49 +01:00
Ted John
4e032aeff0 Improve WinHttp code 2020-02-08 18:11:08 +00:00
Ted John
4af69555d1 Improve WinHttp logic / code 2020-02-08 17:47:03 +00:00
Ted John
be9cb19df5 Replace cURL with WinHttp implementation on Windows 
This reduces the number of third party dependencies for Windows builds. WinHttp is quite a nice straight forward API so doesn't involve too much extra code.
 2020-02-08 17:47:03 +00:00
Michael Steenbeek
d16fbb0cd2
Change ride->overall_view to CoordsXY (#10673) 2020-02-08 17:19:59 +01:00
Michael Steenbeek
5da4903430
Fix #10629: Footpaths on the ground do not cost money (#10671) 2020-02-08 16:29:14 +01:00
Michael Steenbeek
1a5bbdb97e Merge pull request #10660 from IntelOrca/windows-crypt-cng 
Replace OpenSSL with Windows BCrypt API
 2020-02-08 10:27:29 +01:00
Duncan
661be85193
Fix #10196: Cannot place doors at end of track corners (#10663) 2020-02-08 00:02:33 +01:00
Michał Janiszewski
2340206b34
Place constexpr functions in anonymous namespace (#10651) 2020-02-06 08:50:10 +01:00
Ted John
b76092eda3 Fix mingw 2020-02-05 22:39:22 +00:00
Ted John
d402580201 Update cmake config 2020-02-05 21:28:59 +00:00
Ted John
d6da718717 Link to bcrypt instead of ncrypt 2020-02-05 21:24:31 +00:00
Ted John
0cc02f397e Fix guards on crypto implementations 2020-02-05 08:04:05 +00:00
Ted John
57a758b9c0 Get all crypto tests passing 2020-02-05 02:09:19 +00:00
Ted John
e2a541bff4 Get import / export of public key working 2020-02-05 00:36:41 +00:00
Ted John
c8ef6233aa Add CNG implementation of crypto functions 2020-02-04 22:49:43 +00:00
Duncan
1dc7bc2466
Merge pull request #10643 from Gymnasiast/refactor/remove-optional-polyfill 
Remove opt::optional polyfill
 2020-02-02 12:24:10 +00:00
Ted John
0689829980
Update Windows dependencies to v20 (#10642) 2020-02-01 21:38:07 +00:00
Gymnasiast
ca2f37ae7f
Remove opt::optional polyfill 
std::optional is supported by Xcode 10. The non-polyfill variant was already used in our code, so this is not likely to break anything that wasn't broken before.
 2020-02-01 22:25:03 +01:00
Michael Steenbeek
fd6c709128
Merge pull request #10608 from Gymnasiast/refactor/last-next-research-item-optional 
Convert gResearchLast/NextItem to std::optional
 2020-02-01 22:07:11 +01:00
Michael Steenbeek
57daba8796
Merge pull request #10640 from IntelOrca/github-actions-android 
Enable Android builds with GitHub Actions
 2020-02-01 21:52:08 +01:00
Ted John
1e6bf84796
Do not log element out of range as error (#10641) 
Many routines will attempt to access tile elements outside the range of the map. This can happen for example when a routine is observing surrounding tiles of a piece of track that is near the edge of the map. Null is returned from the function which is handled by the routine, so not really an error and can reduce many bounds checking in callers.
 2020-02-01 20:44:57 +00:00
Ted John
a64c9e9924 Only build 32/64 ARM and package just apk file 2020-02-01 16:22:57 +00:00
Ted John
a02448e1fa Link stdc++fs for Clang as well as GCC (#10626) 2020-01-28 13:31:03 +00:00
Gymnasiast
c77c69a0c4
Refactor calls 2020-01-26 16:21:42 +01:00
Gymnasiast
66dbb5e166
Refactor access to ResearchItem's rawValue 2020-01-26 15:17:37 +01:00
Gymnasiast
e6c32230bc
Convert rawValue to uint32 2020-01-26 14:12:57 +01:00
Gymnasiast
63fddee603
Convert gResearchLast/NextItem to std::optional 2020-01-26 10:07:16 +01:00
Ted John
519ea1c8c3 Fix #10376: No ratings generated when a shop and track intersect (#10387) 2020-01-25 23:09:58 +01:00
Michael Steenbeek
2b6e925744
Fix testing giga coaster with cable lift crashing the game (#10620) 2020-01-25 12:24:04 +01:00
Duncan
4a22158387 Fix #10386. Mistake made while refactoring (#10607) 
Added some additional comments whilst investigating the issue. Ultimate fix should look at changing the bounding box units but unsure of consequences
 2020-01-25 10:30:38 +01:00
ζeh Matt
32d6ed2bc2
Merge pull request #10593 from tupaschoal/pr-10048 
Fix #9477: Process exit code is always 0
 2020-01-24 22:38:22 +01:00
Duncan
171e255981 Fix #10598. Mistake made when fixing #7784. (#10606) 2020-01-23 22:43:29 +01:00
Michael Steenbeek
3192bfb7c6
Move research functions to method; remove unused function (#10609) 2020-01-22 22:51:11 +01:00
Aaron van Geffen
d1eb041958 Increase height of track save buttons. (#10604) 2020-01-22 13:30:33 +01:00
Aaron van Geffen
acc6cffad3 Apply clang-format. 2020-01-22 11:41:34 +01:00
Michael Berk
914c07a711 Added Random Title Sequence 2020-01-22 11:41:34 +01:00
Michael Steenbeek
733ec6ec24
Fix water sides glitch (#10599) 2020-01-21 14:34:25 +01:00
Tulio Leao
c87e1ff9b6 Use EXITCODE enum on game startup 2020-01-19 19:37:27 -03:00
Lomash Gupta
0165261ac0 Fix #9477: Fix process exit code always being zero 
- Replaced gExitCode occurences with EXIT_SUCCESS and EXIT_FAILURE
- Removed global declaration of gExitCode
 2020-01-19 18:35:24 -03:00
Lomash Gupta
36840f3fe0 fixed gExitCode 2020-01-19 18:35:24 -03:00
duncanspumpkin
28565b370d Fix clang format 2020-01-19 17:19:45 +00:00
duncanspumpkin
272e4f29a3 Further minor refactors 2020-01-19 17:16:42 +00:00
duncanspumpkin
08ea5585ee Small refactors and cleanups 2020-01-19 17:16:42 +00:00
duncanspumpkin
5e9e9df7ce Refactor invalidate_sprite 2020-01-19 17:16:42 +00:00
duncanspumpkin
71aed18fba Rfactor sprite_set_coordinates 2020-01-19 17:16:42 +00:00
duncanspumpkin
bdcfd615ed Refactor sprite_move 2020-01-19 17:16:41 +00:00
duncanspumpkin
a262f325ed Refactor sprite_remove 2020-01-19 17:15:52 +00:00
duncanspumpkin
65c6564165 Use SpriteBase instead of rct_sprite for move_sprite_to_list 2020-01-19 17:15:52 +00:00
duncanspumpkin
1b6bfa2bbf Remove no longer strictly correct comments 2020-01-19 17:15:51 +00:00
duncanspumpkin
a5ef8d6240 Rename rct_vehicle 2020-01-19 17:14:56 +00:00
duncanspumpkin
164acc85cc Rename sprites to newer style naming 2020-01-19 17:10:53 +00:00
duncanspumpkin
86a20805ad Correct the types for exporting 2020-01-19 17:08:57 +00:00
duncanspumpkin
4e796ec92d Increase Sprite size to 0x200 
This should allow for major refactoring of the sprite classes
 2020-01-19 17:08:57 +00:00
Michael Steenbeek
b1e8caa575
Merge pull request #10570 from tupaschoal/use-more-coords-6 
Prefer CoordsXY* on more places
 2020-01-19 18:06:20 +01:00
Michael Steenbeek
1892a3da48
Merge pull request #10574 from tupaschoal/footpath-direction-delta 
Prefer CoordsDirectionDelta on footpath_update_path_wide_flags()
 2020-01-19 18:06:02 +01:00
Gymnasiast
af12421f2d
Apply fixes 2020-01-19 17:34:11 +01:00
modulo7
fdf0c17fd8
Name field var_CD of vehicle struct. Refactor to enum 2020-01-19 17:34:11 +01:00
Tulio Leao
b7e9b36a27 Prefer std::array and COORDS defines on Map::CoordsDirectionDelta 2020-01-19 13:30:29 -03:00
Tulio Leao
0d88c73b90 Prefer std::array and COORDS defines on Fountain arrays 2020-01-19 13:30:29 -03:00
Tulio Leao
c8097eab3a Use CoordsXYE on maze_entrance_hedge_removal() 2020-01-19 13:30:28 -03:00
Tulio Leao
a3ecefcf89 Use CoordsXYE on maze_entrance_hedge_replacement() 2020-01-19 13:30:28 -03:00
Tulio Leao
893086440c Use CoordsXYZ on park_entrance_get_index() 2020-01-19 13:30:28 -03:00
Tulio Leao
d34321fdaa Use CoordsXY on ride_entrance_exit_place_ghost() 2020-01-19 13:30:28 -03:00
Tulio Leao
e65f9424cf Use CoordsXYZ on rct_duck::MoveTo() 2020-01-19 13:30:26 -03:00
Tulio Leao
49bd8e0c67 Use CoordsXYZ on banner_get_ride_index_at() 2020-01-19 13:28:24 -03:00
Tulio Leao
5a74d057b0 Use CoordsXY on banner_get_closest_ride_index() 2020-01-19 13:28:24 -03:00
Tulio Leao
ad89319918 Simplify loop on footpath_update_path_wide() 2020-01-19 13:09:45 -03:00
Tulio Leao
132ab424f7 Use loop on footpath_update_path_wide() to iterate with CoordsDirectionDelta 2020-01-19 13:09:45 -03:00
Tulio Leao
57faa437c0 Prefer CoordsDirectionDelta on footpath_update_path_wide_flags() 2020-01-19 13:09:45 -03:00
Michael Steenbeek
d798811c4a Make GetWaterHeight return big Z (#10579) 
* Make GetWaterHeight return big Z

* Restore > 0 [ci skip]
 2020-01-19 15:12:48 +00:00
Duncan
8abb9e5515
Fix obstructions not stopping ride placement (#10585) 2020-01-19 15:12:26 +00:00
Duncan
0702808692
Use a game action result for clear at function (#10576) 
* Use a game action result for clear at function

* Clean up callers of set_error_text

* Make it compile

* Make suggested changes

* fix compile

* Fix nullptr deref
 2020-01-19 13:14:37 +00:00
Michael Steenbeek
8a9f0eeca5
Prepare track piece handling code for more than 256 pieces (#10575) 2020-01-17 12:27:14 +01:00
duncanspumpkin
98de6db515 Increment network version 2020-01-16 20:28:42 +00:00
duncanspumpkin
f04e791f7c When in NO_MONEY mode still path to shops with prices 2020-01-16 20:28:38 +00:00
Michael Steenbeek
b9ee231a59
Merge pull request #10559 from tupaschoal/use-more-coords-5 
Only use CoordsXY objects in world/Footpath.cpp
 2020-01-14 22:30:17 +01:00
Tulio Leao
931adaa747 Use TileCoordsXY on footpath_fix_corners_around() 2020-01-14 07:33:46 -03:00
Tulio Leao
05baa13012 Use CoordsXY on footpath_fix_ownership() 2020-01-14 07:33:46 -03:00
Tulio Leao
ac063a7e9a Use CoordsXY on footpath_update_path_wide_flags() 2020-01-14 07:33:43 -03:00
NuclearFej
0192b25943 Android: target SDK 28, remove absolute path (#10568) 
Android version: an absolute path was replaced with a call to the Environment class. The target SDK of 29 was decremented to a target SDK of 28 to fix an incompatibility with an SDK change. Game now builds; however a desktop version must be built first so that build artifacts are present in /bin.
 2020-01-13 22:38:59 +00:00
Michael Steenbeek
77d18a664b
Implement #10358: Clean up leftover references to openrct2.website 2020-01-13 20:20:49 +01:00
Michael Steenbeek
0f306d6f5c
Fix #10547: RCT1 parks have too many rides available (#10556) 2020-01-13 19:23:05 +01:00
ζeh Matt
2242a72b29 Add assertion failure reason to the Backtrace service integration (#10562) 2020-01-13 19:22:45 +01:00
Tulio Leao
89edde6a3c Use CoordsXY on footpath_bridge_get_info_from_pos() 2020-01-12 22:27:30 -03:00
Tulio Leao
201d13577e Use CoordsXY for footpath_get_coordinates_from_pos() 2020-01-12 22:20:29 -03:00
Michael Steenbeek
3fc5f75eb8
Fix #8875: RCT1 competition scenarios are classified incorrectly (#10548) 2020-01-12 14:29:02 +01:00
Michael Steenbeek
d7f23bc5bf
Close #6898: Remove LOADMM and LOADRCT1 commands (#10546) 2020-01-12 14:26:33 +01:00
Michael Steenbeek
c5297dfcdd
Fix #10550: Hovering the mouse cursor with path on a certain height level works weird (#10552) 2020-01-12 14:26:15 +01:00
Michael Steenbeek
f05aeb1fcd
Fix #7784: Vehicle tab takes 1st car colour instead of tab_vehicle's colour (#10544) 2020-01-12 10:32:11 +01:00
Michael Steenbeek
09ac8a0c59
Merge pull request #10540 from IntelOrca/fix/10496-non-eng-paths 
Fix #10496: Game can't handle path with non-english string
 2020-01-12 10:31:31 +01:00
Ted John
9562f42d91 Convert object filenames to UTF-8 when exporting 2020-01-11 23:59:38 +00:00
Michael Steenbeek
5e5752d49d
Fix secondary prices being imported incorrectly from SV4 (#10543) 
An oversight that has been present since the very first version of the SV4 import code.
 2020-01-11 23:27:01 +01:00
Duncan
20223eb5fb Refactor update_sound_params to be member functions 2020-01-11 20:54:28 +01:00
Michael Steenbeek
44dc2068e7
Merge pull request #10515 from tupaschoal/use-more-coords-4 
Use CoordsXY* on world/Footpath.cpp
 2020-01-11 20:52:39 +01:00
Tulio Leao
c5ec4982a3 Use CoordsXY on footpath_chain_ride_queue() 2020-01-11 11:13:05 -03:00
Tulio Leao
57da25cab9 Use CoordsXYZD on footpath_is_connected_to_map_edge_recurse() 2020-01-11 11:13:05 -03:00
Tulio Leao
6189d13b2c Use CoordsXYZD on footpath_is_connected_to_map_edge() 2020-01-11 11:13:05 -03:00
Tulio Leao
301e0cfeb1 Use CoordsXYZ on footpath_remove_litter() 2020-01-11 11:13:05 -03:00
Tulio Leao
613dd41b53 Use CoordsXYZ on map_get_footpath_element_slope() 2020-01-11 11:13:05 -03:00
Tulio Leao
900a2fbd7b Use CoordsXYRangedZ on footpath_get_element() 2020-01-11 11:13:05 -03:00
Tulio Leao
8e0020e5a2 Use CoordsXYRangedZ for footpath_remove_edges_towards() 2020-01-11 11:13:05 -03:00
Tulio Leao
09e434bc19 Use CoordsXYZD on footpath_remove_edges_towards_here() 2020-01-11 11:13:05 -03:00
Tulio Leao
777898fd6c Use CoordsXY on footpath_reconnect_queue_to_path() 2020-01-11 11:13:05 -03:00
Tulio Leao
d8c8f2d804 Use CoordsXYZ on footpath_connect_corners_get_neighbour() 2020-01-11 11:13:04 -03:00
Tulio Leao
7cf03d3e41 Use CoordsXY on footpath_remove_edges_at() 2020-01-11 11:13:04 -03:00
Tulio Leao
2b1101d320 Use CoordsXYZ on footpath_interrupt_peeps() 2020-01-11 11:13:04 -03:00
Tulio Leao
9aad709d5c Use CoordsXY on footpath_disconnect_queue_from_path() 2020-01-11 11:13:04 -03:00
Tulio Leao
b829b22415 Use CoordsXYRangedZ on fence_in_the_way() 2020-01-11 11:13:01 -03:00
Tulio Leao
78611b664f Use CoordsXY on footpath_connect_corners() 2020-01-11 11:00:19 -03:00
Ted John
171969f5fb Fix #10496: Game can't handle path with non-english string 2020-01-11 00:43:00 +00:00
Tom Lankhorst
6f0ea7b3c2 Link stdc++fs with GCC (#10522) 2020-01-09 19:57:28 +01:00
Tom Lankhorst
2ff8a467c6 Find Jansson with pkg-config on non-MSVC. (#10521) 2020-01-09 19:56:25 +01:00
Tulio Leao
c470d84210 Fix #10524: Banners not placeable above certain height (#10528) 2020-01-06 15:10:38 +00:00
Michael Steenbeek
08ab15ef36
Fix #10313: Path furniture can be placed on level crossings 2020-01-05 17:59:02 +01:00
X123M3-256
5063cd2283 Fix line that causes build to fail on Mac (#10518) 2020-01-05 14:34:39 +01:00
Tulio Leao
e7ee8ebc03 Use CoordsXY on footpath_update_queue_entrance_banner() 2020-01-05 09:14:55 -03:00
Tulio Leao
482ca8765c Use CoordsXY on Footpath's loc_6A6D7E() and loc_6A6C85() 2020-01-05 09:14:51 -03:00
Tulio Leao
b1dc6ed6ed Use CoordsXY on footpath_connect_edges() 2020-01-05 08:20:16 -03:00
Michael Steenbeek
63da894257
Merge pull request #10511 from tupaschoal/improve-clear-at 
Improve variable names in map_can_construct_with_clear_at() and use big Z
 2020-01-04 19:57:46 +01:00
Michael Steenbeek
0c9b1cec96
Correct max vehicles per ride value (#10504) 
* Correct max vehicles per ride value

* Fix formatting

* Fix constant usage in TrackDesign.cpp
 2020-01-04 18:10:33 +01:00
Tulio Leao
d3579e472b Use Big Z coordinates for map_can_construct_with_clear_at() vars 2020-01-04 10:31:18 -03:00
Tulio Leao
dff747ce0f Improve variable names in map_can_construct_with_clear_at() 2020-01-04 10:27:57 -03:00
Tulio Leao
d861658669 Use CoordsXY on Scenery and SmallScenery (#10513) 2020-01-04 12:45:51 +01:00
Tulio Leao
c4a865384e Move Mac-only str handling functions to Platform (#10264) 2020-01-04 12:44:40 +01:00
Michael Steenbeek
e87607fa6d
Merge pull request #10402 from NuclearFej/develop 
Android: fix Gradle, CMake, asset copying; upgrade to AndroidX, fullscreen mode
 2020-01-02 13:47:36 +01:00
Kevin Laframboise
13e946a239 Fix #10464: Incorrect error messages for track placement (#10494) 2020-01-02 08:11:24 +00:00
Duncan
f4440b57b7
Merge pull request #10488 from Gymnasiast/refactor/map_get_footpath_element 
Refactor map_get_footpath_element() and fix #10486
 2020-01-02 07:45:15 +00:00
NuclearFej
f35dd778e5 Android: enable fullscreen mode, raise min SDK 
Fullscreen mode (sticky immersive) is enabled. The minimum SDK version was raised to 19 (4.4.2 KitKat, which is more than old enough) from 16 to enable this.

Additonally, deprecation compiler warnings were enabled.
 2020-01-01 22:57:19 -05:00
Gymnasiast
5c0a62c31a
Implement review requests 2020-01-01 23:03:41 +01:00
ζeh Matt
a7c1f1fcc4
Merge pull request #10490 from ZehMatt/fix-10489 
Fix #10489: Hosts last action not being synchronized
 2019-12-31 17:21:00 +01:00
Matt
ef4a3d0528
Fix #10489: Hosts last action not being synchronized 2019-12-31 10:34:33 +01:00
Michael Steenbeek
29922da871
Refactor calls to staff_is_patrol_area_set() 2019-12-31 10:10:40 +01:00
Gymnasiast
0d09a645fc
Refactor map_get_footpath_element() and fix #10486 2019-12-31 10:08:36 +01:00
Kevin Strehl
37110f386d Add Keyboard Shortcuts to the Tile Inspector (#10430) 2019-12-31 09:34:38 +01:00
Duncan
c170926200 Refactor to prefer baseZ instead of height for big Z (#10478) 2019-12-31 09:33:27 +01:00
Duncan
c74339fed9 Fix #10477. Fix upper max height limit being very low for large scenery 
Mistake made while improving mouse control when zoomed out caused the upper limit for multi tile scenery to be limited by the sum of all clearance z values instead of the greatest clearance z value.
 2019-12-31 09:15:46 +01:00
Duncan
d486ac4d3b Reduce direct usage of LOCATION_NULL (#10480) 
* Reduce direct usage of Location_Null

Ideally we want to refactor these out to use std::optional as much as possible but for now move to using the standard interfaces.

* Remove incorrect AND with LOCATION_NULL

In the original this was a simple comparison to check for negative. Unsure how it ended up as an AND with the negative bit.
 2019-12-31 09:01:17 +01:00
Gymnasiast
1133a8c81c
Remove sLocationXY8 2019-12-30 23:03:13 +01:00
Duncan
2c359736ee
Refactor to reduce usage of LocationXY8 and sLocationXY8 (#10479) 
* Refactor to reduce LocationXY8 usage

* Further reduction of LocationXY usage and sLocationXY usage

* Reduce sLocationXY8 usage
 2019-12-30 19:03:34 +00:00
Tulio Leao
06fb16ee88 Use CoordsXYZ for gMapSelectArrowPosition (#10442) 2019-12-30 16:51:35 +00:00
Tulio Leao
8b4e0d7bab Make Map::wall_remove_*() use CoordsXY* (#10461) 
* Make Map::wall_remove_at() use CoordsXYRangedZ

* Make Map::wall_remove_at_z() use CoordsXYZ

* Make Map::wall_remove_intersecting_walls() use CoordsXYRangedZ

* Remove useless TODO and simplify functions
 2019-12-30 16:51:01 +00:00
Tulio Leao
a7b33a7d36 Use more Coords on some files. (#10463) 
* Use more Coords on MazePlaceTrackAction

* Use more Coords on MazeSetTrackAction

* Use more Coords on PlacePeepSpawnAction

* Use more Coords on SetCheatAction

* Use more Coords on SurfaceSetStyleAction

* Use more Coords on Station
 2019-12-30 16:50:48 +00:00
Michael Steenbeek
77494bbc73 Create definitions for some coords related stuff (#10456) 
* Create definitions for some coords related stuff

* Use constexpr; add define for Z step
 2019-12-30 15:03:51 +00:00
Tulio Leao
2d7dccb0c2 Make Map::map_can_construct_*() use CoordsXYRangedZ (#10462) 
* Make Map::map_can_construct_with_clear_at() use CoordsXYRangedZ

* Make Map::map_can_construct_at() use CoordsXYRangedZ
 2019-12-30 15:00:42 +00:00
Michael Steenbeek
9de8fa233f
Fix #5249: No collision detection when building ride entrance at heights > 85.5m (#10473) 2019-12-30 14:01:36 +01:00
Michael Steenbeek
4b0dff92aa
Name word_981D6C (#10471) 2019-12-30 12:29:08 +01:00
Duncan
7a64eb4402 Fix #10470. Mistake caused by reusing variable names for different functions. (#10476) 
Added in comments to clarify why function is required. Renamed variables again to clarify what they are used for
 2019-12-30 12:26:58 +01:00
Michael Steenbeek
fa4ed37895
Fix #10468: Ride's Entrance/Exit is not buildable above a certain height level (#10472) 2019-12-29 23:48:15 +01:00
Michael Steenbeek
bad5e326d1
Merge pull request #10103 from tupaschoal/compilation-warnings 
Fix some compilation warnings
 2019-12-28 23:09:14 +01:00
Tulio Leao
98110c0544 Make Map::map_invalidate*() use CoordsXY (#10437) 
* Make Map::map_invalidate_element() use CoordsXY

* Make Map::map_invalidate_tile_full() use CoordsXY

* Make Map::map_invalidate_tile_zoom0() use CoordsXY

* Make Map::map_invalidate_tile_zoom1() use CoordsXY

* Make Map::map_invalidate_tile() use CoordsXY

* Use CoordsXYRangedZ for map invalidation

* Fix vehicle tile invalidation use Z instead of Y coord

* Fix BannerRemoveAction sending Z TileCoords to invalidate tile

* Fix wrong tile invalidation on peep_update_walking_break_scenery

* Prefer ToTileStart over bitwise and
 2019-12-28 08:44:33 +00:00
Tulio Leao
84928cb4ef Comment why GetOrLoadImageTexture returns BasicTextureInfo 2019-12-27 15:05:28 -03:00
Tulio Leao
f790fb9079 Improve variable initialisation, if statements and assertions 2019-12-27 15:05:28 -03:00
Tulio Leao
d4feed81e6 Fix C6031: return value ignored 2019-12-27 15:05:28 -03:00
Tulio Leao
1bc399537e Fix C6001: using uninitialized memory 2019-12-27 15:05:27 -03:00
Tulio Leao
6cdbb901a5 Fix C26439 SPECIAL_NOEXCEPT 2019-12-27 15:05:27 -03:00
Tulio Leao
28812760e7 Fix some compilation warnings 2019-12-27 15:05:27 -03:00
Tulio Leao
19b7bed37e Use CoordsXY for Map::clear functions (#10439) 2019-12-27 15:58:40 +01:00
Michael Steenbeek
d0744df22f
Merge pull request #10443 from tupaschoal/reduce-locationxy 
Remove LocationXY usage on windows and actions
 2019-12-27 15:58:26 +01:00
Michael Steenbeek
64f7cac6d6
Create getters for station height and start (#10453) 2019-12-27 15:57:40 +01:00
Michael Steenbeek
8ca0cf52a7
Replace more direct accesses to base/clearance Z with getter/setter (#10454) 2019-12-27 15:26:40 +01:00
Tulio Leao
109a90269c Prefer setNull/isNull on TopToolbar over LOCATION_NULL 2019-12-27 09:52:31 -03:00
Tulio Leao
48c2dc31bc Remove LocationXY usage on openrct2\actions\RideDemolishAction.hpp 2019-12-27 09:52:31 -03:00
Tulio Leao
4f58fd5568 Remove LocationXY usage on openrct2\actions\LandSmoothAction.hpp 2019-12-27 09:52:31 -03:00
Tulio Leao
15f873c018 Remove LocationXY usage on openrct2-ui\windows\ViewClipping.cpp 2019-12-27 09:52:27 -03:00
Tulio Leao
05ef277cbd Remove LocationXY usage on openrct2-ui\windows\TopToolbar.cpp 2019-12-27 09:22:51 -03:00
Tulio Leao
3c3e179e7f Remove LocationXY usage on openrct2-ui\windows\RideConstruction.cpp 2019-12-27 09:22:51 -03:00
Michael Steenbeek
26cce7e82b
Merge pull request #10444 from tupaschoal/reduce-locationxy-ride 
Remove LocationXY usage on ride and peep
 2019-12-27 13:13:11 +01:00
Tulio Leao
a4e99695d4 Remove LocationXY usage on openrct2\peep\Staff.cpp 2019-12-27 08:49:35 -03:00
Tulio Leao
37973c162f Remove LocationXY usage on openrct2\peep\Guest.cpp 2019-12-27 08:49:35 -03:00
Tulio Leao
9ec25e85cb Coords for map_get_tile* (#10440) 
* Make Map::map_get_tile_side() use CoordsXY
* Make Map::map_get_tile_quadrant() use CoordsXY
 2019-12-27 12:36:47 +01:00
Tulio Leao
99002ec8e4 Remove LocationXY usage on openrct2\ride\thrill\MagicCarpet.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao
1d011630be Remove LocationXY usage on openrct2\ride\Ride.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao
d47ac61578 Remove LocationXY usage on openrct2\ride\coaster\WoodenRollerCoaster.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao
4f93d6a0f9 Remove LocationXY usage on openrct2\ride\CableLift.cpp 2019-12-27 08:31:15 -03:00
Tulio Leao
e827509786 Make Map::sign_set_colour() use CoordsXYZD (#10441) 
* Make Map::sign_set_colour() use CoordsXYZD

* Rename Map::sign_set_colour()
 2019-12-26 15:18:51 +00:00
Matt
cfe90c3c3b
Bump up network version 2019-12-26 13:30:02 +01:00
Matt
ef4245572c
Use integer math for guest initial happiness calculation 2019-12-26 13:29:35 +01:00
ζeh Matt
518780c3e8
Merge pull request #10422 from ZehMatt/refactor/gCommandExpenditure 
Refactor out gCommandExpenditureType
 2019-12-25 01:49:46 +01:00
Michael Steenbeek
b8687511a4
Merge pull request #10436 from tupaschoal/coords-large-scenery 
Make Map's large scenery functions use Coords objects
 2019-12-24 15:51:20 +01:00
Tulio Leao
ef31ce8149 Improve readability on ride_create_vehicles_find_first_block 2019-12-24 11:19:06 -03:00
Tulio Leao
81647b3dd8 Make Map::map_get_track_element_at_with_direction_from_ride() use CoordsXYZD 2019-12-24 11:19:06 -03:00
Tulio Leao
6ab46bd74a Make Map::map_get_track_element_at_from_ride() use CoordsXYZ 2019-12-24 11:19:06 -03:00
Tulio Leao
c718d2be42 Make Map::map_get_track_element_at_of_type_from_ride() use CoordsXYZ 2019-12-24 11:19:06 -03:00
Tulio Leao
21435a4d01 Make Map::map_get_track_element_at_of_type_seq() use CoordsXYZ 2019-12-24 11:19:05 -03:00
Tulio Leao
77503fee97 Make Map::map_get_track_element_at_of_type() use CoordsXYZ 2019-12-24 11:19:05 -03:00
Tulio Leao
6c998d7b4d Make Map::map_get_track_element_at() use CoordsXYZ 2019-12-24 11:19:03 -03:00
duncanspumpkin
18af061c16 Fix formatting 2019-12-24 12:22:54 +00:00
duncanspumpkin
38434ad688 Use CoordsXYZ for cable lift location 2019-12-24 12:04:14 +00:00
duncanspumpkin
a3a4a7f153 Make suggested changes 2019-12-24 12:04:07 +00:00
duncanspumpkin
0f90b2c353 Rename variable as its technically new 2019-12-24 11:46:56 +00:00
duncanspumpkin
370a9b1113 Change type of cur_test_track_location 2019-12-24 11:44:01 +00:00
duncanspumpkin
c08958a705 Prepare cur_test_track_location for type change 2019-12-24 11:43:55 +00:00
duncanspumpkin
a5ad2f9a87 Change overall view and boat hire return type to TileCoordsXY 2019-12-24 08:51:48 +00:00
duncanspumpkin
58339cff2b Prepare overall_view for type change 2019-12-24 08:39:20 +00:00
duncanspumpkin
0a5d094785 Change type of ChairLiftBullwheel to TileCoordsXYZ 2019-12-24 08:28:10 +00:00
Gymnasiast
62fcbb07ca
Rename methods to GetBaseZ/GetClearanceZ 2019-12-23 20:08:37 +01:00
Gymnasiast
85ecb52e7c
Manually replace more Z occurrences 2019-12-23 20:05:26 +01:00
Gymnasiast
7d11858dbe
Create getter for GetBaseHeight()/GetClearanceHeight() 2019-12-23 20:05:24 +01:00
Duncan
b330d3816f Reduce LocationXY usage in vehicle.cpp (#10431) 
Note changed logic on boat hire (Now uses ToTileCentre() before didn't do the & ~0x1F)
and chairlift (Now actually checks the z coordinate of the bullwheel when going backwards {not sure if that is even possible}).
Both likely minor bugs.
 2019-12-23 17:53:36 +01:00
Tulio Leao
27866e992d Make Map::check_max_allowable_land_rights_for_tile() receive CoordsXYZ (#10433) 2019-12-23 17:24:41 +01:00
Tulio Leao
c169a92f1f Make ClearAction::ClearSceneryFromTile() receive a CoordsXY object (#10432) 2019-12-23 17:12:54 +01:00
Tulio Leao
32259326bf Fix formatting on TrackDesignSave 2019-12-23 11:13:31 -03:00
Tulio Leao
6fb5524e1e Make Map::map_large_scenery_get_origin() use CoordsXYZ* 2019-12-23 10:07:20 -03:00
Tulio Leao
00e1030d09 Make Map::map_get_large_scenery_segment() use CoordsXYZD 2019-12-23 09:53:21 -03:00
Tulio Leao
a2c7ecc6e5 Make Map::map_get_first_element_at() use CoordsXY (#10413) 
* Make Map::map_get_first_element_at() use CoordsXY

* Fix clang-format on ClearAction.hpp

* Prefer TileDIrectionDelta over hardcoded delta on RideConstruction

* Use named Direction constants

* Make Compat::map_get_first_element_at() use CoordsXY
 2019-12-23 07:35:41 +00:00
Matt
0aa6fc7431
Fix formatting 2019-12-22 22:06:10 +01:00
ζeh Matt
19deee3e3a
Merge pull request #10421 from ZehMatt/fix-10420 
Fix #10420: Money effect causing false positive desync
 2019-12-22 20:55:16 +01:00
Matt
52ee9c6896
Use enum class for ExpenditureType 2019-12-22 20:51:55 +01:00
Matt
79acb6a073
Move staff wage data to Staff.cpp/h 2019-12-22 20:51:55 +01:00
Matt
c24112ffad
Refactor out gCommandExpenditureType 2019-12-22 20:51:49 +01:00
nia
addd27d4dc Support NetBSD and simplify platform ifdefs. (#10271) 
For files intended to support unixy freedesktopy systems,
reduce the ifdef down to __unix__ && !__APPLE__ && !__ANDROID__,
rather than naming linux and all the BSDs and so on by hand.

Should simplify adding support for systems like illumos in the
future.

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2019-12-22 17:07:39 +01:00
Duncan
96ff8fe7a1 Change value of COORDS_NULL to a less likely to collide value. (#10423) 
It will also now match LOCATION_NULL. As this change should only affect in memory coords there should be no save, replay, network issues.
 2019-12-22 14:03:32 +01:00
Duncan
e61401e48c Fix #10410: Tile Inspector does not hightlight tile correctly 
Mistake made when refactoring not passing the error up through the chain and silently working.
 2019-12-22 13:59:24 +01:00
Tulio Leao
0416c2eaa3 Merge pull request #10427 from tupaschoal/fix-10426 
Fix #10426: Deleting path moves preview in opposite direction
 2019-12-22 12:45:23 +00:00
Matt
69eb3f5d91
Bump up network version 2019-12-22 07:50:55 +01:00
Matt
d60cdbe5f2
Fix #10420: Money effect causing false positive desync 2019-12-22 07:50:51 +01:00
Tulio Leao
461095ab6c Fix #10417: Ride preview incorrectly centered 2019-12-22 01:48:28 -03:00
Michael Steenbeek
30b03d998c
Merge pull request #10409 from tupaschoal/coords-for-set-tile-elements 
Make Map::map_set_tile_elements() use TileCoordsXY
 2019-12-21 19:12:51 +01:00
Michael Steenbeek
fb2f907414
Merge pull request #10363 from duncanspumpkin/refactor 
Refactor to reduce LocationXY usage
 2019-12-21 16:24:24 +01:00
Michael Steenbeek
c2565bfe1c
Merge pull request #10407 from duncanspumpkin/refactor_stations 
Fixing COORDS_NULL: Refactor stations
 2019-12-21 16:13:48 +01:00
Michael Steenbeek
ef4e494532
Merge pull request #10412 from Gymnasiast/refactor/lesslocationxy 
Remove MakeXY16
 2019-12-21 15:34:40 +01:00
Tulio Leao
5fcfc6af00 Rename map_set_tile_elements to singular 2019-12-21 10:28:52 -03:00
Tulio Leao
d7efe4de90 Make Map::map_set_tile_elements() use TileCoordsXY 2019-12-21 10:28:33 -03:00
Tulio Leao
9b1395bfb8 Make Map::map_get_banner_element_at() use CoordsXYZ (#10408) 2019-12-21 14:15:40 +01:00
Duncan
228205a199 Fix crash in dev builds due to sign issues (#10405) 2019-12-21 14:08:57 +01:00
Tulio Leao
5cd6c67abd Make Map::map_get_small_scenery_element_at() receive CoordsXY (#10406) 2019-12-21 14:08:18 +01:00
Tulio Leao
38cf4728ef Make Map::map_get_nth_element_at() use CoordsXY (#10411) 2019-12-21 14:04:00 +01:00
Gymnasiast
11cc07a2b8
Replace hard-coded index with constant 2019-12-21 14:00:45 +01:00
Gymnasiast
dcc720c1ec
Remove MakeXY16() 2019-12-21 13:51:59 +01:00
duncanspumpkin
64656cdc0e Fix mistake made by auto complete 2019-12-21 12:43:13 +00:00
duncanspumpkin
521e5db4c2 Make constant values more explicit. 
Fix mistake in z coordinate conversion
 2019-12-21 12:22:59 +00:00
duncanspumpkin
f346e439fc Change type of map selection a and b 2019-12-21 12:18:34 +00:00
duncanspumpkin
1f80dee4df Refactor footpath.cpp to remove LocationXY and use CoordsXY 2019-12-21 12:18:34 +00:00
duncanspumpkin
6b72b0992d Removal of LocationXY and simplify 2019-12-21 12:18:34 +00:00
duncanspumpkin
df2393c3f0 Fix clang format 2019-12-21 12:17:57 +00:00
Michael Steenbeek
6b5be4765d
Merge pull request #10399 from duncanspumpkin/refactor_map_animation 
Refactor MapAnimation to use CoordsXYZ
 2019-12-21 13:12:11 +01:00
duncanspumpkin
b3dafc64c3 Refactor to improve readability as per suggestions 2019-12-21 12:12:10 +00:00
duncanspumpkin
21128c5389 Undo clang format mistakes 2019-12-21 11:52:32 +00:00
duncanspumpkin
45403ac2d3 Move station_starts to TileCoordsXY 2019-12-21 11:48:13 +00:00
duncanspumpkin
7297125cae Refactor stations ready for TileCoordsXY 2019-12-21 11:26:37 +00:00
Michael Steenbeek
a2b9598341
Modify code using Location8 to use isNull()/setNull() (#10403) 2019-12-21 11:34:46 +01:00
duncanspumpkin
f64563e0a7 Make suggested changes 2019-12-21 09:07:34 +00:00
NuclearFej
da49d98b8b Android: fix Gradle, CMake, asset copying; upgrade to AndroidX 
Gradle now pulls from the main OpenRCT2 /bin/data folder to insert the assets into the APK. MainActivity now properly copies assets from within the APK. Dependencies have been updated and the support library has been upgraded to AndroidX. CMake libraries now link properly. Network (multiplayer), Discord, and HTTP_Twitch were disabled, in addition to the already-disabled HTTP, OpenGL, and Twitch, due to compile-time errors. Revision number incremented.
 2019-12-20 19:44:45 -05:00
Tulio Leao
780e3265d1 Standardize Coords and TileCoords objects 2019-12-20 08:29:42 -03:00
Duncan
3be7d824ac
Merge pull request #10397 from duncanspumpkin/refactor_gcommand 
Remove gCommandPosition. Use GameActionRes instead.
 2019-12-19 20:48:20 +00:00
duncanspumpkin
86cc7e9734 Add temporary variable to clear up shifting. 
Fix clang format.
Simplify compare
 2019-12-19 18:58:33 +00:00
duncanspumpkin
ee206546bf Refactor MapAnimation to use CoordsXYZ 2019-12-19 18:38:46 +00:00
nia
1f220f2d62 Simplify OS-specific FileStream code (#10270) 
Define ftello/fseeko to ftello64/fseeko64 only on Linux,
these functions are Linux-specific extensions.

Define ftello/fseeko to _ftelli64/_fseeki64 on MSC.

Otherwise, just use the standardized ftello/fseeko, and avoid
duplicating code for different names of the same function.

This allows this code to be reused on e.g. NetBSD without piling
on additional #ifdefs for any other POSIX operating systems.
 2019-12-19 18:34:31 +01:00
Tulio Leao
918624e090 Fix #10396: Function returning TileCoordsXYZD'z coord in a CoordsXYZD object (#10398) 2019-12-19 15:41:22 +01:00
Michael Steenbeek
6ede67d50a
Merge pull request #10371 from tupaschoal/coords-for-get-surface-element-at 
Make map_get_surface_element_at only accept Coords objects
 2019-12-19 13:24:17 +01:00
Tulio Leao
7e7b4029a9 Simplified conversions from TileCoordsXYZ to CoordsXY 2019-12-19 08:12:42 -03:00
Michael Steenbeek
f59f5d9b1f
Merge pull request #10375 from tupaschoal/coords-for-map-entrance-exit 
Make map entrance/exit fetching functions use Coords objects
 2019-12-19 11:39:37 +01:00
Duncan
08bf0a6807
Merge pull request #10391 from tupaschoal/mouse-diff-coords 
Save mouse differential coords using ScreenCoordsXY
 2019-12-19 08:02:32 +00:00
Tulio Leao
aea755bd70 Allow TileCoordsXYZD to generate CoordsXYZD equivalent 2019-12-19 00:11:26 -03:00
Tulio Leao
a5065e95c6 Simplify MouseInput differential coords calculation 2019-12-18 23:57:57 -03:00
Tulio Leao
5c657bde9f Remove map_get_surface_element_at operating with TileCoordsXY 2019-12-18 23:47:17 -03:00
Tulio Leao
7c75db2b2d Make map_get_surface_element_at only accept Coords objects 2019-12-18 23:46:50 -03:00
Duncan
099404b505
Merge pull request #10381 from tupaschoal/cursorsate-store-coords 
Make CursorState store a ScreenCoordsXY object
 2019-12-18 20:10:51 +00:00
Tulio Leao
af281817c3 Use CoordsXYZD on map_get_wall_element_at() (#10374) 
* Use CoordsXYZD on map_get_wall_element_at()

* Add CoordsXYZ::ToTileStart()
 2019-12-18 11:23:53 +01:00
Tulio Leao
4f615c5802 Make const some methods of location objects (#10392) 2019-12-18 11:21:16 +01:00
Tulio Leao
52d09171ba Remove usage of LocationXY on TrackDesign (#10383) 2019-12-18 11:20:51 +01:00
Tulio Leao
c71c4284d0 Make map entrance/exit fetching functions use only CoordsXY objects 2019-12-17 23:55:46 -03:00
Tulio Leao
8613edee4a Use ScreenCoordsXY::operator- to improve readability 2019-12-17 23:33:07 -03:00
Tulio Leao
972a8735e8 Fix arithmetic error in Scenery::window_scenery_update() 2019-12-17 23:32:34 -03:00
Tulio Leao
502a15512b Save mouse differential coords using ScreenCoordsXY 2019-12-17 23:21:12 -03:00
Ted John
b2c0787c2d Fix #10389: Invalid read in vehicle_update_travelling (#10390) 2019-12-17 21:48:38 +01:00
Tulio Leao
c2c40fa951 Create ScreenCoordsXY on UIContext mouse/finger functions (#10382) 2019-12-17 18:46:28 +01:00
Tulio Leao
6b06b2c578 Use ScreenCoordsXY for Mouse Drag storage (#10380) 2019-12-17 18:38:20 +01:00
duncanspumpkin
df5d5f4eb1 Fix the logging once and for all 2019-12-15 16:48:14 +00:00
duncanspumpkin
11974dd7b3 Increment Network Version 2019-12-15 08:31:26 +00:00
duncanspumpkin
3c89fc63ad Reduce logging of variables to just name to make logs useful 2019-12-15 08:26:19 +00:00
duncanspumpkin
2eab8c3784 Fix formatting and declaration 2019-12-15 08:23:21 +00:00
duncanspumpkin
63b8f83f4f Make suggested changes 2019-12-15 08:23:21 +00:00
duncanspumpkin
073e75a7bd Remove extra line break 2019-12-15 08:23:21 +00:00
duncanspumpkin
d97bb88c41 Reduce desyncs by removing teh track before updating peep logic 2019-12-15 08:21:32 +00:00
duncanspumpkin
cfb4bba721 Remove todo and clang format where required 
Change array type to avoid additional code

Make CI's happier
 2019-12-15 08:21:32 +00:00
duncanspumpkin
d8b5060eb9 Remove dead game command code. 
Refactor of z increment
 2019-12-15 08:21:32 +00:00
duncanspumpkin
fa3332f47a Fix ghost desync and rotation issue 
Fix callback by reworking placement code
 2019-12-15 08:21:32 +00:00
duncanspumpkin
7dbf0353ff Serialise scenery, mazes, entrances 2019-12-15 08:21:32 +00:00
duncanspumpkin
83503f4c69 Serialise track design. Start work on making it work 
Fix track designs issuing extra game actions
 2019-12-15 08:21:32 +00:00
duncanspumpkin
c781fcb72d Start moving track design into a game action 
Make place track design work with game actions
 2019-12-15 08:21:32 +00:00
Tulio Leao
2cd3add373 Make CursorState store a ScreenCoordsXY object 2019-12-14 23:30:55 -03:00
Tulio Leao
72d19f779b Fix clang-format 2019-12-14 23:07:45 -03:00
Tulio Leao
9d09f1b95c Use ScreenCoordsXY on context cursor operations (#10364) 2019-12-14 22:52:18 +01:00
Tulio Leao
af7b364946 Prefer map_is_location_valid over hardcoded map limits (#10373) 2019-12-14 22:50:34 +01:00
Tulio Leao
03e7e29b21 Make map entrance/exit fetching functions use Coords objects 2019-12-14 12:13:09 -03:00
frutiemax
18ba9b27a3 Implement #7865: Allow transport rides to synchronise with adjacent stations (#10280) 2019-12-14 09:58:00 +01:00
Tulio Leao
801e6e085d Use CoordsXY on Map::map_surface_is_blocked() (#10369) 
* Use CoordsXY on Map::map_surface_is_blocked()

* Update src/openrct2/peep/GuestPathfinding.cpp

* Use map_is_location_valid() instead of hardcoded number
 2019-12-14 09:57:13 +01:00
Abd Narane
1ace96ccc4 Add shortcuts for changing the scaling value. (#10341) 
Fixes #10305
 2019-12-13 17:31:23 +01:00
Tulio Leao
440f012e8a Remove unused Map::rotate_map_coordinates() function (#10362) 2019-12-12 18:53:24 +01:00
Tulio Leao
2ff4c28cb5 Use CoordsXY on action rotation (#10332) 
* Use CoordsXY on action rotation

* Don't use intermediate CoordsXY variable just for Rotating it next

* Standardize operations on Coords and Rotated Coords

* Remove unwanted linebreak addition
 2019-12-12 08:09:46 +00:00
Duncan
fed417da03
Merge pull request #10356 from duncanspumpkin/label_var 
Change the label on known var to reflect use.
 2019-12-11 18:14:07 +00:00
Duncan
90bde58852
Merge pull request #10329 from tupaschoal/coords-for-windows-rotate 
Use CoordsXY on TopToolbar and TrackDesignPlace rotations
 2019-12-11 08:44:06 +00:00
Tulio Leao
43366a0a51 Make sure height comparisons are done against TileCoords 2019-12-10 23:33:53 -03:00
Duncan
2a53ebd936
Merge pull request #10333 from tupaschoal/rotate-paint 
Use CoordsXY for Paint rotations
 2019-12-10 18:35:38 +00:00
Duncan
432ad7867a
Merge pull request #10334 from tupaschoal/rotate-for-trackdesign 
Use CoordsXY for TrackDesign* rotations
 2019-12-10 12:49:34 +00:00
Michael Steenbeek
8e805f5088
Merge pull request #10328 from tupaschoal/rotate-ride-coords 
Use CoordsXY and ScreenCoordsXY for rotate in Ride*.*
 2019-12-10 13:13:03 +01:00
Ted John
e72d2aba85
Merge pull request #10309 from tupaschoal/floor-ceil-constexpr 
Make floor2 and ceil2 constexpr functions
 2019-12-09 22:48:20 +00:00
Tulio Leao
68e0519c5e Remove Map::map_offset_with_rotation() 2019-12-09 17:55:57 -03:00
Tulio Leao
2ddde8a344 Simplify attach calculation on Paint.cpp 2019-12-09 17:19:45 -03:00
Tulio Leao
01c62437b2 Remove Ride::ride_get_rotated_coords() 2019-12-09 16:52:47 -03:00
Tulio Leao
aca4d39107 Allow TileCoordsXYZ conversion to CoordsXYZ 2019-12-05 21:43:20 -03:00
Tulio Leao
e21e0105af Use CoordsXY for Map rotations (#10335) 2019-12-05 20:38:14 +01:00
Tulio Leao
081c9fb187 Use CoordsXY for TrackDesign* rotations 2019-12-04 23:30:36 -03:00
Tulio Leao
5b43f19708 Use CoordsXY for Paint rotations 2019-12-04 23:08:26 -03:00