diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index 65284101c2..9d924377f2 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -1145,8 +1145,8 @@ enum { STANDUP_TWISTER_RC_CARRIAGE = 72, REVERSER_RC_CAR = 79, REVERSER_RC_BOGIE = 80, - MINIGOLF_PLAYER = 81, - MINIGOLF_BALL = 82, + MINIGOLF_PLAYER = 81, + MINIGOLF_BALL = 82, HYPERCOASTER_FRONT = 96, HYPERCOASTER_CARRIAGE = 97, INVERTED_4_ACROSS_CARRIAGE = 98, diff --git a/src/openrct2/rct1/tables.cpp b/src/openrct2/rct1/tables.cpp index 817785fdbd..6f5b3abf80 100644 --- a/src/openrct2/rct1/tables.cpp +++ b/src/openrct2/rct1/tables.cpp @@ -1368,8 +1368,6 @@ namespace RCT1 return map[sceneryGroupType]; } -#pragma warning(push) -#pragma warning(disable : 4505) // 'identifier' unreferenced local function has been removed const char * GetWaterObject(uint8 waterType) { static const char * map[] = @@ -1379,7 +1377,6 @@ namespace RCT1 }; return map[waterType]; } -#pragma warning(pop) const std::vector GetPreferedRideEntryOrder(uint8 rideType) {