When creating floor indicators, name additional indicators uniquely using the indicator's index value

Author: eventhorizon5

src/sbs/elevatorcar.cpp

@@ -505,7 +505,7 @@ FloorIndicator* ElevatorCar::AddFloorIndicator(const std::string &texture_prefix
 {
 	//Creates a floor indicator at the specified location
 
-	FloorIndicator* indicator = new FloorIndicator(this, parent->Number, Number, texture_prefix, blank_texture, direction, CenterX, CenterZ, width, height, voffset);
+	FloorIndicator* indicator = new FloorIndicator(this, FloorIndicatorArray.size(), parent->Number, Number, texture_prefix, blank_texture, direction, CenterX, CenterZ, width, height, voffset);
 	FloorIndicatorArray.emplace_back(indicator);
 	return indicator;
 }

src/sbs/floor.cpp

@@ -907,7 +907,7 @@ FloorIndicator* Floor::AddFloorIndicator(int elevator, int car, bool relative, c
 
 	if (relative == false)
 	{
-		FloorIndicator *ind = new FloorIndicator(this, elevator, car, texture_prefix, blank_texture, direction, CenterX, CenterZ, width, height, GetBase(true) + voffset);
+		FloorIndicator *ind = new FloorIndicator(this, FloorIndicatorArray.size(), elevator, car, texture_prefix, blank_texture, direction, CenterX, CenterZ, width, height, GetBase(true) + voffset);
 		FloorIndicatorArray.emplace_back(ind);
 		return ind;
 	}
@@ -916,7 +916,7 @@ FloorIndicator* Floor::AddFloorIndicator(int elevator, int car, bool relative, c
 		Elevator* elev = sbs->GetElevator(elevator);
 		if (elev)
 		{
-			FloorIndicator *ind = new FloorIndicator(this, elevator, car, texture_prefix, blank_texture, direction, elev->GetPosition().x + CenterX, elev->GetPosition().z + CenterZ, width, height, GetBase(true) + voffset);
+			FloorIndicator *ind = new FloorIndicator(this, FloorIndicatorArray.size(), elevator, car, texture_prefix, blank_texture, direction, elev->GetPosition().x + CenterX, elev->GetPosition().z + CenterZ, width, height, GetBase(true) + voffset);
 			FloorIndicatorArray.emplace_back(ind);
 			return ind;
 		}

src/sbs/floorindicator.cpp

@@ -47,7 +47,7 @@ class FloorIndicator::Timer : public TimerObject
 	virtual void Notify();
 };
 
-FloorIndicator::FloorIndicator(Object *parent, int elevator, int car, const std::string &texture_prefix, const std::string &blank_texture, const std::string &direction, Real CenterX, Real CenterZ, Real width, Real height, Real voffset) : Object(parent)
+FloorIndicator::FloorIndicator(Object *parent, int index, int elevator, int car, const std::string &texture_prefix, const std::string &blank_texture, const std::string &direction, Real CenterX, Real CenterZ, Real width, Real height, Real voffset) : Object(parent)
 {
 	//creates a new floor indicator at the specified position
 
@@ -64,7 +64,12 @@ FloorIndicator::FloorIndicator(Object *parent, int elevator, int car, const std:
 	//move object
 	Move(CenterX, voffset, CenterZ);
 
-	std::string name = "Floor Indicator " + ToString(elevator);
+	std::string ext = ":" + ToString(index + 1);
+	std::string name;
+	if (index == 0)
+		name = "Floor Indicator " + ToString(elevator);
+	else
+		name = "Floor Indicator " + ToString(elevator) + ext;
 	SetName(name);
 
 	FloorIndicatorMesh = new MeshObject(this, name, 0, "", "", sbs->GetConfigFloat("Skyscraper.SBS.MaxSmallRenderDistance", 100));

src/sbs/floorindicator.h

@@ -36,7 +36,7 @@ class SBSIMPEXP FloorIndicator : public Object
 	std::string Blank; //blank texture name
 
 	//functions
-	FloorIndicator(Object *parent, int elevator, int car, const std::string &texture_prefix, const std::string &blank_texture, const std::string &direction, Real CenterX, Real CenterZ, Real width, Real height, Real altitude);
+	FloorIndicator(Object *parent, int index, int elevator, int car, const std::string &texture_prefix, const std::string &blank_texture, const std::string &direction, Real CenterX, Real CenterZ, Real width, Real height, Real altitude);
 	~FloorIndicator();
 	void Enabled(bool value);
 	void Update(bool blank = false);