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

16993 Commits

Author SHA1 Message Date
zrowny c4aaae1a07
Correct ImageImporter palette index 255 to white 
Reflects the change that was made in 5035492f8c to the renderer to fix #1749 and #6535
 2021-09-05 20:08:00 +02:00
zrowny 2d34fe3972
Update description of palette colors in ImageImporter 2021-09-05 20:08:00 +02:00
Gymnasiast 4cc717ccdb
Rework path surface and railings descriptor handling 2021-09-05 19:09:09 +02:00
Gymnasiast 2282f24404
Rename path surface and railings descriptors 2021-09-05 19:09:09 +02:00
ζeh Matt c844bf9142
Bump up network version 2021-09-05 18:16:37 +03:00
ζeh Matt b8d1f86f3f
Use correct underlying type for Vehicle::Status enum 2021-09-05 18:16:37 +03:00
ζeh Matt 23f4f72047
Fix enum serialization not using byte swap 2021-09-05 18:16:37 +03:00
Michael Steenbeek a40cfae0ff
Merge pull request #15313 from frutiemax/13874_TrackDefinitions 
Part of #13874: Add definition field in TrackElementDescriptor
 2021-09-05 16:10:11 +02:00
Michael Steenbeek 7b2554cdae
Addendum to #15340: guard size of object_entry_group_counts 2021-09-05 16:06:34 +02:00
Hielke Morsink 8ae918118a
Add a bug-report item in file dropdown menu 2021-09-05 15:25:44 +02:00
Hielke Morsink b2dfeaf1b9
Introduce String::URLEncode 2021-09-05 15:25:44 +02:00
Hielke Morsink c23775bf8c
Remove hardcoded dropdown indices 2021-09-05 15:25:43 +02:00
Michael Steenbeek e62fabf607
Merge pull request #15317 from spacek531/more-no-platform 
even fewer platforms
 2021-09-05 13:40:46 +02:00
Michael Steenbeek 2f3d4c6861
Merge pull request #15327 from spacek531/rename-ride-validate-function 
Some housekeeping
 2021-09-05 13:26:56 +02:00
spacek531 e3af9982a9 rework grid entrance rotation finder 2021-09-04 14:06:02 -07:00
spacek531 c527bd87fe remove more hutts 2021-09-04 13:47:30 -07:00
Hielke Morsink f1fbe07ded
Avoid redefining WIN32_LEAN_AND_MEAN (#15342) 2021-09-04 21:17:08 +02:00
ζeh Matt 5868071fbc
Merge pull request #15335 from ZehMatt/refactor/object-load 
Fix ownership of loaded object data
 2021-09-04 09:13:45 -07:00
Michael Steenbeek b1ecd9e89e
Merge pull request #15337 from ZehMatt/refactor/s4-ridetype 
Make S4 RideType a strong enum
 2021-09-04 15:23:53 +02:00
Michael Steenbeek 60d596d1f8
Merge pull request #15339 from Broxzier/bugfix/15319-object-selection-hang 
Fix #15319: Clicking on Object Selection Cheat Freezes the Game
 2021-09-04 01:38:59 +02:00
Hielke Morsink fd2a572f9a
Fix #15319: Clicking on Object Selection Cheat Freezes the Game 
This fixes it by adding limits for the missing path types.

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-04 01:09:09 +02:00
Michael Steenbeek a526caa1cb
Use std::copy for gParkRatingHistory 
Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-04 00:03:24 +02:00
IntelOrca 600ce959d7
Use real values for gGuestsInParkHistory 2021-09-03 23:43:43 +02:00
ζeh Matt 8f5fb9d179
Convert switch to two conditional scopes 2021-09-03 23:53:04 +03:00
ζeh Matt 481f7565dc
Rename enum members 2021-09-03 23:48:35 +03:00
ζeh Matt af99bc28c7
Make S4 RideType a strong enum 2021-09-03 23:35:07 +03:00
spacek531 0794dbf112 rename huts 2021-09-03 10:08:01 -07:00
ζeh Matt 6186b29675
Apply review suggestion 2021-09-03 18:03:19 +03:00
ζeh Matt cf0425d953
Fix building 2021-09-03 14:45:48 +03:00
ζeh Matt a118b16912
Remove unused functions 2021-09-03 14:45:47 +03:00
ζeh Matt 976c614881
Reduce duplicate code 2021-09-03 14:45:47 +03:00
ζeh Matt a44f3017dc
Move the log print and remove optional parameter 2021-09-03 14:45:47 +03:00
ζeh Matt 1f4f0c015c
Fix ownership of loaded object data 2021-09-03 14:45:47 +03:00
spacek531 110ef368b0 update function to TitleCase 2021-09-02 19:51:35 -07:00
spacek531 ebc201aaf2 comment and rename 
refactor to class method

fix formatting

rename function

rename another

rename sub_6C683D

rename loc_6CD18E

annotate ride_get_entrance_or_exit_position_from_screen_position

fix format

rename loop value

fix formatting again

rename functions to TitleCase
 2021-09-02 19:47:22 -07:00
Ted John 3c451a4af4
Use music objects instead of IDs 2021-09-01 10:26:23 +02:00
Duncan b2d0b54d13
Fix viewport interaction when zoomed (#15318) 
Mistake made when increasing the type size from 16 to 32bit
 2021-09-01 06:15:45 +01:00
spacek531 bb1d3ab637 swinging rides 2021-08-31 08:55:31 -07:00
spacek531 77d546f39d dodgems and flying saucers 2021-08-31 08:55:31 -07:00
spacek531 c248c8fada format spiralslide 2021-08-31 08:55:30 -07:00
spacek531 c8bed6fa87 tower rides and slide 2021-08-31 08:55:30 -07:00
ζeh Matt 0be585024f
Merge pull request #15232 from ZehMatt/refactor/gNetwork 
Move network instance to Context
 2021-08-30 14:17:15 -07:00
Michael Steenbeek 481d40b270
Merge pull request #15309 from Gymnasiast/refactor/paths-from-nsf 
Refactor/paths from nsf
 2021-08-30 23:07:54 +02:00
ζeh Matt 9be3a39ddd
Remove old constant PEEP_THOUGHT_ITEM_NONE 2021-08-30 21:13:35 +03:00
ζeh Matt 336372c7be
Adjust InsertThought overloads to use correct constants 2021-08-30 21:13:35 +03:00
ζeh Matt e9c959b187
Test correct fields in the gamestate snapshot 2021-08-30 21:13:34 +03:00
ζeh Matt 77dccb995c
Use RCT12PeepThoughtItemNone for importers 2021-08-30 21:13:34 +03:00
ζeh Matt bab646de6e
Add RCT12PeepThoughtItemNone constant 2021-08-30 21:13:34 +03:00
ζeh Matt a5931921bf
Small clean up 2021-08-30 21:13:34 +03:00
ζeh Matt 483fb173f5
Adjust S6 import/export for different thought item type 2021-08-30 21:13:34 +03:00
ζeh Matt 1555a4da9f
Modify storage of PeepThought items to 16 bit for rides and shop items 2021-08-30 21:13:34 +03:00
ζeh Matt b97ebc745f
Rename rct_peep_thought to PeepThought 2021-08-30 21:13:33 +03:00
ζeh Matt 5d2c9d8be4
Merge pull request #15267 from spacek531/remove-var-CA 
Remove var ca
 2021-08-30 11:13:20 -07:00
ζeh Matt c39bf42510
Merge pull request #15311 from ZehMatt/fix-15306 
Fix #15306: Fix track paint using the wrong bounding box offsets
 2021-08-30 07:13:57 -07:00
Michael Steenbeek 1730673ca3
Merge pull request #15285 from duncanspumpkin/rct2 
Move RCT2 structs into RCT2 header
 2021-08-30 13:45:23 +02:00
duncanspumpkin 2f9e9e853e Move further structs into correct headers 2021-08-30 12:27:23 +01:00
Duncan 8cc833f905
Strip RCT1 out of RCT1 struct names in namespace (#15284) 
* Strip RCT1 out of struct names in namespace

* Remove RCT1:: where not required
 2021-08-30 11:28:50 +01:00
frutiemax 98a52ac934 Part of #13874: Add SpinFunction field 2021-08-29 20:37:59 -04:00
frutiemax 7e5e9bdf13 Part of #13874: Add definition field in TrackElementDescriptor 2021-08-29 20:22:48 -04:00
spacek531 39b762aa78 fix sign error 2021-08-29 15:00:47 -07:00
spacek531 91099429c8 bump network 2021-08-29 14:52:43 -07:00
spacek531 0f5075f024 fix triggers 2021-08-29 14:52:43 -07:00
spacek531 315070faaa set value to 0 2021-08-29 14:52:43 -07:00
spacek531 199de52afe quick removing this 2021-08-29 14:52:43 -07:00
spacek531 6d7fd57f5b remove var_CA 2021-08-29 14:52:43 -07:00
ζeh Matt 51ad88c25d
Fix #15306: Fix track paint using the wrong bounding box offsets 2021-08-29 23:43:59 +03:00
Michael Steenbeek 4bbee1c6ae
Merge pull request #15261 from frutiemax/13874_refactor 
Track Element Descriptor refactor (issue #13874)
 2021-08-29 22:38:46 +02:00
ζeh Matt b367f74496
Fix #15199: Construction window is not closed when a ride gets demolished 2021-08-29 22:20:30 +02:00
ζeh Matt a75e07cde6
Merge pull request #15305 from ZehMatt/fix-15289 
Fix #15289: Duplicated banner correction using the wrong index
 2021-08-29 10:06:55 -07:00
Gymnasiast bcba227430
Add footpath surface and railings objects from NSF 2021-08-29 17:07:38 +02:00
frutiemax 450bf61ee4 Part of #13874: TrackSequenceProperties, Pricing and MirrorMap renamed 2021-08-29 10:45:17 -04:00
Gymnasiast b6b792f874
Add GetImage() method to rct_footpath_entry 2021-08-29 16:22:51 +02:00
spacek531 cba52b240e
Bird animation (#15294) 
* initial implementation;

progress 1

progress 2

refactor to chain start

progress 3

begin walking

finish bird

remove walking

remove unused functions

refactor track element getting

fix formatting

refactor and add comments

remove brackets from simple if-else statements

invalidate vehicle

refactor again

fix format and refactor

please satisfy clang format

fix fallthrough

invalidate default case

remove redundant falltrhough

network bump

use std::max

refactor animation again

fix modulus

* move array declaration

* satisfy clang-format

* add changelog entry
 2021-08-29 10:30:34 +01:00
ζeh Matt 4ada04c7ca
Fix #15289: Duplicated banner correction using the wrong index 2021-08-29 12:20:17 +03:00
frutiemax b3744f129f Part of #13874: Avoid copies of ted 2021-08-28 18:57:46 -04:00
Hielke Morsink e0751d707f
Fix #15298: Crash on map.getAllEntities from in-game console (#15301) 2021-08-28 17:43:11 +02:00
ζeh Matt 97ded2d7c4
Use reference and not copy (#15303) 2021-08-28 00:31:40 +02:00
frutiemax 5f438535ad Part of #13874: Gymnasiast review 2021-08-27 17:57:10 -04:00
frutiemax 9c53fe252d Part of #13874: ZehMatt review changes 2021-08-27 17:44:33 -04:00
ζeh Matt 85d3dc2a84
Merge pull request #15292 from ZehMatt/refactor/paint-constexpr 
Apply constexpr where possible
 2021-08-27 13:04:24 -07:00
ζeh Matt 0c05557b92
Change defines to constexpr and add SPR_ prefix 2021-08-27 22:40:51 +03:00
ζeh Matt d7b911ffea
Add sprite constants for LOOPING_RC_FLAT_CHAINED 2021-08-27 22:37:37 +03:00
ζeh Matt 70df58da15
Use constexpr where applicable in MiniatureRailway.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt 2a087a7eef
Remove static initialization in looping_rc_track_station 2021-08-27 18:24:08 +03:00
ζeh Matt 3c106f7e0f
Use constexpr where applicable in JuniorRollerCoaster.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt 5dd277fc0d
Use constexpr where applicable in HybridCoaster.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt 5bf882587a
Use constexpr where applicable in Viewport.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt 04ba3f92d7
Use constexpr where applicable in Monorail.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt 78747d266f
Use constexpr where applicable in MiniatureRailway.cpp 2021-08-27 18:24:08 +03:00
Michael Steenbeek ef2477901e
Merge pull request #15278 from Gymnasiast/fix/3868-opengl-ttf 
Get basic TTF support working in OpenGL
 2021-08-27 02:00:45 +02:00
Hielke Morsink f9c4bb2757
Remove unused persistentChunks argument (#15290) 2021-08-26 23:00:12 +02:00
ζeh Matt 01c808c601
Remove unused argument of wooden_(a|b)_supports_paint_setup 2021-08-26 20:54:06 +03:00
Ted John 6e2b79a895
Get basic TTF support working in OpenGL 
co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-08-26 19:46:18 +03:00
ZehMatt de364aa15a
Rename type SpriteBase to EntityBase 2021-08-26 15:37:16 +03:00
ZehMatt 20d3b50771
Correct includes for EntityBase.h 2021-08-26 15:33:53 +03:00
ZehMatt eeb5c64119
Rename SpriteBase.h to EntityBase.h 2021-08-26 15:33:50 +03:00
duncanspumpkin cdf1c3b1b8 Move s6 into rct2 header 2021-08-26 12:44:26 +01:00
Duncan b97c46421e
Move all RCT1 to RCT1 namespace (#15283) 2021-08-25 20:44:24 +01:00
ζeh Matt 4d261b389c
Merge pull request #15280 from ZehMatt/refactor/gfx-draw-const 
Cleanup DrawSpriteArgs
 2021-08-25 07:15:00 -07:00
Duncan c209021229
Remove unused serialiser trait (#15279) 2021-08-25 14:03:48 +01:00
ZehMatt 8fa4823055
Pass rct_drawpixelinfo as explicit argument, make DrawSpriteArgs const 2021-08-25 15:37:44 +03:00
Duncan 008f106242
Add constants for golf flags (#15072) 
* Add constants for golf flags

* Reorg SubPositionData for minigolf

* Add enum for golf states

* Add golf animation enum

* Fix names of animations

* Correct spleing

* Revert stray change
 2021-08-25 11:08:57 +01:00
ζeh Matt eccbbdbe59
Use inline for direction functions in Location.hpp 2021-08-25 00:07:25 +02:00
ζeh Matt 55add9883f
Implement DirectionFlipXAxis 2021-08-24 22:57:13 +02:00
Duncan d2aca03ff6
Fix #15271. Use formatter to pass description args to text input (#15272) 
* Fix #15271. Use formatter to pass description args to text input

Originally passed the variables via global vars which were not updated to 32bit during recent refactors. This removes the global and makes the interface cleaner and corrects the type

* Fix size of arguments
 2021-08-24 19:12:05 +01:00
Duncan 201a94f7e6
Add overloads to take CoordsXYZ (#15253) 2021-08-24 16:26:52 +01:00
Hielke Morsink e48dd2d32b
Remove utf-8 BOM from source files (#15270) 2021-08-23 21:18:25 +02:00
Hielke Morsink 956e77f4c3
Use [[nodiscard]] for allocator and RAII functions (#15244) 2021-08-23 20:09:43 +02:00
ZehMatt c858f21845
Default initialize members the same way across the file 2021-08-23 14:41:18 +03:00
ZehMatt 07ceec6b60
Make all location types constexpr 2021-08-23 14:35:58 +03:00
frutiemax 046c060e74 Part of #13874: Replace Track Sequence properties 2021-08-22 18:01:03 -04:00
frutiemax a29b369ff8 Part of #13874: Replace Sequence Element Wall table 2021-08-22 17:58:52 -04:00
frutiemax 382315b2c3 Part of #13874: Replace block tables 2021-08-22 17:57:56 -04:00
frutiemax b5219d76d8 Part of #13874: Replace pricing tables 2021-08-22 17:55:17 -04:00
frutiemax 780eb4f287 Part of #13874: Replace piece lengths 2021-08-22 17:53:38 -04:00
frutiemax 716dd3dcb6 Part of #13874: Replace mirror maps 2021-08-22 17:52:56 -04:00
frutiemax 72e6f9a694 Part of #13874: replace height markers positions tables 2021-08-22 17:52:19 -04:00
frutiemax 1bfa26e4c5 Part of #13874: replace flags table 2021-08-22 17:51:35 -04:00
frutiemax 675777efaf Part of #13874: replace curvechain 2021-08-22 17:50:18 -04:00
frutiemax 5a8cc7c610 Part of #13874: Replace alternativeTypes 2021-08-22 17:49:39 -04:00
frutiemax 80418efafb Part of #13874: Replace TrackCoordinates 2021-08-22 17:49:00 -04:00
frutiemax 5c261b6d2e Part of #13874: TrackElementDescriptor loader 2021-08-22 17:47:10 -04:00
ζeh Matt f49559daa5
Fix #15259: Large scenery not rendering correctly 2021-08-22 22:05:05 +02:00
Michael Steenbeek 95111047b0
Merge pull request #15249 from Broxzier/feature/make_ptr 
Refactor use of std::unique_ptr
 2021-08-21 21:50:42 +02:00
Michael Steenbeek 7b3258b17e
Merge pull request #15248 from ZehMatt/refactor/paint-hierarchy 
Refactor PaintAddImageAsParent overloads
 2021-08-21 21:33:06 +02:00
ζeh Matt 3ab70b200b
Fix #15255: Wall banner index defaults to 0 instead of null type 2021-08-21 19:24:09 +02:00
spacek531 c49c6ca4a7
Rename animation vars 2021-08-21 19:23:27 +02:00
ζeh Matt 8de2965f13
Merge pull request #15231 from ZehMatt/fix-15169 
Refactor out capturing of window pointers with GA callbacks
 2021-08-21 06:07:35 -07:00
ZehMatt 0e08286d88
Apply review comments 2021-08-21 14:07:27 +03:00
Hielke Morsink 15d3a4a9da
Update more include guards (#15254) 2021-08-21 12:55:28 +02:00
Hielke Morsink dd2467d805
Update include guards 
- Update from C-style to pragma once
- Add missing include guard to ui.h
 2021-08-21 09:43:26 +02:00
Michael Steenbeek f5935931e3
Port remaining DrawTextWrapped calls with void args to Formatter 2021-08-21 09:42:05 +02:00
Hielke Morsink be4159f9ac Create std::unique_ptr<ILanguagePack>instead of raw pointer 2021-08-21 00:28:21 +02:00
Hielke Morsink cef26400cf Use std::make_unique instead of new for arrays 2021-08-21 00:28:21 +02:00
ZehMatt 8d801d9126
Apply review suggestion 2021-08-21 01:10:36 +03:00
Hielke Morsink 6011478590 Directly use std::unique_ptr prvalues 
This removes the unnecessary constructor calls and improves flexibility in case of typename changes.
All cases, except for the one in Context.cpp, are temporaries.
 2021-08-20 23:38:15 +02:00
Michael Steenbeek a38ae68f09
Remove Paint.cpp assertions 
Before the refactor, the assertion read like this:
```
assert(static_cast<uint16_t>(bound_box_length_x) == static_cast<int16_t>(bound_box_length_x));
```
which meant that bound_box_length_x = 0 was valid. The refactor (likely accidentally) changed this, which causes assertions to get hit within 2 seconds after opening on my machine.

According to Duncan, the asserts are no longer necessary at all, so remove them altogether.
 2021-08-20 23:27:58 +02:00
ZehMatt 15e32ce5f8
Simplify some arg passing on PaintAddImageAsParent 2021-08-20 23:34:44 +03:00
ZehMatt 77b06cbf9a
Use CoordsXY for haunted_house_bound_box and correct arg passing 2021-08-20 23:34:44 +03:00
ZehMatt 5f49276d53
Use CoordsXY for ferris_wheel_bound_box and correct arg passing 2021-08-20 23:34:44 +03:00
ZehMatt a5d2939108
Use CoordsXY for rct_crooked_house_bound_box and correct arg passing 2021-08-20 23:34:44 +03:00
ZehMatt 3d90257dde
Simplify more argument passing to PaintAddImageAsParent 2021-08-20 23:34:44 +03:00
ZehMatt 7764bb910f
Use CoordsXYZ instead of anonymous struct in unk_supports_desc 2021-08-20 23:34:44 +03:00
ZehMatt efa9af4610
Simplify passing args on PaintAddImageAsParent where possible 2021-08-20 23:34:44 +03:00
ZehMatt 7feea62ab3
Remove overload of PaintAddImageAsParent with bbox offset 2021-08-20 23:34:44 +03:00
ZehMatt 6c233ac802
Remove first overload of PaintAddImageAsParent 2021-08-20 23:34:44 +03:00
Michael Steenbeek c6a7829554
Fix #15245: Excitement factors are all listed as 0% 2021-08-20 13:05:54 +02:00
Margen67 a371d1ff11
Disallow opening problematic windows in multiplayer 2021-08-19 12:04:49 +02:00
Duncan 223b926f8c
Use std::vector for ride use memory (#14884) 
* Use std::vector for ride use memory

* Use new system for import/export

* Remove legacy field

* Add replay entity size protection to prevent crash

* Increment network version

* Update replays

* Move function to header

* Move constant to RCT12 header as used for both 1 and 2

* Align naming with nsf
 2021-08-17 21:29:35 +01:00
Basssiiie 399f6f27b4
Fix #15176: Incorrect base height in tile inspector for track pieces (#15233) 2021-08-17 17:10:33 +01:00