zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

exhumed.cpp: Comment out the "socket" variable and code that uses it.

Browse source 
This variable conflicts with library function named "socket".
This commit is contained in:
NY00123 2019-11-13 23:34:11 +02:00 committed by Christoph Oelckers
parent 7182190464
commit 3d82a745b3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/exhumed/src/exhumed.cpp
View file

@ -1096,7 +1096,8 @@ short bMapMode = kFalse;
short bNoCreatures = kFalse; short bNoCreatures = kFalse;
short nTotalPlayers = 1; short nTotalPlayers = 1;
short socket = 0; // TODO: Rename this (or make it static) so it doesn't conflict with library function
//short socket = 0;
short nFirstPassword = 0; short nFirstPassword = 0;
short nFirstPassInfo = 0; short nFirstPassInfo = 0;
@ -2310,9 +2311,11 @@ int app_main(int argc, char const* const* argv)
case 'h': case 'h':
SetHiRes(); SetHiRes();
break; break;
#if 0
case 's': case 's':
socket = atoi(pChar + 1); socket = atoi(pChar + 1);
break; break;
#endif
case 't': case 't':
nNetTime = atoi(pChar + 1); nNetTime = atoi(pChar + 1);
if (nNetTime < 0) { if (nNetTime < 0) {
@ -2479,6 +2482,7 @@ int app_main(int argc, char const* const* argv)
// loc_116A5: // loc_116A5:
#if 0
if (nNetPlayerCount) if (nNetPlayerCount)
{ {
InitInput(); InitInput();
@ -2509,6 +2513,7 @@ int app_main(int argc, char const* const* argv)
WaitTicks(nWaitTicks); WaitTicks(nWaitTicks);
} }
} }
#endif
// temp - moving InstallEngine(); before FadeOut as we use nextpage() in FadeOut // temp - moving InstallEngine(); before FadeOut as we use nextpage() in FadeOut
InstallEngine(); InstallEngine();