Merge commit '146d231d90b19e2a0edcabff1c4eb9ca44e053e7' into master-merge

[xonotic/netradiant.git] / tools / quake3 / q3data / q3data.c

diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c
index 331f6138c352448d04e97fc5bcef5c2940b898ea..3f74d27f44a96ec98070f293a42069bcf4740b45 100644 (file)
--- a/tools/quake3/q3data/q3data.c
+++ b/tools/quake3/q3data/q3data.c
@@ -20,9 +20,11 @@
  */
 
 #include "globaldefs.h"
+
 #if GDEF_OS_WINDOWS
 #include <io.h>
-#endif
+#endif // GDEF_OS_WINDOWS
+
 #include "q3data.h"
 #include "md3lib.h"
 
@@ -38,12 +40,10 @@ qboolean g_skipmodel;           // set true when a cd is not g_only
 
 // bogus externs for some TA hacks (common/ using them against q3map)
 char *moddir = NULL;
-// some old defined that was in cmdlib lost during merge
-char writedir[1024];
 
-#if GDEF_OS_LINUX || GDEF_OS_MACOS
+#if !GDEF_OS_WINDOWS
 #define strlwr strlower
-#endif
+#endif // !GDEF_OS_WINDOWS
 
 /*
    =======================================================
@@ -561,8 +561,6 @@ void ParseScript( void ){
 
 //=======================================================
 
-#include "version.h"
-
 /*
    ==============
    main
@@ -574,7 +572,7 @@ int main( int argc, char **argv ){
 
        // using GtkRadiant's versioning next to Id's versioning
        printf( "Q3Data      - (c) 1999 Id Software Inc.\n" );
-       printf( "NetRadiant  - v" RADIANT_VERSION " " __DATE__ "\n" );
+       printf( RADIANT_NAME " - v" RADIANT_VERSION " " __DATE__ "\n" );
 
        ExpandWildcards( &argc, &argv );