mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity
16,962 Commits 8 Branches 59 Tags
1d4c1958dd71ba8e2363fc014eecaab8c8e2c83c
Commit Graph

465 Commits

Author SHA1 Message Date
Ted John
f8b08b334e Fix a few more bugs 2019-07-29 19:18:16 +01:00
Ted John
3f45976009 Fix openrct2ui errors 2019-07-29 19:18:16 +01:00
Ted John
3155c661fa Refactor format peep action 2019-07-29 19:18:16 +01:00
Ted John
6fff2079f9 Refactor ride name to dynamic args and std::string 2019-07-29 19:18:16 +01:00
Jim Armstrong
a432a8a514 Fix #9487: Access violation in UpdateRideEnterVehicle (#9577) 
* Fix #9487: Implement nullptr checks

Implemented nullptr checks for the ride and vehicle variables
in UpdateRideEnterVehicle()
 2019-07-29 18:07:21 +01:00
Matt
98a17fe8d9 Refactor create_sprite and remove unnecessary move_sprite_to_list 2019-07-24 17:53:51 +02:00
Duncan
ab5f5b20cd Use enum class for RCT2_SOUND (#9618) 
* Use enum class for RCT2_SOUND

* Fix formatting. Fix mistaken declaration.

* Change name of enum to SoundId

* Fix clang format
 2019-07-22 19:02:45 +01:00
Duncan
4e44818a04 Merge pull request #9449 from ZehMatt/refactor/sprite-list-pow2 
Remove unnecessary multiplication and division for sprite lists
 2019-07-13 09:37:35 +01:00
Jim Armstrong
cc62e41feb Refactor #9291: Move easter egg code to Guest 
Refactored static Peep functions related to easter egg names into member
functions in the Guest struct.
 2019-06-24 15:17:59 -04:00
Matt
fc3afb3349 Remove unnecessary multiplication and division for sprite lists 2019-06-22 17:38:28 +02:00
duncanspumpkin
2de9430bd3 Remove incorrect code that resets picked peep 
The game command owner is never set for game actions so this would be incorrect
 2019-06-20 20:13:23 +01:00
duncanspumpkin
b896f07687 Add PeepPickupAction 
Move Guest and Staff pickup to the new game action. Rework the game
action so that only one game action is required for the two game
commands. Remove the final game command with a callback.
 2019-06-20 19:34:02 +01:00
Aaron van Geffen
f1ac847fce Merge pull request #9222 from IntelOrca/implement/485-ghost-train-simulation 
Implement #485: ghost train simulation
 2019-06-04 20:24:16 +02:00
ζeh Matt
bc14f427a5 Fix #9322: Peep crashing the game trying to find a ride to look at 2019-05-30 20:49:54 +02:00
Ted John
c4e18e570e Add and implement simulation mode for rides 2019-05-28 16:50:08 +01:00
aw20368
8c20b635bd Fix #9270: Refactor money effect 
Changed static functions to rct_money_effect member functions. GetStringId now returns std::pair.
 2019-05-21 21:22:47 +02:00
nexgenration
6b232f7e53 Fix#9197: Peep insert new thought (#9230) 
Improve the readability of the codebase by moving functions into the relevant structures.
- Change name of peep_insert_new_thought to InsertNewThought.
- Update InsertNewThought definition to Guest::InsertNewThought.
 2019-05-18 09:47:25 +01:00
Greg Hennis
1fcedae3bc Fix #9258: Rename SPRITE_LIST_NULL to ..._FREE (#9260) 2019-05-15 19:07:01 +02:00
Gymnasiast
4e23c42d38 Remove stub functions from new_game_command_table[] 2019-05-13 22:51:41 +02:00
Gymnasiast
2ea1fcc69d Remove unused declarations and functions 2019-05-13 22:16:14 +02:00
Filip Gawin
6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02: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
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
ζeh Matt
cd8c67ddac Implement SetCheatAction. (#8990) 
* Implement SetCheatAction.

* Bump up network version
 2019-05-04 15:28:38 +02:00
Michael Steenbeek
c8df801e66 Create ShopItemDescriptor 2019-04-26 20:25:11 +02: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
Gymnasiast
ec6b738317 Fix #8079: Crash when unloading buggy custom rides 2019-04-21 12:13:04 +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
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
Gymnasiast
44da799afd Modify return type of get_num_of_sheltered_eighths() 2019-03-27 15:52:18 +01:00
Gymnasiast
64e51cd34b Close #8965: Refactor ride->inversions 2019-03-27 11:30:18 +01:00
Aaron van Geffen
f4602d0a34 Use SCREEN_FLAGS_EDITOR when appropriate. 2019-03-20 20:58:08 +01:00
duncanspumpkin
add40feb57 Merge #8898 branch 'staff_ga' into game_actions 2019-03-18 20:00:34 +00:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
duncanspumpkin
0b231c8b38 Remove old game commands 2019-03-16 20:47:54 +00: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
duncanspumpkin
edff5caa7e Merge pull request #8849 'ga-staff-hire' 2019-03-15 19:49:24 +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
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
Ted John
f5904c90cb Fix #8834: Invalid read in UpdateRideApproachExitWaypoints 2019-03-09 11:36:53 +00:00
Ted John
cdec457abd Refactor peep struct 2019-02-28 20:28:58 +01:00