zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation on Windows.

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-07 18:59:18 +02:00
parent ff379e7c0c
commit 6f821a9198
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_net.cpp
View file

@ -1548,7 +1548,7 @@ bool D_ArbitrateNetStart (void)
// Return right away if we're just playing with ourselves. // Return right away if we're just playing with ourselves.
if (doomcom.numnodes == 1) if (doomcom.numnodes == 1)
return; return true;
autostart = true; autostart = true;

9
src/win32/i_main.cpp
View file

@ -749,7 +749,7 @@ static void UnTbp()
// //
//========================================================================== //==========================================================================
void DoMain (HINSTANCE hInstance) int DoMain (HINSTANCE hInstance)
{ {
LONG WinWidth, WinHeight; LONG WinWidth, WinHeight;
int height, width, x, y; int height, width, x, y;
@ -853,7 +853,7 @@ void DoMain (HINSTANCE hInstance)
WCHAR progbuff[1024]; WCHAR progbuff[1024];
if (GetModuleFileNameW(nullptr, progbuff, sizeof progbuff) == 0) 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); exit(-1);
} }
@ -992,7 +992,6 @@ void I_ShowFatalError(const char *msg)
RestoreConView (); RestoreConView ();
S_StopMusic(true); S_StopMusic(true);
I_FlushBufferedConsoleStuff(); I_FlushBufferedConsoleStuff();
auto msg = error.what();
if (CVMAbortException::stacktrace.IsNotEmpty()) if (CVMAbortException::stacktrace.IsNotEmpty())
{ {
@ -1287,11 +1286,11 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE nothing, LPWSTR cmdline, int
//_crtBreakAlloc = 227524; //_crtBreakAlloc = 227524;
#endif #endif
DoMain (hInstance); int ret = DoMain (hInstance);
CloseHandle (MainThread); CloseHandle (MainThread);
MainThread = INVALID_HANDLE_VALUE; MainThread = INVALID_HANDLE_VALUE;
return 0; return ret;
} }
// each platform has its own specific version of this function. // each platform has its own specific version of this function.