diff --git a/public/build.c b/public/build.c index 6c85bbaf..1235fd8c 100644 --- a/public/build.c +++ b/public/build.c @@ -20,31 +20,6 @@ GNU General Public License for more details. static const char *const mon[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; static const char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -int Q_buildnum_date( const char *date ) -{ - int b; - int m = 0; - int d = 0; - int y = 0; - - for( m = 0; m < 11; m++ ) - { - if( !Q_strnicmp( &date[0], mon[m], 3 )) - break; - d += mond[m]; - } - - d += Q_atoi( &date[4] ) - 1; - y = Q_atoi( &date[7] ) - 1900; - b = d + (int)((y - 1) * 365.25f ); - - if((( y % 4 ) == 0 ) && m > 1 ) - b += 1; - b -= 41728; // Apr 1 2015 - - return b; -} - int Q_buildnum_iso( const char *date ) { int y, m, d, b, i; @@ -82,11 +57,7 @@ int Q_buildnum( void ) if( b ) return b; - if( COM_CheckString( g_buildcommit_date )) - b = Q_buildnum_iso( g_buildcommit_date ); - - if( b <= 0 ) - b = Q_buildnum_date( g_build_date ); + b = Q_buildnum_iso( g_buildcommit_date ); return b; } diff --git a/public/build_vcs.c b/public/build_vcs.c index c81275e6..786d4232 100644 --- a/public/build_vcs.c +++ b/public/build_vcs.c @@ -16,4 +16,3 @@ GNU General Public License for more details. const char *g_buildcommit = XASH_BUILD_COMMIT; const char *g_buildbranch = XASH_BUILD_BRANCH; const char *g_buildcommit_date = XASH_BUILD_COMMIT_DATE; -const char *g_build_date = __DATE__; diff --git a/public/crtlib.h b/public/crtlib.h index eb52ba14..18633662 100644 --- a/public/crtlib.h +++ b/public/crtlib.h @@ -56,7 +56,6 @@ enum // build.c // int Q_buildnum( void ); -int Q_buildnum_date( const char *date ); int Q_buildnum_iso( const char *date ); int Q_buildnum_compat( void ); const char *Q_PlatformStringByID( const int platform ); diff --git a/public/tests/test_build.c b/public/tests/test_build.c index ee3b0f40..a0cb4dff 100644 --- a/public/tests/test_build.c +++ b/public/tests/test_build.c @@ -177,16 +177,10 @@ int main( void ) if( Q_buildnum_compat() != 4529 ) return 200; - if( Q_buildnum_date( "Apr 02 2015" ) != 1 ) - return 201; - - if( Q_buildnum_date( "Apr 02 2015" ) != Q_buildnum_iso( "2015-04-02 21:19:10 +0300" )) + if( Q_buildnum_iso( "2015-04-02 21:19:10 +0300" ) != 1 ) return 202; - if( Q_buildnum_date( "Apr 17 2023" ) != 2938 ) - return 203; - - if( Q_buildnum_date( "Apr 17 2023" ) != Q_buildnum_iso( "2023-04-17 21:19:10 +0300" )) + if( Q_buildnum_iso( "2023-04-17 21:19:10 +0300" ) != 2938 ) return 204; return EXIT_SUCCESS;