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:
@@ -37,7 +37,7 @@ void ServerScoreboard::setDisplayObjective(int slot, Objective *objective)
|
||||
|
||||
//Scoreboard::setDisplayObjective(slot, objective);
|
||||
|
||||
//if (old != objective && old != NULL)
|
||||
//if (old != objective && old != nullptr)
|
||||
//{
|
||||
// if (getObjectiveDisplaySlotCount(old) > 0)
|
||||
// {
|
||||
@@ -49,7 +49,7 @@ void ServerScoreboard::setDisplayObjective(int slot, Objective *objective)
|
||||
// }
|
||||
//}
|
||||
|
||||
//if (objective != NULL)
|
||||
//if (objective != nullptr)
|
||||
//{
|
||||
// if (trackedObjectives.contains(objective))
|
||||
// {
|
||||
@@ -146,7 +146,7 @@ void ServerScoreboard::setSaveData(ScoreboardSaveData *data)
|
||||
|
||||
void ServerScoreboard::setDirty()
|
||||
{
|
||||
//if (saveData != NULL)
|
||||
//if (saveData != nullptr)
|
||||
//{
|
||||
// saveData->setDirty();
|
||||
//}
|
||||
@@ -154,7 +154,7 @@ void ServerScoreboard::setDirty()
|
||||
|
||||
vector<shared_ptr<Packet> > *ServerScoreboard::getStartTrackingPackets(Objective *objective)
|
||||
{
|
||||
return NULL;
|
||||
return nullptr;
|
||||
|
||||
//vector<shared_ptr<Packet> > *packets = new vector<shared_ptr<Packet> >();
|
||||
//packets.push_back( shared_ptr<SetObjectivePacket>( new SetObjectivePacket(objective, SetObjectivePacket::METHOD_ADD)));
|
||||
@@ -189,7 +189,7 @@ void ServerScoreboard::startTrackingObjective(Objective *objective)
|
||||
|
||||
vector<shared_ptr<Packet> > *ServerScoreboard::getStopTrackingPackets(Objective *objective)
|
||||
{
|
||||
return NULL;
|
||||
return nullptr;
|
||||
|
||||
//vector<shared_ptr<Packet> > *packets = new ArrayList<Packet>();
|
||||
//packets->push_back( shared_ptr<SetObjectivePacket( new SetObjectivePacket(objective, SetObjectivePacket.METHOD_REMOVE)));
|
||||
|
||||
Reference in New Issue
Block a user