1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Commit Graph

11101 Commits

Author SHA1 Message Date
Hielke Morsink
8d10bfb5a1 Add namespace closing comments 2018-05-04 22:54:43 +02:00
Hielke Morsink
bc44792da9 Pack nested namespaces together 2018-05-04 22:54:43 +02:00
Ted John
dbbd5b89e6 Fix assert in SDL2 (debug) 2018-05-04 20:24:35 +01:00
Aaron van Geffen
e92264a2af Fix #7484: Incorrect label offsets in New Campaign window 2018-05-04 10:45:14 +02:00
Hielke Morsink
11aeabdb2f Bump network version 2018-05-03 23:10:12 +02:00
Hielke Morsink
a86482576f Land Line Tools (select land edges/row of tiles)
(This commit is multiple commits squashed together, to make rebasing and merging easier. Many of the commits undid or slightly altered previous changes.)

This Extends the land-tool by allowing the player to select an edge of a surface tile, and to select a row of tiles. Both work by holding down the Ctrl key (same key for keeping the same base-height for other tools). When using a single-sized tool, the selection will become the edge, and when using a selection area of 2x2 or higher, the selection becomes a row of tiles.

The tables `tile_element_raise_styles` and `tile_element_lower_styles` hold the data for how slopes should change when a tile gets raised or lowered with the land tool. Each row represents a selection, and each column the slope type.

Co-authored-by: Adam T <32143337+Despotico@users.noreply.github.com>
2018-05-03 23:03:07 +02:00
Michael Steenbeek
5f9d40be7a Replace tile_element_get_type() with struct method 2018-05-02 19:27:04 +02:00
Michael Steenbeek
6d6714aa0f Fix setters 2018-05-02 14:24:57 +02:00
Michael Steenbeek
45ce5e1d7d Turn elementsAreAt90DegAngle into a bool 2018-05-02 13:36:45 +02:00
Michael Steenbeek
e3ac097999 Use binary literals in TileElement.h 2018-05-02 13:30:15 +02:00
Michael Steenbeek
b725916808 Use TitleCase 2018-05-02 13:27:53 +02:00
Michael Steenbeek
ef433df26a Clean up tile element usage, introduce struct methods 2018-05-02 11:58:12 +02:00
Gymnasiast
350b777fe9 Fix includes 2018-05-01 20:38:57 +02:00
oli414
126881cc8a Move last_for_tile function to tile element 2018-05-01 18:08:11 +02:00
oli414
353c8bcf8d Adhere to coding style 2018-05-01 17:48:34 +02:00
oli414
c5fd9e67eb Seperate tile element from map 2018-05-01 17:47:00 +02:00
oli414
3bff12c081 Seperate surface tile element 2018-05-01 16:33:16 +02:00
oli414
27aa28749c Move surface element to seperate file 2018-05-01 14:57:13 +02:00
Aaron van Geffen
735cc2df89 Take line height into account in scenario selection screen 2018-05-01 13:58:46 +02:00
Michał Janiszewski
3a0e553cf5 Use c++1z for android 2018-05-01 10:49:22 +02:00
Michał Janiszewski
dc1c715bb9 Update Android CMake project for C++17
Android uses cmake 3.6, so cannot use `CXX_STANDARD` 17, which only got introduced in cmake 3.9
2018-05-01 10:34:27 +02:00
Gymnasiast
728eb7565c Increase network version 2018-04-30 21:20:18 +02:00
Gymnasiast
4244f915a1 Implement #7377: Allow for six 6-seater cars on the Wooden RC 2018-04-30 20:37:11 +02:00
Michael Steenbeek
3025599eb3 Merge pull request #7435 from ZehMatt/indexing-perf
Use multiple threads to generate object index cache.
2018-04-30 14:55:54 +02:00
Toby Hinloopen
2fc01cb698 Fix #7424: Do not auto-rotate shops to face queue paths 2018-04-30 14:54:26 +02:00
Olivier Wervers
7713cdac4d Replace month count magic numbers 2018-04-29 20:46:46 +02:00
ZehMatt
76e54dd5ec Fix dead lock due to uninitialized variables. 2018-04-28 02:38:06 +02:00
Ted John
2ef549b055 Fix #7450: Only 3 standard entertainer costumes can be chosen
String value rather than string arrays were not being processed for enterainer costumes in object json files.
2018-04-26 22:00:48 +01:00
ZehMatt
ee53855c62 Use emplace_back with reference as return type. 2018-04-26 21:26:30 +02:00
Ted John
dd58a710ee Make Console::Write functions atomic 2018-04-26 21:26:30 +02:00
Ted John
7da60f4950 Make log functions atomic
Use only one print call to stdout in log functions so that messages are not malformed.
2018-04-26 21:26:30 +02:00
Ted John
20be1cc0a8 Small refactor and code format 2018-04-26 21:26:30 +02:00
ZehMatt
b9d939b294 Show progress of processed elements instead of pending tasks. 2018-04-26 21:26:30 +02:00
ZehMatt
d77f06c1ee Coding style changes. 2018-04-26 21:26:30 +02:00
ZehMatt
7be1cd3e37 Use std::list and fixed step size. 2018-04-26 21:26:30 +02:00
ZehMatt
b9e0eede44 Code cleanup 2018-04-26 21:26:30 +02:00
ZehMatt
64d9109226 Add progress report back. 2018-04-26 21:26:30 +02:00
ZehMatt
bee0fc25b1 Move all code into JobPool.hpp 2018-04-26 21:26:30 +02:00
ZehMatt
ac6b3fb225 Change order of members. 2018-04-26 21:26:30 +02:00
ZehMatt
8c2ac904b4 Add missing vector include. 2018-04-26 21:26:30 +02:00
ZehMatt
6b649e6b29 Remove unused includes. 2018-04-26 21:26:30 +02:00
ZehMatt
dfcec4d9da Refactor file indexing to use the job pool instead of threads. 2018-04-26 21:26:30 +02:00
ZehMatt
254aedefd4 Add generic job pool implementation. 2018-04-26 21:26:30 +02:00
ZehMatt
e841c5b20b Use multiple threads to generate object index cache. 2018-04-26 21:26:30 +02:00
Michael Steenbeek
2d92ecf10b Fix #7436: Only the first 32 vehicles of a train can be painted 2018-04-26 10:33:54 +02:00
Hielke Morsink
49cf840f28 Fix memset byte value too big (#7447)
`memset` takes an integer as argument which gets converted to an unsigned byte. `SPRITE_INDEX_NULL` has a value of 0xFFFF, essentially cutting it to 0xFF. Calling `std::fill_n` instead of `memcpy` assigns the given value to each element in its range rather than setting the bytes. In this case, the result is the same.

None of the other calls to `memset` in the project use values bigger than 0xFF.
2018-04-25 14:47:03 +02:00
Michael Steenbeek
3aac52cf44 Fix rendering of inverted exclamation mark 2018-04-25 13:47:07 +02:00
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