Skip to content

Commit 4d37b6b

Browse files
committed
Run ingame server in a separate process
1 parent 693eb67 commit 4d37b6b

File tree

12 files changed

+273
-323
lines changed

12 files changed

+273
-323
lines changed

Client/mods/deathmatch/logic/CClientGame.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ bool CClientGame::StartLocalGame(eServerType Type, const char* szPassword)
752752
{
753753
m_bWaitingForLocalConnect = true;
754754
m_bErrorStartingLocal = true;
755-
g_pCore->ShowMessageBox(_("Error") + _E("CD04"), _("The server is not installed"), MB_ICON_ERROR | MB_BUTTON_OK);
755+
g_pCore->ShowMessageBox(_("Error") + _E("CD60"), _("Could not start the local server. See console for details."), MB_BUTTON_OK | MB_ICON_ERROR);
756756
g_pCore->GetModManager()->RequestUnload();
757757
return false;
758758
}
@@ -1122,8 +1122,8 @@ void CClientGame::DoPulses()
11221122
// Call debug code if debug mode
11231123
m_Foo.DoPulse();
11241124

1125-
// Output stuff from our internal server eventually
1126-
m_Server.DoPulse();
1125+
// Output stuff from our server eventually
1126+
m_Server.Pulse();
11271127

11281128
if (m_pManager->IsGameLoaded() && m_Status == CClientGame::STATUS_JOINED && GetTickCount64_() - m_llLastTransgressionTime > 60000)
11291129
{

Client/mods/deathmatch/logic/CDynamicLibrary.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*****************************************************************************/
1111

1212
#include <StdInc.h>
13+
#include "CDynamicLibrary.h"
1314

1415
CDynamicLibrary::CDynamicLibrary()
1516
{

0 commit comments

Comments
 (0)