feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -5,6 +5,7 @@ NetworkPlayerSony::NetworkPlayerSony(SQRNetworkPlayer *qnetPlayer)
|
||||
{
|
||||
m_sqrPlayer = qnetPlayer;
|
||||
m_pSocket = NULL;
|
||||
m_lastChunkPacketTime = 0;
|
||||
}
|
||||
|
||||
unsigned char NetworkPlayerSony::GetSmallId()
|
||||
@@ -12,10 +13,10 @@ unsigned char NetworkPlayerSony::GetSmallId()
|
||||
return m_sqrPlayer->GetSmallId();
|
||||
}
|
||||
|
||||
void NetworkPlayerSony::SendData(INetworkPlayer *player, const void *pvData, int dataSize, bool lowPriority)
|
||||
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 );
|
||||
m_sqrPlayer->SendData( ((NetworkPlayerSony *)player)->m_sqrPlayer, pvData, dataSize, ack );
|
||||
}
|
||||
|
||||
bool NetworkPlayerSony::IsSameSystem(INetworkPlayer *player)
|
||||
@@ -23,14 +24,19 @@ bool NetworkPlayerSony::IsSameSystem(INetworkPlayer *player)
|
||||
return m_sqrPlayer->IsSameSystem(((NetworkPlayerSony *)player)->m_sqrPlayer);
|
||||
}
|
||||
|
||||
int NetworkPlayerSony::GetOutstandingAckCount()
|
||||
{
|
||||
return m_sqrPlayer->GetOutstandingAckCount();
|
||||
}
|
||||
|
||||
int NetworkPlayerSony::GetSendQueueSizeBytes( INetworkPlayer *player, bool lowPriority )
|
||||
{
|
||||
return 0; // TODO
|
||||
return m_sqrPlayer->GetSendQueueSizeBytes();
|
||||
}
|
||||
|
||||
int NetworkPlayerSony::GetSendQueueSizeMessages( INetworkPlayer *player, bool lowPriority )
|
||||
{
|
||||
return 0; // TODO
|
||||
return m_sqrPlayer->GetSendQueueSizeMessages();
|
||||
}
|
||||
|
||||
int NetworkPlayerSony::GetCurrentRtt()
|
||||
@@ -112,3 +118,20 @@ void NetworkPlayerSony::SetUID(PlayerUID UID)
|
||||
{
|
||||
m_sqrPlayer->SetUID(UID);
|
||||
}
|
||||
|
||||
void NetworkPlayerSony::SentChunkPacket()
|
||||
{
|
||||
m_lastChunkPacketTime = System::currentTimeMillis();
|
||||
}
|
||||
|
||||
int NetworkPlayerSony::GetTimeSinceLastChunkPacket_ms()
|
||||
{
|
||||
// If we haven't ever sent a packet, return maximum
|
||||
if( m_lastChunkPacketTime == 0 )
|
||||
{
|
||||
return INT_MAX;
|
||||
}
|
||||
|
||||
__int64 currentTime = System::currentTimeMillis();
|
||||
return (int)( currentTime - m_lastChunkPacketTime );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user