Skip to content
Permalink
Browse files

- fixed compilation on Windows.

  • Loading branch information...
coelckers committed Oct 7, 2019
1 parent ff379e7 commit 6f821a919852935e798d4afe8f4362bfa2a2bf5b
Showing with 5 additions and 6 deletions.
  1. +1 −1 src/d_net.cpp
  2. +4 −5 src/win32/i_main.cpp
@@ -1548,7 +1548,7 @@ bool D_ArbitrateNetStart (void)

// Return right away if we're just playing with ourselves.
if (doomcom.numnodes == 1)
return;
return true;

autostart = true;

@@ -749,7 +749,7 @@ static void UnTbp()
//
//==========================================================================

void DoMain (HINSTANCE hInstance)
int DoMain (HINSTANCE hInstance)
{
LONG WinWidth, WinHeight;
int height, width, x, y;
@@ -853,7 +853,7 @@ void DoMain (HINSTANCE hInstance)
WCHAR progbuff[1024];
if (GetModuleFileNameW(nullptr, progbuff, sizeof progbuff) == 0)
{
MessageBoc(nullptr, "Fatal", "Could not determine program location.", MB_ICONEXCLAMATION|MB_OK);
MessageBoxA(nullptr, "Fatal", "Could not determine program location.", MB_ICONEXCLAMATION|MB_OK);
exit(-1);
}

@@ -992,7 +992,6 @@ void I_ShowFatalError(const char *msg)
RestoreConView ();
S_StopMusic(true);
I_FlushBufferedConsoleStuff();
auto msg = error.what();

if (CVMAbortException::stacktrace.IsNotEmpty())
{
@@ -1287,11 +1286,11 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE nothing, LPWSTR cmdline, int
//_crtBreakAlloc = 227524;
#endif

DoMain (hInstance);
int ret = DoMain (hInstance);

CloseHandle (MainThread);
MainThread = INVALID_HANDLE_VALUE;
return 0;
return ret;
}

// each platform has its own specific version of this function.

0 comments on commit 6f821a9

Please sign in to comment.
You can’t perform that action at this time.