Use sizeof and use Windows 7 as platform target.

OpenXRay · Jan 8, 2018 · 6840506 · 6840506
1 parent a644bf5
commit 6840506
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Common/PlatformWindows.inl b/src/Common/PlatformWindows.inl
@@ -4,8 +4,8 @@
 #define DIRECTINPUT_VERSION 0x0800 //
 
 #ifndef _WIN32_WINNT
-// Windows Server 2003 with SP1, Windows XP with SP2
-#define _WIN32_WINNT _WIN32_WINNT_WS03
+// Request Windows 7 functionality
+#define _WIN32_WINNT _WIN32_WINNT_WIN7
 #endif
 
 #include <sys/utime.h>

diff --git a/src/xrGame/console_commands_mp.cpp b/src/xrGame/console_commands_mp.cpp
@@ -1226,7 +1226,7 @@ class CCC_ListPlayers : public IConsole_Command
             exclude_raid_from_args(args, tmp_dest, sizeof(tmp_dest));
             if (xr_strlen(tmp_dest))
             {
-                sscanf_s(tmp_dest, "%s", filter_string, _countof(filter_string));
+                sscanf_s(tmp_dest, "%s", filter_string, sizeof(filter_string));
                 tmp_functor.filter_string = filter_string;
             }
         }
@@ -1323,7 +1323,7 @@ class CCC_ListPlayers_Banned : public IConsole_Command
         exclude_raid_from_args(args, tmp_dest, sizeof(tmp_dest));
         if (xr_strlen(tmp_dest))
         {
-            sscanf_s(tmp_dest, "%s", filter_dest, _countof(filter_dest));
+            sscanf_s(tmp_dest, "%s", filter_dest, sizeof(filter_dest));
         }
         tmp_sv_game->PrintBanList(filter_dest);
         Level().Server->Print_Banned_Addreses();