diff --git a/src/object/BannerObject.cpp b/src/object/BannerObject.cpp index 4daa3d3fc5..7bf92b92a4 100644 --- a/src/object/BannerObject.cpp +++ b/src/object/BannerObject.cpp @@ -24,11 +24,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - void BannerObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(6, STREAM_SEEK_CURRENT); diff --git a/src/object/EntranceObject.cpp b/src/object/EntranceObject.cpp index 2d4656f9bd..031a2ed70d 100644 --- a/src/object/EntranceObject.cpp +++ b/src/object/EntranceObject.cpp @@ -23,11 +23,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - void EntranceObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(6, STREAM_SEEK_CURRENT); diff --git a/src/object/FootpathItemObject.cpp b/src/object/FootpathItemObject.cpp index 7a24d7a6a1..b00614ee78 100644 --- a/src/object/FootpathItemObject.cpp +++ b/src/object/FootpathItemObject.cpp @@ -23,11 +23,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - void FootpathItemObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(6, STREAM_SEEK_CURRENT); diff --git a/src/object/FootpathObject.cpp b/src/object/FootpathObject.cpp index b892d2612f..e72b3fc171 100644 --- a/src/object/FootpathObject.cpp +++ b/src/object/FootpathObject.cpp @@ -24,11 +24,6 @@ extern "C" #include "../world/footpath.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - void FootpathObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(10, STREAM_SEEK_CURRENT); diff --git a/src/object/LargeSceneryObject.cpp b/src/object/LargeSceneryObject.cpp index 47831c4e56..0bcc6e327e 100644 --- a/src/object/LargeSceneryObject.cpp +++ b/src/object/LargeSceneryObject.cpp @@ -24,11 +24,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - LargeSceneryObject::~LargeSceneryObject() { Memory::Free(_3dFont); diff --git a/src/object/Object.cpp b/src/object/Object.cpp index 90f11bcd16..dcd81f7650 100644 --- a/src/object/Object.cpp +++ b/src/object/Object.cpp @@ -23,11 +23,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - Object::Object(const rct_object_entry &entry) { _objectEntry = entry; diff --git a/src/object/Object.h b/src/object/Object.h index 96f78ad046..6474b2dc39 100644 --- a/src/object/Object.h +++ b/src/object/Object.h @@ -25,6 +25,16 @@ extern "C" #include "../object.h" } +enum OBJ_STRING_ID +{ + OBJ_STRING_ID_NAME, + OBJ_STRING_ID_DESCRIPTION, + OBJ_STRING_ID_SCENARIO_NAME = 0, + OBJ_STRING_ID_PARK_NAME = 1, + OBJ_STRING_ID_SCENARIO_DETAILS = 2, + OBJ_STRING_ID_CAPACITY = 2, +}; + interface IStream; struct ObjectRepositoryItem; struct rct_drawpixelinfo; diff --git a/src/object/RideObject.cpp b/src/object/RideObject.cpp index 703572caa9..6d07e16e51 100644 --- a/src/object/RideObject.cpp +++ b/src/object/RideObject.cpp @@ -28,13 +28,6 @@ extern "C" #include "../rct1.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, - OBJ_STRING_ID_DESCRIPTION, - OBJ_STRING_ID_CAPACITY, -}; - RideObject::~RideObject() { for (int i = 0; i < 4; i++) @@ -90,7 +83,7 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream) // Read preset colours, by default there are 32 _presetColours.count = stream->ReadValue(); - + int coloursCount = _presetColours.count; // To indicate a ride has different colours each train the count // is set to 255. There are only actually 32 colours though. diff --git a/src/object/SceneryGroupObject.cpp b/src/object/SceneryGroupObject.cpp index 2e3d507080..f75acbd574 100644 --- a/src/object/SceneryGroupObject.cpp +++ b/src/object/SceneryGroupObject.cpp @@ -26,11 +26,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - SceneryGroupObject::~SceneryGroupObject() { Memory::Free(_items); diff --git a/src/object/SmallSceneryObject.cpp b/src/object/SmallSceneryObject.cpp index f89b8d23a4..4aa4ac61a4 100644 --- a/src/object/SmallSceneryObject.cpp +++ b/src/object/SmallSceneryObject.cpp @@ -25,11 +25,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - SmallSceneryObject::~SmallSceneryObject() { Memory::Free(_var10data); diff --git a/src/object/StexObject.cpp b/src/object/StexObject.cpp index 0130a20820..6f51124685 100644 --- a/src/object/StexObject.cpp +++ b/src/object/StexObject.cpp @@ -22,13 +22,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_SCENARIO_NAME, - OBJ_STRING_ID_PARK_NAME, - OBJ_STRING_ID_SCENARIO_DETAILS, -}; - void StexObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(6, STREAM_SEEK_CURRENT); diff --git a/src/object/WallObject.cpp b/src/object/WallObject.cpp index 93c5eee0bd..7a8194dc5e 100644 --- a/src/object/WallObject.cpp +++ b/src/object/WallObject.cpp @@ -24,11 +24,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - void WallObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(6, STREAM_SEEK_CURRENT); diff --git a/src/object/WaterObject.cpp b/src/object/WaterObject.cpp index 90a123318a..17a2ff245c 100644 --- a/src/object/WaterObject.cpp +++ b/src/object/WaterObject.cpp @@ -22,11 +22,6 @@ extern "C" #include "../localisation/localisation.h" } -enum OBJ_STRING_ID -{ - OBJ_STRING_ID_NAME, -}; - void WaterObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(6, STREAM_SEEK_CURRENT);