Common: Replace GetTickCount() on SDL analogue (fix Actor death)

OpenXRay · Nov 6, 2018 · 9dae709 · 9dae709
1 parent f32fbe2
commit 9dae709
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 48 deletions.
diff --git a/src/Common/Common.hpp b/src/Common/Common.hpp
@@ -6,12 +6,3 @@
 #include "Common/FSMacros.hpp"
 #include "Include/xrAPI/xrAPI.h"
 
-#if defined(WINDOWS)
-#if __has_include("SDL.h")
-#include "SDL.h"
-#endif
-
-#if __has_include("SDL_syswm.h")
-#include "SDL_syswm.h"
-#endif
-#endif
diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptestDlg.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptestDlg.cpp
@@ -1026,7 +1026,7 @@ void TransferCallback(GPConnection * connection, void * arg_, void * param)
 	switch(arg->type)
 	{
 	case GP_TRANSFER_SEND_REQUEST:
-		transferStart = GetTickCount();
+		transferStart = SDL_GetTicks();
 		CHECK(gpAcceptTransfer(connection, arg->transfer, "I'd like your file"));
 		break;
 

diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/common/gsPlatformUtil.c b/src/utils/mp_gpprof_server/libraries/gamespy/common/gsPlatformUtil.c
@@ -552,7 +552,7 @@ time_t time(time_t *timer)
 gsi_time current_time()  //returns current time in milliseconds
 { 
 #if defined(_WIN32)
-	return (GetTickCount()); 
+	return (SDL_GetTicks()); 
 
 #elif defined(_PS2)
 	unsigned int ticks;
@@ -1800,7 +1800,7 @@ static void GenerateID(char *keyval)
 		seed = (l1.LowPart ^ l1.HighPart);
 	else
 		seed = 0;
-	Util_RandSeed(seed ^ GetTickCount() ^ (unsigned long)time(NULL) ^ clock());
+	Util_RandSeed(seed ^ SDL_GetTicks() ^ (unsigned long)time(NULL) ^ clock());
 #else
 	Util_RandSeed(time(NULL) ^ clock());
 #endif

diff --git a/src/xrCore/Threading/Event.hpp b/src/xrCore/Threading/Event.hpp
@@ -1,6 +1,8 @@
 #pragma once
 #include "xrCore/_types.h"
 
+#include "SDL.h"
+
 class XRCORE_API Event
 {
     void* handle;

diff --git a/src/xrGame/Level_network.cpp b/src/xrGame/Level_network.cpp
@@ -363,16 +363,15 @@ bool CLevel::Connect2Server(const char* options)
     if (psNET_direct_connect)
         m_bConnectResultReceived = true;
 
-#ifndef LINUX // FIXME!!!
-    u32 EndTime = GetTickCount() + ConnectionTimeOut;
+    u32 EndTime = SDL_GetTicks() + ConnectionTimeOut;
     while (!m_bConnectResultReceived)
     {
         ClientReceive();
         Sleep(5);
         if (Server)
             Server->Update();
         //-----------------------------------------
-        u32 CurTime = GetTickCount();
+        u32 CurTime = SDL_GetTicks();
         if (CurTime > EndTime)
         {
             NET_Packet P;
@@ -393,7 +392,6 @@ bool CLevel::Connect2Server(const char* options)
         }
         //-----------------------------------------
     }
-#endif
     Msg("%c client : connection %s - <%s>", m_bConnectResult ? '*' : '!', m_bConnectResult ? "accepted" : "rejected",
         m_sConnectResult.c_str());
     if (!m_bConnectResult)

diff --git a/src/xrGame/game_sv_deathmatch.cpp b/src/xrGame/game_sv_deathmatch.cpp
@@ -104,11 +104,7 @@ void game_sv_Deathmatch::Create(shared_str& options)
 
     switch_Phase(GAME_PHASE_PENDING);
 
-#ifdef LINUX // FIXME!!!
-    ::Random.seed(0);
-#else
-    ::Random.seed(GetTickCount());
-#endif
+    ::Random.seed(SDL_GetTicks());
     m_CorpseList.clear();
 
     m_AnomaliesPermanent.clear();

diff --git a/src/xrGame/game_sv_event_queue.cpp b/src/xrGame/game_sv_event_queue.cpp
@@ -4,9 +4,9 @@
 
 GameEventQueue::GameEventQueue() :
 #ifdef CONFIG_PROFILE_LOCKS
-	pcs(new Lock(MUTEX_PROFILE_ID(GameEventQueue)))
+    pcs(new Lock(MUTEX_PROFILE_ID(GameEventQueue)))
 #else
-	pcs(new Lock)
+    pcs(new Lock)
 #endif // CONFIG_PROFILE_LOCKS
 {
     unused.reserve(128);
@@ -38,9 +38,7 @@ GameEvent* GameEventQueue::Create()
 #ifdef _DEBUG
 //		Msg ("* GameEventQueue::Create - ready %d, unused %d", ready.size(), unused.size());
 #endif
-#ifndef LINUX // FIXME!!!
-        LastTimeCreate = GetTickCount();
-#endif
+        LastTimeCreate = SDL_GetTicks();
         //---------------------------------------------
     }
     else
@@ -74,16 +72,14 @@ GameEvent* GameEventQueue::Create(NET_Packet& P, u16 type, u32 time, ClientID cl
     pcs->Enter();
     if (unused.empty())
     {
-#ifndef LINUX // FIXME!!!
         ready.push_back(new GameEvent());
         ge = ready.back();
 //---------------------------------------------
 #ifdef _DEBUG
 //		Msg ("* GameEventQueue::Create - ready %d, unused %d", ready.size(), unused.size());
 #endif
-        LastTimeCreate = GetTickCount();
+        LastTimeCreate = SDL_GetTicks();
         //---------------------------------------------
-#endif
     }
     else
     {
@@ -108,8 +104,7 @@ GameEvent* GameEventQueue::Retreive()
     //---------------------------------------------
     else
     {
-#ifndef LINUX // FIXME!!
-        u32 tmp_time = GetTickCount() - 60000;
+        u32 tmp_time = SDL_GetTicks() - 60000;
         u32 size = unused.size();
         if ((LastTimeCreate < tmp_time) && (size > 32))
         {
@@ -119,7 +114,6 @@ GameEvent* GameEventQueue::Retreive()
 //			Msg ("GameEventQueue::Retreive - ready %d, unused %d", ready.size(), unused.size());
 #endif
         }
-#endif
     }
     //---------------------------------------------
     pcs->Leave();
@@ -131,8 +125,7 @@ void GameEventQueue::Release()
     pcs->Enter();
     R_ASSERT(!ready.empty());
     //---------------------------------------------
-#ifndef LINUX // FIXME!!!
-    u32 tmp_time = GetTickCount() - 60000;
+    u32 tmp_time = SDL_GetTicks() - 60000;
     u32 size = unused.size();
     if ((LastTimeCreate < tmp_time) && (size > 32))
     {
@@ -143,7 +136,6 @@ void GameEventQueue::Release()
     }
     else
         unused.push_back(ready.front());
-#endif
     //---------------------------------------------
     ready.pop_front();
     pcs->Leave();
@@ -183,8 +175,7 @@ u32 GameEventQueue::EraseEvents(event_predicate to_del)
     while (need_to_erase != ready.end())
     {
         //-----
-#ifndef LINUX // FIXME!!!
-        u32 tmp_time = GetTickCount() - 60000;
+        u32 tmp_time = SDL_GetTicks() - 60000;
         u32 size = unused.size();
         if ((LastTimeCreate < tmp_time) && (size > 32))
         {
@@ -197,7 +188,6 @@ u32 GameEventQueue::EraseEvents(event_predicate to_del)
         {
             unused.push_back(*need_to_erase);
         }
-#endif
 //-----
 #ifdef DEBUG
         Msg("! GameEventQueue::EraseEvents - destroying event type[%d], sender[0x%08x]", (*need_to_erase)->type,

diff --git a/src/xrGameSpy/stdafx.h b/src/xrGameSpy/stdafx.h
@@ -3,9 +3,7 @@
 #include "Common/Common.hpp"
 #include "xrCore/xrCore.h"
 
-#ifdef LINUX
 #include "SDL.h"
-#endif
 
 #include <GameSpy/common/gsCommon.h>
 #include <GameSpy/common/gsAvailable.h>

diff --git a/src/xrNetServer/NET_Client.cpp b/src/xrNetServer/NET_Client.cpp
@@ -132,7 +132,7 @@ NET_Packet* INetQueue::Create()
         ready.push_back(new NET_Packet());
         P = ready.back();
         //---------------------------------------------
-        LastTimeCreate = GetTickCount();
+        LastTimeCreate = SDL_GetTicks();
         //---------------------------------------------
     }
     else
@@ -157,7 +157,7 @@ NET_Packet* INetQueue::Create(const NET_Packet& _other)
         ready.push_back(new NET_Packet());
         P = ready.back();
         //---------------------------------------------
-        LastTimeCreate = GetTickCount();
+        LastTimeCreate = SDL_GetTicks();
         //---------------------------------------------
     }
     else
@@ -183,7 +183,7 @@ NET_Packet* INetQueue::Retreive()
     //---------------------------------------------
     else
     {
-        u32 tmp_time = GetTickCount() - 60000;
+        u32 tmp_time = SDL_GetTicks() - 60000;
         u32 size = unused.size();
         if ((LastTimeCreate < tmp_time) && (size > 32))
         {
@@ -204,7 +204,7 @@ void INetQueue::Release()
 //#endif
     VERIFY(!ready.empty());
     //---------------------------------------------
-    u32 tmp_time = GetTickCount() - 60000;
+    u32 tmp_time = SDL_GetTicks() - 60000;
     u32 size = unused.size();
     ready.front()->B.count = 0;
     if ((LastTimeCreate < tmp_time) && (size > 32))

diff --git a/src/xrNetServer/empty/NET_Client.cpp b/src/xrNetServer/empty/NET_Client.cpp
@@ -47,7 +47,7 @@ NET_Packet* INetQueue::Create()
         ready.push_back(new NET_Packet());
         P = ready.back();
         //---------------------------------------------
-        // LastTimeCreate = GetTickCount();
+        // LastTimeCreate = SDL_GetTicks();
         //---------------------------------------------
     } else {
         ready.push_back(unused.back());
@@ -66,7 +66,7 @@ NET_Packet* INetQueue::Create(const NET_Packet& _other)
         ready.push_back(new NET_Packet());
         P = ready.back();
         //---------------------------------------------
-        //        LastTimeCreate = GetTickCount();
+        //        LastTimeCreate = SDL_GetTicks();
         //---------------------------------------------
     } else {
         ready.push_back(unused.back());
@@ -87,7 +87,7 @@ NET_Packet* INetQueue::Retreive()
     //---------------------------------------------
     else {
         /*
-    u32 tmp_time = GetTickCount() - 60000;
+    u32 tmp_time = SDL_GetTicks() - 60000;
     u32 size = unused.size();
     if ((LastTimeCreate < tmp_time) && (size > 32))
     {
@@ -104,7 +104,7 @@ void INetQueue::Release()
 {
     VERIFY(!ready.empty());
     //---------------------------------------------
-    // u32 tmp_time = GetTickCount() - 60000;
+    // u32 tmp_time = SDL_GetTicks() - 60000;
     u32 size = unused.size();
     ready.front()->B.count = 0;
     /*