Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -10,7 +10,7 @@ void Node::_init()
|
||||
|
||||
closed = false;
|
||||
|
||||
cameFrom = NULL;
|
||||
cameFrom = nullptr;
|
||||
}
|
||||
|
||||
Node::Node(const int x, const int y, const int z) :
|
||||
@@ -35,9 +35,9 @@ int Node::createHash(const int x, const int y, const int z)
|
||||
|
||||
float Node::distanceTo(Node *to)
|
||||
{
|
||||
float xd = (float) ( to->x - x );
|
||||
float yd = (float) ( to->y - y );
|
||||
float zd = (float) ( to->z - z );
|
||||
float xd = static_cast<float>(to->x - x);
|
||||
float yd = static_cast<float>(to->y - y);
|
||||
float zd = static_cast<float>(to->z - z);
|
||||
return Mth::sqrt(xd * xd + yd * yd + zd * zd);
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ float Node::distanceToSqr(Node *to)
|
||||
bool Node::equals(Node *o)
|
||||
{
|
||||
//4J Jev, never used anything other than a node.
|
||||
//if (dynamic_cast<Node *>((Node *) o) != NULL)
|
||||
//if (dynamic_cast<Node *>((Node *) o) != nullptr)
|
||||
//{
|
||||
return hash == o->hash && x == o->x && y == o->y && z == o->z;
|
||||
//}
|
||||
|
||||
Reference in New Issue
Block a user