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

Fix formatting and remove warning silencer

This commit is contained in:
Gymnasiast 2017-01-23 21:01:26 +01:00 committed by Ted John
parent 803c4ddfe5
commit 02da9caf5d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/rct1.h
View File

@ -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,

3
src/openrct2/rct1/tables.cpp
View File

@ -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<const char *> GetPreferedRideEntryOrder(uint8 rideType)
{