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:
@@ -4,7 +4,7 @@
|
||||
NetworkPlayerSony::NetworkPlayerSony(SQRNetworkPlayer *qnetPlayer)
|
||||
{
|
||||
m_sqrPlayer = qnetPlayer;
|
||||
m_pSocket = NULL;
|
||||
m_pSocket = nullptr;
|
||||
m_lastChunkPacketTime = 0;
|
||||
}
|
||||
|
||||
@@ -16,12 +16,12 @@ unsigned char NetworkPlayerSony::GetSmallId()
|
||||
void NetworkPlayerSony::SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority, bool ack)
|
||||
{
|
||||
// TODO - handle priority
|
||||
m_sqrPlayer->SendData( ((NetworkPlayerSony *)player)->m_sqrPlayer, pvData, dataSize, ack );
|
||||
m_sqrPlayer->SendData( static_cast<NetworkPlayerSony *>(player)->m_sqrPlayer, pvData, dataSize, ack );
|
||||
}
|
||||
|
||||
bool NetworkPlayerSony::IsSameSystem(INetworkPlayer *player)
|
||||
{
|
||||
return m_sqrPlayer->IsSameSystem(((NetworkPlayerSony *)player)->m_sqrPlayer);
|
||||
return m_sqrPlayer->IsSameSystem(static_cast<NetworkPlayerSony *>(player)->m_sqrPlayer);
|
||||
}
|
||||
|
||||
int NetworkPlayerSony::GetOutstandingAckCount()
|
||||
@@ -133,5 +133,5 @@ int NetworkPlayerSony::GetTimeSinceLastChunkPacket_ms()
|
||||
}
|
||||
|
||||
int64_t currentTime = System::currentTimeMillis();
|
||||
return (int)( currentTime - m_lastChunkPacketTime );
|
||||
return static_cast<int>(currentTime - m_lastChunkPacketTime);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user