1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

21607 Commits

Author SHA1 Message Date
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
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
ζeh Matt
bc1696ab48 Merge pull request #15268 from ZehMatt/refactor/constexpr-location
Make all location types constexpr
2021-08-23 05:09:06 -07: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
ζ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
OpenRCT2 git bot
d8997cd60f Merge Localisation/master into OpenRCT2/develop 2021-08-21 04:07:57 +00: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
ζeh Matt
4bc5f70581 Minor refactor work around the painting (#15226)
* Remove unused variables and drop packing of paint structs

* Move PAINT_QUADRANT_FLAGS out of the header

* Rename enum and variable to SortFlags

* Rename variable and document the sorting

* Apply review
2021-08-17 09:32:58 +01:00
ZehMatt
f4602f49c7 Remove capture of window pointer in RideConstruction.cpp 2021-08-17 00:43:03 +03:00
ZehMatt
b7a4b00a07 Remove capture of window pointer in Player.cpp 2021-08-17 00:42:39 +03:00
Hielke Morsink
15ba3d3229 Fix compiler warning C4702 in ScMap.cpp
Co-authored-by: ZehMatt <m.moninger.h@gmail.com>
Co-authored-by: Ted John <ted@brambles.org>
2021-08-16 23:36:58 +02:00
ζeh Matt
a721ce30e8 Merge pull request #15189 from ZehMatt/scripting/refactor
Re-arrange structure of scripting
2021-08-16 13:01:54 -07:00
Duncan
940cab87d3 Map size refactors from NSF (#15112)
* Support large map sizes

* Fix top spin painting

* Fix crooked house

* Increase bb size

* Decrease limit back

* Clang format

* Remove asserts and apply review comments

* Fix rebase mistake

Co-authored-by: Ted John <ted@brambles.org>
2021-08-16 20:51:16 +01:00
Kane
bef853d0ab Fix #15225: Some scenarios show incorrect name in-game
The S6Importer/SawyerChunkReader correctly decodes the scenario name and description and stores it under the rct_s6_info struct (info.name and info.details)

The problem is that on lines 369-370 the name and description are replaced with the scenario internal name and description - which is sometimes incorrect - specifically a number of scenarios by Frontier in the exapansion packs.
2021-08-16 21:01:37 +02:00
ζeh Matt
758ad547ce Remove strdup in ObjectLoadError.cpp fixing a memory leak (#15218) 2021-08-16 14:18:22 +01:00
ζeh Matt
1553c904ea Fix #15221: Update tile inspector highlighted element when order changes (#15223) 2021-08-16 10:36:02 +01:00
Michael Steenbeek
0bb0800b6c Merge pull request #15144 from Gymnasiast/refactor/track-design-stuff
Refactor/track design stuff
2021-08-15 22:56:00 +02:00