shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -14,7 +14,7 @@ TerrainParticle::TerrainParticle(Level *level, double x, double y, double z, dou
|
||||
size /= 2;
|
||||
}
|
||||
|
||||
shared_ptr<TerrainParticle> TerrainParticle::init(int x, int y, int z, int data) // 4J - added data parameter
|
||||
std::shared_ptr<TerrainParticle> TerrainParticle::init(int x, int y, int z, int data) // 4J - added data parameter
|
||||
{
|
||||
if (tile == Tile::grass) return dynamic_pointer_cast<TerrainParticle>( shared_from_this() );
|
||||
int col = tile->getColor(level, x, y, z, data); // 4J - added data parameter
|
||||
@@ -24,7 +24,7 @@ shared_ptr<TerrainParticle> TerrainParticle::init(int x, int y, int z, int data)
|
||||
return dynamic_pointer_cast<TerrainParticle>( shared_from_this() );
|
||||
}
|
||||
|
||||
shared_ptr<TerrainParticle> TerrainParticle::init(int data)
|
||||
std::shared_ptr<TerrainParticle> TerrainParticle::init(int data)
|
||||
{
|
||||
if (tile == Tile::grass) return dynamic_pointer_cast<TerrainParticle>( shared_from_this() );
|
||||
int col = tile->getColor(data);
|
||||
@@ -59,7 +59,7 @@ void TerrainParticle::render(Tesselator *t, float a, float xa, float ya, float z
|
||||
float y = (float) (yo + (this->y - yo) * a - yOff);
|
||||
float z = (float) (zo + (this->z - zo) * a - zOff);
|
||||
|
||||
// 4J - don't render terrain particles that are less than a metre away, to try and avoid large particles that are causing us problems with
|
||||
// 4J - don't render terrain particles that are less than a metre away, to try and avoid large particles that are causing us problems with
|
||||
// photosensitivity testing
|
||||
float distSq = (x*x + y*y + z*z);
|
||||
if( distSq < 1.0f ) return;
|
||||
|
||||
Reference in New Issue
Block a user