reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-28 15:45:46 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #409 from dreamstalker/fixes201703192

Browse Source 
Make cycle more close to original.
This commit is contained in:
Lev 2017-03-19 22:41:16 +05:00 committed by GitHub
commit e92df0e3f4
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
rehlds/dedicated/src/sys_ded.cpp
View File

@ -80,19 +80,21 @@ char *UTIL_GetBaseDir()
int RunServer()
{
#ifdef _WIN32
// TODO: finish me!
/*if (g_bVGui)
if (g_bVGui)
{
vgui::ivgui()->SetSleep(0);
}*/
// TODO: finish VGUI
//vgui::ivgui()->SetSleep(0);
}
#endif
int iret = 0;
while (true)
{
if (gbAppHasBeenTerminated)
break;
return iret;
CreateInterfaceFn engineFactory = Sys_GetFactory(g_pEngineModule);
RunVGUIFrame();
if (engineFactory)
@ -113,21 +115,22 @@ int RunServer()
}
#endif
}
RunVGUIFrame();
if (!engineAPI)
return -1;
if (!engineAPI->Init(UTIL_GetBaseDir(), (char *)CommandLine()->GetCmdLine(), Sys_GetFactoryThis(), g_FilesystemFactoryFn)) {
if (!engineAPI->Init(UTIL_GetBaseDir(), (char *)CommandLine()->GetCmdLine(), Sys_GetFactoryThis(), g_FilesystemFactoryFn))
return -1;
}
RunVGUIFrame();
#ifdef _WIN32
// TODO: finish me!
/*if (g_bVGui)
if (g_bVGui)
{
g_pFileSystemInterface->AddSearchPath("platform", "PLATFORM");
// TODO: finish VGUI
/*g_pFileSystemInterface->AddSearchPath("platform", "PLATFORM");
// find our configuration directory
char szConfigDir[512];
@ -141,56 +144,57 @@ int RunServer()
{
// we're not running steam, so just put the config dir under the platform
strncpy(szConfigDir, "platform/config", sizeof(szConfigDir));
}
}*/
}*/
}
#endif // _WIN32
RunVGUIFrame();
if (gpszCvars) {
if (gpszCvars)
engineAPI->AddConsoleText(gpszCvars);
}
VGUIFinishedConfig();
RunVGUIFrame();
bool bDone = false;
while (!bDone)
while (true)
{
#ifdef _WIN32
if (g_bVGui)
RunVGUIFrame();
#endif // _WIN32
// Running really fast, yield some time to other apps
sys->Sleep(1);
#ifdef _WIN32
MSG msg;
while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
if (!g_bVGui)
{
if (!GetMessage(&msg, NULL, 0, 0))
bool bDone = false;
MSG msg;
while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
{
bDone = true;
break;
if (!GetMessage(&msg, NULL, 0, 0))
{
bDone = true;
break;
}
TranslateMessage(&msg);
DispatchMessage(&msg);
}
TranslateMessage(&msg);
DispatchMessage(&msg);
if (gbAppHasBeenTerminated || bDone)
break;
}
if (gbAppHasBeenTerminated)
break;
if (g_bVGui)
{
RunVGUIFrame();
}
else
if (!g_bVGui)
#endif // _WIN32
{
ProcessConsoleInput();
}
if (!engineAPI->RunFrame())
{
bDone = true;
}
break;
sys->UpdateStatus(0 /* don't force */);
}
@ -206,13 +210,11 @@ int RunServer()
console.ShutDown();
}
auto iret = engineAPI->Shutdown();
iret = engineAPI->Shutdown();
Sys_UnloadModule(g_pEngineModule);
VGUIFinishedConfig();
if (iret == DLL_CLOSE)
return iret;
}
return 0;
}

13
rehlds/dedicated/src/sys_linux.cpp
View File

@ -61,14 +61,7 @@ void Sleep_Select(int msec)
void Sleep_Net(int msec)
{
if (NET_Sleep_Timeout)
{
NET_Sleep_Timeout();
return;
}
// NET_Sleep_Timeout isn't hooked yet, fallback to the old method
Sleep_Old(msec);
NET_Sleep_Timeout();
}
// linux runs on a 100Hz scheduling clock, so the minimum latency from
@ -275,11 +268,11 @@ int main(int argc, char *argv[])
Sys_Sleep = Sleep_Select;
break;
case 3:
Sys_Sleep = Sleep_Net;
// we Sys_GetProcAddress NET_Sleep() from
//engine_i486.so later in this function
NET_Sleep_Timeout = (NET_Sleep_t)Sys_GetProcAddress(g_pEngineModule, "NET_Sleep_Timeout");
if (NET_Sleep_Timeout != nullptr)
Sys_Sleep = Sleep_Net;
break;
// just in case
default: