Merge OBJ_STRING_ID enums into one

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);

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);

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);

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);

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);

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;

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;

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<uint8>();
-	
+
     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.

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);

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);

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);

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);

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);