mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Track.cpp and Track.h: fix formatting

This commit is contained in:
Michael Steenbeek 2017-10-17 13:55:53 +02:00
parent bb01699b7d
commit a1621e4eb1
2 changed files with 869 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

863
src/openrct2/ride/Track.cpp
View File

File diff suppressed because it is too large Load Diff

56
src/openrct2/ride/Track.h
View File

@ -14,15 +14,15 @@
*****************************************************************************/ *****************************************************************************/
#pragma endregion #pragma endregion
#ifndef _TRACK_H_ #pragma once
#define _TRACK_H_
#include "../common.h" #include "../common.h"
#include "../object.h" #include "../object.h"
#include "ride.h" #include "ride.h"
#pragma pack(push, 1) #pragma pack(push, 1)
typedef struct rct_trackdefinition { typedef struct rct_trackdefinition
{
uint8 type; uint8 type;
uint8 vangle_end; uint8 vangle_end;
uint8 vangle_start; uint8 vangle_start;
@ -37,7 +37,8 @@ assert_struct_size(rct_trackdefinition, 8);
/** /**
* Size: 0x0A * Size: 0x0A
*/ */
typedef struct rct_preview_track { typedef struct rct_preview_track
{
uint8 index; // 0x00 uint8 index; // 0x00
sint16 x; // 0x01 sint16 x; // 0x01
sint16 y; // 0x03 sint16 y; // 0x03
@ -48,7 +49,8 @@ typedef struct rct_preview_track {
} rct_preview_track; } rct_preview_track;
/* size 0x0A */ /* size 0x0A */
typedef struct rct_track_coordinates { typedef struct rct_track_coordinates
{
sint8 rotation_begin; // 0x00 sint8 rotation_begin; // 0x00
sint8 rotation_end; // 0x01 sint8 rotation_end; // 0x01
sint16 z_begin; // 0x02 sint16 z_begin; // 0x02
@ -57,13 +59,15 @@ typedef struct rct_track_coordinates {
sint16 y; // 0x08 sint16 y; // 0x08
} rct_track_coordinates; } rct_track_coordinates;
enum { enum
{
TRACK_ELEMENT_FLAG_TERMINAL_STATION = 1 << 3, TRACK_ELEMENT_FLAG_TERMINAL_STATION = 1 << 3,
TRACK_ELEMENT_FLAG_INVERTED = 1 << 6, TRACK_ELEMENT_FLAG_INVERTED = 1 << 6,
TRACK_ELEMENT_FLAG_CHAIN_LIFT = 1 << 7, TRACK_ELEMENT_FLAG_CHAIN_LIFT = 1 << 7,
}; };
enum { enum
{
// Not anything to do with colour but uses // Not anything to do with colour but uses
// that field in the map element // that field in the map element
@ -80,7 +84,8 @@ enum {
#define MAX_STATION_PLATFORM_LENGTH 32 #define MAX_STATION_PLATFORM_LENGTH 32
enum { enum
{
TRACK_NONE = 0, TRACK_NONE = 0,
TRACK_FLAT = 0, TRACK_FLAT = 0,
@ -149,7 +154,8 @@ enum {
TRACK_MINI_GOLF_HOLE = 195, TRACK_MINI_GOLF_HOLE = 195,
}; };
enum { enum
{
TRACK_CURVE_LEFT_VERY_SMALL = 5, TRACK_CURVE_LEFT_VERY_SMALL = 5,
TRACK_CURVE_LEFT_SMALL = 3, TRACK_CURVE_LEFT_SMALL = 3,
TRACK_CURVE_LEFT = 1, TRACK_CURVE_LEFT = 1,
@ -161,7 +167,8 @@ enum {
TRACK_CURVE_RIGHT_VERY_SMALL = 6 TRACK_CURVE_RIGHT_VERY_SMALL = 6
}; };
enum { enum
{
TRACK_SLOPE_NONE = 0, TRACK_SLOPE_NONE = 0,
TRACK_SLOPE_UP_25 = 2, TRACK_SLOPE_UP_25 = 2,
TRACK_SLOPE_UP_60 = 4, TRACK_SLOPE_UP_60 = 4,
@ -174,14 +181,16 @@ enum {
TRACK_VANGLE_REVERSE_FREEFALL = 10 TRACK_VANGLE_REVERSE_FREEFALL = 10
}; };
enum { enum
{
TRACK_BANK_NONE = 0, TRACK_BANK_NONE = 0,
TRACK_BANK_LEFT = 2, TRACK_BANK_LEFT = 2,
TRACK_BANK_RIGHT = 4, TRACK_BANK_RIGHT = 4,
TRACK_BANK_UPSIDE_DOWN = 15, TRACK_BANK_UPSIDE_DOWN = 15,
}; };
enum { enum
{
TRACK_HALF_LOOP_UP = 64, TRACK_HALF_LOOP_UP = 64,
TRACK_HALF_LOOP_DOWN = -64, TRACK_HALF_LOOP_DOWN = -64,
TRACK_UNKNOWN_VERTICAL_LOOP = -48, TRACK_UNKNOWN_VERTICAL_LOOP = -48,
@ -189,7 +198,8 @@ enum {
TRACK_CORKSCREW_DOWN = -32 TRACK_CORKSCREW_DOWN = -32
}; };
enum { enum
{
TRACK_ELEM_FLAG_ONLY_UNDERWATER = (1 << 0), TRACK_ELEM_FLAG_ONLY_UNDERWATER = (1 << 0),
TRACK_ELEM_FLAG_TURN_LEFT = (1 << 1), TRACK_ELEM_FLAG_TURN_LEFT = (1 << 1),
TRACK_ELEM_FLAG_TURN_RIGHT = (1 << 2), TRACK_ELEM_FLAG_TURN_RIGHT = (1 << 2),
@ -208,7 +218,8 @@ enum {
TRACK_ELEM_FLAG_BANKED = (1 << 15), // Also set on Spinning Tunnel and Log Flume reverser, probably to save a flag. TRACK_ELEM_FLAG_BANKED = (1 << 15), // Also set on Spinning Tunnel and Log Flume reverser, probably to save a flag.
}; };
enum { enum
{
TRACK_ELEM_FLAT, TRACK_ELEM_FLAT,
TRACK_ELEM_END_STATION, TRACK_ELEM_END_STATION,
TRACK_ELEM_BEGIN_STATION, TRACK_ELEM_BEGIN_STATION,
@ -470,7 +481,8 @@ enum {
TRACK_ELEM_255, TRACK_ELEM_255,
}; };
enum { enum
{
FLAT_TRACK_ELEM_1_X_4_A = 95, FLAT_TRACK_ELEM_1_X_4_A = 95,
FLAT_TRACK_ELEM_2_X_2 = 110, FLAT_TRACK_ELEM_2_X_2 = 110,
FLAT_TRACK_ELEM_4_X_4 = 111, FLAT_TRACK_ELEM_4_X_4 = 111,
@ -482,7 +494,8 @@ enum {
FLAT_TRACK_ELEM_3_X_3 = 123, FLAT_TRACK_ELEM_3_X_3 = 123,
}; };
enum { enum
{
TRACK_SEQUENCE_FLAG_DIRECTION_0 = (1 << 0), TRACK_SEQUENCE_FLAG_DIRECTION_0 = (1 << 0),
TRACK_SEQUENCE_FLAG_DIRECTION_1 = (1 << 1), TRACK_SEQUENCE_FLAG_DIRECTION_1 = (1 << 1),
TRACK_SEQUENCE_FLAG_DIRECTION_2 = (1 << 2), TRACK_SEQUENCE_FLAG_DIRECTION_2 = (1 << 2),
@ -492,17 +505,20 @@ enum {
TRACK_SEQUENCE_FLAG_DISALLOW_DOORS = (1 << 6), // 0x40 TRACK_SEQUENCE_FLAG_DISALLOW_DOORS = (1 << 6), // 0x40
}; };
enum { enum
{
TRACK_ELEMENT_LOCATION_IS_UNDERGROUND = 2, TRACK_ELEMENT_LOCATION_IS_UNDERGROUND = 2,
}; };
enum { enum
{
GC_SET_MAZE_TRACK_BUILD = 0, GC_SET_MAZE_TRACK_BUILD = 0,
GC_SET_MAZE_TRACK_MOVE = 1, GC_SET_MAZE_TRACK_MOVE = 1,
GC_SET_MAZE_TRACK_FILL = 2, GC_SET_MAZE_TRACK_FILL = 2,
}; };
typedef struct track_circuit_iterator { typedef struct track_circuit_iterator
{
rct_xy_element last; rct_xy_element last;
rct_xy_element current; rct_xy_element current;
sint32 currentZ; sint32 currentZ;
@ -562,5 +578,3 @@ void track_element_set_colour_scheme(rct_map_element * mapElement, uint8 colourS
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif