mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
14,449 Commits 8 Branches 59 Tags
42f46d15e388ec43e64b7f013005c79fad71f134
Commit Graph

11054 Commits

Author SHA1 Message Date
Ted John
42f46d15e3 Merge pull request #7414 from OpenRCT2/refactor/string-conversions 
Refactor string conversion between RCT2 and UTF8
 2018-04-25 10:14:39 +01:00
Hielke Morsink
bf4f68fe33 Use enum type that guarantee to support its values 
By default enumerators use type `int` which can store values up to `1 << 31 - 1`. The clang compiler generates this error for enums values that use the sign bit: `enumerator value is not representable in the underlying type 'int'.`

To get rid of those warnings (and technically improve the code) the erroneous enums are now of type of `uint32`.

Note: I've skipped peep.h to prevent conflicts with the peep refactor branch.
 2018-04-24 16:51:42 +02:00
Hielke Morsink
5327c9feb4 Remove unused windows_get_registry_install_info (#7442) 2018-04-23 20:20:03 +02:00
Ted John
41b3a33af4 Merge pull request #7430 from IntelOrca/fix/scan-objects 
Fix scan objects and run before tests
 2018-04-22 22:11:03 +01:00
Hielke Morsink
30063984e6 Delete unused function arguments or mark them so (#7426) 
This aims to make future refactoring easier. The arguments are removed where possible, but kept and marked with C++17's [[maybe_unused]] where they could not be removed (e.g. when they are used as a callback, rather than called directly).

I've skipped the rides/<category>/* and peep/* source files, because the rides source files are mostly generated and have a ton of unused variables, and the peep source files are being refactored.
I've also skipped most of window/* source files, because most of the functions are used as callbacks and will be bulk-renamed at some point.
 2018-04-20 13:56:37 +02:00
Manuel Vögele
588e6f32c4 Rename vehicle_is_boat_on_water to better reflect the actual functionality (#7421) 
* Rename and refactor `vehicle_is_boat_on_water` to better reflect the actual functionality

New name is `vehicle_boat_is_location_accessible`

* Refactor `vehicle_boat_is_location_accessible` take `TileCoordsXYZ` as parameter
 2018-04-20 12:50:11 +01:00
Ted John
4ce4101ac5 Ensure correct language is used for scan-objects 2018-04-20 00:12:40 +01:00
Ted John
edb9dc39ab Pass object repository as a dependency when loading objects 2018-04-19 23:51:05 +01:00
Ted John
6d76d76f98 Protect against bad RCT2 strings 2018-04-19 22:36:14 +01:00
Ted John
6526f9f6cb Fix scan-objects CLI action 
Ensure a context is available when objects are loaded.
 2018-04-19 13:26:19 +01:00
Ted John
947a0625c8 Fix mingw builds 2018-04-18 13:16:20 +02:00
Ted John
deaa60f8f1 Refactor string conversion between RCT2 and UTF8 
Use Win32 API for conversion on Windows for non-1252 code pages instead of built-in tables.
 2018-04-18 13:16:20 +02:00
Hielke Morsink
f661d48d90 Add tests for tile_element_wants_path_connection_towards 2018-04-17 20:43:49 +02:00
Hielke Morsink
99d8c83807 Fix #7402 Properly check for entrance location before disconnecting paths 2018-04-17 20:43:49 +02:00
Aaron van Geffen
11207f9c41 Re-introduce zebra striping. 2018-04-16 22:11:53 +02:00
Aaron van Geffen
97d1c296a4 Increase row height for object load error window. 2018-04-16 22:11:53 +02:00
Albert Morgese
a3b04a67b2 Implement #1675: Auto-rotate shops to face footpaths 2018-04-16 20:02:46 +02:00
Ted John
d0ad94bb5e Merge pull request #7412 from IntelOrca/cmake/msvc 
Add basic support for MSVC to cmake scripts
 2018-04-14 22:30:57 +01:00
Manuel Vögele
e4b42f58a5 Fix the order predicate for GameCommands 
This commit bumps the network stream version
 2018-04-14 22:47:41 +02:00
Ted John
f24b1bdfa6 Enable curl, openssl and freetype libraries for msvc 2018-04-13 19:21:03 +01:00
woj1993
4b372120f1 Fix #6141: CSS50.dat is never loaded (#7357) 2018-04-13 11:29:31 +01:00
Gymnasiast
4c676e6000 Fix #6134: Scenarios incorrectly categorised when using Polish version of RCT2 2018-04-13 09:07:01 +02:00
Ted John
c59f342f2f Use correct SDL2 library in debug builds 2018-04-12 23:31:33 +01:00
Ted John
b8d8d24d21 Get cmake working with msvc for basic game 2018-04-12 23:07:18 +01:00
Gymnasiast
60b864441a Fix encoding of scenario index names 2018-04-12 13:13:14 +02:00
duncanspumpkin
c2c5afa62c Fix mistaken assignment 2018-04-11 18:58:48 +01:00
duncanspumpkin
e4e514c743 Fix travis errors. Revert mistaken rename. 
Use enum where known

Remove unused cases
 2018-04-11 18:16:23 +01:00
duncanspumpkin
e954865b49 Fix waypoints for json changes 2018-04-11 18:16:16 +01:00
duncanspumpkin
765500adfa Label offsets and functions 
Actually save before commiting

Label more peep vars.

Remove unread var

Further refactoring

Fix mistake in map element type
 2018-04-11 18:16:09 +01:00
duncanspumpkin
a24c2672fd Label all peep ride sub states 
Add additional notes to function.

Perform exorcism on code base

Use vector for carArray
 2018-04-11 18:15:47 +01:00
duncanspumpkin
376c40f1d4 Make peep loading positions nicer 
Change name to waypoints. Rework
 2018-04-11 18:15:28 +01:00
duncanspumpkin
c96c7b29df Breakup substate 1 add asserts 2018-04-11 18:13:19 +01:00
duncanspumpkin
fc14f6e635 Refactor peep update ride sub state 0 2018-04-11 18:13:17 +01:00
Ted John
1cd88a1641 Fix #7367: 'invalid name for park' shown when opening a scenario (#7394) 
Apply extra changes from my own implementation of ParkSetNameAction
which re-introduces logging and calls the action directly from the UI
layer.
 2018-04-10 17:14:32 +01:00
Hielke Morsink
dc673a64d8 Give context the ownership of repositories and the object manager (#7340) 
This makes them no longer a singleton, which fixes annoying behaviour when launching multiple contexts in one game session.
 2018-04-10 13:19:23 +01:00
Ted John
124fb0df90 Fix out of bounds error in window_editor_object_selection_scroll_mouseover 2018-04-09 17:46:43 +01:00
Michael Steenbeek
7ebd7f1194 Increase network version 2018-04-09 16:50:17 +02:00
Michael Steenbeek
92ba2dfb01 Make seatsInPairs default to true 2018-04-09 16:05:21 +02:00
Ted John
dea5d2754b Search ObjData recursively 
Enable recursive searching ObjData for Windows and non-Windows. This allows players to continue using sub directories for their official objects, e.g. WW and TT. There will be a slight performance hit if all objects are in a sub directory as a search is done for each official object that is loaded.
 2018-04-08 19:03:33 +01:00
Ted John
9dba4a87cc Fix #7389: Path items cannot be placed on sloped paths 
Handle isAllowedOnQueue and isAllowedOnSlope separately
 2018-04-08 18:46:01 +01:00
NathanZabriskie
cc256997ef Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382 (#7387) 
* Opening the mini-map reverts the size of the land tool to 1x1, regardless of what was selected before. #7382
* Updated changelog and contributors
 2018-04-08 19:34:36 +02:00
Duncan
0ab3d0955c Merge pull request #7310 from OpenRCT2/json-objects 
Add support for new JSON object format
 2018-04-08 10:45:55 +01:00
Ted John
4c9d047b52 Update android build to download objects 2018-04-06 10:45:08 +01:00
Michał Janiszewski
b26d484726 Fix remaining headers 2018-03-31 23:48:15 +02:00
Hielke Morsink
b62017657b Fix header dependencies for openrct2-ui 2018-03-31 23:07:14 +02:00
Hielke Morsink
a51462b0fd Include necessary files for compiling headers 
This commits works towards #7289. It includes files that it depends on, or forward declares types when possible. It may seem like this only increases compilation time, but before this commit they depended on the other includes of the source files that use them.
 2018-03-31 23:07:14 +02:00
Fusxfaranto
69bb1cdf82 Use STR_NONE over magic number, and conform to style guide 2018-03-31 10:54:41 +02:00
Fusxfaranto
74361dcf87 Add different titles for multiplayer window tabs (#2989) 2018-03-31 10:54:41 +02:00
Ted John
63e9275b60 Protect against unknown ride types 2018-03-30 16:58:12 +01:00
Ted John
375deb0c9f Include string not cstring 2018-03-30 16:53:55 +01:00