Replace more snprintf by UTIL_Format.

dlls/nvault/NVault.cpp

@@ -17,10 +17,6 @@
 #include "Binary.h"
 #include "CString.h"
 
-#if defined(__linux__) || defined(__APPLE__)
-#define _snprintf snprintf
-#endif
-
 /** 
  * :TODO: This beast calls strcpy()/new() way too much by creating new strings on the stack.
  *		  That's easily remedied and it should be fixed?

dlls/nvault/sdk/amxxmodule.cpp

@@ -3123,3 +3123,21 @@ unsigned short FixedUnsigned16( float value, float scale )
 	return (unsigned short)output;
 }
 #endif // USE_METAMOD
+
+size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	size_t len = vsnprintf(buffer, maxlength, fmt, ap);
+	va_end(ap);
+
+	if (len >= maxlength)
+	{
+		buffer[maxlength - 1] = '\0';
+		return (maxlength - 1);
+	}
+	else
+	{
+		return len;
+	}
+}

dlls/nvault/sdk/amxxmodule.h

@@ -2495,4 +2495,6 @@ void	Mem_Deallocator(const char *sourceFile, const unsigned int sourceLine, cons
 
 #endif //MEMORY_TEST
 
+size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...);
+
 #endif // #ifndef __AMXXMODULE_H__