mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Clean up branch

Browse source
This commit is contained in:
Ted John 2017-06-05 17:38:14 +01:00
parent 79eef1d28f
commit 9a619b3e0a
3 changed files with 91 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/openrct2/common.h
View file

@ -296,7 +296,4 @@ assert_struct_size(registers, 7 * 4);
#define UNUSED(x) ((void)(x))
// Macro for turning symbol names into strings
#define SZ(x) #x
#endif

182
src/openrct2/ride/ride.c
View file

@ -8381,97 +8381,97 @@ const char * ride_type_get_enum_name(sint32 rideType)
{
static const char * RideTypeEnumNames[RIDE_TYPE_COUNT] =
{
SZ(RIDE_TYPE_SPIRAL_ROLLER_COASTER),
SZ(RIDE_TYPE_STAND_UP_ROLLER_COASTER),
SZ(RIDE_TYPE_SUSPENDED_SWINGING_COASTER),
SZ(RIDE_TYPE_INVERTED_ROLLER_COASTER),
SZ(RIDE_TYPE_JUNIOR_ROLLER_COASTER),
SZ(RIDE_TYPE_MINIATURE_RAILWAY),
SZ(RIDE_TYPE_MONORAIL),
SZ(RIDE_TYPE_MINI_SUSPENDED_COASTER),
SZ(RIDE_TYPE_BOAT_RIDE),
SZ(RIDE_TYPE_WOODEN_WILD_MOUSE),
SZ(RIDE_TYPE_STEEPLECHASE),
SZ(RIDE_TYPE_CAR_RIDE),
SZ(RIDE_TYPE_LAUNCHED_FREEFALL),
SZ(RIDE_TYPE_BOBSLEIGH_COASTER),
SZ(RIDE_TYPE_OBSERVATION_TOWER),
SZ(RIDE_TYPE_LOOPING_ROLLER_COASTER),
SZ(RIDE_TYPE_DINGHY_SLIDE),
SZ(RIDE_TYPE_MINE_TRAIN_COASTER),
SZ(RIDE_TYPE_CHAIRLIFT),
SZ(RIDE_TYPE_CORKSCREW_ROLLER_COASTER),
SZ(RIDE_TYPE_MAZE),
SZ(RIDE_TYPE_SPIRAL_SLIDE),
SZ(RIDE_TYPE_GO_KARTS),
SZ(RIDE_TYPE_LOG_FLUME),
SZ(RIDE_TYPE_RIVER_RAPIDS),
SZ(RIDE_TYPE_DODGEMS),
SZ(RIDE_TYPE_PIRATE_SHIP),
SZ(RIDE_TYPE_SWINGING_INVERTER_SHIP),
SZ(RIDE_TYPE_FOOD_STALL),
SZ(RIDE_TYPE_1D),
SZ(RIDE_TYPE_DRINK_STALL),
SZ(RIDE_TYPE_1F),
SZ(RIDE_TYPE_SHOP),
SZ(RIDE_TYPE_MERRY_GO_ROUND),
SZ(RIDE_TYPE_22),
SZ(RIDE_TYPE_INFORMATION_KIOSK),
SZ(RIDE_TYPE_TOILETS),
SZ(RIDE_TYPE_FERRIS_WHEEL),
SZ(RIDE_TYPE_MOTION_SIMULATOR),
SZ(RIDE_TYPE_3D_CINEMA),
SZ(RIDE_TYPE_TOP_SPIN),
SZ(RIDE_TYPE_SPACE_RINGS),
SZ(RIDE_TYPE_REVERSE_FREEFALL_COASTER),
SZ(RIDE_TYPE_LIFT),
SZ(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER),
SZ(RIDE_TYPE_CASH_MACHINE),
SZ(RIDE_TYPE_TWIST),
SZ(RIDE_TYPE_HAUNTED_HOUSE),
SZ(RIDE_TYPE_FIRST_AID),
SZ(RIDE_TYPE_CIRCUS_SHOW),
SZ(RIDE_TYPE_GHOST_TRAIN),
SZ(RIDE_TYPE_TWISTER_ROLLER_COASTER),
SZ(RIDE_TYPE_WOODEN_ROLLER_COASTER),
SZ(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER),
SZ(RIDE_TYPE_WILD_MOUSE),
SZ(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER),
SZ(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT),
SZ(RIDE_TYPE_FLYING_ROLLER_COASTER),
SZ(RIDE_TYPE_FLYING_ROLLER_COASTER_ALT),
SZ(RIDE_TYPE_VIRGINIA_REEL),
SZ(RIDE_TYPE_SPLASH_BOATS),
SZ(RIDE_TYPE_MINI_HELICOPTERS),
SZ(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER),
SZ(RIDE_TYPE_SUSPENDED_MONORAIL),
SZ(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT),
SZ(RIDE_TYPE_REVERSER_ROLLER_COASTER),
SZ(RIDE_TYPE_HEARTLINE_TWISTER_COASTER),
SZ(RIDE_TYPE_MINI_GOLF),
SZ(RIDE_TYPE_GIGA_COASTER),
SZ(RIDE_TYPE_ROTO_DROP),
SZ(RIDE_TYPE_FLYING_SAUCERS),
SZ(RIDE_TYPE_CROOKED_HOUSE),
SZ(RIDE_TYPE_MONORAIL_CYCLES),
SZ(RIDE_TYPE_COMPACT_INVERTED_COASTER),
SZ(RIDE_TYPE_WATER_COASTER),
SZ(RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER),
SZ(RIDE_TYPE_INVERTED_HAIRPIN_COASTER),
SZ(RIDE_TYPE_MAGIC_CARPET),
SZ(RIDE_TYPE_SUBMARINE_RIDE),
SZ(RIDE_TYPE_RIVER_RAFTS),
SZ(RIDE_TYPE_50),
SZ(RIDE_TYPE_ENTERPRISE),
SZ(RIDE_TYPE_52),
SZ(RIDE_TYPE_53),
SZ(RIDE_TYPE_54),
SZ(RIDE_TYPE_55),
SZ(RIDE_TYPE_INVERTED_IMPULSE_COASTER),
SZ(RIDE_TYPE_MINI_ROLLER_COASTER),
SZ(RIDE_TYPE_MINE_RIDE),
SZ(RIDE_TYPE_59),
SZ(RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER),
nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER),
nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER),
nameof(RIDE_TYPE_SUSPENDED_SWINGING_COASTER),
nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER),
nameof(RIDE_TYPE_JUNIOR_ROLLER_COASTER),
nameof(RIDE_TYPE_MINIATURE_RAILWAY),
nameof(RIDE_TYPE_MONORAIL),
nameof(RIDE_TYPE_MINI_SUSPENDED_COASTER),
nameof(RIDE_TYPE_BOAT_RIDE),
nameof(RIDE_TYPE_WOODEN_WILD_MOUSE),
nameof(RIDE_TYPE_STEEPLECHASE),
nameof(RIDE_TYPE_CAR_RIDE),
nameof(RIDE_TYPE_LAUNCHED_FREEFALL),
nameof(RIDE_TYPE_BOBSLEIGH_COASTER),
nameof(RIDE_TYPE_OBSERVATION_TOWER),
nameof(RIDE_TYPE_LOOPING_ROLLER_COASTER),
nameof(RIDE_TYPE_DINGHY_SLIDE),
nameof(RIDE_TYPE_MINE_TRAIN_COASTER),
nameof(RIDE_TYPE_CHAIRLIFT),
nameof(RIDE_TYPE_CORKSCREW_ROLLER_COASTER),
nameof(RIDE_TYPE_MAZE),
nameof(RIDE_TYPE_SPIRAL_SLIDE),
nameof(RIDE_TYPE_GO_KARTS),
nameof(RIDE_TYPE_LOG_FLUME),
nameof(RIDE_TYPE_RIVER_RAPIDS),
nameof(RIDE_TYPE_DODGEMS),
nameof(RIDE_TYPE_PIRATE_SHIP),
nameof(RIDE_TYPE_SWINGING_INVERTER_SHIP),
nameof(RIDE_TYPE_FOOD_STALL),
nameof(RIDE_TYPE_1D),
nameof(RIDE_TYPE_DRINK_STALL),
nameof(RIDE_TYPE_1F),
nameof(RIDE_TYPE_SHOP),
nameof(RIDE_TYPE_MERRY_GO_ROUND),
nameof(RIDE_TYPE_22),
nameof(RIDE_TYPE_INFORMATION_KIOSK),
nameof(RIDE_TYPE_TOILETS),
nameof(RIDE_TYPE_FERRIS_WHEEL),
nameof(RIDE_TYPE_MOTION_SIMULATOR),
nameof(RIDE_TYPE_3D_CINEMA),
nameof(RIDE_TYPE_TOP_SPIN),
nameof(RIDE_TYPE_SPACE_RINGS),
nameof(RIDE_TYPE_REVERSE_FREEFALL_COASTER),
nameof(RIDE_TYPE_LIFT),
nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER),
nameof(RIDE_TYPE_CASH_MACHINE),
nameof(RIDE_TYPE_TWIST),
nameof(RIDE_TYPE_HAUNTED_HOUSE),
nameof(RIDE_TYPE_FIRST_AID),
nameof(RIDE_TYPE_CIRCUS_SHOW),
nameof(RIDE_TYPE_GHOST_TRAIN),
nameof(RIDE_TYPE_TWISTER_ROLLER_COASTER),
nameof(RIDE_TYPE_WOODEN_ROLLER_COASTER),
nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER),
nameof(RIDE_TYPE_WILD_MOUSE),
nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER),
nameof(RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT),
nameof(RIDE_TYPE_FLYING_ROLLER_COASTER),
nameof(RIDE_TYPE_FLYING_ROLLER_COASTER_ALT),
nameof(RIDE_TYPE_VIRGINIA_REEL),
nameof(RIDE_TYPE_SPLASH_BOATS),
nameof(RIDE_TYPE_MINI_HELICOPTERS),
nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER),
nameof(RIDE_TYPE_SUSPENDED_MONORAIL),
nameof(RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT),
nameof(RIDE_TYPE_REVERSER_ROLLER_COASTER),
nameof(RIDE_TYPE_HEARTLINE_TWISTER_COASTER),
nameof(RIDE_TYPE_MINI_GOLF),
nameof(RIDE_TYPE_GIGA_COASTER),
nameof(RIDE_TYPE_ROTO_DROP),
nameof(RIDE_TYPE_FLYING_SAUCERS),
nameof(RIDE_TYPE_CROOKED_HOUSE),
nameof(RIDE_TYPE_MONORAIL_CYCLES),
nameof(RIDE_TYPE_COMPACT_INVERTED_COASTER),
nameof(RIDE_TYPE_WATER_COASTER),
nameof(RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER),
nameof(RIDE_TYPE_INVERTED_HAIRPIN_COASTER),
nameof(RIDE_TYPE_MAGIC_CARPET),
nameof(RIDE_TYPE_SUBMARINE_RIDE),
nameof(RIDE_TYPE_RIVER_RAFTS),
nameof(RIDE_TYPE_50),
nameof(RIDE_TYPE_ENTERPRISE),
nameof(RIDE_TYPE_52),
nameof(RIDE_TYPE_53),
nameof(RIDE_TYPE_54),
nameof(RIDE_TYPE_55),
nameof(RIDE_TYPE_INVERTED_IMPULSE_COASTER),
nameof(RIDE_TYPE_MINI_ROLLER_COASTER),
nameof(RIDE_TYPE_MINE_RIDE),
nameof(RIDE_TYPE_59),
nameof(RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER),
};
return RideTypeEnumNames[rideType];

3
test/tests/RideRatings.cpp
View file

@ -6,7 +6,6 @@
#include <openrct2/core/Path.hpp>
#include <openrct2/core/String.hpp>
#include <openrct2/OpenRCT2.h>
#include <openrct2/ui/UiContext.h>
#include "TestData.h"
extern "C"
@ -16,8 +15,6 @@ extern "C"
}
using namespace OpenRCT2;
using namespace OpenRCT2::Audio;
using namespace OpenRCT2::Ui;
class RideRatings : public testing::Test
{