diff --git a/msvc/ReHLDS.sln b/msvc/ReHLDS.sln index 3af9f01..498b7ed 100644 --- a/msvc/ReHLDS.sln +++ b/msvc/ReHLDS.sln @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gradle", "gradle", "{FFC337 ..\shared.gradle = ..\shared.gradle EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dedicated", "..\rehlds\dedicated\msvc\dedicated.vcxproj", "{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Play|Win32 = Debug Play|Win32 @@ -95,6 +97,26 @@ Global {792DF067-9904-4579-99B9-46C17277ADE3}.Test Fixes|Win32.Build.0 = Debug|Win32 {792DF067-9904-4579-99B9-46C17277ADE3}.Tests|Win32.ActiveCfg = Debug|Win32 {792DF067-9904-4579-99B9-46C17277ADE3}.Tests|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Play|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Play|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Record|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Record|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds Play|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds Play|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Play|Win32.ActiveCfg = Release|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Play|Win32.Build.0 = Release|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Swds Play|Win32.ActiveCfg = Release|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Swds Play|Win32.Build.0 = Release|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release|Win32.ActiveCfg = Release|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release|Win32.Build.0 = Release|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Test Fixes|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Test Fixes|Win32.Build.0 = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Tests|Win32.ActiveCfg = Debug|Win32 + {D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Tests|Win32.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/rehlds/engine/net_ws.cpp b/rehlds/engine/net_ws.cpp index 58d50ad..c34704b 100644 --- a/rehlds/engine/net_ws.cpp +++ b/rehlds/engine/net_ws.cpp @@ -1085,7 +1085,7 @@ DLL_EXPORT int NET_Sleep_Timeout(void) int res; if (numFrames > 0 && numFrames % staggerFrames) { - int number = 0; + SOCKET number = 0; for (int sock = 0; sock < 3; sock++) { @@ -1109,7 +1109,7 @@ DLL_EXPORT int NET_Sleep_Timeout(void) } #endif // _WIN32 } - res = select(number + 1, &fdset, 0, 0, &tv); + res = select((int)(number + 1), &fdset, 0, 0, &tv); } else { @@ -1123,7 +1123,7 @@ int NET_Sleep(void) { fd_set fdset; struct timeval tv; - int number; + SOCKET number; FD_ZERO(&fdset); number = 0; @@ -1154,7 +1154,7 @@ int NET_Sleep(void) tv.tv_sec = 0; tv.tv_usec = 20 * 1000; - return select(number + 1, &fdset, 0, 0, net_sleepforever == 0 ? &tv : NULL); + return select((int)(number + 1), &fdset, 0, 0, net_sleepforever == 0 ? &tv : NULL); } void NET_StartThread(void) diff --git a/rehlds/msvc/ReHLDS.vcxproj b/rehlds/msvc/ReHLDS.vcxproj index 71b8431..14803e7 100644 --- a/rehlds/msvc/ReHLDS.vcxproj +++ b/rehlds/msvc/ReHLDS.vcxproj @@ -65,6 +65,7 @@ + @@ -1103,4 +1104,4 @@ - + \ No newline at end of file diff --git a/rehlds/msvc/ReHLDS.vcxproj.filters b/rehlds/msvc/ReHLDS.vcxproj.filters index 7c5571b..73f0a7a 100644 --- a/rehlds/msvc/ReHLDS.vcxproj.filters +++ b/rehlds/msvc/ReHLDS.vcxproj.filters @@ -352,6 +352,9 @@ unittests + + engine\common + @@ -1086,4 +1089,4 @@ linux - + \ No newline at end of file