mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,390 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

12503 Commits

Author SHA1 Message Date
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
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
duncanspumpkin ab058fe659 Remove unnecessary compare with zero 2019-02-26 08:13:21 +00:00
Ted John cf1a4c9d66 Fix #8754: Crash when downloading objects due to race condition 
Use stack allocated buffer for string format arguments instead of the
global argument buffer as this is performed on a background thread.
 2019-02-26 09:06:02 +01: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 336e2cafce
Fix #4094: Long flat-to-steep pieces are offered in diagonal building mode 2019-02-25 12:02:27 +01: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
Ted John 8def463360 Fix #8513: invalid read access in window_footpath_set_provisional_path_at_point 2019-02-24 17:39:22 +01: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
Hielke Morsink 0adbd1f43a Enable kick button only when able to use it 
Now it's disabled:
 - When lacking the kick permission
 - The player is the host
 - You are the player
 2019-02-21 19:50:05 +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 1418975d84 Fix shop construction on client 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
duncanspumpkin 8bf3689d42 Introduce flag to prevent ghosts in multiplayer 
Fix error message arguments

Remove dead code. Fix clang format
 2019-02-19 12:31:11 +00:00
duncanspumpkin 77b25714ff Move callbacks into GameActionCallbacks 
Remove remaining references to game command
 2019-02-19 12:30:42 +00:00
duncanspumpkin 650e8291d0 Start moving track place into GameAction framework 2019-02-19 12:30:33 +00:00
Ted John cce979f96b
Remove logic for required objects (#8718) 
This allows TARMAC to be removed when `remove_unused_objects` is called.
 2019-02-19 11:55:43 +00:00
ζeh Matt 8a6dd5c4dd Fix #8720: Desync due to boats colliding with ghost pieces 2019-02-19 11:39:48 +01:00
Matt d7ff3854a9 Bump up network version. 2019-02-18 17:20:18 +01:00
Matt a6c6d6ddc3 Update checks for when money is required. 2019-02-18 17:19:44 +01:00
Matt 21e4c52853 Use finance_check_affordability instead of CheckActionAffordability 2019-02-18 17:19:44 +01:00
Matt 914bf3a0c6 Add finance_check_money_required and finance_check_affordability helper functions. 2019-02-18 17:19:44 +01:00
ζeh Matt a1d1669492
Merge pull request #8713 from ZehMatt/replay-bpb 
Add bpb.sv6 to the replays with 7000 ticks.
 2019-02-18 13:38:22 +01:00
Matt 3f07fd6bed Bump up network version. 2019-02-17 10:12:02 +01:00
Matt 7a18fc4b96 Fix ClearAction breaking out of the loop too early. 2019-02-17 10:12:02 +01:00
Matt 597b0956fc Fix SmallSceneryRemoveAction returning no error on invalid coordinates. 2019-02-17 10:12:02 +01:00
Matt 5f02c480c2 Fix FootpathRemoveAction crashing with invalid coordinates. 2019-02-17 10:12:02 +01:00
Matt 2d78eace05 Use QueryInternal in ExecuteInternal. 2019-02-17 10:12:02 +01:00
Matt a630c17e92 Fix ReplayManager testing checksums out of order. 2019-02-16 09:10:05 +01:00
ζeh Matt 416915c883
Merge pull request #8711 from ZehMatt/ga-toplevel 
Refactor direct calls to Query and Execute on game actions.
 2019-02-15 17:07:53 +01:00
Matt 00be865ff1 Use ExecuteNested/QueryNested instead of passing a parameter. 2019-02-15 16:32:11 +01:00
Duncan 79ccc8ca32
Merge pull request #8705 from phillipwalters/develop 
Removed dead code per issue 8677 (https://github.com/OpenRCT2/OpenRCT2/issues/8677)
 2019-02-15 13:58:57 +00:00
Matt 16e371c792 Bump up network version. 2019-02-15 09:01:38 +01:00
Matt 60ec1da0f8 Remove direct calls to Execute Query on action. 2019-02-15 08:55:01 +01:00
Matt 22811e0e85 Remove direct calls to Execute Query on action. 2019-02-15 08:50:48 +01:00
Matt 46c9bcc4bc Remove direct calls to Execute Query on action. 2019-02-15 08:47:07 +01:00
Matt caa490642c Refactor GameActions to allow non-top level actions. 2019-02-15 08:43:05 +01:00