Commit graph

4677 commits

Author SHA1 Message Date
ζeh Matt
1f6c7c9942 Fix false positive desync when changing map during network play 2019-05-11 18:27:09 +02:00
Ted John
7074d6f3ae Apply review suggestions 2019-05-11 13:57:18 +01:00
Tom Lankhorst
ed353faccf Implement replace_if condition lambda
Fix include typo and CS
2019-05-11 13:54:16 +01:00
Tom Lankhorst
744f2225ed Write platform tests 2019-05-11 13:54:16 +01:00
Tom Lankhorst
bbd69496b4 Sanitize screenshot path 2019-05-11 13:54:16 +01:00
nexgenration
ebefe5721b Fix #9198: Move vehicle invalidate to member function
To further improve the readability of the codebase the vehicle_invalidate function is now a member function of rct_vehicle.
2019-05-11 13:20:34 +01:00
Filip Gawin
6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02:00
Michał Janiszewski
7b71fe8acd Fix error value checked from ride_get_smallest_station_length (#8719)
ride_get_smallest_station_length returns the int32_t::max instead of -1
on error.
2019-05-08 22:34:41 +01:00
Michael Steenbeek
da6794ad9e
Refactor second argument to move_sprite_to_list() 2019-05-08 22:11:51 +02:00
Gymnasiast
7f5c9622c0 Fix guests eating popcorn being drawn eating pizza 2019-05-08 20:57:20 +02:00
Gymnasiast
17ddd451db Fix tests, fix formatting 2019-05-07 20:04:07 +02:00
Gymnasiast
916b8c2705 Use more constants 2019-05-07 19:46:58 +02:00
Gymnasiast
212f425ff0 Rename variables, change signature 2019-05-07 19:34:50 +02:00
NexGenration
846011e21b another message here 2019-05-07 19:34:50 +02:00
NexGenration
e6c88a05db Make peep generate a static member function 2019-05-07 19:34:50 +02:00
Ted John
0d0479f9b1
Merge pull request #8558 from richard-fine/feature/peep-inspector
Peep debug tab
2019-05-06 20:29:29 +01:00
Gymnasiast
2368fea91e Bump network version 2019-05-06 19:15:32 +02:00
Ted John
a22f0a53fb Use localised strings for guest debug tab 2019-05-04 21:48:02 +00:00
Ted John
1d296242b4 Improve text colour 2019-05-04 14:09:15 +00:00
Richard Fine
c4a449f47d Add new debugging tab to the Guest window
Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
2019-05-04 14:08:37 +00:00
ζeh Matt
cd8c67ddac
Implement SetCheatAction. (#8990)
* Implement SetCheatAction.

* Bump up network version
2019-05-04 15:28:38 +02:00
Ted John
e84631c273
Fix #9204: Making screenshots from command-line is broken (#9206) 2019-05-04 13:22:01 +00:00
Hielke Morsink
5e9e7bcbe5 Fix: artifacts when changing ride type as client or using the in-game console (#9202) 2019-05-04 10:31:10 +00:00
Aaron van Geffen
0da35a599d
Merge pull request #9193 from Gymnasiast/optional-header
Add `optional` header
2019-05-03 10:45:50 +02:00
Aaron van Geffen
f1b9c71524
Merge pull request #8687 from Xkeeper0/f/multiplayer-plus
Multiplayer dropdown additions
2019-05-02 22:53:50 +02:00
Tom Lankhorst
63a38412aa Add optional header 2019-05-02 22:53:19 +02:00
Duncan
a6c2aed26d
Merge pull request #9059 from duncanspumpkin/banner_ga
Implement Banner Place/Remove Actions
2019-05-02 21:32:51 +01:00
Florian Will
8c109307cf Fix #8507: Incorrect change in vehicle rolling direction
In OpenRCT2, when vehicles roll backward on a long, flat track piece,
they would eventually change their direction of movement and move
forward instead, after their velocity reached -4095. The acceleration
due to rolling resistance and drag changes to 0 at that point, which
caused the "implicit boost" up to a velocity of ~+32k (close to 2km/h)
to trigger.

The behavior is different in vanilla RCT2, where vehicles just keep on
very slowly rolling backwards.

This commit disables the "implicit forward boost" for vehicles rolling
backward to mimic vanilla RCT2 behavior.
2019-05-02 22:22:59 +02:00
Ted John
4746051d1b
Merge pull request #8814 from tomlankhorst/link-threads
Always link threads, fix linking cURL
2019-05-02 19:40:04 +00:00
Duncan
48bf5e10f3
Increment network version 2019-05-02 20:20:20 +01:00
duncanspumpkin
f0df14bb0f Use BannerIndex type 2019-05-02 17:50:04 +01:00
duncanspumpkin
7f42824642 Update game.h 2019-05-02 17:47:01 +01:00
duncanspumpkin
d14637e1ca Fix narrowing and formatting 2019-05-02 17:47:01 +01:00
duncanspumpkin
f6b610c325 Implement Banner Place/Remove Actions 2019-05-02 17:47:01 +01:00
Aaron van Geffen
57040c392c Change multiplayer toolbar image to framed globe, with pressed state. 2019-05-02 12:32:45 +02:00
Ted John
39123f68eb Fix #5889: Giant screenshot does not work while using OpenGL renderer 2019-05-02 00:07:43 +00:00
Ted John
f842d8a693 Fix #5103: OpenGL: ride track preview not rendered 2019-05-02 00:07:43 +00:00
Xkeeper
7e6bed39d4 Fix z->s and DISABLE_NETWORK support 2019-05-02 00:30:30 +02:00
Xkeeper
c075eec224 Update sync icons, new multiplayer toolbar button
The multiplayer toolbar button is the same globe used for the
multiplayer option on the title screen, since it seems like
a nicer (and better?) looking option than the two riders.

Also conflicts less with the new sync icons.
2019-05-02 00:30:30 +02:00
Xkeeper
8c4de40239 Add graphics for desync notice 2019-05-02 00:29:25 +02:00
Xkeeper
bc8ecd8e67 Add "Reconnect" option under the multiplayer button 2019-05-02 00:26:37 +02:00
Xkeeper
d614fb4035 add network indicators for desync/player count 2019-05-02 00:22:03 +02:00
Aaron van Geffen
6098c1c3cc
Merge pull request #8659 from Xkeeper0/f/better-sign-tooltips
Better tooltips for banners and signs
2019-05-02 00:21:26 +02:00
Aaron van Geffen
df42cfe1e1
Change map toolbar icon with current rotation (#9154) 2019-05-02 00:07:20 +02:00
Xkeeper
51593c540a Fix ride entrance hut banner issue
This fixes the problem where the ride entrance hut
banner would show a nonsense number after auto-named
rides based on the amount the text had scrolled.
2019-05-01 23:59:09 +02:00
Xkeeper
100ee139f5 Update code style with clang-format 2019-05-01 23:59:09 +02:00
Xkeeper
877ce58f0b Update sign tooltip to use STR_NO_ENTRY
Changes the number of the sign tooltip string
and removes the now-duplicate "no entry" string
2019-05-01 23:58:38 +02:00
Xkeeper
c6a4316bd4 Update banner formatting code/strings
Changes some things to use STR_BANNER_TEXT_FORMAT and removes
instances of " - - " attached to other strings in the
localization files.

This can be used in the future to show the messages on
a sign or banner via a tooltip without having to
duplicate those messages without " - - ".
2019-05-01 23:57:07 +02:00
Xkeeper
a1454be336 Add new localizable strings for sign tooltips
re: OpenRCT2/OpenRCT2#8593

These strings use high IDs right now and are probably
not entirely suited for direct inclusion. There is also
some duplication in that "No entry" had to be unique,
as the actual no entry string is "No entry - -".
2019-05-01 23:57:07 +02:00
ζeh Matt
181a722c3b Fix game action errors not showing if no round trip was done (#9175) 2019-05-01 22:53:10 +02:00
Duncan
1e1d263dae
PlayerSetGroupAction (#9072)
* First pass at action.

* Version 2. Do all the work in Network.cpp

* Mark game command as complete

* Make requested changes

* Increment of network version
2019-05-01 16:54:12 +01:00
ζeh Matt
c5b66c0294 Fix #9152: Spectators can modify ride colours 2019-04-29 20:08:09 +02:00
Michael Steenbeek
c8df801e66
Create ShopItemDescriptor 2019-04-26 20:25:11 +02:00
Michael Steenbeek
57201c12db
Merge pull request #9128 from Broxzier/feature/6116-tile-inspector-colour-scheme
Expose colour scheme in the tile inspector (#6116)
2019-04-24 19:42:12 +02:00
Michael Steenbeek
b2535ba35a
Merge pull request #9117 from Gymnasiast/fix/7729
Fix #7729: Money Input Prompt breaks on certain values
2019-04-24 19:41:24 +02:00
boucks
b052c4ac61 Fix #9054: remove gSceneryTileElement by returning it within GameActi… (#9127)
* Fix #9054: remove gSceneryTileElement by returning it within GameActionResult

* fixing Clang-format issues

* fixing clang-format

lets try this again...

* fixing clang-format

alright should be good this time

* fixing clang-format issues

using automatic clang-formatting

* initializing tileElement
2019-04-24 09:42:00 +01:00
Duncan
3f4acd7e69
Merge pull request #9120 from Gymnasiast/fix/8079
Fix #8079: Crash when unloading buggy custom rides
2019-04-23 18:28:34 +01:00
Nicole
d38fb6a7a2 Fix #8800: ensure tile_element_height is used correctly (#9087)
* Changed calls to tile_element_height to tile_element_water_height

* Changes to calls to tile_element_height

* Removed tile element_height, map_get_highest_land_height, and map_get lowest_land_height

3 functions removed due to relocation.

* Added function tile_element_height back to map.cpp

Added tile_element height back to map.cpp. Was unnecessarily deleted.

* Update Map.h

* water_height changes

* Update Scenario.cpp

* Update Scenario.cpp

* Fix 8800: applied clang format

* Removed unnecessary ANDs
2019-04-23 18:26:48 +01:00
Gymnasiast
6d3eca31fd Add log_verbose for vehicle entries with broken peep loading positions 2019-04-22 23:27:25 +02:00
Hielke Morsink
ac7bc97736 Expose colour scheme in the tile inspector (#6116) 2019-04-22 15:49:09 +02:00
Trevor Harkness
700ebe646f Add new class in SmallSceneryPlaceAction def
Change to definition to refer to created SmallSceneryPlaceAction subclass instead of GameActionResult
2019-04-22 02:33:46 -04:00
duncanspumpkin
cc2da47271 Fix parameters 2019-04-21 20:06:55 +01:00
duncanspumpkin
228628b702 Undo 2nd mistake 2019-04-21 19:59:37 +01:00
duncanspumpkin
90a04e2758 Undo mistake. Remove pointless parameter 2019-04-21 19:56:18 +01:00
Duncan
46844e2218
Merge branch 'develop' into issue-9053 2019-04-21 19:50:20 +01:00
Gymnasiast
ec6b738317 Fix #8079: Crash when unloading buggy custom rides 2019-04-21 12:13:04 +02:00
Hielke Morsink
bcaa856911
Merge pull request #9089 from Broxzier/bugfix/9083-ghost-banner-index
Fix #9083: Wrong sign index is set for clients
2019-04-21 10:26:05 +02:00
Michael Steenbeek
5a906b2378
Port more functions to Ride struct (#9119) 2019-04-20 22:22:39 +02:00
Michael Steenbeek
42a1a8704d
Use empty() for vectors; clean up bool comparisons (#9118) 2019-04-20 20:39:47 +02:00
Gymnasiast
61a402b913 Fix formatting 2019-04-20 19:19:33 +02:00
hokasha2016
6022521118 Fix #7871: String::StartsWith() returns true if source is shorter than match 2019-04-20 18:55:27 +02:00
Gymnasiast
28ad78f204 Allow entry of numbers up to 10 million in string_to_money 2019-04-20 18:42:06 +02:00
Gymnasiast
abf416a5a9 Fix string_to_money rounding errors in 4.10, 5.10... 2019-04-20 18:37:50 +02:00
Hielke Morsink
71af88fc5c Bump network version 2019-04-20 14:47:45 +02:00
duncanspumpkin
8035127acd Allocate banner index in the constructor.
Note this does not fix the issue as ghosts still break placement
2019-04-20 00:05:04 +02:00
Trevor Harkness
0dfa079002 Fix remaining formatting issue
Remaining formatting error adjusted in SmallSceneryPlaceAction for CI tests
2019-04-19 02:38:38 -04:00
Trevor Harkness
844a28f3f5 Fix formatting and added to contributors.md
Adjusted formatting for CI tests
2019-04-19 02:18:55 -04:00
Trevor Harkness
6df19daa02 Remove comments from subclass 2019-04-17 23:03:37 -04:00
Trevor Harkness
8cb50432de Fix #9053. Remove instances of gSceneryGroundFlags
Created subclass of GameActionResult in LargeSceneryPlaceAction and SmallSceneryPlaceAction. Removed references to global variable in other files.
2019-04-17 22:55:37 -04:00
Hielke Morsink
70fc620ebe Fix #9083: Wrong sign index is set for clients
This issue was caused by the ghost for banners, which already create an entry on the banner. The game command is then received while the ghost still exists, giving the placed banner another ID.
This fix is basically a copy of the fix that is also `game_do_command_p` that tackles this same issue.
2019-04-16 20:26:42 +02:00
Florian Will
6e9a9448a2 Fix format issue, second attempt
Let's see if I can get this right.
2019-04-15 16:10:57 +02:00
Florian Will
35ff10e480 Fix format issue and add myself to contributors.md 2019-04-15 15:51:01 +02:00
Florian Will
eb6ea8e81d Fix #5893: Invalidate widget only if it's visible
Remove the widget_invalidate() call after changing a guest's
guest_heading_to_ride_id, because that call fails a debug assertion if
the guest window is open and the currently active tab is not the
"overview" tab. In Release builds (if assertion is disabled),
widget_invalidate() might access the widgets array out of bounds.

Instead, introduce a new flag PEEP_INVALIDATE_PEEP_ACTION for
window_invalidate_flags in the peep struct and set that flag. The guest
window update function then makes sure to invalidate the label if the
flag is set.

The flag could be used in other places to reduce libopenrct2 dependency
on window_*() calls (see #6808), but this commit only cares about cases
where the assertion would fail.
2019-04-15 14:26:33 +02:00
Duncan
2515f8d6d2
Merge pull request #9082 from duncanspumpkin/fix_9079
Fix 9079
2019-04-09 20:05:38 +01:00
Duncan
e01b5f908a
Merge pull request #9070 from ZehMatt/fix-9068
Fix #9068: Unable to place staff or peeps during multiplayer
2019-04-09 20:05:21 +01:00
duncanspumpkin
0ffa6d1ae5 Increment network version 2019-04-09 18:46:31 +01:00
duncanspumpkin
e2e4c1d942 Fix #9079. Null derference checked for when getting banner element.
Unsure how the save managed to get in this state
2019-04-09 18:39:33 +01:00
duncanspumpkin
2e104a00c8 Increment network version 2019-04-08 17:19:58 +01:00
duncanspumpkin
d6522f0aee Fix formatting 2019-04-08 17:19:52 +01:00
duncanspumpkin
d40a22e32b Make suggested changes 2019-04-07 15:11:03 +01:00
duncanspumpkin
b7c3324bae Include missing include 2019-04-07 14:55:08 +01:00
duncanspumpkin
baad532c17 Fix formatting 2019-04-07 14:55:08 +01:00
duncanspumpkin
00cbd75641 Return more useful error messages.
Fix clearance checks always being on for underground placement
2019-04-07 14:55:08 +01:00
duncanspumpkin
d63919c0cc Implement LargeSceneryPlaceAction 2019-04-07 14:55:07 +01:00
Matt
7c901addc6 Fix #9068: Unable to place staff or peeps during multiplayer 2019-04-07 14:12:23 +02:00
duncanspumpkin
57efe286cf Increment network version 2019-04-07 12:24:02 +01:00
duncanspumpkin
008ed86bca Make requested fixes 2019-04-07 12:02:04 +01:00
duncanspumpkin
aa65e25c6b Implement banner set style action 2019-04-07 10:10:36 +01:00
duncanspumpkin
3593366e95 Implement banner set colour action 2019-04-07 09:22:39 +01:00
duncanspumpkin
5ab42488a9 Implement large scenery set colour action 2019-04-07 09:22:33 +01:00
duncanspumpkin
8ef5afe2ce Implement wall set colour action 2019-04-06 19:39:01 +01:00
duncanspumpkin
8fc1d70239 Implement small scenery set colour action 2019-04-06 19:39:00 +01:00
duncanspumpkin
63f9e3dbb4 Set tertiary colour correctly 2019-04-06 18:56:44 +01:00
duncanspumpkin
3e9356857f Fix wall placement in track designs.
X and Y values go a bit screwey in ride previews. So you need to override there check.
Also fixed the wall from nesting the command wrong
2019-04-06 18:06:40 +01:00
duncanspumpkin
cee953f899 Fix #9042. Pass the flags to wall placement when in track design mode 2019-04-04 19:23:44 +01:00
duncanspumpkin
eedb24700d Fix #8535, #8480. Unintialised variable used to get path object.
When you try to mirror a track design that has a path object type that isn't loaded it will try to pass an uninitialised variable as the index of the path object. This will cause a bad pointer to be generated. Fix was to auto set it to zero and to be super careful reset it again to zero in the case when its not available
2019-04-04 19:23:44 +01:00
duncanspumpkin
5280728760 Fix formatting 2019-04-04 19:23:44 +01:00
duncanspumpkin
356a0e5e91 Rework flags 2019-04-04 19:23:44 +01:00
duncanspumpkin
06645f6a0d Further small refactor. Name Game_command_flag_5 2019-04-04 19:23:44 +01:00
duncanspumpkin
561ce03d18 Fix formatting 2019-04-04 19:23:44 +01:00
duncanspumpkin
30a5194085 Use a vector for map selection tiles 2019-04-04 19:23:44 +01:00
duncanspumpkin
7b2363f0ef Refactor further 2019-04-04 19:23:43 +01:00
duncanspumpkin
f7c84fff60 Split scenery place into multiple functions 2019-04-04 19:23:38 +01:00
duncanspumpkin
9f80a16353 Further rename 2019-04-04 18:58:52 +01:00
duncanspumpkin
2320cd169f Rename PTD enum 2019-04-04 18:58:52 +01:00
ζeh Matt
62f163a67d Don't enable multithreading option by default. (#9039) 2019-04-04 12:11:37 +02:00
anon569
3efdcdef43 Hungarian Forint fix (#9043)
https://en.wikipedia.org/wiki/Hungarian_forint
"The Hungarian abbreviation for forint is Ft, which is written after the number with a space between."
2019-04-04 08:01:21 +01:00
hokasha2016
1ff1f6d126 Add the Hungarian Forint (HUF) to the list of available currencies. (#9017) 2019-04-03 00:04:22 +02:00
Michał Janiszewski
2fb31910ca
Merge pull request #8481 from ZehMatt/multicore-rendering
Implement partial multicore rendering
2019-04-02 22:08:46 +02:00
Matt
c520b0061e Refactor large_scenery_sign_fit_text to not return static local. 2019-04-02 20:14:50 +02:00
Matt
4e264bd45d Use mutex to protect scrolling banner cache from data race 2019-04-02 20:14:50 +02:00
duncanspumpkin
c8523b18b9 One more null check 2019-04-02 19:08:06 +01:00
duncanspumpkin
78527f7af4 Extra checks for nullptrs and bad values 2019-04-02 18:52:52 +01:00
duncanspumpkin
09875311b3 Increment network version 2019-04-02 18:36:57 +01:00
duncanspumpkin
7e6254f30c Fix function. 2019-04-02 18:36:57 +01:00
duncanspumpkin
29f5018bd1 Implement wall place game action 2019-04-02 18:36:57 +01:00
Gymnasiast
9839bb7bba Fix path preview
More work is needed to properly split the paths, but this will do for now.
2019-04-01 21:58:57 +02:00
Michael Steenbeek
b618bbdcd4
Implement GameAction for setting date 2019-03-31 19:48:51 +02:00
Matt
1153b97ace Use thread_local to protect globals from data race 2019-03-31 17:15:15 +02:00
Matt
4b1e7c3dd2 Remove _unk9E32BC from global scope and make it local 2019-03-31 17:15:15 +02:00
Matt
383ded68e9 Cleanup 2019-03-31 15:50:55 +02:00
Matt
65ef018e4e Move paint_session_alloc and paint_session_free into Painter. 2019-03-31 15:50:55 +02:00
Matt
db96df010f Expose Painter in Context 2019-03-31 15:50:55 +02:00
Matt
37c3809744 Implement partial multicore rendering 2019-03-31 15:50:55 +02:00
ζeh Matt
521b78390f Fix #8909: Potential crash when invoking game actions as server 2019-03-31 14:42:47 +02:00
ζeh Matt
0b41c0f9a1 Fix #8988: Improve lookups for codepoint offsets 2019-03-30 21:50:49 +01:00
Michael Steenbeek
8d83f5a549
Merge pull request #8978 from Gymnasiast/refactor/inversions
Close #8965: Refactor ride->inversions
2019-03-28 20:28:35 +01:00
Duncan
c01cfbdc26
Merge pull request #8902 from duncanspumpkin/land_smooth_ga
Land Smooth Game Action
2019-03-28 19:10:30 +00:00
Michael Steenbeek
a50c7836f8
Move more ride functions to struct methods (#8977) 2019-03-27 21:53:38 +01:00
Gymnasiast
731af74732 Cast after std::min 2019-03-27 21:49:10 +01:00
Michael Steenbeek
ec3d757854
Fix #5905: Urban Park MGR has entrance/exit swapped 2019-03-27 20:53:48 +01:00
Michael Steenbeek
bbf523e829
Fix #8537: Imported RCT1 rides/shops are all numbered 1 2019-03-27 20:07:13 +01:00
duncanspumpkin
9b4bc97826 Increment network version 2019-03-27 18:49:19 +00:00
duncanspumpkin
68bf1bc464 Make requested changes 2019-03-27 18:48:26 +00:00
duncanspumpkin
95b7a90c55 Refactor function names and variables 2019-03-27 18:48:26 +00:00
duncanspumpkin
cc57de791a Fix formatting. Add correct headers 2019-03-27 18:48:26 +00:00
duncanspumpkin
227786e05b Remove game command 2019-03-27 18:48:26 +00:00
duncanspumpkin
81307f71df Implement LandSmoothAction 2019-03-27 18:48:26 +00:00
Gymnasiast
a27e04e5a3 Limit inversions and holes to 31 (for now) 2019-03-27 19:44:46 +01:00
Gymnasiast
a3a1028385 Drop bitmask from TrackShelteredEighths comparisons 2019-03-27 19:44:33 +01:00
Gymnasiast
bc0b0fe231 Increase argument size of get_inversions_ratings() 2019-03-27 15:57:17 +01:00
Gymnasiast
921e426605 Increase size of inversions and holes to uint16_t 2019-03-27 15:55:34 +01:00
Gymnasiast
44da799afd Modify return type of get_num_of_sheltered_eighths() 2019-03-27 15:52:18 +01:00
Gymnasiast
ba404338cc Max out inversions value instead of truncating 2019-03-27 14:02:32 +01:00
Gymnasiast
2a99c42242 Fix code to determine number of golf holes 2019-03-27 12:53:15 +01:00
ζeh Matt
31d32caf8c Fix #8972: Master server unable to query game info 2019-03-27 11:30:41 +01:00
Gymnasiast
64e51cd34b Close #8965: Refactor ride->inversions 2019-03-27 11:30:18 +01:00
Michael Steenbeek
d88d80335d
Fix #8882: Submarine Ride does not count as indoors (#8964) 2019-03-27 10:09:14 +01:00
Gymnasiast
7f045918e1 Fix formatting 2019-03-27 10:06:25 +01:00
Gymnasiast
bbfa2570d5 Switch Czech to sprite font 2019-03-27 10:06:25 +01:00
Gymnasiast
ff12d5c202 Add Z with caron 2019-03-27 10:06:25 +01:00
Gymnasiast
cf65d01ac0 Add U with ring 2019-03-27 10:06:25 +01:00
Gymnasiast
ef5472c566 Add S with caron 2019-03-27 10:06:25 +01:00
Gymnasiast
fd1f763b83 Add R with caron 2019-03-27 10:06:25 +01:00
Gymnasiast
43d4a20b79 Add N with caron 2019-03-27 10:06:25 +01:00
Nazey
047fa65a66 Fix #8942: Water level is raised abnormally (#8971) 2019-03-26 17:34:30 +01:00
Michael Steenbeek
c841ee31e7
Remove more remains of scenario description from Object Selection window 2019-03-25 17:21:53 +01:00
Michael Steenbeek
cf913d1419
Remove two unused functions 2019-03-25 15:56:40 +01:00
ζeh Matt
d41822e0f5 Network relevant player info on changes 2019-03-24 23:16:57 +01:00
Ben Hopkins
c537f87fd5 Add scenery picker shortcut 2019-03-24 22:45:42 +01:00
Gymnasiast
262a9f29e8 Fix formatting 2019-03-24 22:24:40 +01:00
ζeh Matt
184d95c720 Fix #8947: Detection of AVX2 support 2019-03-24 21:53:54 +01:00
Duncan
791c3059f6 Add ParkEntranceRemove GameAction 2019-03-24 21:41:14 +01:00
Nazey
9cbc308c40 Remove gTrackGroundFlags by returning it within GameActionResult (#8930)
Fix #8726
2019-03-24 19:48:37 +00:00
Matt
c0cd1aaef3 Exclude host from rate limiting. 2019-03-22 08:06:54 +01:00
Matt
097ed015d8 Add cooldown time for SmallSceneryPlaceAction 2019-03-22 08:06:54 +01:00
Matt
cfe2fb939e Add cooldown time to RideDemolishAction 2019-03-22 08:06:54 +01:00
Matt
7be312c4c6 Implement rate limiting times for game actions. 2019-03-22 08:06:54 +01:00
Michael Steenbeek
df687ac59c
Merge pull request #8928 from AaronVanGeffen/scenario-editor-cheats
Make cheats menu partially accessible in scenario editor
2019-03-21 17:42:20 +01:00
Aaron van Geffen
f4602d0a34 Use SCREEN_FLAGS_EDITOR when appropriate. 2019-03-20 20:58:08 +01:00
Duncan
476f392eeb
Merge pull request #8919 from duncanspumpkin/console_set_price
Console command to set price of all rides of type
2019-03-20 19:13:19 +00:00
Michael Steenbeek
1c570c8eec
Move some ride functions to struct methods 2019-03-20 20:05:25 +01:00
duncanspumpkin
320c88df99 Make requested changes 2019-03-20 18:48:01 +00:00
Gymnasiast
511dd44f6b Bump network version 2019-03-20 16:57:22 +01:00
Gymnasiast
aa21f0fb1d Prepare for food/drink stall recolouration 2019-03-19 22:55:28 +01:00
Gymnasiast
79318997bc Remove old code for MEDIENTR 2019-03-19 22:21:06 +01:00
Gymnasiast
8b1330ec57 Add comment [ci skip] 2019-03-19 22:13:02 +01:00
Gymnasiast
14c2925ae5 Add import code to make Ice Cream Stalls light blue 2019-03-19 22:11:18 +01:00
Gymnasiast
59c74ead94 Add fallback for legacy objects 2019-03-19 21:20:31 +01:00
Gymnasiast
4f8548dfea Allow different default colours per stall 2019-03-19 21:20:31 +01:00
Michael Steenbeek
68aa5122fa
Fix #6006: Objects higher than 6 metres are considered trees 2019-03-18 22:56:14 +01:00
duncanspumpkin
d5fa7185ca Prevent a crash when bad data passed 2019-03-18 21:50:29 +00:00
duncanspumpkin
576976627e Use displayable character instead of pipe 2019-03-18 21:45:32 +00:00
duncanspumpkin
fb36d2b1f9 Set price of all rides from the console 2019-03-18 21:38:48 +00:00
duncanspumpkin
aa2f0a46d0 Increment network version 2019-03-18 20:01:30 +00:00
duncanspumpkin
add40feb57 Merge #8898 branch 'staff_ga' into game_actions 2019-03-18 20:00:34 +00:00
duncanspumpkin
351adcc88b Merge #8897 branch 'surface_set_style_ga' into game_actions 2019-03-18 19:58:21 +00:00
duncanspumpkin
f28be1ae30 Merge #8881 branch 'set_park_open' into game_actions 2019-03-18 19:57:50 +00:00
duncanspumpkin
329514a49c Merge #8900 branch 'zehmatt/mp-peep-flags-ga' into game_actions 2019-03-18 19:56:49 +00:00
Duncan
a9e9993ff5 Fix #8910. Staff patrol areas sharing id's. (#8912) 2019-03-17 23:18:56 +01:00
Matt
57283a4e2b Fix #8900: Implement GuestSetFlagsAction. 2019-03-17 22:17:04 +01:00
Michael Steenbeek
8bf693983a
Fix #7884: Unfinished preserved rides can be demolished with quick demolish 2019-03-17 16:55:17 +01:00
duncanspumpkin
e97428acc0 Make requested changes 2019-03-17 07:26:39 +00:00
duncanspumpkin
9fc464a322 Remove game command
Correct the copyright

Include correct headers
2019-03-17 07:20:37 +00:00
duncanspumpkin
c9332b4c5d Use the game action. Fix issues with it 2019-03-17 07:20:36 +00:00
duncanspumpkin
2457feb6ab Create surface set style action 2019-03-17 07:20:36 +00:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
ζeh Matt
cb88c713c3
Merge pull request #8896 from duncanspumpkin/fix_8885
Fix #8885. Incorrect function for calculating lowest water height.
2019-03-16 13:55:32 -07:00
ζeh Matt
3b69c1c75e Fix #8055: Ignore rendering specific fields for sprite checksum. (#8895) 2019-03-16 21:53:26 +01:00
duncanspumpkin
ca92d63b20 Put the correct copyright date on 2019-03-16 20:50:00 +00:00
duncanspumpkin
0b231c8b38 Remove old game commands 2019-03-16 20:47:54 +00:00
duncanspumpkin
77238c1e5e Add staff set patrol area and fire actions 2019-03-16 20:45:52 +00:00
duncanspumpkin
1274a3fae4 Fix #8885. Incorrect function for calculating lowest water height.
Looks like a good old ctrl+c, ctrl+v and then forgot to actually modify it correctly.
2019-03-16 20:08:57 +00:00
duncanspumpkin
cb087e3b4e Fix formatting. Initialise to bad value 2019-03-16 16:41:18 +00:00
duncanspumpkin
6c92594c4b Use wall element as return 2019-03-16 16:35:30 +00:00
duncanspumpkin
2c2239b131 Use small scenery element as return 2019-03-16 16:29:02 +00:00
duncanspumpkin
c80c7b5cd2 Use LargeSceneryElement for return type 2019-03-16 16:23:26 +00:00
Gymnasiast
7e2ff6d752 Fix alignment 2019-03-16 15:43:36 +01:00
Michael Steenbeek
6884eac24c
Turn railing support type into enum class 2019-03-16 14:21:44 +01:00
Michael Steenbeek
1c0877fc6c
Fix missed occurrence of SCROLLING_MODE_NONE 2019-03-16 14:20:03 +01:00
Michael Steenbeek
602821a389
Split path surface objects into paths and queues 2019-03-16 12:37:32 +01:00
Duncan
9c4430736d
Use get track element (#8884)
* Use get_track_element and change its return type

* Make things work

* Use helper functions where possible
2019-03-16 11:21:36 +00:00
Duncan
adf440ed1f
Merge pull request #8874 from ZehMatt/fix-8873
Fix #8873: null dereference when trying to place footpath.
2019-03-16 07:40:48 +00:00
Duncan
296a0e3d35
Merge pull request #8879 from ZehMatt/ga-player-error
Fix #8851: Show only game action errors to the issuer.
2019-03-16 07:40:08 +00:00
duncanspumpkin
24e9428731 Use 64bit values to simplify code 2019-03-16 07:33:21 +00:00
duncanspumpkin
78ede8758b Add a default to the switch 2019-03-16 07:15:12 +00:00
Phillip Walters
0e50d438d7 Added console logging for failed map saves 2019-03-15 20:35:41 -07:00
duncanspumpkin
9a1532ecc4 Add ParkSetParameterAction 2019-03-15 21:01:35 +00:00
Matt
2090cbefae Fix #8851: Show only game action errors to the issuer. 2019-03-15 21:27:51 +01:00
duncanspumpkin
0c46475d07 Increment network version 2019-03-15 20:12:10 +00:00
duncanspumpkin
cd6c9b7b15 Fix set brakes speed action 2019-03-15 20:11:06 +00:00
duncanspumpkin
edff5caa7e Merge pull request #8849 'ga-staff-hire' 2019-03-15 19:49:24 +00:00
duncanspumpkin
fa0feb18d0 Merge pull request #8852 'track_set_brake_speed' 2019-03-15 19:46:19 +00:00
duncanspumpkin
cdabb7c388 Use continue to prevent nested brackets 2019-03-15 19:44:17 +00:00
duncanspumpkin
3ed08f8977 Fix formatting. Add missing header 2019-03-15 19:44:17 +00:00
duncanspumpkin
d8f764723f Remove old game command 2019-03-15 19:44:17 +00:00
duncanspumpkin
c84927306e Implement land/water lower raise 2019-03-15 19:44:17 +00:00
Duncan
82f320eb24
Merge pull request #8830 from duncanspumpkin/path_from_track
Footpath Place From Track Game Action
2019-03-15 19:42:30 +00:00
Matt
126ffd104e Fix #8873: null dereference when trying to place footpath. 2019-03-15 19:31:04 +01:00
Matt
3c8480ee26 Remove unused variables and strip unused DEBUG_DESYNC paths. 2019-03-14 13:43:49 +01:00
Matt
b249928222 Buffer tick data so client can catch up. 2019-03-14 13:43:49 +01:00
Matt
258f2722d7 Bump up network version. 2019-03-14 13:43:49 +01:00
Matt
8f7cf5fcc9 Check desyncs only when the map is fully loaded. 2019-03-14 13:42:15 +01:00
Matt
7410c4b56c Use real server tick to check desyncs. 2019-03-14 13:42:15 +01:00
Michał Janiszewski
298c9f5238 Release 0.2.2
- Feature: [#4418] Allow steep slopes on the side-friction roller coaster.
- Feature: [#7726] Add shortcut to advance one tick.
- Feature: [#7956, #7964] Add sprite font glyphs for Hungarian and some Czech letters.
- Feature: [#7971] Toolbox option to open custom content folder.
- Feature: [#7980] Allow data path for RCT1 to be specified by a command line argument.
- Feature: [#8073] Auto-upload minidumps to backtrace.io (optional, MSVC/Windows only)
- Feature: [#8078] Add save_park command to in-game console.
- Feature: [#8080] New console variable "current_rotation" to get or set view rotation.
- Feature: [#8098] Glyph for Russian rouble sign.
- Feature: [#8099] Add Powered Launch mode to Inverted RC (for RCT1 parity).
- Feature: [#8190] Allow building footpaths on 'corner down' terrain.
- Feature: [#8191] Allow building on-ride photos and water S-bends on the Water Coaster.
- Feature: [#8259] Add say command to in-game console.
- Feature: [#8374] Add replay system.
- Feature: [#8377] Add option to adjust amount of autosaves to keep.
- Feature: [#8458] Add sprite sorting benchmark.
- Feature: [#8583] Add boosters to water coaster.
- Feature: [#8648] Add optional chat button to top toolbar in multiplayer games.
- Feature: [#8652] Add network window including a graph for data usage visualisation.
- Feature: [#8670] Add ability to download missing objects when loading a park.
- Change: [#7961] Add new object types: station, terrain surface, and terrain edge.
- Change: [#8222] The climate setting has been moved from objective options to scenario options.
- Change: [#8718] Allow TARMAC object to be removed when running the `remove_unused_objects` command.
- Change: [#8718] No longer require the generic scenery groups and tarmac footpath to be checked when creating a scenario.
- Change: [#8734] Disable kick button in multiplayer window when unable to use it.
- Fix: [#3832] Changing the colour scheme of track pieces does not work in multiplayer.
- Fix: [#4094] Coasters with long flat-to-steep pieces offer them in diagonal mode (original bug).
- Fix: [#5684] Player list can desync between clients and server and can crash.
- Fix: [#6191] OpenRCT2 fails to run when the path has an emoji in it.
- Fix: [#7439] Placement messages have mixed strings
- Fix: [#7473] Disabling sound effects also disables "Disable audio on focus loss".
- Fix: [#7536] Android builds fail to start.
- Fix: [#7689] Deleting 0-tile maze gives a MONEY32_UNDEFINED (negative) refund.
- Fix: [#7828] Copied entrances and exits stay when demolishing ride.
- Fix: [#7945] Client IP address is logged as `(null)` in server logs.
- Fix: [#7952] Performance drop caused by code refactor.
- Fix: [#7954] Key validation fails on Windows due to non-ASCII user / player name.
- Fix: [#7975] Inspection flag not cleared for rides which are set to never be inspected (original bug).
- Fix: [#7985] Giant Screenshot ignores 'Map rendering' settings.
- Fix: [#7987] Broken track designs increase money by MONEY32_UNDEFINED.
- Fix: [#7991] Scenery and footpaths on Construction Rights tiles can be deleted using Clear Scenery.
- Fix: [#8034] Vanilla sprites are broken when making screenshots from command line.
- Fix: [#8045] Crash when switching between languages.
- Fix: [#8062] In multiplayer warnings for unstable cheats are shown when disabling them.
- Fix: [#8090] Maze designs saved incorrectly.
- Fix: [#8101] Title sequences window flashes after opening.
- Fix: [#8120] Crash trying to place peep spawn outside of map.
- Fix: [#8121] Crash Renaming park with server logging enabled.
- Fix: [#8139] Buying land costs money when the game is in "no money" mode.
- Fix: [#8141] Attempting to build entrance/exit on station 2 does not work.
- Fix: [#8142] Reliability of mazes and crooked houses can go below 100%.
- Fix: [#8187] Cannot set land ownership over ride entrances or exits in sandbox mode.
- Fix: [#8200] Incorrect behaviour when removing entrances and exits that are on the same tile.
- Fix: [#8204] Crash when tile element has no surface elements.
- Fix: [#8264] Rides and scenery placeable outside of map with ZC and Sandbox mode enabled.
- Fix: [#8335] Rides with arbitrary ride types can crash the game when they break down.
- Fix: [#8358] Infinite loop when changing vehicle count on stopped ride.
- Fix: [#8402] Crash closing a window in some cases.
- Fix: [#8431] Crash when game action logging is enabled.
- Fix: [#8433] Crash if master server response is not valid JSON.
- Fix: [#8434] Crash if curl_easy_init fails.
- Fix: [#8443] Crash when selecting the current vehicle for ride that has none available.
- Fix: [#8456] Junior booster track piece doesn't connect properly.
- Fix: [#8464] Crash on game shutdown.
- Fix: [#8469] Crash modifying colour on hacked rides.
- Fix: [#8508] Underground roto-drop is not going up.
- Fix: [#8555] Multiplayer window text limits are not computed properly.
- Fix: [#8572] Steel Twister track pieces ID 64 and 65 drawn incorrectly.
- Fix: [#8585] Part of track missing on air powered vertical coaster.
- Fix: [#8588] Guest list scrolling breaks above ~2000 guests.
- Fix: [#8591] Game loop does not run at a consistent tick rate of 40 Hz.
- Fix: [#8647] Marketing campaigns check for entry fees below £1 (original bug).
- Fix: [#8653] Crash when peeps attempt to enter a ride with no vehicles.
- Fix: [#8720] Desync due to boats colliding with ghost pieces.
- Fix: [#8739] Savegame from original game crashes when cruising through map.
- Fix: [#8742] Access violation in vehicle_update_sound_params.
- Fix: [#8804] Raising water shows money effect at the bottom rather than new height.
- Fix: [#8811] Some fields in the sv6 save file not being copied correctly.
- Fix: [#8824] Invalid read in footpath_chain_ride_queue.
- Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only).
- Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab.
- Improved: [#7930] Automatically create folders for custom content.
- Improved: [#7980] Show the full path of the scenario in the scenario select window.
- Improved: [#7993] Allow assigning a keyboard shortcut for opening the tile inspector.
- Improved: [#8107] Support Discord release of RCT2.
- Improved: [#8491] Highlight entrance and exit with different colours in track design previews.
- Improved: Almost completely new Hungarian translation.
- Removed: [#7929] Support for scenario text objects.
2019-03-13 21:51:10 +01:00
duncanspumpkin
6daa406138 Actually register it. Include correct header. Fix formatting 2019-03-12 17:29:38 +00:00
Duncan
5538fe3ac5
Merge pull request #8599 from janisozaur/fix-h2h7-r4-diamondheights
Add missing nullptr check in rct_peep::UpdateRideMazePathfinding
2019-03-12 11:19:04 +00:00
Michael Steenbeek
18ac3b02b1
Fix #8524: Do not show RCT1 land edges when CSG1 is not loaded (#8845) 2019-03-12 09:23:17 +01:00
duncanspumpkin
539c12b41a Remove old game command 2019-03-11 19:11:54 +00:00
duncanspumpkin
7fbf11ac79 Implement TrackSetBrakeSpeedAction 2019-03-11 19:08:07 +00:00
duncanspumpkin
da377e5b64 Add constants for min and max footpath height 2019-03-11 17:43:07 +00:00
Ted John
f4526dd2ae
Merge pull request #8837 from IntelOrca/fix/invalid-reads
Fix more of these backtrace reports
2019-03-11 16:31:21 +00:00
Matt
84d28f2967 Update error messages. 2019-03-11 17:02:29 +01:00
Matt
f8e98b4e3e Pass staff orders by parameter. 2019-03-11 16:54:46 +01:00
Matt
f96a1a1b5f Implement StaffHireNewAction game action. 2019-03-11 13:44:34 +01:00
duncanspumpkin
0b989710b5 Increment network version 2019-03-09 18:08:20 +00:00
duncanspumpkin
904bb0b6e9 Fix formatting 2019-03-09 18:07:52 +00:00
duncanspumpkin
a3703cf2c0 Fix #8736. Add error title to ride create 2019-03-09 18:07:52 +00:00
duncanspumpkin
63e7f7a990 Use correct error messages with can_construct_with_clear
Pass correct parameters to the function
2019-03-09 18:07:52 +00:00
Ted John
ca023f7c5e Fix #8829: invalid read in window_guest_open 2019-03-09 13:05:12 +00:00
Matt
e9523caeb4 Bump up network version. 2019-03-09 13:58:49 +01:00
Matt
d7a4570a1c Fix #8802: public key signature being null terminated. 2019-03-09 13:58:23 +01:00
Ted John
f5904c90cb Fix #8834: Invalid read in UpdateRideApproachExitWaypoints 2019-03-09 11:36:53 +00:00
Ted John
0aade935aa
Fix #8824: invalid read in footpath_chain_ride_queue (#8831) 2019-03-06 19:11:21 +00:00
duncanspumpkin
0070283dc2 Implement game action 2019-03-05 19:54:17 +00:00
duncanspumpkin
cfeeeab9b9 Increment network version 2019-03-04 16:58:57 +00:00
duncanspumpkin
da24ea53b8 Fix formating add missing include 2019-03-04 16:58:22 +00:00
duncanspumpkin
540be7c7be Provide a conversion from old game command.
Note doesn't handle footpath scenery or clear direction mode
2019-03-04 16:57:21 +00:00
duncanspumpkin
29de97f5b1 Remove references to old game command 2019-03-04 16:57:21 +00:00
duncanspumpkin
bcced4016f Use new action 2019-03-04 16:57:21 +00:00
duncanspumpkin
c8fd5174ae Implement footpathplace 2019-03-04 16:57:21 +00:00
duncanspumpkin
510d71ab68 Add FootpathSceneryPlaceAction 2019-03-04 16:57:21 +00:00
duncanspumpkin
ef69c01da5 Create FootpathSceneryRemoveAction to split up footpath place 2019-03-04 16:57:21 +00:00
Michał Janiszewski
1fa5606509
Simplify some code in Vehicle.cpp (#8595)
* Simplify some code in Vehicle.cpp

This reduces amount of code that depends on registers struct

* Simplify code in Vehicle.cpp

This removes one goto.
2019-03-03 15:25:47 +01:00
Aaron van Geffen
a6773584b0 Amend changelog; increase network version. 2019-03-03 12:09:19 +01:00
duncanspumpkin
e4ab16acc1 Fix #8804: Raising water shows money effect at the bottom rather than new height 2019-03-03 11:17:21 +01:00
Michał Janiszewski
a2bfb77b4a Make sure the header-only function direction_valid is static 2019-03-03 08:18:15 +01:00
Michał Janiszewski
f83fa88512 Fix printing of non-POD NetworkRideId_t
The underlying type is using int32_t rather than uint32_t, so reflect
that as well
2019-03-03 08:18:15 +01:00
duncanspumpkin
47de289ca2 Increment network version 2019-03-02 16:06:44 +00:00
duncanspumpkin
7484b3f00e Fix formating. Add correct includes 2019-03-02 16:06:03 +00:00
duncanspumpkin
aef3f24178 Remove reference to game command 2019-03-02 16:06:03 +00:00
duncanspumpkin
61cb84e0ca Add WaterSetHeightAction 2019-03-02 16:06:03 +00:00
Duncan
ec60781a2b
Merge pull request #8796 from duncanspumpkin/entranceexit_place_ga
Entranceexit place ga
2019-03-02 16:04:01 +00:00
Duncan
46ae0934f8 Fix #8809. Check for valid colours ignored special cases (#8813)
Due to the special cases the colour check would fail and this would mean that the ride type could not be changed. 255 and 0 are both used to indicate that the ride should use different colours for each train.
2019-03-02 12:51:27 +01:00
Tom Lankhorst
c951118eb0
Corrected order of finding and linking 2019-03-02 09:48:04 +01:00
Tom Lankhorst
68eec6bb5d
Include OpenSSL when not DISABLE_NETWORK/DISABLE_HTTP 2019-03-02 09:24:54 +01:00
Tom Lankhorst
44d4783309
Split linking cURL and SSL 2019-03-02 09:23:13 +01:00
Tom Lankhorst
49d36926b4
Move find_package benchmark to appropriate place 2019-03-02 09:21:19 +01:00
Tom Lankhorst
73c8a0a4a8
Require curl include when not DISABLE_HTTP 2019-03-02 09:20:25 +01:00
Tom Lankhorst
e7d875dd04
Always link threads, fix linking cURL
Threads are currently used throughout the codebase so they need to be
required. CURL is required when using HTTP, not when using Networking.
2019-03-02 09:00:49 +01:00
duncanspumpkin
87a21d6cda Increment network version 2019-03-02 07:25:28 +00:00
duncanspumpkin
e128a78b91 Fix formating and other issues
Refactor as per comments.

Simplified some of the code as well

Use constants
2019-03-02 07:24:42 +00:00
duncanspumpkin
c55ff1288d Add conversion from old command 2019-03-02 07:24:42 +00:00
duncanspumpkin
f10391c98d Remove references to old command 2019-03-02 07:24:42 +00:00
duncanspumpkin
7f586f50e1 Move all callees to the game action framework. Fix CoordXY bug 2019-03-02 07:24:41 +00:00
duncanspumpkin
27046c2468 Simplify game action by creating seperate function for track design ptd1 2019-03-02 07:24:41 +00:00
duncanspumpkin
6081aa4720 Create place game action 2019-03-02 07:24:41 +00:00
ζeh Matt
e776faee97
Merge pull request #8812 from ZehMatt/import-export-fixes
Fix #8811: Import export fields not copied correctly.
2019-03-02 07:47:36 +01:00
Matt
538526f075 Bump up network version. 2019-03-02 04:51:20 +01:00
Matt
8b6012a44b Add missing field "no_of_food" to importer/exporter. 2019-03-02 04:46:31 +01:00
Matt
5f6ae6ac8c Fix copying the wrong field. 2019-03-02 04:45:47 +01:00
ζeh Matt
dcf750f004
Merge pull request #8805 from ZehMatt/ga-toplevel-pause
Fix nested query not working in paused game state.
2019-03-01 10:56:57 +01:00
Matt
df5dfa6863 Bump up network version. 2019-03-01 10:21:09 +01:00
Matt
6350a3b0b4 Fix nested query not working in paused game state. 2019-03-01 08:26:03 +01:00
ζeh Matt
4805c1c082
Merge pull request #8801 from ZehMatt/mp-playerinfo
Synchronize player info
2019-02-28 20:41:00 +01:00
Ted John
cdec457abd Refactor peep struct 2019-02-28 20:28:58 +01:00
Matt
d14b07a748 Bump up network version. 2019-02-28 20:15:32 +01:00
Matt
0000e9741f Fix #8798: Player info not being synchronized over network. 2019-02-28 20:15:11 +01:00
duncanspumpkin
6c91d54255 Increment network version 2019-02-28 09:13:11 +00:00
duncanspumpkin
5d82760cf0 Use more sensible flags 2019-02-28 08:22:52 +00:00
duncanspumpkin
1565982f18 Fix formating 2019-02-28 08:22:52 +00:00
duncanspumpkin
7fdc482e7d Make review changes. Fix formating 2019-02-28 08:21:58 +00:00
duncanspumpkin
245a7fe64d Remove old game command 2019-02-28 08:21:58 +00:00
duncanspumpkin
f4791f9d96 Remove allow while paused 2019-02-28 08:21:58 +00:00
duncanspumpkin
705fe17362 Implement RideEntranceExitRemoveAction
Move all calls to the game action framework
2019-02-28 08:21:58 +00:00
Duncan
8ed824f285
Merge pull request #8773 from duncanspumpkin/scenery_place_ga
Implement SmallSceneryPlaceAction
Fix #8793, Fix #8787
2019-02-28 08:21:02 +00:00
duncanspumpkin
de1ec264b0 Increment network version 2019-02-28 08:03:00 +00:00
Duncan
f0092b7aae
Merge pull request #8781 from duncanspumpkin/flag_refactor
Flag refactor
2019-02-27 19:18:02 +00:00
duncanspumpkin
cbb02ec98a Use game action for track design. Fix error titles.
Add files to xcode project (#20)

Finally get the placement code working

Use game action for ghosts. Fix basequarter

Remove references to old command

Fix formating remove unused var

Fix clang format
2019-02-27 18:51:54 +00:00
duncanspumpkin
4714350216 Implement SmallSceneryPlaceAction 2019-02-27 18:46:51 +00:00
jensj12
89066759eb Fix #8264: Rides and scenery placeable outside of map with ZC and Sandbox mode enabled (#8715)
* Fix #8264: Rides and scenery placeable outside of map with ZC and Sandbox mode enabled

map_can_construct_with_clear_at first checks whether it is inside the map, and then checks gCheatsDisableClearanceChecks, making earlier checks for gCheatsDisableClearanceChecks unnecessary.

* Increase network version
2019-02-27 18:46:18 +00:00
Michael Steenbeek
6d3200aacc
Merge pull request #8772 from IntelOrca/refactor/sprite-import-export-2
Refactor in-game sprite structs
2019-02-27 13:29:13 +01:00
duncanspumpkin
9d78bb0d4e Fix compile and formating 2019-02-27 10:54:08 +00:00
duncanspumpkin
584c4d5134 Prevent a dereference of nullptr 2019-02-27 10:49:48 +00:00
duncanspumpkin
d3c0a76259 Use correct functions where defined 2019-02-27 10:49:48 +00:00
duncanspumpkin
47b0c779de Use correct function call.
SMALL_SCENERY_FLAG_ANIMATED is for SmallScenery not for SmallSceneryElements
2019-02-27 10:49:48 +00:00
duncanspumpkin
83f7547bf2 Use Is/Set BlockBrakeClosed 2019-02-27 10:49:48 +00:00
duncanspumpkin
92cdbfb0a8 Use Is/Set Indestructible 2019-02-27 10:49:48 +00:00
duncanspumpkin
411e5c47a2 Use Is/Set Accounted 2019-02-27 10:49:48 +00:00
duncanspumpkin
fae15fceca Use IsBroken 2019-02-27 10:49:48 +00:00
duncanspumpkin
7840f6a7f7 Use SetIsBroken 2019-02-27 10:49:48 +00:00
duncanspumpkin
6495ffdb34 Use IsBlockedByVehicle 2019-02-27 10:49:48 +00:00
duncanspumpkin
354cce71eb Introduce new functions to stop direct access 2019-02-27 10:49:48 +00:00
duncanspumpkin
c68af628c2 Increment network version 2019-02-27 10:18:52 +00:00
duncanspumpkin
93873c5e74 Make review changes. Fix formating
Reorder includes
2019-02-27 08:15:11 +00:00
duncanspumpkin
9d76c609f3 Provide conversion from gamecommand in replay manager 2019-02-27 08:15:11 +00:00
duncanspumpkin
e1977d1a2f Remove references to game command 2019-02-27 08:15:11 +00:00
duncanspumpkin
d01dfe44d5 Add RideSetSettingAction
Use game action for calling

Use correct error titles for operation mode changes
2019-02-27 08:15:07 +00:00
Ted John
aa7d181070 Define constants for vehicle type 2019-02-26 16:49:29 +00:00
duncanspumpkin
d5ad6b7b0f Move game command calls to a single call site 2019-02-26 12:47:44 +00:00
Michael Steenbeek
5b0367ea0e
Merge pull request #8774 from duncanspumpkin/ghost_refactor
Use IsGhost() to access ghost state
2019-02-26 12:46:16 +01:00
duncanspumpkin
eb9ecea92e Add IsGhost to the testpaint calls 2019-02-26 08:50:04 +00:00
duncanspumpkin
5facc32100 Increment network version 2019-02-26 08:15:32 +00:00
duncanspumpkin
07b372f4c6 Make review changes fix clang format 2019-02-26 08:14:57 +00:00
duncanspumpkin
c1546a92b7 Implement RideSetVehicleAction
Move all callees to the new action.
Required rework on how the ride type change worked.
2019-02-26 08:14:57 +00:00
Michał Janiszewski
b957ad5e9e
Remove redundant move (#8778) 2019-02-26 06:41:01 +01:00
Ted John
a3af56f285 Fix formatting 2019-02-25 22:31:14 +00:00
duncanspumpkin
112b40910b Pass a bool to the set function. Make review changes 2019-02-25 20:44:12 +00:00
Matt
f0366b84e4 Fix ride_shop_connected dereferencing null. 2019-02-25 20:58:41 +01:00
Ted John
bac3168a23 Refactor IsChild to IsHead 2019-02-25 17:58:22 +00:00
Ted John
ca807c5ed4 Refactor some IsChild references to GetHead 2019-02-25 17:51:25 +00:00
duncanspumpkin
737c308e4e Use IsGhost() to access ghost state
Added set and clear ghost to further prevent direct access to flags
2019-02-25 15:12:35 +00:00
duncanspumpkin
6890f4f756 Use quarter tile for map can construct at
Make callees of map_can_construct_with_clear use QuarterTile

Use quarter tile for small scenery rotation

Fix clang format

Further clang format
2019-02-25 13:51:08 +00:00
duncanspumpkin
f9fe09634c Move quarter tile class to the tile element header.
Refactor flags slightly
2019-02-25 13:51:07 +00:00
duncanspumpkin
921062d073 Start transferring trackdata to use the seperate values
Finish the conversion
2019-02-25 13:51:04 +00:00
duncanspumpkin
dffa56aca2 Create a class for the quarter tile
Finish implementing TrackQuarterTile

Rename class
2019-02-25 13:51:00 +00:00
Ted John
520b1b4819 Try out changed sprite structs for main game 2019-02-25 12:29:31 +00:00
Ted John
08e560da28
Merge pull request #8735 from IntelOrca/refactor/sprite-import-export
Refactor sprite import / export
2019-02-25 12:25:59 +00:00
Duncan
94b5133388
Merge pull request #8737 from duncanspumpkin/load_or_quit_ga
Add LoadOrQuitAction
2019-02-25 11:28:57 +00:00
Michael Steenbeek
ec2d609200
Merge pull request #8734 from Broxzier/feature/multiplayer-tweaks
Disable kick button when unable to use it + slight refactor
2019-02-25 10:34:56 +01:00
Ted John
08508cc638
Fix #8739: savegame from original game crashes when cruising through map (#8746) 2019-02-24 23:23:41 +00:00
Ted John
a6e7041f49 Fix #8769: Segmentation fault on host 2019-02-24 23:22:43 +00:00
duncanspumpkin
2d1ed8ce05 Fix interactive console staff set costume command.
After the refactor to GameActions, forgot to actually issue the command after generating it.
2019-02-24 18:10:07 +00:00
ζeh Matt
92b6ed5a94
Merge pull request #8751 from ZehMatt/fix-8741
utf8* string refactor.
2019-02-24 17:33:37 +01:00
Duncan
6a0cff2676 Fix being unable to refund when in negative money 2019-02-24 17:31:43 +01:00
Ted John
d31e92e652 Fix #8742: access violation in vehicle_update_sound_params 2019-02-24 16:49:03 +01:00
Ted John
81d41895d2 Fix divide by zero in ride_prepare_breakdown 2019-02-24 11:57:05 +00:00
Nathaniel Ngo
300fd3a589 Fix for Issue#8725: refactoring _currentTrackBegin and _previousTrackPiece to use CoordsXYZ struct (#8759)
* Refactored _currentTrackBeginX, _currentTrackBeginY, _currentTrackBeginZ to use a CoordsXYZ struct

* Refactored _previousTracPieceX, _previousTrackPieceY, _previousTrackPieceZ to use a CoordsXYZ struct

* Refactored _currentTrackBegin and _previousTrackPiece in source files

* Fixed clang formatting
2019-02-24 09:15:31 +00:00
Matt
a7f8c8aa36 Refactor utf8* use over std::string 2019-02-24 00:08:05 +01:00
duncanspumpkin
b60d97ef55 Use enum values for the savePromptMode 2019-02-22 09:08:04 +00:00
duncanspumpkin
dac1b9ab4a Fix ci issues 2019-02-22 09:01:40 +00:00
duncanspumpkin
c24c6bdf0a Remove references to old game command 2019-02-22 09:01:39 +00:00
duncanspumpkin
eadef45ffd Add LoadOrQuiteAction 2019-02-22 09:00:38 +00:00
Hielke Morsink
d460443305 Introduce network permission enum
This enum needs to match the vector. To make sure their sizes are equal,
the vector has been changed to an std::array.
2019-02-21 19:50:07 +01:00
duncanspumpkin
a8cf6381da Make changes for set last network position change 2019-02-21 16:04:26 +00:00
duncanspumpkin
71bdd28022 Increment network version 2019-02-21 16:00:31 +00:00
duncanspumpkin
7cbed69816 Make changes from review 2019-02-21 16:00:31 +00:00
duncanspumpkin
1227bc09fc Remove references to game command 2019-02-21 16:00:31 +00:00
duncanspumpkin
3a615c2126 Use new game action for callees 2019-02-21 16:00:31 +00:00
duncanspumpkin
e8b2c0f16f Add TrackRemoveAction 2019-02-21 16:00:31 +00:00
Matt
92d73e2fab Set last player position based on game action result. 2019-02-21 15:51:00 +01:00
Ted John
3b7b46706c Export sprites field by field 2019-02-20 23:51:43 +00:00
Ted John
b77bc56a52 Copy vehicle structure for S6 2019-02-20 23:31:14 +00:00
Ted John
c0e4eff9f1 Start copying sprite structures for RCT1 and RCT2 2019-02-20 23:31:14 +00:00
Ted John
ddaddf59c6 Import misc sprites field by field 2019-02-20 23:31:14 +00:00
Ted John
67ae973ac8 Import peep field by field 2019-02-20 23:31:14 +00:00
Ted John
1b83b9881b Import vehicle field by field 2019-02-20 23:31:14 +00:00
Ted John
9960397f2c Import litter field by field 2019-02-20 23:31:14 +00:00
Duncan
9a746c4fc1
Merge pull request #8733 from duncanspumpkin/fix_pause
Fix pause
2019-02-20 19:41:56 +00:00
duncanspumpkin
768321c517 Increment network version 2019-02-20 19:14:24 +00:00
duncanspumpkin
3467941310 Fix #8732 GameActions not working when in negative money.
Related to the simplification to the finance code
2019-02-20 19:14:10 +00:00
Ted John
440511afc5 Use uint16_t for marketing probability 2019-02-20 16:51:19 +00:00
Michael Steenbeek
dfa0c528c2 Rename command to forbid_marketing_campaigns
Co-Authored-By: IntelOrca <ted@brambles.org>
2019-02-20 16:49:03 +00:00
Ted John
4013479094 Refactor marketing to be a single vector 2019-02-20 16:49:02 +00:00
Ted John
261dd32697
Refactor peep_interact_with_path to prevent null ride warnings (#8728) 2019-02-20 16:47:38 +00:00
duncanspumpkin
d959657346 Increment network version 2019-02-19 15:22:29 +00:00
duncanspumpkin
9b6fdd41aa Remove redundant code. Rename to standard style 2019-02-19 15:20:55 +00:00
duncanspumpkin
6375d2537a Move and refactor shop interact with path code to prevent possible desync 2019-02-19 15:20:49 +00:00
duncanspumpkin
09bb99d9e8 Fix clang format and travis errors
Minor refactor

Move key callback code into callbacks. Fixes shop placement

Use rotate_map_coordinates
2019-02-19 12:31:22 +00:00
duncanspumpkin
4d3c594e47 Provide a translation for the replay manager 2019-02-19 12:31:22 +00:00