From 1336d9cf5e920c47d18594e4db3d2c51b1e7be1a Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 2 Jul 2015 17:21:03 -0400 Subject: [PATCH 1/4] Update date format on sm_dump_classes and sm_dump_datamaps to use the less ambiguous Y/m/d... Instead of d/m/Y. --- extensions/sdktools/vhelpers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/sdktools/vhelpers.cpp b/extensions/sdktools/vhelpers.cpp index d9e4b292..aaf89449 100644 --- a/extensions/sdktools/vhelpers.cpp +++ b/extensions/sdktools/vhelpers.cpp @@ -715,7 +715,7 @@ CON_COMMAND(sm_dump_classes, "Dumps the class list as a text file") #endif time_t t = g_pSM->GetAdjustedTime(); - size_t written = strftime(buffer, sizeof(buffer), "%d/%m/%Y", localtime(&t)); + size_t written = strftime(buffer, sizeof(buffer), "%Y/%m/%d", localtime(&t)); #if defined SUBPLATFORM_SECURECRT _set_invalid_parameter_handler(handler); @@ -879,7 +879,7 @@ CON_COMMAND(sm_dump_datamaps, "Dumps the data map list as a text file") #endif time_t t = g_pSM->GetAdjustedTime(); - size_t written = strftime(buffer, sizeof(buffer), "%d/%m/%Y", localtime(&t)); + size_t written = strftime(buffer, sizeof(buffer), "%Y/%m/%d", localtime(&t)); #if defined SUBPLATFORM_SECURECRT _set_invalid_parameter_handler(handler); From 3ab4e4f24eee2f7a8d82425a457343b8bf9e720d Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 2 Jul 2015 17:21:40 -0400 Subject: [PATCH 2/4] Update sm_dump_netprops to include date of dump, similar to datamaps and classes dump commands. --- extensions/sdktools/vhelpers.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/extensions/sdktools/vhelpers.cpp b/extensions/sdktools/vhelpers.cpp index aaf89449..a9b7fb70 100644 --- a/extensions/sdktools/vhelpers.cpp +++ b/extensions/sdktools/vhelpers.cpp @@ -566,8 +566,22 @@ CON_COMMAND(sm_dump_netprops, "Dumps the networkable property table as a text fi META_CONPRINTF("Could not open file \"%s\"\n", path); return; } + + char buffer[80]; + buffer[0] = 0; - fprintf(fp, "// Dump of all network properties for \"%s\" follows\n//\n\n", g_pSM->GetGameFolderName()); +#if defined SUBPLATFORM_SECURECRT + _invalid_parameter_handler handler = _set_invalid_parameter_handler(_ignore_invalid_parameter); +#endif + + time_t t = g_pSM->GetAdjustedTime(); + size_t written = strftime(buffer, sizeof(buffer), "%Y/%m/%d", localtime(&t)); + +#if defined SUBPLATFORM_SECURECRT + _set_invalid_parameter_handler(handler); +#endif + + fprintf(fp, "// Dump of all network properties for \"%s\" as at %s\n//\n\n", g_pSM->GetGameFolderName(), buffer); ServerClass *pBase = gamedll->GetAllServerClasses(); while (pBase != NULL) From 801da2db37f2ed1d115ae375f62b1b7aba7a7ddf Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 3 Jul 2015 10:38:15 -0400 Subject: [PATCH 3/4] Fix MSVC compile. --- extensions/sdktools/vhelpers.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/extensions/sdktools/vhelpers.cpp b/extensions/sdktools/vhelpers.cpp index a9b7fb70..be081308 100644 --- a/extensions/sdktools/vhelpers.cpp +++ b/extensions/sdktools/vhelpers.cpp @@ -496,6 +496,19 @@ void UTIL_DrawSendTable(FILE *fp, SendTable *pTable, int level = 1) } } +#if defined SUBPLATFORM_SECURECRT +void _ignore_invalid_parameter( + const wchar_t * expression, + const wchar_t * function, + const wchar_t * file, + unsigned int line, + uintptr_t pReserved + ) +{ + /* Wow we don't care, thanks Microsoft. */ +} +#endif + CON_COMMAND(sm_dump_netprops_xml, "Dumps the networkable property table as an XML file") { #if SOURCE_ENGINE <= SE_DARKMESSIAH @@ -594,19 +607,6 @@ CON_COMMAND(sm_dump_netprops, "Dumps the networkable property table as a text fi fclose(fp); } -#if defined SUBPLATFORM_SECURECRT -void _ignore_invalid_parameter( - const wchar_t * expression, - const wchar_t * function, - const wchar_t * file, - unsigned int line, - uintptr_t pReserved - ) -{ - /* Wow we don't care, thanks Microsoft. */ -} -#endif - CEntityFactoryDictionary *GetEntityFactoryDictionary() { static CEntityFactoryDictionary *dict = NULL; From 8fb97a61524460a2a3757c441b44dae3f64a0112 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 3 Jul 2015 10:39:44 -0400 Subject: [PATCH 4/4] Add date to sm_dump_netprops_xml output. --- extensions/sdktools/vhelpers.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/extensions/sdktools/vhelpers.cpp b/extensions/sdktools/vhelpers.cpp index be081308..9cba4386 100644 --- a/extensions/sdktools/vhelpers.cpp +++ b/extensions/sdktools/vhelpers.cpp @@ -538,8 +538,22 @@ CON_COMMAND(sm_dump_netprops_xml, "Dumps the networkable property table as an XM return; } + char buffer[80]; + buffer[0] = 0; + +#if defined SUBPLATFORM_SECURECRT + _invalid_parameter_handler handler = _set_invalid_parameter_handler(_ignore_invalid_parameter); +#endif + + time_t t = g_pSM->GetAdjustedTime(); + size_t written = strftime(buffer, sizeof(buffer), "%Y/%m/%d", localtime(&t)); + +#if defined SUBPLATFORM_SECURECRT + _set_invalid_parameter_handler(handler); +#endif + fprintf(fp, "\n\n"); - fprintf(fp, "\n\n", g_pSM->GetGameFolderName()); + fprintf(fp, "\n\n", g_pSM->GetGameFolderName(), buffer); ServerClass *pBase = gamedll->GetAllServerClasses(); while (pBase != NULL)