OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 02:51:27 +00:00
Code Releases Activity

Fix UnifiedTime collision

Browse Source 
Win32's GetCurrentTime and plUnifiedTime::GetCurrentTime collided. Rather
than hacking around the solution by undefining GetCurrentTime, we rename
plUnifiedTime::GetCurrentTime to plUnifiedTime::GetCurrent. This fix is
less fiddly than an undef hack.
This commit is contained in:
Adam Johnson
2012-12-21 21:00:03 -05:00
parent c8419b0107
commit 5de87cdaca
9 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
View File

@ -322,7 +322,7 @@ void plNetClientMgr::IDumpOSVersionInfo() const
int plNetClientMgr::Init()
{
int ret=hsOK;
hsLogEntry( DebugMsg("*** plNetClientMgr::Init GMT:%s", plUnifiedTime::GetCurrentTime().Print()) );
hsLogEntry( DebugMsg("*** plNetClientMgr::Init GMT:%s", plUnifiedTime::GetCurrent().Print()) );
IDumpOSVersionInfo();
@ -496,7 +496,7 @@ void plNetClientMgr::UpdateServerTimeOffset(plNetMessage* msg)
const plUnifiedTime& msgSentUT = msg->GetTimeSent();
if (!msgSentUT.AtEpoch())
{
double diff = plUnifiedTime::GetTimeDifference(msgSentUT, plClientUnifiedTime::GetCurrentTime());
double diff = plUnifiedTime::GetTimeDifference(msgSentUT, plUnifiedTime::GetCurrent());
if (fServerTimeOffset == 0)
{
@ -526,13 +526,13 @@ void plNetClientMgr::ResetServerTimeOffset(bool delayed)
plUnifiedTime plNetClientMgr::GetServerTime() const
{
if ( fServerTimeOffset==0 ) // offline mode or before connecting/calibrating to a server
return plUnifiedTime::GetCurrentTime();
return plUnifiedTime::GetCurrent();
plUnifiedTime serverUT;
if (fServerTimeOffset<0)
return plUnifiedTime::GetCurrentTime() - plUnifiedTime(fabs(fServerTimeOffset));
return plUnifiedTime::GetCurrent() - plUnifiedTime(fabs(fServerTimeOffset));
else
return plUnifiedTime::GetCurrentTime() + plUnifiedTime(fServerTimeOffset);
return plUnifiedTime::GetCurrent() + plUnifiedTime(fServerTimeOffset);
}
//

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
View File

@ -424,7 +424,7 @@ int plNetClientMgr::SendMsg(plNetMessage* msg)
msg->SetBit(plNetMessage::kEchoBackToSender, true);
}
msg->SetTimeSent(plUnifiedTime::GetCurrentTime());
msg->SetTimeSent(plUnifiedTime::GetCurrent());
int channel = IPrepMsg(msg);
// hsLogEntry( DebugMsg( "<SND> %s %s", msg->ClassName(), msg->AsStdString().c_str()) );