mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
15,870 Commits 8 Branches 59 Tags
39b59b118544a07186cacfdafbf62745cf1a53b6
Commit Graph

12100 Commits

Author SHA1 Message Date
Michał Janiszewski
39b59b1185 Merge pull request #8549 from janisozaur/sdl2-prefix 
Drop SDL2/ prefix on includes
 2019-01-07 22:32:26 +01:00
ζeh Matt
eb4ddebe3e Merge pull request #8525 from ZehMatt/ga-scenery-remove 
Implement scenery remove game actions.
 2019-01-07 19:50:40 +01:00
Aaron van Geffen
2427b67374 Fix #8555: Multiplayer window text limits are not computed properly. 2019-01-07 12:17:37 +01:00
Michał Janiszewski
0d2fd33fd8 Bump network version 
Co-Authored-By: ZehMatt <m.moninger.h@gmail.com>
 2019-01-07 09:04:51 +01:00
Matt
9f613833ce Rename actions. 2019-01-07 09:04:51 +01:00
IntelOrca
b9fd90ffd3 Implement ClearAction. 2019-01-07 09:04:51 +01:00
Matt
d7096f71cb Implement SceneryRemoveLargeAction. 2019-01-07 09:04:51 +01:00
Matt
b34b09c6bb Implement SceneryRemoveSmallAction. 2019-01-07 09:04:51 +01:00
Michał Janiszewski
ecfbf60cc4 Drop SDL2/ prefix on includes 
pkg-config, cmake, all demos and tests define the path with SDL2/
already included.
 2019-01-06 17:29:29 +01:00
Ted John
0328355f9e Include stdexcept instead of exception (#8559) 2019-01-05 22:12:47 +01:00
Hielke Morsink
53ae48ffca Merge pull request #8550 from janisozaur/fallthroughs 
Fix implicit fallthroughs
 2019-01-04 23:27:02 +01:00
Hielke Morsink
5ef5e4153d Fix some more implicit and conditional fallthroughs 2019-01-04 22:26:56 +01:00
Michał Janiszewski
8a70b29f64 Fix GCC's warning regarding enum vs non-enum values being compared (#8551) 2019-01-04 21:29:44 +01:00
Michał Janiszewski
7e769ed662 Fix #7536: Android build fails to start (#8554) 
This was a regression from #7435 which introduced threads and caused JNI
to misbehave and fail to load our expected classes. Provide a workaround
based on the description in https://stackoverflow.com/a/16302771 which
stores a main thread's class loader and uses that in neighbouring
threads.
 2019-01-04 19:48:26 +01:00
ζeh Matt
20496b0390 Merge pull request #8545 from richard-fine/use-enum-types 
Use of enum types in Peep code
 2019-01-04 10:57:56 +01:00
ζeh Matt
069052c685 Fix replays not working in some cases. (#8552) 2019-01-04 10:45:21 +01:00
Richard Fine
a30e154388 Handle all enum values in switches 
Add 'default' cases to a few enums that were not otherwise handling all possible enum values. This wasn't a problem before because the variables we were switching on were not actually enum types, but now that they are, Clang is warning us about the non-covered cases.
 2019-01-03 12:06:47 +00:00
Michael Steenbeek
31298bd772 Merge pull request #8543 from IntelOrca/refactor-ride 
Refactor ride structure
 2019-01-02 22:38:20 +01:00
Michał Janiszewski
c5e1abcfb1 Fix implicit fallthroughs 2019-01-02 22:30:57 +01:00
Michał Janiszewski
b7d1d49956 Merge pull request #8548 from janisozaur/memleak-20190102 
Plug memory leaks
 2019-01-02 21:23:09 +01:00
Ted John
d979511628 Do code review suggestions 2019-01-02 19:46:13 +00:00
Gymnasiast
7c8144b57d Fix codepoint of interpunct 2019-01-02 20:04:42 +01:00
Michał Janiszewski
ca3d9cea91 Add missing free() call in config_release() 2019-01-02 20:02:14 +01:00
Michał Janiszewski
635e46af83 Plug memory leak in ObjectFactory::CreateObjectFromZipFile 2019-01-02 19:57:41 +01:00
Michael Steenbeek
b5317ee9e9 Split drawing of path and railing 2019-01-02 19:52:53 +01:00
Richard Fine
3089781883 Reformat 2019-01-02 14:40:17 +00:00
Richard Fine
b845304656 Equality operators for TileCoordsXYZ 
Introduce operator == and operator != for TileCoordsXYZ, so that we can more easily operate on them in tests.
 2019-01-02 14:11:28 +00:00
Richard Fine
60396c6658 Rename enums to modern style 
Change various PEEP_ENUM_TYPE names to PeepEnumType names, to match the more modern coding standard.
 2019-01-02 14:10:05 +00:00
ζeh Matt
a065806b20 Merge pull request #8374 from ZehMatt/replay-feature 
Add support to record and replay game commands/actions.
 2019-01-02 09:15:10 +01:00
Matt
7955dba9ba Add warning for mismatching network version. 2019-01-02 06:58:36 +01:00
Matt
fc4e45562d Use stringstream to log integral values. 2019-01-02 06:39:59 +01:00
Matt
74668c6188 Use correct file path on replay info output. 2019-01-02 05:39:32 +01:00
Matt
8615690891 Fix timestamp not being stored. 2019-01-02 05:36:31 +01:00
Matt
6aee1cba28 Remove deprecated function std::asctime. 2019-01-02 05:35:57 +01:00
Matt
1f20fdf65b Log more replay information to console. 2019-01-02 05:20:10 +01:00
Matt
a8254aa292 Add 64 bit serialisation support. 2019-01-02 05:18:36 +01:00
Matt
fafd2081e3 Result NewsItem when adding to queue. 2019-01-02 05:03:42 +01:00
Richard Fine
88beb4ee6a Define PEEP_ACTION_SPRITE_TYPE_WATCH_RIDE 
Previously untitled "PEEP_ACTION_SPRITE_TYPE_2" is a single-frame animation that guests play when they are standing still and watching a ride.
 2019-01-01 23:17:45 +00:00
Richard Fine
a5e896f0c3 Use PEEP_ACTION_SPRITE_TYPE in the peep drawing code 2019-01-01 23:07:13 +00:00
Richard Fine
73686e84d6 Define PEEP_ACTION_SPRITE_TYPE_SITTING_IDLE 
Previously untitled 'PEEP_ACTION_SPRITE_TYPE7' is actually a single-frame animation for sitting on benches, from looking at the sprite. Makes sense with the way the value is used in the code too.
 2019-01-01 23:06:57 +00:00
Richard Fine
f3292194f5 Use PEEP_SPRITE_TYPE enum 
Use the PEEP_SPRITE_TYPE enum for rct_peep::sprite_type so we get type safety on it.
 2019-01-01 22:40:59 +00:00
Richard Fine
88850cdab2 Use PEEP_ACTION_SPRITE_TYPE enum 
Use the PEEP_ACTION_SPRITE_TYPE enum for rct_peep::action_sprite_type and ::next_action_sprite_type, as well as other code that deals with action sprite types.
 2019-01-01 22:29:26 +00:00
Richard Fine
38cec94d9d Use PEEP_THOUGHT_TYPE enum 
Use PEEP_THOUGHT_TYPE for rct_peep_thought::type field, as well as functions that deal with selecting thoughts to add.
 2019-01-01 22:18:49 +00:00
Richard Fine
b716fd071d Use PEEP_TYPE enum for rct_peep::type field 
Use the PEEP_TYPE enum for rct_peep::type so that the compiler/debugger understand what values it should contain.
 2019-01-01 22:11:02 +00:00
Richard Fine
e1016bf71e Use PEEP_ACTION_EVENTS enum for rct_peep::action field 
Use the PEEP_ACTION_EVENTS enum for the rct_peep::action field explicitly, so that we get type safety on it from the compiler and debugger. In the process, force PEEP_ACTION_EVENTS to be of size uint8_t, and use named constants for NONE actions instead of magic numbers in a few places.
 2019-01-01 22:06:02 +00:00
Michał Janiszewski
51c88d85fd Add missing repository to Android project 2019-01-01 22:38:04 +01:00
Ted John
38f632074b Merge ride track colour arrays into one 2019-01-01 21:25:34 +00:00
Richard Fine
88b86eb0c1 Use PEEP_STATE enum type directly 
Explicitly declare the PEEP_STATE enum as being uint8_t width, then use it instead of uint8_t in the rct_peep struct. This has a few benefits:

* It makes it clearer which values we expect to be assigned to that variable. If you hadn't already seen PEEP_STATE existed, it wouldn't be obvious.
* It lets the compiler catch assignment of non-PEEP_STATE values for us
* It lets the debugger show us symbolic constants when looking at a peep, instead of raw values.

The only downside is that we no longer see directly in the rct_peep struct that the field is 1 byte wide, but I think that the benefits outweigh the costs in this case...
 2019-01-01 20:49:17 +00:00
Ted John
37f76d1687 Move station fields into new station struct 2019-01-01 02:26:14 +00:00
Ted John
8e6497fc1d Merge vehicle_colours and vehicle_colours_extended 2018-12-31 19:25:07 +00:00