From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 20 Jun 2022 02:29:55 +0000 (+0200)
Subject: Merge commit 'ffb487e45c26dccd20285849979be1cb261c52f6' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14ecd029a55a0b53c5ad8c444ae9b9f73ebabd2b;p=xonotic%2Fnetradiant.git

Merge commit 'ffb487e45c26dccd20285849979be1cb261c52f6' into master-merge
---

14ecd029a55a0b53c5ad8c444ae9b9f73ebabd2b
diff --cc tools/quake3/common/vfs.c
index d199d6c0,ed4c1f61..02fd1f78
--- a/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@@ -50,8 -50,12 +50,12 @@@
  #include "mathlib.h"
  #include "inout.h"
  #include "vfs.h"
 -#include <minizip/unzip.h>
 +#include <unzip.h>
  #include <glib.h>
+ #define BAD_MINIZ
+ #ifndef BAD_MINIZ
+ #include "miniz.h"
+ #endif
  
  typedef struct
  {
diff --cc tools/quake3/q3map2/main.c
index 2a95c44c,ee3f63e7..9f28fdf7
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@@ -388,8 -1053,11 +1059,11 @@@ int main( int argc, char **argv )
  
  	Sys_Printf( "Q3Map         - v1.0r (c) 1999 Id Software Inc.\n" );
  	Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" );
 -	Sys_Printf( "NetRadiant    - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
 +	Sys_Printf( RADIANT_NAME "    - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
  	Sys_Printf( "%s\n", Q3MAP_MOTD );
+ 	Sys_Printf( "%s\n", argv[0] );
+ 
+ 	strcpy( q3map2path, argv[0] );//fuer autoPack func
  
  	/* ydnar: new path initialization */
  	InitPaths( &argc, argv );