diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..418bbb2d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,15 @@ +Here is a quick checklist for any new contributor to the project: + +- Please read the [mission statement](http://icculus.org/gtkradiant/) on the project homepage. + +- This project is mostly coordinated via IRC. We recommend joining the [#radiant channel on QuakeNet IRC](http://webchat.quakenet.org/#radiant) to ask questions there. + +- The [mailing list](http://icculus.org/mailman/listinfo/gtkradiant) is another channel of communication with the developers. + +Ok, I want to write some code! Where do I start? + +- Check the list of [known issues](https://github.com/TTimo/GtkRadiant/issues). + +- Use the milestones filter to find tasks that need to be worked on in priority. + +- Send in pull requests! diff --git a/apple/Makefile b/apple/Makefile index 9c89b8df..18833766 100644 --- a/apple/Makefile +++ b/apple/Makefile @@ -8,7 +8,7 @@ BINDIR = $(RESOURCES)/install CONFDIR = $(RESOURCES)/etc DATADIR = $(RESOURCES)/share LIBDIR = $(RESOURCES)/lib -VERSION = 1.6.4 +VERSION = 1.6.5 DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg VOLUME_NAME = "GtkRadiant $(VERSION)" @@ -31,15 +31,8 @@ all: install bundle gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \ $(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders - --gtk-runtime-pango: - cp -r $(MACPORTS_PREFIX)/lib/pango $(LIBDIR) - find $(LIBDIR)/pango -type f ! -name "*.so" -delete - pango-querymodules | sed $(PREFIX_SED_EXPR) > \ - $(CONFDIR)/pango/pango.modules - --gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango +-gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 cp -r $(MACPORTS_PREFIX)/lib/gtk-2.0 $(LIBDIR) find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete @@ -53,7 +46,7 @@ all: install bundle install: -pre-install -gtk-runtime cp -r $(INSTALL) $(RESOURCES) - rm -rf `find $(INSTDIR)/installs -type d -name .svn` + rm -rf `find $(INSTALL)/installs -type d -name .svn` bundle: diff --git a/config.py b/config.py index f8c3662f..10d3ed7e 100644 --- a/config.py +++ b/config.py @@ -283,11 +283,10 @@ class Config: if ( self.platform == 'Windows' ): backup_cwd = os.getcwd() for lib_archive in [ - 'STLport-5.2.1-GtkRadiant.zip', 'gtk-bundle-2.24.10-GtkRadiant.zip', 'gtk-bundle-2.22.1-win64-GtkRadiant.zip', - 'jpeg-9-GtkRadiant.zip', - 'libxml2-2.9.1-GtkRadiant.zip', + 'jpeg-9-MSVC2014-GtkRadiant.zip', + 'libxml2-2.9.2-GtkRadiant-2.zip', 'gtkglext-1.2.0-3-win32.zip', ]: if ( not os.path.exists( lib_archive ) ): @@ -367,6 +366,18 @@ class Config: ]: shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' ) + self.CloneBSPC() + + def CloneBSPC( self ): + if ( os.path.exists( 'bspc' ) ): + cmd = [ 'git', 'pull' ] + print( repr( cmd ) ) + subprocess.check_call( cmd, cwd = 'bspc' ) + else: + cmd = [ 'git', 'clone', 'https://github.com/TTimo/bspc.git' ] + print( repr( cmd ) ) + subprocess.check_call( cmd ) + def FinishBuild( self, target, source, env ): print( 'Lookup and bundle the PNG and JPEG libraries' ) # radiant.bin doesn't link to jpeg lib directly, grab that from a module @@ -384,6 +395,10 @@ class Config: jpeg_path = find_library( module_ldd, 'libjpeg' ) print( 'JPEG library: %s' % repr( jpeg_path ) ) + + p = subprocess.Popen( 'ldd -r install/modules/imagepng.so', shell = True, stdout = subprocess.PIPE ) + module_ldd = p.communicate()[0] + png_path = find_library( module_ldd, 'libpng' ) print( 'PNG library: %s' % repr( png_path ) ) diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcxproj b/contrib/bkgrnd2d/bkgrnd2d.vcxproj index 25453672..77745c35 100644 --- a/contrib/bkgrnd2d/bkgrnd2d.vcxproj +++ b/contrib/bkgrnd2d/bkgrnd2d.vcxproj @@ -21,23 +21,24 @@ {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows diff --git a/contrib/bobtoolz/DBrush.cpp b/contrib/bobtoolz/DBrush.cpp index 3e54e797..01a34330 100644 --- a/contrib/bobtoolz/DBrush.cpp +++ b/contrib/bobtoolz/DBrush.cpp @@ -83,7 +83,7 @@ int DBrush::BuildPoints(){ int pos = PointPosition( pnt ); if ( pos == POINT_IN_BRUSH ) { // ???? shouldn't happen here - Sys_Printf( "ERROR:: Build Brush Points: Point IN brush!!!\n" ); + Sys_FPrintf( SYS_ERR, "ERROR:: Build Brush Points: Point IN brush!!!\n" ); } else if ( pos == POINT_ON_BRUSH ) { // normal point if ( !HasPoint( pnt ) ) { diff --git a/contrib/bobtoolz/bobtoolz.vcxproj b/contrib/bobtoolz/bobtoolz.vcxproj index bb0f5567..a354fe93 100644 --- a/contrib/bobtoolz/bobtoolz.vcxproj +++ b/contrib/bobtoolz/bobtoolz.vcxproj @@ -21,23 +21,24 @@ {302086A7-5C73-42A4-8591-F5C9336EC911} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows diff --git a/contrib/bobtoolz/cportals.cpp b/contrib/bobtoolz/cportals.cpp index c408eda2..6878a8d2 100644 --- a/contrib/bobtoolz/cportals.cpp +++ b/contrib/bobtoolz/cportals.cpp @@ -122,7 +122,7 @@ void CPortals::Load(){ in = fopen( fn, "rt" ); if ( in == NULL ) { - Sys_Printf( " ERROR - could not open file.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - could not open file.\n" ); return; } @@ -130,7 +130,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -138,7 +138,7 @@ void CPortals::Load(){ if ( strncmp( "PRT1", buf, 4 ) != 0 ) { fclose( in ); - Sys_Printf( " ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); return; } @@ -146,7 +146,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -158,7 +158,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - Extreme number of nodes, aborting.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - Extreme number of nodes, aborting.\n" ); return; } @@ -168,7 +168,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -181,7 +181,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -199,7 +199,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -218,7 +218,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -249,7 +249,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); return; } @@ -262,7 +262,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); return; } @@ -272,7 +272,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); return; } @@ -285,7 +285,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); return; } @@ -298,7 +298,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); return; } diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp index ec94f71f..4ae16b42 100644 --- a/contrib/bobtoolz/misc.cpp +++ b/contrib/bobtoolz/misc.cpp @@ -143,7 +143,7 @@ void Sys_ERROR( const char* text, ... ){ vsprintf( buf, text,argptr ); va_end( argptr ); - Sys_Printf( "BobToolz::ERROR->%s", buf ); + Sys_FPrintf( SYS_ERR, "BobToolz::ERROR->%s", buf ); } /*void Sys_Printf (char *text, ...) diff --git a/contrib/camera/camera.vcxproj b/contrib/camera/camera.vcxproj index a4c0f4cb..538fa3df 100644 --- a/contrib/camera/camera.vcxproj +++ b/contrib/camera/camera.vcxproj @@ -21,23 +21,24 @@ {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows diff --git a/contrib/camera/misc.cpp b/contrib/camera/misc.cpp index 1fe7509b..75e885de 100644 --- a/contrib/camera/misc.cpp +++ b/contrib/camera/misc.cpp @@ -34,7 +34,7 @@ void Sys_ERROR( char* text, ... ){ vsprintf( buf, text,argptr ); va_end( argptr ); - Sys_Printf( "Camera::ERROR->%s", buf ); + Sys_FPrintf( SYS_ERR, "Camera::ERROR->%s", buf ); } char* UnixToDosPath( char* path ){ @@ -117,7 +117,7 @@ void CDECL Com_Error( int level, const char *error, ... ){ vsprintf( buf, error,argptr ); va_end( argptr ); - Sys_Printf( "Camera::ERROR->%s", buf ); + Sys_FPrintf( SYS_ERR, "Camera::ERROR->%s", buf ); } void CDECL Com_Printf( const char* msg, ... ){ diff --git a/contrib/gtkgensurf/gtkgensurf.vcxproj b/contrib/gtkgensurf/gtkgensurf.vcxproj index ec234394..9e43e870 100644 --- a/contrib/gtkgensurf/gtkgensurf.vcxproj +++ b/contrib/gtkgensurf/gtkgensurf.vcxproj @@ -21,23 +21,24 @@ {E37A9846-84FC-48F8-9880-954C5D9F8ED0} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows diff --git a/contrib/hydratoolz/hydratoolz.vcxproj b/contrib/hydratoolz/hydratoolz.vcxproj index 37226ec4..f2b3396e 100644 --- a/contrib/hydratoolz/hydratoolz.vcxproj +++ b/contrib/hydratoolz/hydratoolz.vcxproj @@ -21,23 +21,24 @@ {4E63003A-6B5D-4076-8ADF-D5A94809CE32} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp index 4a5de388..79bba252 100644 --- a/contrib/hydratoolz/plugin.cpp +++ b/contrib/hydratoolz/plugin.cpp @@ -305,7 +305,7 @@ void UpdateWadKeyPair( void ){ } else { - Sys_Printf( "HydraToolz: WARNING: could not locate wad file %s\n",(char *)wadlist->data ); + Sys_FPrintf( SYS_WRN, "WARNING: could not locate wad file %s\n",(char *)wadlist->data ); strcat( wads, (char *)wadlist->data ); } } diff --git a/contrib/prtview/portals.cpp b/contrib/prtview/portals.cpp index 288a6c2c..e11dd3bc 100644 --- a/contrib/prtview/portals.cpp +++ b/contrib/prtview/portals.cpp @@ -166,7 +166,7 @@ void CPortals::Load(){ in = fopen( fn, "rt" ); if ( in == NULL ) { - Sys_Printf( " ERROR - could not open file.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - could not open file.\n" ); return; } @@ -174,7 +174,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -182,7 +182,7 @@ void CPortals::Load(){ if ( strncmp( "PRT1", buf, 4 ) != 0 ) { fclose( in ); - Sys_Printf( " ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); return; } @@ -190,7 +190,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -203,7 +203,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf(" ERROR - Extreme number of nodes, aborting.\n"); + Sys_FPrintf( SYS_ERR, "ERROR - Extreme number of nodes, aborting.\n"); return; } @@ -214,7 +214,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -227,7 +227,7 @@ void CPortals::Load(){ portal_count = 0; node_count = 0; - Sys_Printf( " ERROR - Extreme number of portals, aborting.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - Extreme number of portals, aborting.\n" ); return; } @@ -238,7 +238,7 @@ void CPortals::Load(){ portal_count = 0; node_count = 0; - Sys_Printf( " ERROR - number of portals equals 0, aborting.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - number of portals equals 0, aborting.\n" ); return; } @@ -260,7 +260,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Could not find information for portal number %d of %d.\n", n + 1, portal_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Could not find information for portal number %d of %d.\n", n + 1, portal_count ); return; } @@ -278,7 +278,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, portal_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, portal_count ); return; } diff --git a/contrib/prtview/prtview.vcxproj b/contrib/prtview/prtview.vcxproj index f4ff3eb8..7064ee44 100644 --- a/contrib/prtview/prtview.vcxproj +++ b/contrib/prtview/prtview.vcxproj @@ -21,23 +21,24 @@ {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows diff --git a/include/stl_check.h b/include/stl_check.h index 89660091..b08142bd 100644 --- a/include/stl_check.h +++ b/include/stl_check.h @@ -24,6 +24,11 @@ this allows to catch some weird errors early at compile time */ +// TODO: finish complete cleanup and removal of STLPort usage traces +#ifndef Q_NO_STLPORT +#define Q_NO_STLPORT +#endif + #ifdef Q_NO_STLPORT // not using STLPort (gcc 3.x build) diff --git a/include/version.default b/include/version.default index 4bffc9ea..42025646 100644 --- a/include/version.default +++ b/include/version.default @@ -1 +1 @@ -1.6.2 +1.6.5 diff --git a/include/version.h b/include/version.h index 1d6a99cd..85372497 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ // generated header, see makeversion.py -#define RADIANT_VERSION "1.6.4" -#define RADIANT_MINOR_VERSION "4" +#define RADIANT_VERSION "1.6.5" +#define RADIANT_MINOR_VERSION "5" #define RADIANT_MAJOR_VERSION "6" diff --git a/libs/cmdlib/cmdlib.vcxproj b/libs/cmdlib/cmdlib.vcxproj index 8aa8c4de..73bae340 100644 --- a/libs/cmdlib/cmdlib.vcxproj +++ b/libs/cmdlib/cmdlib.vcxproj @@ -21,23 +21,24 @@ {0B522841-BDCC-493A-BA5C-604AE2CD5756} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/ddslib/ddslib.vcxproj b/libs/ddslib/ddslib.vcxproj index a2cf4b20..6cf0ca7a 100644 --- a/libs/ddslib/ddslib.vcxproj +++ b/libs/ddslib/ddslib.vcxproj @@ -21,23 +21,24 @@ {DDE81BE7-D457-47F3-9762-A838EFA2672E} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/l_net/l_net.vcxproj b/libs/l_net/l_net.vcxproj index bef68bfa..b72f320d 100644 --- a/libs/l_net/l_net.vcxproj +++ b/libs/l_net/l_net.vcxproj @@ -21,23 +21,24 @@ {B957BA35-F807-4C84-85A2-C1F9AC56713B} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/mathlib/mathlib.vcxproj b/libs/mathlib/mathlib.vcxproj index 02d92b13..98d1a46f 100644 --- a/libs/mathlib/mathlib.vcxproj +++ b/libs/mathlib/mathlib.vcxproj @@ -21,23 +21,24 @@ {14734EBB-B167-48D9-9B93-2277F645925F} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/md5lib/md5lib.vcxproj b/libs/md5lib/md5lib.vcxproj index f729d23b..4f3c10f6 100644 --- a/libs/md5lib/md5lib.vcxproj +++ b/libs/md5lib/md5lib.vcxproj @@ -21,23 +21,24 @@ {12E69671-B980-4BFF-BC1A-6D9A3C158D16} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/pak/unzip.cpp b/libs/pak/unzip.cpp index 269c76c3..8bf2e6a4 100644 --- a/libs/pak/unzip.cpp +++ b/libs/pak/unzip.cpp @@ -1158,8 +1158,8 @@ int z_verbose = 0; typedef uLong ( *check_func ) OF ( ( uLong check, const Byte * buf, uInt len ) ); -voidp zcalloc OF( ( voidp opaque, unsigned items, unsigned size ) ); -void zcfree OF( ( voidp opaque, voidp ptr ) ); +static voidp zcalloc OF( ( voidp opaque, unsigned items, unsigned size ) ); +static void zcfree OF( ( voidp opaque, voidp ptr ) ); #define ZALLOC( strm, items, size ) \ ( *( ( strm )->zalloc ) )( ( strm )->opaque, ( items ), ( size ) ) diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj index b9bed4fe..f5c872a5 100644 --- a/libs/picomodel/picomodel.vcxproj +++ b/libs/picomodel/picomodel.vcxproj @@ -21,23 +21,24 @@ {818BAC3D-0399-4416-930D-0AA28D55F798} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/splines/splines.vcxproj b/libs/splines/splines.vcxproj index 612d6e1f..94e0e7e8 100644 --- a/libs/splines/splines.vcxproj +++ b/libs/splines/splines.vcxproj @@ -21,23 +21,24 @@ {6C1116CE-D99E-4629-9E69-A9329335D706} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/synapse/synapse.vcxproj b/libs/synapse/synapse.vcxproj index 82d35292..151ec567 100644 --- a/libs/synapse/synapse.vcxproj +++ b/libs/synapse/synapse.vcxproj @@ -21,23 +21,24 @@ {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -85,7 +86,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +99,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -109,7 +110,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/plugins/eclassfgd/fgd.vcxproj b/plugins/eclassfgd/fgd.vcxproj index c5aad7b6..e4e0e257 100644 --- a/plugins/eclassfgd/fgd.vcxproj +++ b/plugins/eclassfgd/fgd.vcxproj @@ -21,23 +21,24 @@ {04213509-5ED3-4C74-B8A2-480BE6F48363} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows diff --git a/plugins/eclassfgd/plugin.cpp b/plugins/eclassfgd/plugin.cpp index baff99ce..13089949 100644 --- a/plugins/eclassfgd/plugin.cpp +++ b/plugins/eclassfgd/plugin.cpp @@ -402,12 +402,12 @@ void EClass_ImportFromClass( eclass_t *e, GSList *l_classes, class_t *bc ){ // make sure we don't request ourself! if ( rbc == bc ) { - Sys_Printf( "WARNING: baseclass '%s' tried to request itself!\n", bclst->data ); + Sys_FPrintf( SYS_WRN, "WARNING: baseclass '%s' tried to request itself!\n", bclst->data ); } else { if ( !rbc ) { - Sys_Printf( "WARNING: could not find the requested baseclass '%s' when building '%s'\n", requestedclass,bc->classname ); + Sys_FPrintf( SYS_WRN, "WARNING: could not find the requested baseclass '%s' when building '%s'\n", requestedclass,bc->classname ); } else { @@ -494,7 +494,7 @@ void EClass_ImportFromClass( eclass_t *e, GSList *l_classes, class_t *bc ){ } else { - Sys_Printf( "WARNING: baseclass '%s' has a spawnflag out of range, ignored!\n", bc->classname ); + Sys_FPrintf( SYS_WRN, "WARNING: baseclass '%s' has a spawnflag out of range, ignored!\n", bc->classname ); } } break; @@ -1015,7 +1015,7 @@ void Eclass_ScanFile( char *filename ){ } else { - Sys_Printf( "%WARNING: Parse error occured in '%s - %s'\n",classnames[newclass->classtype],newclass->classname ); + Sys_FPrintf( SYS_WRN, "WARNING: Parse error occured in '%s - %s'\n",classnames[newclass->classtype],newclass->classname ); Free_Option( newoption ); } diff --git a/plugins/entity/eclassmodel.cpp b/plugins/entity/eclassmodel.cpp index 28670a03..163ffe47 100644 --- a/plugins/entity/eclassmodel.cpp +++ b/plugins/entity/eclassmodel.cpp @@ -152,7 +152,7 @@ void CEntityEclassModel::UpdateCachedData(){ m4x4_pivoted_transform_by_vec3( m_transform, m_translate, m_euler, eXYZ, m_scale, m_pivot ); memcpy( m_inverse_transform, m_transform, sizeof( m4x4_t ) ); if ( m4x4_invert( m_inverse_transform ) == 1 ) { - Sys_Printf( "ERROR: Singular Matrix, cannot invert" ); + Sys_FPrintf( SYS_ERR, "ERROR: Singular Matrix, cannot invert" ); } if ( m_eclass ) { diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp index 35c836fd..7f8df9a7 100644 --- a/plugins/entity/entity.cpp +++ b/plugins/entity/entity.cpp @@ -326,7 +326,7 @@ epair_t** Entity_GetKeyValList( entity_t *e ){ void Entity_SetKeyValList( entity_t *e, epair_t* ep ){ if ( e->epairs ) { - Sys_Printf( "Warning : pe->epairs != NULL in Entity_SetKeyValList, will not set\n" ); + Sys_FPrintf( SYS_WRN, "Warning : pe->epairs != NULL in Entity_SetKeyValList, will not set\n" ); } else { e->epairs = ep; diff --git a/plugins/entity/entity.vcxproj b/plugins/entity/entity.vcxproj index 0cba3fd6..3b95abe3 100644 --- a/plugins/entity/entity.vcxproj +++ b/plugins/entity/entity.vcxproj @@ -21,23 +21,24 @@ {17DD38AA-4842-45BC-9304-2ADC1A12B4F4} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows diff --git a/plugins/entity/entity_entitymodel.h b/plugins/entity/entity_entitymodel.h index f523630b..3a4aad31 100644 --- a/plugins/entity/entity_entitymodel.h +++ b/plugins/entity/entity_entitymodel.h @@ -27,129 +27,129 @@ /*! simulates misc_model entity behaviours for rendering/selection/editing */ class CEntityMiscModel : public IRender, public ISelect, public IEdit { -public: -CEntityMiscModel ( entity_t *e ); -virtual ~CEntityMiscModel (); + public: + CEntityMiscModel( entity_t *e ); + virtual ~CEntityMiscModel (); -void IncRef() { refCount++; } -void DecRef() { - if ( --refCount == 0 ) { - delete this; + void IncRef() { refCount++; } + void DecRef() { + if ( --refCount == 0 ) { + delete this; + } } -} -// IRender -void Draw( int state, int rflags ) const; -const aabb_t *GetAABB() const { return &m_BBox; } + // IRender + void Draw( int state, int rflags ) const; + const aabb_t *GetAABB() const { return &m_BBox; } -// ISelect -bool TestRay( const ray_t *ray, vec_t *dist ) const; -//bool TestBox(const aabb_t aabb) const; + // ISelect + bool TestRay( const ray_t *ray, vec_t *dist ) const; + //bool TestBox(const aabb_t aabb) const; -// ITransform -void Translate( const vec3_t translation ); -void Rotate( const vec3_t pivot, const vec3_t rotation ); -const vec_t *GetTranslation() const { return m_translate; } -const vec_t *GetRotation() const { return m_euler; } -void OnKeyValueChanged( entity_t *e, const char *key, const char* value ); + // ITransform + void Translate( const vec3_t translation ); + void Rotate( const vec3_t pivot, const vec3_t rotation ); + const vec_t *GetTranslation() const { return m_translate; } + const vec_t *GetRotation() const { return m_euler; } + void OnKeyValueChanged( entity_t *e, const char *key, const char* value ); -void SetName( const char *name ); -private: -void BuildCacheRequestString( const char *name ); -/*! updates the AABB and transformation matrix */ -void UpdateCachedData(); -entity_interfaces_t *m_model; + void SetName( const char *name ); + private: + void BuildCacheRequestString( const char *name ); + /*! updates the AABB and transformation matrix */ + void UpdateCachedData(); + entity_interfaces_t *m_model; -entity_t *m_entity; + entity_t *m_entity; -int refCount; -string_t m_version; + int refCount; + string_t m_version; -Str m_cachereq; + Str m_cachereq; -/*! AABB in local space */ -aabb_t m_BBox; + /*! AABB in local space */ + aabb_t m_BBox; -/*! worldspace-to-localspace translation */ -vec3_t m_translate; + /*! worldspace-to-localspace translation */ + vec3_t m_translate; -/*! worldspace-to-localspace euler rotation angles */ -vec3_t m_euler; + /*! worldspace-to-localspace euler rotation angles */ + vec3_t m_euler; -/*! worldspace-to-localspace scale */ -vec3_t m_scale; + /*! worldspace-to-localspace scale */ + vec3_t m_scale; -/*! localspace origin, effectively rotation & scale pivot point */ -vec3_t m_pivot; + /*! localspace origin, effectively rotation & scale pivot point */ + vec3_t m_pivot; -/*! worldspace-to-localspace transform, generated from translate/euler/scale/pivot */ -m4x4_t m_transform; + /*! worldspace-to-localspace transform, generated from translate/euler/scale/pivot */ + m4x4_t m_transform; -/*! localspace-to-worldspace transform */ -m4x4_t m_inverse_transform; + /*! localspace-to-worldspace transform */ + m4x4_t m_inverse_transform; }; /*! simulates eclass-model entity behaviours for rendering/selection/editing */ class CEntityEclassModel : public IRender, public ISelect, public IEdit { -public: -CEntityEclassModel (); -virtual ~CEntityEclassModel (); + public: + CEntityEclassModel(); + virtual ~CEntityEclassModel(); -void IncRef() { refCount++; } -void DecRef() { - if ( --refCount == 0 ) { - delete this; + void IncRef() { refCount++; } + void DecRef() { + if ( --refCount == 0 ) { + delete this; + } } -} -// IRender -void Draw( int state, int rflags ) const; -const aabb_t *GetAABB() const { return &m_BBox; } + // IRender + void Draw( int state, int rflags ) const; + const aabb_t *GetAABB() const { return &m_BBox; } -// ISelect -bool TestRay( const ray_t *ray, vec_t *dist ) const; -//bool TestBox(const aabb_t aabb) const; + // ISelect + bool TestRay( const ray_t *ray, vec_t *dist ) const; + //bool TestBox(const aabb_t aabb) const; -// ITransform -void Translate( const vec3_t translation ); -void Rotate( const vec3_t pivot, const vec3_t rotation ); -const vec_t *GetTranslation() const { return m_translate; } -const vec_t *GetRotation() const { return m_euler; } -void OnKeyValueChanged( entity_t *e, const char *key, const char* value ); + // ITransform + void Translate( const vec3_t translation ); + void Rotate( const vec3_t pivot, const vec3_t rotation ); + const vec_t *GetTranslation() const { return m_translate; } + const vec_t *GetRotation() const { return m_euler; } + void OnKeyValueChanged( entity_t *e, const char *key, const char* value ); -void SetName( const char *name ); -void SetEclass( const eclass_t* eclass ); -private: -/*! updates the AABB and transformation matrix */ -void UpdateCachedData(); -entity_interfaces_t *m_model; + void SetName( const char *name ); + void SetEclass( const eclass_t* eclass ); + private: + /*! updates the AABB and transformation matrix */ + void UpdateCachedData(); + entity_interfaces_t *m_model; -int refCount; -string_t m_name; -string_t m_version; -const eclass_t *m_eclass; + int refCount; + string_t m_name; + string_t m_version; + const eclass_t *m_eclass; -/*! AABB in local space */ -aabb_t m_BBox; + /*! AABB in local space */ + aabb_t m_BBox; -/*! worldspace-to-localspace translation */ -vec3_t m_translate; + /*! worldspace-to-localspace translation */ + vec3_t m_translate; -/*! worldspace-to-localspace euler rotation angles */ -vec3_t m_euler; + /*! worldspace-to-localspace euler rotation angles */ + vec3_t m_euler; -/*! worldspace-to-localspace scale */ -vec3_t m_scale; + /*! worldspace-to-localspace scale */ + vec3_t m_scale; -/*! localspace origin, effectively rotation & scale pivot point */ -vec3_t m_pivot; + /*! localspace origin, effectively rotation & scale pivot point */ + vec3_t m_pivot; -/*! worldspace-to-localspace transform, generated from translate/euler/scale/pivot */ -m4x4_t m_transform; + /*! worldspace-to-localspace transform, generated from translate/euler/scale/pivot */ + m4x4_t m_transform; -/*! localspace-to-worldspace transform */ -m4x4_t m_inverse_transform; + /*! localspace-to-worldspace transform */ + m4x4_t m_inverse_transform; }; void pivot_draw( const vec3_t pivot ); diff --git a/plugins/entity/miscmodel.cpp b/plugins/entity/miscmodel.cpp index 301bc4eb..79e864f2 100644 --- a/plugins/entity/miscmodel.cpp +++ b/plugins/entity/miscmodel.cpp @@ -20,6 +20,7 @@ */ #include +#include #include "entity_entitymodel.h" #include "entity.h" @@ -62,7 +63,7 @@ void CEntityMiscModel::Draw( int state, int rflags ) const { // draw children if ( m_model && m_model->pRender ) { - m_model->pRender->Draw( state, rflags ); + m_model->pRender->Draw(state, rflags); } g_QglTable.m_pfn_qglPopMatrix(); @@ -201,9 +202,11 @@ void CEntityMiscModel::SetName( const char *name ){ return; } - if ( m_cachereq.GetBuffer()[0] != ':' + if ( m_oldcachereq.GetBuffer()[0] != ':' && m_version.c_str()[0] != '\0' ) { - GetModelCache()->DeleteByID( m_cachereq.GetBuffer(), m_version.c_str() ); + GetModelCache()->DeleteByID( m_oldcachereq.GetBuffer(), m_version.c_str() ); + } else { + assert(m_model == NULL); } m_model = NULL; diff --git a/plugins/image/image.vcxproj b/plugins/image/image.vcxproj index f7e5cd9f..2435b43d 100644 --- a/plugins/image/image.vcxproj +++ b/plugins/image/image.vcxproj @@ -21,23 +21,24 @@ {1F9977F6-216F-4AE1-9928-59B72CF31C46} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows diff --git a/plugins/imagehl/imagehl.vcxproj b/plugins/imagehl/imagehl.vcxproj index f61dbe74..8f481c0f 100644 --- a/plugins/imagehl/imagehl.vcxproj +++ b/plugins/imagehl/imagehl.vcxproj @@ -21,23 +21,24 @@ {BA1BC409-744B-4270-8E47-BA10872313AD} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows diff --git a/plugins/imagehl/lbmlib.cpp b/plugins/imagehl/lbmlib.cpp index c34c22df..0d1e207f 100644 --- a/plugins/imagehl/lbmlib.cpp +++ b/plugins/imagehl/lbmlib.cpp @@ -148,14 +148,14 @@ static void LoadIDSP( const char *name, byte ** pic, int *width, int *height ){ header = (dspriteheader_t *)buffer; if ( header->ident != IDSPRITEHEADER ) { - Sys_Printf( "WARNING: %s has wrong header\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: %s has wrong header\n" ); vfsFreeFile( buffer ); return; } version = header->version; if ( version != 1 && version != 2 ) { - Sys_Printf( "WARNING: %s has wrong version number " + Sys_FPrintf( SYS_WRN, "WARNING: %s has wrong version number " "(%i should be 1 or 2)\n", name, version ); vfsFreeFile( buffer ); return; @@ -180,7 +180,7 @@ static void LoadIDSP( const char *name, byte ** pic, int *width, int *height ){ break; } if ( numframes > 1 ) { - Sys_Printf( "WARNING: %s has multiple frames, only the first frame will be used.\n", name ); + Sys_FPrintf( SYS_WRN, "WARNING: %s has multiple frames, only the first frame will be used.\n", name ); } // palette = buffer+mipdatasize+2; diff --git a/plugins/imagem8/imagem8.vcxproj b/plugins/imagem8/imagem8.vcxproj index 6aeda675..57e6aba2 100644 --- a/plugins/imagem8/imagem8.vcxproj +++ b/plugins/imagem8/imagem8.vcxproj @@ -21,23 +21,24 @@ {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows diff --git a/plugins/imagepng/imagepng.vcxproj b/plugins/imagepng/imagepng.vcxproj index a9bc6352..a7a48ade 100644 --- a/plugins/imagepng/imagepng.vcxproj +++ b/plugins/imagepng/imagepng.vcxproj @@ -21,23 +21,24 @@ {43C01E60-21CC-49F5-8A11-F460BC866A31} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows diff --git a/plugins/imagewal/imagewal.vcxproj b/plugins/imagewal/imagewal.vcxproj index 7de7e507..0687fa03 100644 --- a/plugins/imagewal/imagewal.vcxproj +++ b/plugins/imagewal/imagewal.vcxproj @@ -21,23 +21,24 @@ {8D3160AB-B386-4970-8146-826BC293CCB1} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows diff --git a/plugins/map/map.vcxproj b/plugins/map/map.vcxproj index 0a9d7bd1..959dfe4f 100644 --- a/plugins/map/map.vcxproj +++ b/plugins/map/map.vcxproj @@ -21,23 +21,24 @@ {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows diff --git a/plugins/map/parse.cpp b/plugins/map/parse.cpp index 01ee011c..4305979a 100644 --- a/plugins/map/parse.cpp +++ b/plugins/map/parse.cpp @@ -338,7 +338,7 @@ void Face_Parse( face_t *face, bool bAlternateTexdef = false ){ else { // using the cache below means that this message is only ever printed out once! - Sys_Printf( "WARNING: could not find \"%s\" in any listed wad files, searching all wad files instead!\n",token ); + Sys_FPrintf( SYS_WRN, "WARNING: could not find \"%s\" in any listed wad files, searching all wad files instead!\n",token ); } // end of half-life specific bit. @@ -390,7 +390,7 @@ void Face_Parse( face_t *face, bool bAlternateTexdef = false ){ } else { - Sys_Printf( "WARNING: could not find \"%s\" in the vfs search path\n",token ); + Sys_FPrintf( SYS_WRN, "WARNING: could not find \"%s\" in the vfs search path\n",token ); str = new char[strlen( token ) + 10]; strcpy( str, "textures/" ); strcpy( str + 9, token ); diff --git a/plugins/mapxml/mapxml.vcxproj b/plugins/mapxml/mapxml.vcxproj index 33a50d61..249e02e0 100644 --- a/plugins/mapxml/mapxml.vcxproj +++ b/plugins/mapxml/mapxml.vcxproj @@ -21,23 +21,24 @@ {DDBF170A-42DF-4836-9006-816422E08493} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows diff --git a/plugins/model/cpicosurface.cpp b/plugins/model/cpicosurface.cpp index 7aed8c08..2112a02d 100644 --- a/plugins/model/cpicosurface.cpp +++ b/plugins/model/cpicosurface.cpp @@ -38,6 +38,8 @@ CPicoSurface::CPicoSurface( picoSurface_t *pSurface ){ // directory as a fall-back. This is a hack for malformed models. if ( m_shader->IsDefault() ) { + Sys_FPrintf( SYS_WRN, "WARNING: Failed to load shader %s for %s\n", m_shader->getName(), m_pSurface->model->name ); + gchar *dir = g_path_get_dirname( m_pSurface->model->name ); gchar *skin = g_strdup_printf( "%s/skin.tga", dir ); @@ -144,7 +146,7 @@ void CPicoSurface::Draw( int state, IShader *pShader, int rflags ){ g_QglTable.m_pfn_qglEnd();*/ break; - default: Sys_Printf( "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); + default: Sys_FPrintf( SYS_ERR, "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); break; } @@ -203,7 +205,7 @@ bool CPicoSurface::TestRay( const ray_t *ray, vec_t *dist ) const { } break; default: - Sys_Printf( "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); + Sys_FPrintf( SYS_ERR, "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); break; } } diff --git a/plugins/model/miscmodel.cpp b/plugins/model/miscmodel.cpp index a0f52a97..5c46de8c 100644 --- a/plugins/model/miscmodel.cpp +++ b/plugins/model/miscmodel.cpp @@ -317,7 +317,7 @@ void CEntityMiscModel::UpdateCachedData(){ m4x4_pivoted_transform_by_vec3( m_transform, m_translate, m_euler, m_scale, m_pivot ); memcpy( m_inverse_transform, m_transform, sizeof( m4x4_t ) ); if ( m4x4_invert( m_inverse_transform ) == 1 ) { - Sys_Printf( "ERROR: Singular Matrix, cannot invert" ); + Sys_FPrintf( SYS_ERR, "ERROR: Singular Matrix, cannot invert" ); } aabb_clear( &aabb_temp ); diff --git a/plugins/model/model.vcxproj b/plugins/model/model.vcxproj index 23d0d7cd..3cc7af53 100644 --- a/plugins/model/model.vcxproj +++ b/plugins/model/model.vcxproj @@ -21,23 +21,24 @@ {83C877DA-17B2-4863-B085-06AE9A8D68F3} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) model.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;%(AdditionalLibraryDirectories) model.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) model.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;%(AdditionalLibraryDirectories) model.def true Windows diff --git a/plugins/model/plugin.cpp b/plugins/model/plugin.cpp index d5bc6e80..dd3e305e 100644 --- a/plugins/model/plugin.cpp +++ b/plugins/model/plugin.cpp @@ -74,7 +74,7 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_WARNING: - Sys_Printf( "WARNING: %s\n", str ); + Sys_FPrintf( SYS_WRN, "WARNING: %s\n", str ); break; case PICO_ERROR: @@ -82,7 +82,7 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_FATAL: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_ERR, "ERROR: %s\n", str ); break; } } diff --git a/plugins/shaders/plugin.h b/plugins/shaders/plugin.h index 0aea3e84..4ba8c8bb 100644 --- a/plugins/shaders/plugin.h +++ b/plugins/shaders/plugin.h @@ -53,6 +53,7 @@ extern _QERBrushTable g_BrushTable; #define vfsLoadFile g_VFSTable.m_pfnLoadFile #define vfsFreeFile g_VFSTable.m_pfnFreeFile #define Sys_Printf g_FuncTable.m_pfnSysPrintf +#define Sys_FPrintf g_FuncTable.m_pfnSysFPrintf class CSynapseClientShaders : public CSynapseClient { diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp index bbe6a531..792b2ad0 100644 --- a/plugins/shaders/shaders.cpp +++ b/plugins/shaders/shaders.cpp @@ -188,7 +188,7 @@ void CShaderArray::operator =( const class CShaderArray & src ){ #ifdef _DEBUG if ( CPtrArray::GetSize() != 0 ) { - Sys_Printf( "WARNING: CShaderArray::operator = expects an empty array\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: CShaderArray::operator = expects an empty array\n" ); } #endif Copy( src ); @@ -239,7 +239,7 @@ char *ShaderNameLookup( patchMesh_t * patch ){ return static_cast < patchEntry_t * >( PatchShaders.GetAt( i ) )->name; } } - Sys_Printf( "ERROR: failed to lookup name in ShaderNameLookup??\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: failed to lookup name in ShaderNameLookup??\n" ); return const_cast(SHADER_NOT_FOUND); } //++timo end clean @@ -420,7 +420,7 @@ int WINAPI QERApp_LoadShadersFromDir( const char *path ){ // check we activated the right shader // NOTE: if there was something else loaded, the size of g_Shaders may have changed and strange behaviours are to be expected if ( pFoo != pShader ) { - Sys_Printf( "WARNING: unexpected pFoo != pShader in QERApp_LoadShadersFromDir\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: unexpected pFoo != pShader in QERApp_LoadShadersFromDir\n" ); } #else pFoo = NULL; // leo: shut up the compiler @@ -606,7 +606,7 @@ void WINAPI QERApp_LoadShaderFile( const char *filename ){ //++timo NOTE: this may a bit slow, we may need to use a map instead of a dumb list if ( g_Shaders.Shader_ForName( pShader->getName() ) != NULL ) { #ifdef _DEBUG - Sys_Printf( "WARNING: shader %s is already in memory, definition in %s ignored.\n", + Sys_FPrintf( SYS_WRN, "WARNING: shader %s is already in memory, definition in %s ignored.\n", pShader->getName(), filename ); #endif delete pShader; @@ -620,7 +620,7 @@ void WINAPI QERApp_LoadShaderFile( const char *filename ){ } else { - Sys_Printf( "Error parsing shader %s\n", pShader->getName() ); + Sys_FPrintf( SYS_ERR, "ERROR: parsing shader %s\n", pShader->getName() ); delete pShader; } } @@ -628,7 +628,7 @@ void WINAPI QERApp_LoadShaderFile( const char *filename ){ } else { - Sys_Printf( "Unable to read shaderfile %s\n", filename ); + Sys_FPrintf( SYS_ERR, "ERROR: Unable to read shaderfile %s\n", filename ); } } @@ -658,7 +658,7 @@ IShader *WINAPI QERApp_CreateShader_ForTextureName( const char *name ){ // Hydra: display an error message, so the user can quickly find a list of missing // textures by looking at the console. if ( !pShader->Activate() ) { - Sys_Printf( "WARNING: Activate shader failed for %s\n",pShader->getName() ); + Sys_FPrintf( SYS_WRN, "WARNING: Activate shader failed for %s\n", pShader->getName() ); } pShader->SetDisplayed( true ); @@ -706,7 +706,7 @@ qtexture_t *WINAPI QERApp_Try_Texture_ForName( const char *name ){ for ( q = g_qeglobals.d_qtextures; q; q = q->next ) { if ( !strcmp( stdName, q->name ) ) { - Sys_Printf( "ERROR: %s is not in texture map, but was found in texture list\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: %s is not in texture map, but was found in texture list\n" ); return q; } } @@ -837,7 +837,7 @@ void WINAPI QERApp_ReloadShaderFile( const char *name ){ // check the shader name is a reletive path // I hacked together a few quick tests to make sure :-) if ( strstr( name, ":\\" ) || !strstr( name, "scripts" ) ) { - Sys_Printf( "WARNING: is %s a reletive path to a shader file? (QERApp_ReloadShaderFile\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: is %s a reletive path to a shader file? (QERApp_ReloadShaderFile\n" ); } #endif diff --git a/plugins/shaders/shaders.vcxproj b/plugins/shaders/shaders.vcxproj index 6803a707..4cb93e49 100644 --- a/plugins/shaders/shaders.vcxproj +++ b/plugins/shaders/shaders.vcxproj @@ -21,23 +21,24 @@ {AEBCB950-AB67-48BB-9AF5-FCFB042824E8} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows diff --git a/plugins/spritemodel/spritemodel.cpp b/plugins/spritemodel/spritemodel.cpp index 28684133..0a2f2041 100644 --- a/plugins/spritemodel/spritemodel.cpp +++ b/plugins/spritemodel/spritemodel.cpp @@ -35,7 +35,7 @@ void LoadSpriteModel( entity_interfaces_t *interfaces, const char *name ){ pShader = QERApp_Shader_ForName( name ); if ( !pShader ) { - Sys_Printf( "ERROR: can't find shader (or image) for: %s\n", name ); + Sys_FPrintf( SYS_ERR, "ERROR: can't find shader (or image) for: %s\n", name ); return; } diff --git a/plugins/spritemodel/spritemodel.vcxproj b/plugins/spritemodel/spritemodel.vcxproj index cfba7856..666f2c9e 100644 --- a/plugins/spritemodel/spritemodel.vcxproj +++ b/plugins/spritemodel/spritemodel.vcxproj @@ -21,23 +21,24 @@ {F291A09D-73BC-48FF-98EE-D672BBDE5C16} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows diff --git a/plugins/surface/surface.vcxproj b/plugins/surface/surface.vcxproj index 1130263e..c2bda393 100644 --- a/plugins/surface/surface.vcxproj +++ b/plugins/surface/surface.vcxproj @@ -21,23 +21,24 @@ {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows diff --git a/plugins/surface_idtech2/surface_idtech2.vcxproj b/plugins/surface_idtech2/surface_idtech2.vcxproj index 81caebec..d51ad2c7 100644 --- a/plugins/surface_idtech2/surface_idtech2.vcxproj +++ b/plugins/surface_idtech2/surface_idtech2.vcxproj @@ -21,23 +21,24 @@ {F400371F-455F-4B6C-9F13-A2E57110E725} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows diff --git a/plugins/textool/textool.vcxproj b/plugins/textool/textool.vcxproj index a38fb815..6c62a6a7 100644 --- a/plugins/textool/textool.vcxproj +++ b/plugins/textool/textool.vcxproj @@ -21,23 +21,24 @@ {4F52DED4-285A-4E99-9C78-734D59E8ACD6} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows diff --git a/plugins/vfspak/vfspak.vcxproj b/plugins/vfspak/vfspak.vcxproj index 8bdedfd4..06dc1182 100644 --- a/plugins/vfspak/vfspak.vcxproj +++ b/plugins/vfspak/vfspak.vcxproj @@ -21,23 +21,24 @@ {8BE599BF-6318-4B0C-AC3E-DE811676C63B} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows diff --git a/plugins/vfspk3/unzip.cpp b/plugins/vfspk3/unzip.cpp index 7390894a..1ef15059 100644 --- a/plugins/vfspk3/unzip.cpp +++ b/plugins/vfspk3/unzip.cpp @@ -1177,8 +1177,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len)); -voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); -void zcfree OF((voidp opaque, voidp ptr)); +static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); +static void zcfree OF((voidp opaque, voidp ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp index 0654a656..c556d0a5 100644 --- a/plugins/vfspk3/vfs.cpp +++ b/plugins/vfspk3/vfs.cpp @@ -43,6 +43,7 @@ #include #include +#include #if defined ( __linux__ ) || defined ( __APPLE__ ) #include diff --git a/plugins/vfspk3/vfspk3.vcxproj b/plugins/vfspk3/vfspk3.vcxproj index f4b91505..50c83f12 100644 --- a/plugins/vfspk3/vfspk3.vcxproj +++ b/plugins/vfspk3/vfspk3.vcxproj @@ -21,23 +21,24 @@ {DEFCF433-3A47-40EB-BBF7-861211C3A941} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows diff --git a/plugins/vfsqlpk3/unzip.cpp b/plugins/vfsqlpk3/unzip.cpp index c7ff36b7..cc1f13d5 100644 --- a/plugins/vfsqlpk3/unzip.cpp +++ b/plugins/vfsqlpk3/unzip.cpp @@ -1178,8 +1178,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len)); -voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); -void zcfree OF((voidp opaque, voidp ptr)); +static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); +static void zcfree OF((voidp opaque, voidp ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) diff --git a/plugins/vfsqlpk3/vfsqlpk3.vcxproj b/plugins/vfsqlpk3/vfsqlpk3.vcxproj index 7a985c81..f00e978a 100644 --- a/plugins/vfsqlpk3/vfsqlpk3.vcxproj +++ b/plugins/vfsqlpk3/vfsqlpk3.vcxproj @@ -22,23 +22,24 @@ {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0} vfsqlpk3 Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -72,7 +73,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -84,8 +85,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows @@ -95,7 +96,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -107,8 +108,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows @@ -116,7 +117,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -126,8 +127,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows @@ -138,7 +139,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -149,8 +150,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows diff --git a/plugins/vfswad/vfswad.vcxproj b/plugins/vfswad/vfswad.vcxproj index 3c994824..f1b0ea68 100644 --- a/plugins/vfswad/vfswad.vcxproj +++ b/plugins/vfswad/vfswad.vcxproj @@ -21,23 +21,24 @@ {18116120-2710-4DD8-B1AC-940D0BDB36EF} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows diff --git a/po/de.po b/po/de.po index f61ce8ff..4cab9d63 100644 --- a/po/de.po +++ b/po/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Zeroradiant\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-07-05 09:00+0100\n" -"Last-Translator: Martin Gerhardy \n" +"PO-Revision-Date: 2016-05-15 19:00+0100\n" +"Last-Translator: Ettore Atalan \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -40,27 +40,27 @@ msgstr "" #: radiant/mainframe.cpp:939 #: radiant/mainframe.cpp:934 msgid "_File" -msgstr "Datei" +msgstr "_Datei" #: radiant/mainframe.cpp:943 #: radiant/mainframe.cpp:938 msgid "_New Map" -msgstr "_Neue Map" +msgstr "_Neue Karte" #: radiant/mainframe.cpp:948 #: radiant/mainframe.cpp:943 msgid "_Sleep" -msgstr "" +msgstr "_Schlaf" #: radiant/mainframe.cpp:954 #: radiant/mainframe.cpp:949 msgid "_Open..." -msgstr "Öffne..." +msgstr "_Öffnen..." #: radiant/mainframe.cpp:957 #: radiant/mainframe.cpp:952 msgid "_Import..." -msgstr "_Importiere..." +msgstr "_Importieren..." #: radiant/mainframe.cpp:959 #: radiant/mainframe.cpp:954 @@ -75,22 +75,22 @@ msgstr "Speichern _als..." #: radiant/mainframe.cpp:964 #: radiant/mainframe.cpp:959 msgid "Save s_elected..." -msgstr "Speicher Auswahl..." +msgstr "Ausgewählte speichern..." #: radiant/mainframe.cpp:967 #: radiant/mainframe.cpp:962 msgid "Save re_gion..." -msgstr "Speichere Region..." +msgstr "Re_gion speichern..." #: radiant/mainframe.cpp:971 #: radiant/mainframe.cpp:966 msgid "New p_roject..." -msgstr "Neues P_rojekt" +msgstr "Neues P_rojekt..." #: radiant/mainframe.cpp:973 #: radiant/mainframe.cpp:968 msgid "Load _project..." -msgstr "Lade _Projekt" +msgstr "_Projekt laden..." #: radiant/mainframe.cpp:975 #: radiant/mainframe.cpp:970 @@ -100,84 +100,84 @@ msgstr "Pro_jekteinstellungen..." #: radiant/mainframe.cpp:978 #: radiant/mainframe.cpp:973 msgid "_Pointfile..." -msgstr "" +msgstr "_Punktdatei..." #: radiant/mainframe.cpp:981 #: radiant/mainframe.cpp:976 msgid "Recent Files" -msgstr "Zuletzt verwendet" +msgstr "Zuletzt verwendete Dateien" #: radiant/mainframe.cpp:999 #: radiant/mainframe.cpp:994 msgid "Check for GtkRadiant update (web)" -msgstr "Prüfe auf GtkRadiant Update (web)" +msgstr "Auf GtkRadiant-Aktualisierung (Web) prüfen" #: radiant/mainframe.cpp:1004 #: radiant/mainframe.cpp:999 msgid "E_xit" -msgstr "Beenden" +msgstr "_Beenden" #: radiant/mainframe.cpp:1008 #: radiant/mainframe.cpp:1003 msgid "_Edit" -msgstr "Bearbeiten" +msgstr "B_earbeiten" #: radiant/mainframe.cpp:1011 #: radiant/mainframe.cpp:1006 msgid "_Undo" -msgstr "Rückgängig" +msgstr "_Rückgängig" #: radiant/mainframe.cpp:1014 #: radiant/mainframe.cpp:1009 msgid "_Redo" -msgstr "Wiederholen" +msgstr "_Wiederherstellen" #: radiant/mainframe.cpp:1018 #: radiant/mainframe.cpp:1013 msgid "_Copy" -msgstr "Kopieren" +msgstr "_Kopieren" #: radiant/mainframe.cpp:1019 #: radiant/mainframe.cpp:1014 msgid "_Paste" -msgstr "Einfügen" +msgstr "_Einfügen" #: radiant/mainframe.cpp:1020 #: radiant/mainframe.cpp:1015 msgid "P_aste To Camera" -msgstr "" +msgstr "_Auf Kamera einfügen" #: radiant/mainframe.cpp:1021 #: radiant/mainframe.cpp:1168 #: radiant/mainframe.cpp:1016 #: radiant/mainframe.cpp:1163 msgid "_Delete" -msgstr "Entfernen" +msgstr "_Löschen" #: radiant/mainframe.cpp:1024 #: radiant/mainframe.cpp:1019 msgid "Map Info..." -msgstr "Map Info..." +msgstr "Karteninfo..." #: radiant/mainframe.cpp:1025 #: radiant/mainframe.cpp:1020 msgid "Entity Info..." -msgstr "Entity Info..." +msgstr "Entitätsinfo..." #: radiant/mainframe.cpp:1027 #: radiant/mainframe.cpp:1022 msgid "Brush Scripts..." -msgstr "" +msgstr "Pinselskripte..." #: radiant/mainframe.cpp:1029 #: radiant/mainframe.cpp:1024 msgid "Load Pre_fab..." -msgstr "Lade Pre_fab..." +msgstr "_Fertigteil laden..." #: radiant/mainframe.cpp:1030 #: radiant/mainframe.cpp:1025 msgid "Save Selection as Prefab..." -msgstr "" +msgstr "Auswahl als Fertigteil speichern..." #: radiant/mainframe.cpp:1032 #: radiant/mainframe.cpp:1027 @@ -187,27 +187,27 @@ msgstr "Einstellungen..." #: radiant/mainframe.cpp:1035 #: radiant/mainframe.cpp:1030 msgid "_View" -msgstr "Anzeige" +msgstr "_Ansicht" #: radiant/mainframe.cpp:1039 #: radiant/mainframe.cpp:1034 msgid "Toggle" -msgstr "" +msgstr "Umschalten" #: radiant/mainframe.cpp:1040 #: radiant/mainframe.cpp:1035 msgid "Camera View" -msgstr "" +msgstr "Kameraansicht" #: radiant/mainframe.cpp:1041 #: radiant/mainframe.cpp:1036 msgid "Console View" -msgstr "" +msgstr "Konsolenansicht" #: radiant/mainframe.cpp:1042 #: radiant/mainframe.cpp:1037 msgid "Entity View" -msgstr "" +msgstr "Entitätsansicht" #: radiant/mainframe.cpp:1045 #: radiant/mainframe.cpp:1057 @@ -229,32 +229,32 @@ msgstr "XZ (Vorne)" #: radiant/mainframe.cpp:1048 #: radiant/mainframe.cpp:1043 msgid "Z View" -msgstr "" +msgstr "Z-Ansicht" #: radiant/mainframe.cpp:1050 #: radiant/mainframe.cpp:1045 msgid "_Center" -msgstr "" +msgstr "_Mitte" #: radiant/mainframe.cpp:1051 #: radiant/mainframe.cpp:1046 msgid "_Center 2d" -msgstr "" +msgstr "_Mitte 2D" #: radiant/mainframe.cpp:1052 #: radiant/mainframe.cpp:1047 msgid "_Up Floor" -msgstr "" +msgstr "_Oberer Boden" #: radiant/mainframe.cpp:1053 #: radiant/mainframe.cpp:1048 msgid "_Down Floor" -msgstr "" +msgstr "_Unterer Boden" #: radiant/mainframe.cpp:1055 #: radiant/mainframe.cpp:1050 msgid "_Next (XY, YZ, XY)" -msgstr "" +msgstr "_Weiter (XY, YZ, XY)" #: radiant/mainframe.cpp:1056 #: radiant/preferences.cpp:1641 @@ -268,7 +268,7 @@ msgstr "" #: radiant/preferences.cpp:2069 #: radiant/preferences.cpp:2071 msgid "Layout" -msgstr "" +msgstr "Anordnung" #: radiant/mainframe.cpp:1058 #: radiant/mainframe.cpp:1053 @@ -293,12 +293,12 @@ msgstr "_XY 100%" #: radiant/mainframe.cpp:1062 #: radiant/mainframe.cpp:1057 msgid "XY Zoom _In" -msgstr "" +msgstr "XY h_ineinzoomen" #: radiant/mainframe.cpp:1063 #: radiant/mainframe.cpp:1058 msgid "XY Zoom _Out" -msgstr "" +msgstr "XY hinausz_oomen" #: radiant/mainframe.cpp:1065 #: radiant/mainframe.cpp:1060 @@ -308,12 +308,12 @@ msgstr "_Z 100%" #: radiant/mainframe.cpp:1066 #: radiant/mainframe.cpp:1061 msgid "Z Zoo_m In" -msgstr "Z hereinzoo_men" +msgstr "Z hineinzoo_men" #: radiant/mainframe.cpp:1068 #: radiant/mainframe.cpp:1063 msgid "Z Zoom O_ut" -msgstr "Z hera_uszoomen" +msgstr "Z hinau_uszoomen" #: radiant/mainframe.cpp:1071 #: radiant/mainframe.cpp:1066 @@ -323,52 +323,52 @@ msgstr "" #: radiant/mainframe.cpp:1072 #: radiant/mainframe.cpp:1067 msgid "Cubic Clip Zoom Out" -msgstr "" +msgstr "Kubischen Ausschnitt hinauszoomen" #: radiant/mainframe.cpp:1075 #: radiant/mainframe.cpp:1070 msgid "Show" -msgstr "Zeige" +msgstr "Anzeigen" #: radiant/mainframe.cpp:1076 #: radiant/mainframe.cpp:1071 msgid "Show _Angles" -msgstr "" +msgstr "Winkel _anzeigen" #: radiant/mainframe.cpp:1078 #: radiant/mainframe.cpp:1073 msgid "Show _Names" -msgstr "Zeigen _Namen" +msgstr "_Namen anzeigen" #: radiant/mainframe.cpp:1080 #: radiant/mainframe.cpp:1075 msgid "Show Blocks" -msgstr "" +msgstr "Blöcke anzeigen" #: radiant/mainframe.cpp:1082 #: radiant/mainframe.cpp:1077 msgid "Show C_oordinates" -msgstr "" +msgstr "K_oordinaten anzeigen" #: radiant/mainframe.cpp:1084 #: radiant/mainframe.cpp:1079 msgid "Show Window Outline" -msgstr "" +msgstr "Fensterkontur anzeigen" #: radiant/mainframe.cpp:1086 #: radiant/mainframe.cpp:1081 msgid "Show ZBuffered Outline" -msgstr "" +msgstr "ZBuffered-Kontur anzeigen" #: radiant/mainframe.cpp:1088 #: radiant/mainframe.cpp:1083 msgid "Show Axes" -msgstr "Zeige Achsen" +msgstr "Achsen anzeigen" #: radiant/mainframe.cpp:1090 #: radiant/mainframe.cpp:1085 msgid "Show Workzone" -msgstr "" +msgstr "Arbeitsbereich anzeigen" #: radiant/mainframe.cpp:1093 #: radiant/mainframe.cpp:1088 @@ -384,32 +384,32 @@ msgstr "Welt" #: radiant/gtkdlgs.cpp:1590 #: radiant/mainframe.cpp:1090 msgid "Entities" -msgstr "Entities" +msgstr "Entitäten" #: radiant/mainframe.cpp:1096 #: radiant/mainframe.cpp:1091 msgid "Areaportals" -msgstr "" +msgstr "Areaportale" #: radiant/mainframe.cpp:1097 #: radiant/mainframe.cpp:1092 msgid "Translucent" -msgstr "" +msgstr "Lichtdurchlässig" #: radiant/mainframe.cpp:1098 #: radiant/mainframe.cpp:1093 msgid "Liquids" -msgstr "" +msgstr "Flüssigkeiten" #: radiant/mainframe.cpp:1099 #: radiant/mainframe.cpp:1094 msgid "Caulk" -msgstr "" +msgstr "Dichtungsmasse" #: radiant/mainframe.cpp:1100 #: radiant/mainframe.cpp:1095 msgid "Clips" -msgstr "" +msgstr "Ausschnitte" #: radiant/mainframe.cpp:1101 #: radiant/preferences.cpp:1667 @@ -423,12 +423,12 @@ msgstr "" #: radiant/preferences.cpp:2425 #: radiant/preferences.cpp:2427 msgid "Paths" -msgstr "" +msgstr "Pfade" #: radiant/mainframe.cpp:1102 #: radiant/mainframe.cpp:1097 msgid "Clusterportals" -msgstr "" +msgstr "Clusterportale" #: radiant/mainframe.cpp:1103 #: radiant/mainframe.cpp:1098 @@ -438,38 +438,38 @@ msgstr "Lichter" #: radiant/mainframe.cpp:1104 #: radiant/mainframe.cpp:1099 msgid "Structural" -msgstr "" +msgstr "Struktur" #: radiant/mainframe.cpp:1105 #: radiant/mainframe.cpp:1100 msgid "Lightgrid" -msgstr "" +msgstr "Lichtgitter" #: radiant/mainframe.cpp:1107 #: radiant/mainframe.cpp:1102 msgid "Patches" -msgstr "" +msgstr "Patches" #: radiant/mainframe.cpp:1108 #: radiant/mainframe.cpp:1103 #: radiant/patchdialog.cpp:333 msgid "Details" -msgstr "" +msgstr "Details" #: radiant/mainframe.cpp:1109 #: radiant/mainframe.cpp:1104 msgid "Hints" -msgstr "" +msgstr "Hinweise" #: radiant/mainframe.cpp:1110 #: radiant/mainframe.cpp:1105 msgid "Models" -msgstr "Models" +msgstr "Modelle" #: radiant/mainframe.cpp:1111 #: radiant/mainframe.cpp:1106 msgid "Triggers" -msgstr "" +msgstr "Auslöser" #: radiant/mainframe.cpp:1112 #: radiant/mainframe.cpp:1107 @@ -479,27 +479,27 @@ msgstr "" #: radiant/mainframe.cpp:1115 #: radiant/mainframe.cpp:1110 msgid "Hide/Show" -msgstr "" +msgstr "Ausblenden/Anzeigen" #: radiant/mainframe.cpp:1116 #: radiant/mainframe.cpp:1111 msgid "Hide Selected" -msgstr "Verstecke Auswahl" +msgstr "Ausgewählte ausblenden" #: radiant/mainframe.cpp:1118 #: radiant/mainframe.cpp:1113 msgid "Show Hidden" -msgstr "Zeige versteckte" +msgstr "Ausgeblendete anzeigen" #: radiant/mainframe.cpp:1121 #: radiant/mainframe.cpp:1116 msgid "Entities as" -msgstr "Entities als" +msgstr "Entitäten als" #: radiant/mainframe.cpp:1123 #: radiant/mainframe.cpp:1118 msgid "Bounding box" -msgstr "" +msgstr "Rahmen" #: radiant/mainframe.cpp:1126 #: radiant/mainframe.cpp:1121 @@ -509,7 +509,7 @@ msgstr "Gitternetz" #: radiant/mainframe.cpp:1129 #: radiant/mainframe.cpp:1124 msgid "Selected Wireframe" -msgstr "" +msgstr "Ausgewähltes Gitternetz" #: radiant/mainframe.cpp:1132 #: radiant/mainframe.cpp:1127 @@ -534,37 +534,37 @@ msgstr "" #: radiant/mainframe.cpp:1146 #: radiant/mainframe.cpp:1141 msgid "OpenGL Lighting" -msgstr "" +msgstr "OpenGL-Beleuchtung" #: radiant/mainframe.cpp:1151 #: radiant/mainframe.cpp:1146 msgid "_Selection" -msgstr "Auswahl" +msgstr "Au_swahl" #: radiant/mainframe.cpp:1155 #: radiant/mainframe.cpp:1150 msgid "Drag" -msgstr "" +msgstr "Ziehen" #: radiant/mainframe.cpp:1156 #: radiant/mainframe.cpp:1151 msgid "Drag _Edges" -msgstr "" +msgstr "_Kanten ziehen" #: radiant/mainframe.cpp:1158 #: radiant/mainframe.cpp:1153 msgid "Drag _Vertices" -msgstr "" +msgstr "_Eckpunkte ziehen" #: radiant/mainframe.cpp:1161 #: radiant/mainframe.cpp:1156 msgid "_Clone" -msgstr "Klonen" +msgstr "_Klonen" #: radiant/mainframe.cpp:1163 #: radiant/mainframe.cpp:1158 msgid "Deselect" -msgstr "Deselektieren" +msgstr "Abwählen" #: radiant/mainframe.cpp:1165 #: radiant/mainframe.cpp:1526 @@ -581,38 +581,38 @@ msgstr "Spiegeln" #: radiant/mainframe.cpp:1173 #: radiant/mainframe.cpp:1168 msgid "Flip _X" -msgstr "Spiegele _X" +msgstr "_X spiegeln" #: radiant/mainframe.cpp:1175 #: radiant/mainframe.cpp:1170 msgid "Flip _Y" -msgstr "Spiegele _Y" +msgstr "_Y spiegeln" #: radiant/mainframe.cpp:1177 #: radiant/mainframe.cpp:1172 msgid "Flip _Z" -msgstr "Spiegele _Z" +msgstr "_Z spiegeln" #: radiant/mainframe.cpp:1180 #: radiant/mainframe.cpp:1175 #: radiant/surfacedialog.cpp:715 msgid "Rotate" -msgstr "Rotieren" +msgstr "Drehen" #: radiant/mainframe.cpp:1181 #: radiant/mainframe.cpp:1176 msgid "Rotate X" -msgstr "Rotiere X" +msgstr "X drehen" #: radiant/mainframe.cpp:1183 #: radiant/mainframe.cpp:1178 msgid "Rotate Y" -msgstr "Rotiere Y" +msgstr "Y drehen" #: radiant/mainframe.cpp:1185 #: radiant/mainframe.cpp:1180 msgid "Rotate Z" -msgstr "Rotiere Z" +msgstr "Z drehen" #: radiant/mainframe.cpp:1187 #: radiant/mainframe.cpp:1182 @@ -642,13 +642,13 @@ msgstr "CSG subtrahieren" #: radiant/mainframe.cpp:1196 #: radiant/mainframe.cpp:1191 msgid "CSG _Merge" -msgstr "CSG vereinen" +msgstr "CSG zusa_mmenführen" #: radiant/mainframe.cpp:1199 #: radiant/gtkdlgs.cpp:1729 #: radiant/mainframe.cpp:1194 msgid "Select" -msgstr "" +msgstr "Auswählen" #: radiant/mainframe.cpp:1200 #: radiant/mainframe.cpp:1195 @@ -707,12 +707,12 @@ msgstr "" #: radiant/mainframe.cpp:1223 #: radiant/mainframe.cpp:1218 msgid "Clip selection" -msgstr "" +msgstr "Ausschnittauswahl" #: radiant/mainframe.cpp:1225 #: radiant/mainframe.cpp:1220 msgid "Split selection" -msgstr "" +msgstr "Auswahl aufteilen" #: radiant/mainframe.cpp:1227 #: radiant/mainframe.cpp:1222 @@ -722,22 +722,22 @@ msgstr "" #: radiant/mainframe.cpp:1230 #: radiant/mainframe.cpp:1225 msgid "Connect entities" -msgstr "" +msgstr "Entitäten verbinden" #: radiant/mainframe.cpp:1232 #: radiant/mainframe.cpp:1227 msgid "Ungroup entity" -msgstr "" +msgstr "Entitätengruppierung aufheben" #: radiant/mainframe.cpp:1234 #: radiant/mainframe.cpp:1229 msgid "Make detail" -msgstr "" +msgstr "Detail erstellen" #: radiant/mainframe.cpp:1236 #: radiant/mainframe.cpp:1231 msgid "Make structural" -msgstr "" +msgstr "Struktur erstellen" #: radiant/mainframe.cpp:1240 #: radiant/mainframe.cpp:1235 @@ -807,7 +807,7 @@ msgstr "Gitter256" #: radiant/mainframe.cpp:1284 #: radiant/mainframe.cpp:1279 msgid "Snap to grid" -msgstr "Am Gitter fangen" +msgstr "Am Gitter einrasten" #: radiant/mainframe.cpp:1289 #: radiant/mainframe.cpp:1284 @@ -817,47 +817,47 @@ msgstr "_Texturen" #: radiant/mainframe.cpp:1293 #: radiant/mainframe.cpp:1288 msgid "Show In _Use" -msgstr "Zeige ben_utzte" +msgstr "Ben_utzte anzeigen" #: radiant/mainframe.cpp:1296 #: radiant/mainframe.cpp:1291 msgid "Show _All" -msgstr "Zeige _alle" +msgstr "_Alle anzeigen" #: radiant/mainframe.cpp:1300 #: radiant/mainframe.cpp:1295 msgid "Show shaders" -msgstr "Zeige Shader" +msgstr "Schattierer anzeigen" #: radiant/mainframe.cpp:1303 #: radiant/mainframe.cpp:1298 msgid "Flush & Reload Shaders" -msgstr "" +msgstr "Schattierer leeren & neu laden" #: radiant/mainframe.cpp:1306 #: radiant/mainframe.cpp:1301 msgid "Load directory..." -msgstr "Lade Verzeichnis..." +msgstr "Verzeichnis laden..." #: radiant/mainframe.cpp:1309 #: radiant/mainframe.cpp:1304 msgid "Directory list..." -msgstr "" +msgstr "Verzeichnisliste..." #: radiant/mainframe.cpp:1313 #: radiant/mainframe.cpp:1308 msgid "_Surface Inspector" -msgstr "_Surface Inspector" +msgstr "Oberflächenin_spektor" #: radiant/mainframe.cpp:1316 #: radiant/mainframe.cpp:1311 msgid "Render Quality" -msgstr "Render Qualität" +msgstr "Renderqualität" #: radiant/mainframe.cpp:1318 #: radiant/mainframe.cpp:1313 msgid "_Wireframe" -msgstr "Gitternetz" +msgstr "_Gitternetz" #: radiant/mainframe.cpp:1321 #: radiant/mainframe.cpp:1316 @@ -867,12 +867,12 @@ msgstr "" #: radiant/mainframe.cpp:1324 #: radiant/mainframe.cpp:1319 msgid "_Nearest" -msgstr "" +msgstr "_Nächstliegende" #: radiant/mainframe.cpp:1327 #: radiant/mainframe.cpp:1322 msgid "Nearest _Mipmap" -msgstr "" +msgstr "Nächstliegende _Mipmap" #: radiant/mainframe.cpp:1330 #: radiant/mainframe.cpp:1325 @@ -887,7 +887,7 @@ msgstr "_Bilinear" #: radiant/mainframe.cpp:1336 #: radiant/mainframe.cpp:1331 msgid "B_ilinear Mipmap" -msgstr "B_ilinear Mipmap" +msgstr "B_ilineare Mipmap" #: radiant/mainframe.cpp:1339 #: radiant/mainframe.cpp:1334 @@ -903,7 +903,7 @@ msgstr "Suchen / Ersetzen..." #: radiant/mainframe.cpp:1340 #, fuzzy msgid "Texture Lock" -msgstr "_Texturen" +msgstr "Textursperre" #: radiant/mainframe.cpp:1346 #: radiant/mainframe.cpp:1341 @@ -913,12 +913,12 @@ msgstr "" #: radiant/mainframe.cpp:1349 #: radiant/mainframe.cpp:1344 msgid "Rotations" -msgstr "Rotationen" +msgstr "Drehungen" #: radiant/mainframe.cpp:1352 #: radiant/mainframe.cpp:1347 msgid "Texture Window Scale" -msgstr "" +msgstr "Texturfensterskalierung" #: radiant/mainframe.cpp:1353 #: radiant/mainframe.cpp:1348 @@ -953,7 +953,7 @@ msgstr "Nur shaderlist.txt" #: radiant/mainframe.cpp:1377 #: radiant/mainframe.cpp:1372 msgid "_Misc" -msgstr "Verschiedenes" +msgstr "_Verschiedenes" #: radiant/mainframe.cpp:1381 #: radiant/mainframe.cpp:1376 @@ -968,7 +968,7 @@ msgstr "Farben" #: radiant/mainframe.cpp:1383 #: radiant/mainframe.cpp:1378 msgid "Themes" -msgstr "" +msgstr "Themen" #: radiant/mainframe.cpp:1384 #: radiant/mainframe.cpp:1379 @@ -983,72 +983,72 @@ msgstr "Q3Radiant Original" #: radiant/mainframe.cpp:1386 #: radiant/mainframe.cpp:1381 msgid "Black and Green" -msgstr "" +msgstr "Schwarz und Grün" #: radiant/mainframe.cpp:1387 #: radiant/mainframe.cpp:1382 msgid "Maya/Max/Lightwave Emulation" -msgstr "" +msgstr "Maya-/Max-/Lightwave-Emulation" #: radiant/mainframe.cpp:1390 #: radiant/mainframe.cpp:1385 msgid "_Texture Background..." -msgstr "" +msgstr "_Texturhintergrund..." #: radiant/mainframe.cpp:1392 #: radiant/mainframe.cpp:1387 msgid "Grid Background..." -msgstr "Gitter Hintergrund..." +msgstr "Gitterhintergrund..." #: radiant/mainframe.cpp:1394 #: radiant/mainframe.cpp:1389 msgid "Grid Major..." -msgstr "" +msgstr "Hauptgitter..." #: radiant/mainframe.cpp:1396 #: radiant/mainframe.cpp:1391 msgid "Grid Minor..." -msgstr "" +msgstr "Nebengitter..." #: radiant/mainframe.cpp:1398 #: radiant/mainframe.cpp:1393 msgid "Grid Major Small..." -msgstr "" +msgstr "Hauptgitter klein..." #: radiant/mainframe.cpp:1400 #: radiant/mainframe.cpp:1395 msgid "Grid Minor Small..." -msgstr "" +msgstr "Nebengitter klein..." #: radiant/mainframe.cpp:1402 #: radiant/mainframe.cpp:1397 msgid "Grid Text..." -msgstr "Gitter Text..." +msgstr "Gittertext..." #: radiant/mainframe.cpp:1404 #: radiant/mainframe.cpp:1399 msgid "Grid Block..." -msgstr "" +msgstr "Gitterblock..." #: radiant/mainframe.cpp:1406 #: radiant/mainframe.cpp:1401 msgid "Default Brush..." -msgstr "" +msgstr "Standardpinsel..." #: radiant/mainframe.cpp:1408 #: radiant/mainframe.cpp:1403 msgid "Camera Background..." -msgstr "" +msgstr "Kamerahintergrund..." #: radiant/mainframe.cpp:1410 #: radiant/mainframe.cpp:1405 msgid "Selected Brush..." -msgstr "Gewählte Brush..." +msgstr "Ausgewählter Pinsel..." #: radiant/mainframe.cpp:1412 #: radiant/mainframe.cpp:1407 msgid "Selected Brush (Camera)..." -msgstr "" +msgstr "Ausgewählter Pinsel (Kamera)..." #: radiant/mainframe.cpp:1414 #: radiant/mainframe.cpp:1409 @@ -1058,7 +1058,7 @@ msgstr "" #: radiant/mainframe.cpp:1416 #: radiant/mainframe.cpp:1411 msgid "Active View name..." -msgstr "" +msgstr "Name der aktiven Ansicht..." #: radiant/mainframe.cpp:1419 #: radiant/mainframe.cpp:1414 @@ -1068,22 +1068,22 @@ msgstr "_Gamma..." #: radiant/mainframe.cpp:1421 #: radiant/mainframe.cpp:1416 msgid "Find brush..." -msgstr "Finde Brush..." +msgstr "Pinsel suchen..." #: radiant/mainframe.cpp:1423 #: radiant/mainframe.cpp:1418 msgid "Next leak spot" -msgstr "" +msgstr "Nächste Leckstelle" #: radiant/mainframe.cpp:1425 #: radiant/mainframe.cpp:1420 msgid "Previous leak spot" -msgstr "" +msgstr "Vorherige Leckstelle" #: radiant/mainframe.cpp:1429 #: radiant/mainframe.cpp:1423 msgid "_Select Entity Color..." -msgstr "" +msgstr "Entität_sfarbe auswählen..." #: radiant/mainframe.cpp:1434 #: radiant/mainframe.cpp:1428 @@ -1093,77 +1093,77 @@ msgstr "_Region" #: radiant/mainframe.cpp:1438 #: radiant/mainframe.cpp:1432 msgid "_Off" -msgstr "" +msgstr "_Aus" #: radiant/mainframe.cpp:1440 #: radiant/mainframe.cpp:1434 msgid "_Set XY" -msgstr "" +msgstr "XY fe_stlegen" #: radiant/mainframe.cpp:1442 #: radiant/mainframe.cpp:1436 msgid "Set _Tall Brush" -msgstr "" +msgstr "Großen Pinsel fes_tlegen" #: radiant/mainframe.cpp:1444 #: radiant/mainframe.cpp:1438 msgid "Set _Brush" -msgstr "" +msgstr "_Pinsel festlegen" #: radiant/mainframe.cpp:1446 #: radiant/mainframe.cpp:1440 msgid "Set Se_lected Brushes" -msgstr "" +msgstr "Ausg_ewählte Pinsel festlegen" #: radiant/mainframe.cpp:1450 #: radiant/mainframe.cpp:1444 msgid "_Brush" -msgstr "_Brush" +msgstr "_Pinsel" #: radiant/mainframe.cpp:1454 #: radiant/mainframe.cpp:1448 msgid "3 sided" -msgstr "3 Seiten" +msgstr "3-seitig" #: radiant/mainframe.cpp:1455 #: radiant/mainframe.cpp:1449 msgid "4 sided" -msgstr "4 Seiten" +msgstr "4-seitig" #: radiant/mainframe.cpp:1456 #: radiant/mainframe.cpp:1450 msgid "5 sided" -msgstr "5 Seiten" +msgstr "5-seitig" #: radiant/mainframe.cpp:1457 #: radiant/mainframe.cpp:1451 msgid "6 sided" -msgstr "6 Seiten" +msgstr "6-seitig" #: radiant/mainframe.cpp:1458 #: radiant/mainframe.cpp:1452 msgid "7 sided" -msgstr "7 Seiten" +msgstr "7-seitig" #: radiant/mainframe.cpp:1459 #: radiant/mainframe.cpp:1453 msgid "8 sided" -msgstr "8 Seiten" +msgstr "8-seitig" #: radiant/mainframe.cpp:1460 #: radiant/mainframe.cpp:1454 msgid "9 sided" -msgstr "9 Seiten" +msgstr "9-seitig" #: radiant/mainframe.cpp:1462 #: radiant/mainframe.cpp:1456 msgid "Arbitrary sided..." -msgstr "" +msgstr "Beliebigseitig..." #: radiant/mainframe.cpp:1465 #: radiant/mainframe.cpp:1459 msgid "Primitives" -msgstr "" +msgstr "Primitiven" #: radiant/mainframe.cpp:1466 #: radiant/mainframe.cpp:1460 @@ -1178,7 +1178,7 @@ msgstr "Kugel..." #: radiant/mainframe.cpp:1474 #: radiant/mainframe.cpp:1468 msgid "_Curve" -msgstr "Rundung (Kurve)" +msgstr "_Kurve" #: radiant/mainframe.cpp:1478 #: radiant/mainframe.cpp:1472 @@ -1188,27 +1188,27 @@ msgstr "Zylinder" #: radiant/mainframe.cpp:1479 #: radiant/mainframe.cpp:1473 msgid "More Cylinders" -msgstr "" +msgstr "Mehr Zylinder" #: radiant/mainframe.cpp:1480 #: radiant/mainframe.cpp:1474 msgid "Dense Cylinder" -msgstr "" +msgstr "Dicht gedrängter Zylinder" #: radiant/mainframe.cpp:1482 #: radiant/mainframe.cpp:1476 msgid "Very Dense Cylinder" -msgstr "" +msgstr "Sehr dicht gedrängter Zylinder" #: radiant/mainframe.cpp:1484 #: radiant/mainframe.cpp:1478 msgid "Square Cylinder" -msgstr "" +msgstr "Quadratischer Zylinder" #: radiant/mainframe.cpp:1487 #: radiant/mainframe.cpp:1481 msgid "End cap" -msgstr "" +msgstr "Endkappe" #: radiant/mainframe.cpp:1488 #: radiant/gtkdlgs.cpp:3087 @@ -1220,17 +1220,17 @@ msgstr "Schräge" #: radiant/mainframe.cpp:1489 #: radiant/mainframe.cpp:1483 msgid "More End caps, Bevels" -msgstr "" +msgstr "Mehr Endkappen, Schrägen" #: radiant/mainframe.cpp:1490 #: radiant/mainframe.cpp:1484 msgid "Square Endcap" -msgstr "" +msgstr "Quadratische Endkappe" #: radiant/mainframe.cpp:1492 #: radiant/mainframe.cpp:1486 msgid "Square Bevel" -msgstr "" +msgstr "Quadratische Schräge" #: radiant/mainframe.cpp:1495 #: radiant/mainframe.cpp:1489 @@ -1255,47 +1255,47 @@ msgstr "Einfügen" #: radiant/mainframe.cpp:1505 #: radiant/mainframe.cpp:1499 msgid "Insert (2) Columns" -msgstr "" +msgstr "(2) Spalten einfügen" #: radiant/mainframe.cpp:1507 #: radiant/mainframe.cpp:1501 msgid "Add (2) Columns" -msgstr "" +msgstr "(2) Spalten hinzufügen" #: radiant/mainframe.cpp:1510 #: radiant/mainframe.cpp:1504 msgid "Insert (2) Rows" -msgstr "" +msgstr "(2) Zeilen einfügen" #: radiant/mainframe.cpp:1512 #: radiant/mainframe.cpp:1506 msgid "Add (2) Rows" -msgstr "" +msgstr "(2) Zeilen hinzufügen" #: radiant/mainframe.cpp:1514 #: radiant/mainframe.cpp:1508 msgid "Delete" -msgstr "Entfernen" +msgstr "Löschen" #: radiant/mainframe.cpp:1515 #: radiant/mainframe.cpp:1509 msgid "First (2) Columns" -msgstr "" +msgstr "Erste (2) Spalten" #: radiant/mainframe.cpp:1517 #: radiant/mainframe.cpp:1511 msgid "Last (2) Columns" -msgstr "" +msgstr "Letzte (2) Spalten" #: radiant/mainframe.cpp:1520 #: radiant/mainframe.cpp:1514 msgid "First (2) Rows" -msgstr "" +msgstr "Erste (2) Zeilen" #: radiant/mainframe.cpp:1522 #: radiant/mainframe.cpp:1516 msgid "Last (2) Rows" -msgstr "" +msgstr "Letzte (2) Zeilen" #: radiant/mainframe.cpp:1525 #: radiant/mainframe.cpp:1519 @@ -1315,12 +1315,12 @@ msgstr "Zeilen" #: radiant/mainframe.cpp:1530 #: radiant/mainframe.cpp:1524 msgid "Cols (Intermediate)" -msgstr "" +msgstr "Spalten (dazwischenliegend)" #: radiant/mainframe.cpp:1531 #: radiant/mainframe.cpp:1525 msgid "Rows (Intermediate)" -msgstr "" +msgstr "Zeilen (dazwischenliegend)" #: radiant/mainframe.cpp:1532 #: radiant/mainframe.cpp:1526 @@ -1330,7 +1330,7 @@ msgstr "Transponieren" #: radiant/mainframe.cpp:1535 #: radiant/mainframe.cpp:1529 msgid "Cap Selection" -msgstr "Deckel Auswahl" +msgstr "Kappenauswahl" #: radiant/mainframe.cpp:1537 #: radiant/mainframe.cpp:1531 @@ -1340,24 +1340,24 @@ msgstr "" #: radiant/mainframe.cpp:1540 #: radiant/mainframe.cpp:1534 msgid "Overlay" -msgstr "" +msgstr "Überlagerung" #: radiant/mainframe.cpp:1541 #: radiant/mainframe.cpp:1535 msgid "Set" -msgstr "Setze" +msgstr "Festlegen" #: radiant/mainframe.cpp:1543 #: radiant/mainframe.cpp:2063 #: radiant/mainframe.cpp:1537 #: radiant/mainframe.cpp:2057 msgid "Clear" -msgstr "" +msgstr "Löschen" #: radiant/mainframe.cpp:1546 #: radiant/mainframe.cpp:1540 msgid "Thicken..." -msgstr "" +msgstr "Verdicken..." #: radiant/mainframe.cpp:1549 #: radiant/mainframe.cpp:1543 @@ -1377,17 +1377,17 @@ msgstr "Anleitung" #: radiant/mainframe.cpp:1577 #: radiant/mainframe.cpp:1571 msgid "Bug report" -msgstr "Bug melden" +msgstr "Fehlerbericht" #: radiant/mainframe.cpp:1579 #: radiant/mainframe.cpp:1573 msgid "Shortcuts list" -msgstr "Tastenbelegung" +msgstr "Tastaturkürzelliste" #: radiant/mainframe.cpp:1581 #: radiant/mainframe.cpp:1575 msgid "_About" -msgstr "Über" +msgstr "_Über" #: radiant/mainframe.cpp:1668 #: radiant/mainframe.cpp:1662 @@ -1397,7 +1397,7 @@ msgstr "Öffnen" #: radiant/mainframe.cpp:1668 #: radiant/mainframe.cpp:1662 msgid "Open an existing map" -msgstr "Öffne eine bereits existierende Map" +msgstr "Bereits vorhandene Karte öffnen" #: radiant/mainframe.cpp:1672 #: radiant/gtkdlgs.cpp:3831 @@ -1409,37 +1409,37 @@ msgstr "Speichern" #: radiant/mainframe.cpp:1672 #: radiant/mainframe.cpp:1666 msgid "Save the active map" -msgstr "" +msgstr "Aktive Karte speichern" #: radiant/mainframe.cpp:1677 #: radiant/mainframe.cpp:1671 msgid "x-axis Flip" -msgstr "" +msgstr "X-Achse spiegeln" #: radiant/mainframe.cpp:1681 #: radiant/mainframe.cpp:1675 msgid "x-axis Rotate" -msgstr "x-Achsen Rotation" +msgstr "X-Achse drehen" #: radiant/mainframe.cpp:1685 #: radiant/mainframe.cpp:1679 msgid "y-axis Flip" -msgstr "" +msgstr "Y-Achse spiegeln" #: radiant/mainframe.cpp:1689 #: radiant/mainframe.cpp:1683 msgid "y-axis Rotate" -msgstr "y-Achsen Rotation" +msgstr "Y-Achse drehen" #: radiant/mainframe.cpp:1693 #: radiant/mainframe.cpp:1687 msgid "z-axis Flip" -msgstr "" +msgstr "Z-Achse spiegeln" #: radiant/mainframe.cpp:1697 #: radiant/mainframe.cpp:1691 msgid "z-axis Rotate" -msgstr "z-Achsen Rotation" +msgstr "Z-Achse drehen" #: radiant/mainframe.cpp:1705 #: radiant/mainframe.cpp:1699 @@ -1459,7 +1459,7 @@ msgstr "CSG subtrahieren" #: radiant/mainframe.cpp:1737 #: radiant/mainframe.cpp:1731 msgid "CSG Merge" -msgstr "CSG vereinen" +msgstr "CSG zusammenführen" #: radiant/mainframe.cpp:1743 #: radiant/mainframe.cpp:1737 @@ -1469,12 +1469,12 @@ msgstr "Aushöhlen" #: radiant/mainframe.cpp:1758 #: radiant/mainframe.cpp:1752 msgid "Change views" -msgstr "" +msgstr "Ansichten ändern" #: radiant/mainframe.cpp:1768 #: radiant/mainframe.cpp:1762 msgid "Texture view mode" -msgstr "" +msgstr "Texturenansichtsmodus" #: radiant/mainframe.cpp:1776 #: radiant/mainframe.cpp:1795 @@ -1491,37 +1491,37 @@ msgstr "Kameravorschau" #: radiant/mainframe.cpp:1801 #: radiant/mainframe.cpp:1795 msgid "Entity inspector" -msgstr "Entity inspector" +msgstr "Entitätsinspektor" #: radiant/mainframe.cpp:1813 #: radiant/mainframe.cpp:1807 msgid "Free Rotation" -msgstr "Freies Rotieren" +msgstr "Freie Drehung" #: radiant/mainframe.cpp:1818 #: radiant/mainframe.cpp:1812 msgid "Free Scaling" -msgstr "Freies Skalieren" +msgstr "Freie Skalierung" #: radiant/mainframe.cpp:1822 #: radiant/mainframe.cpp:1816 msgid "Scale X" -msgstr "Skaliere X" +msgstr "X skalieren" #: radiant/mainframe.cpp:1826 #: radiant/mainframe.cpp:1820 msgid "Scale Y" -msgstr "Skaliere Y" +msgstr "Y skalieren" #: radiant/mainframe.cpp:1830 #: radiant/mainframe.cpp:1824 msgid "Scale Z" -msgstr "Skaliere Z" +msgstr "Z skalieren" #: radiant/mainframe.cpp:1838 #: radiant/mainframe.cpp:1832 msgid "Don't select model brushes" -msgstr "" +msgstr "Modellpinsel nicht auswählen" #: radiant/mainframe.cpp:1847 #: radiant/mainframe.cpp:1841 @@ -1561,24 +1561,24 @@ msgstr "" #: radiant/mainframe.cpp:1891 #: radiant/mainframe.cpp:1885 msgid "Show Entities as" -msgstr "Zeige Entities als" +msgstr "Entitäten anzeigen als" #: radiant/mainframe.cpp:1956 #: radiant/mainframe.cpp:1970 #: radiant/mainframe.cpp:1950 #: radiant/mainframe.cpp:1964 msgid " Label " -msgstr "" +msgstr " Bezeichnung " #: radiant/mainframe.cpp:2738 #: radiant/mainframe.cpp:2732 msgid "XZ View" -msgstr "XZ Anzeige" +msgstr "XZ-Anzeige" #: radiant/mainframe.cpp:2762 #: radiant/mainframe.cpp:2756 msgid "YZ View" -msgstr "YZ Anzeige" +msgstr "YZ-Anzeige" #: radiant/mainframe.cpp:2790 #: radiant/mainframe.cpp:2855 @@ -1605,37 +1605,37 @@ msgstr "" #: radiant/mainframe.cpp:3693 #: radiant/mainframe.cpp:3687 msgid "Load Project" -msgstr "Lade Projekt" +msgstr "Projekt laden" #: radiant/mainframe.cpp:3695 #: radiant/mainframe.cpp:3689 msgid "Choose Project File" -msgstr "Wähle Projektdatei" +msgstr "Projektdatei auswählen" #: radiant/mainframe.cpp:4270 #: radiant/mainframe.cpp:4268 msgid "Open Map" -msgstr "Öffne Map" +msgstr "Karte öffnen" #: radiant/mainframe.cpp:4288 #: radiant/mainframe.cpp:4290 msgid "Import Map" -msgstr "Importiere Map" +msgstr "Karte importieren" #: radiant/mainframe.cpp:4312 #: radiant/mainframe.cpp:4318 msgid "Save Map" -msgstr "Speichere Map" +msgstr "Karte speichern" #: radiant/mainframe.cpp:4330 #: radiant/mainframe.cpp:4340 msgid "Export Selection" -msgstr "Exportiere Auswahl" +msgstr "Auswahl exportieren" #: radiant/mainframe.cpp:4346 #: radiant/mainframe.cpp:4360 msgid "Export Region" -msgstr "Exportiere Region" +msgstr "Region exportieren" #: radiant/mainframe.cpp:4380 #: radiant/mainframe.cpp:4394 @@ -1645,37 +1645,37 @@ msgstr "Fehler" #: radiant/mainframe.cpp:4579 #: radiant/mainframe.cpp:4593 msgid "Import Prefab" -msgstr "Importiere Prefab" +msgstr "Fertigteil importieren" #: radiant/mainframe.cpp:4603 #: radiant/mainframe.cpp:4617 msgid "Export Prefab" -msgstr "Exportiere Prefab" +msgstr "Fertigteil exportieren" #: radiant/mainframe.cpp:4631 #: radiant/mainframe.cpp:4645 msgid "You must restart Radiant for the changes to take effect." -msgstr "Radiant muss neu gestartet werden damit die Änderungen wirksam werden." +msgstr "Radiant muss neu gestartet werden, damit die Änderungen wirksam werden." #: radiant/mainframe.cpp:5756 #: radiant/mainframe.cpp:5768 msgid "Load textures from path" -msgstr "Lade Texturen aus Verzeichnis" +msgstr "Texturen aus Pfad laden" #: radiant/mainframe.cpp:6174 #: radiant/mainframe.cpp:6186 msgid "You must restart Radiant for Gamma settings to take effect." -msgstr "Radiant muss neu gestartet werden, damit die Änderungen an den Gammawerten wirksam werden." +msgstr "Radiant muss neu gestartet werden, damit die Änderungen an den Gamma-Einstellungen wirksam werden." #: radiant/preferences.cpp:540 #: radiant/preferences.cpp:541 msgid "Set prefab path" -msgstr "" +msgstr "Fertigteilpfad festlegen" #: radiant/preferences.cpp:561 #: radiant/preferences.cpp:562 msgid "Find INI file" -msgstr "" +msgstr "INI-Datei suchen" #: radiant/preferences.cpp:574 #: radiant/preferences.cpp:575 @@ -1687,19 +1687,19 @@ msgstr "" #: radiant/preferences.cpp:576 #: radiant/preferences.cpp:577 msgid "Reset Registry" -msgstr "" +msgstr "Registrierung zurücksetzen" #: radiant/preferences.cpp:1022 #: radiant/preferences.cpp:1023 #: radiant/preferences.cpp:1036 msgid "Select the game:" -msgstr "Wähle das Spiel:" +msgstr "Wählen Sie das Spiel aus:" #: radiant/preferences.cpp:1034 #: radiant/preferences.cpp:1035 #: radiant/preferences.cpp:1048 msgid "Auto load selected game on startup" -msgstr "" +msgstr "Ausgewähltes Spiel beim Start automatisch laden" #: radiant/preferences.cpp:1039 #: radiant/preferences.cpp:1040 @@ -1723,7 +1723,7 @@ msgstr "" #: radiant/preferences.cpp:1108 #: radiant/preferences.cpp:1121 msgid "Select Game" -msgstr "Wähle Spiel" +msgstr "Spiel auswählen" #: radiant/preferences.cpp:1116 #: radiant/preferences.cpp:1117 @@ -1817,13 +1817,13 @@ msgstr "Abbrechen" #: radiant/preferences.cpp:1530 #: radiant/preferences.cpp:1542 msgid "GtkRadiant Preferences" -msgstr "GtkRadiant Einstellungen" +msgstr "GtkRadiant-Einstellungen" #: radiant/preferences.cpp:1553 #: radiant/preferences.cpp:1554 #: radiant/preferences.cpp:1566 msgid "Clean" -msgstr "" +msgstr "Sauber" #: radiant/preferences.cpp:1585 #: radiant/preferences.cpp:1586 @@ -1838,7 +1838,7 @@ msgstr "Einstellungen" #: radiant/preferences.cpp:1618 #: radiant/preferences.cpp:1722 msgid "Globals" -msgstr "" +msgstr "Globale" #: radiant/preferences.cpp:1609 #: radiant/preferences.cpp:1610 @@ -1850,13 +1850,13 @@ msgstr "Spieleinstellungen" #: radiant/preferences.cpp:1617 #: radiant/preferences.cpp:1629 msgid "Display" -msgstr "" +msgstr "Anzeige" #: radiant/preferences.cpp:1620 #: radiant/preferences.cpp:1621 #: radiant/preferences.cpp:1633 msgid "2D Display/Rendering" -msgstr "" +msgstr "2D-Anzeige/Rendering" #: radiant/preferences.cpp:1625 #: radiant/preferences.cpp:1773 @@ -1868,7 +1868,7 @@ msgstr "" #: radiant/preferences.cpp:1785 #: radiant/preferences.cpp:1787 msgid "3D View" -msgstr "3D Ansicht" +msgstr "3D-Ansicht" #: radiant/preferences.cpp:1630 #: radiant/preferences.cpp:1631 @@ -1880,7 +1880,7 @@ msgstr "Textureinstellungen" #: radiant/preferences.cpp:1638 #: radiant/preferences.cpp:1650 msgid "Interface" -msgstr "Interface" +msgstr "Schnittstelle" #: radiant/preferences.cpp:1646 #: radiant/preferences.cpp:2187 @@ -1892,7 +1892,7 @@ msgstr "Interface" #: radiant/preferences.cpp:2199 #: radiant/preferences.cpp:2201 msgid "Mouse" -msgstr "Mouse" +msgstr "Maus" #: radiant/preferences.cpp:1651 #: radiant/preferences.cpp:2254 @@ -1905,7 +1905,7 @@ msgstr "Mouse" #: radiant/preferences.cpp:2268 #, fuzzy msgid "Editing" -msgstr "Bearbeiten" +msgstr "Bearbeitung" #: radiant/preferences.cpp:1658 #: radiant/preferences.cpp:1659 @@ -1923,7 +1923,7 @@ msgstr "Andere" #: radiant/preferences.cpp:2368 #: radiant/preferences.cpp:2370 msgid "Startup/Auto save" -msgstr "" +msgstr "Start/Automatisches Speichern" #: radiant/preferences.cpp:1672 #: radiant/preferences.cpp:2488 @@ -1953,7 +1953,7 @@ msgstr "" #: radiant/preferences.cpp:1696 #: radiant/preferences.cpp:1708 msgid "Front Page" -msgstr "" +msgstr "Startseite" #: radiant/preferences.cpp:1716 #: radiant/preferences.cpp:1718 @@ -1962,32 +1962,32 @@ msgstr "" #: radiant/preferences.cpp:1729 #: radiant/preferences.cpp:1731 msgid "2D Display" -msgstr "" +msgstr "2D-Anzeige" #: radiant/preferences.cpp:1727 #: radiant/preferences.cpp:1728 #: radiant/preferences.cpp:1740 msgid "OpenGL Display Lists" -msgstr "" +msgstr "OpenGL-Anzeigelisten" #: radiant/preferences.cpp:1734 #: radiant/preferences.cpp:1735 #: radiant/preferences.cpp:1747 msgid "OpenGL antialiased points and lines" -msgstr "" +msgstr "OpenGL kantengeglättete Punkte und Linien" #: radiant/preferences.cpp:1740 #: radiant/preferences.cpp:1741 #: radiant/preferences.cpp:1753 #, fuzzy msgid "Solid selection boxes" -msgstr "Auswahl" +msgstr "" #: radiant/preferences.cpp:1746 #: radiant/preferences.cpp:1747 #: radiant/preferences.cpp:1759 msgid "Display size info" -msgstr "" +msgstr "Anzeigegrößeninfo" #: radiant/preferences.cpp:1753 #: radiant/preferences.cpp:1754 @@ -1999,19 +1999,19 @@ msgstr "" #: radiant/preferences.cpp:1764 #: radiant/preferences.cpp:1775 msgid "ATI cards with broken drivers - bug #802" -msgstr "" +msgstr "ATI-Karten mit defekten Treiber - bug #802" #: radiant/preferences.cpp:1790 #: radiant/preferences.cpp:1791 #: radiant/preferences.cpp:1802 msgid "Movement Velocity" -msgstr "" +msgstr "Bewegungsgeschwindigkeit" #: radiant/preferences.cpp:1813 #: radiant/preferences.cpp:1814 #: radiant/preferences.cpp:1825 msgid "Rotational Velocity" -msgstr "" +msgstr "Drehgeschwindigkeit" #: radiant/preferences.cpp:1835 #: radiant/preferences.cpp:1836 @@ -2051,13 +2051,13 @@ msgstr "Ja" #: radiant/preferences.cpp:1863 #: radiant/preferences.cpp:1874 msgid "Yes (Classic Key Setup)" -msgstr "" +msgstr "Ja (Klassische Tasteneinrichtung)" #: radiant/preferences.cpp:1874 #: radiant/preferences.cpp:1875 #: radiant/preferences.cpp:1886 msgid "Freelook in Camera view" -msgstr "" +msgstr "Freier Blick in Kameraansicht" #: radiant/preferences.cpp:1881 #: radiant/preferences.cpp:1882 @@ -2069,19 +2069,19 @@ msgstr "" #: radiant/preferences.cpp:1889 #: radiant/preferences.cpp:1900 msgid "Invert mouse in freelook" -msgstr "" +msgstr "Maus im freien Blick invertieren" #: radiant/preferences.cpp:1895 #: radiant/preferences.cpp:1896 #: radiant/preferences.cpp:1907 msgid "Discrete movement" -msgstr "" +msgstr "Diskrete Bewegung" #: radiant/preferences.cpp:1902 #: radiant/preferences.cpp:1903 #: radiant/preferences.cpp:1914 msgid "Update XY views on camera move" -msgstr "" +msgstr "XY-Ansichten bei Kamerabewegung aktualisieren" #: radiant/preferences.cpp:1924 #: radiant/preferences.cpp:1925 @@ -2106,14 +2106,14 @@ msgstr "hoch" #: radiant/preferences.cpp:1964 #, fuzzy msgid "Texture subsets" -msgstr "Texturen" +msgstr "Texturenteilmenge" #: radiant/preferences.cpp:1958 #: radiant/preferences.cpp:1959 #: radiant/preferences.cpp:1970 #, fuzzy msgid "Texture scrollbar" -msgstr "Texturen" +msgstr "Texturenrollbalken" #: radiant/preferences.cpp:1964 #: radiant/preferences.cpp:1965 @@ -2125,7 +2125,7 @@ msgstr "" #: radiant/preferences.cpp:1979 #: radiant/preferences.cpp:1990 msgid "Texture Compression (if available):" -msgstr "" +msgstr "Texturkompression (falls vorhanden):" #: radiant/preferences.cpp:1989 #: radiant/preferences.cpp:2035 @@ -2135,7 +2135,7 @@ msgstr "" #: radiant/preferences.cpp:2047 #, fuzzy msgid "None" -msgstr "Kegel" +msgstr "Keine" #: radiant/preferences.cpp:1995 #: radiant/preferences.cpp:1996 @@ -2165,7 +2165,7 @@ msgstr "S3TC DXT5" #: radiant/preferences.cpp:2026 #: radiant/preferences.cpp:2037 msgid "Startup Shaders:" -msgstr "" +msgstr "Start-Schattierer:" #: radiant/preferences.cpp:2037 #: radiant/preferences.cpp:2038 @@ -2178,7 +2178,7 @@ msgstr "System" #: radiant/preferences.cpp:2053 #, fuzzy msgid "Common" -msgstr "Kegel" +msgstr "Gewöhnlich" #: radiant/preferences.cpp:2042 #: radiant/preferences.cpp:2043 @@ -2196,7 +2196,7 @@ msgstr "" #: radiant/preferences.cpp:2140 #: radiant/preferences.cpp:2151 msgid "Detachable Menus" -msgstr "" +msgstr "Abtrennbare Menüs" #: radiant/preferences.cpp:2147 #: radiant/preferences.cpp:2148 @@ -2208,25 +2208,25 @@ msgstr "" #: radiant/preferences.cpp:2156 #: radiant/preferences.cpp:2167 msgid "Wide Toolbar" -msgstr "" +msgstr "Breite Werkzeugleiste" #: radiant/preferences.cpp:2161 #: radiant/preferences.cpp:2162 #: radiant/preferences.cpp:2173 msgid "Plugin Toolbar" -msgstr "" +msgstr "Plugin-Werkzeugleiste" #: radiant/preferences.cpp:2168 #: radiant/preferences.cpp:2169 #: radiant/preferences.cpp:2180 msgid "Use win32 file load dialog" -msgstr "" +msgstr "Win32-Dateiladedialog verwenden" #: radiant/preferences.cpp:2175 #: radiant/preferences.cpp:2176 #: radiant/preferences.cpp:2187 msgid "Start on Primary Monitor" -msgstr "" +msgstr "Auf primärem Monitor starten" #: radiant/preferences.cpp:2204 #: radiant/preferences.cpp:2205 @@ -2244,19 +2244,19 @@ msgstr "3 Tasten" #: radiant/preferences.cpp:2216 #: radiant/preferences.cpp:2227 msgid "Right click to drop entities" -msgstr "" +msgstr "Rechtsklick zum Ablegen von Entitäten" #: radiant/preferences.cpp:2221 #: radiant/preferences.cpp:2222 #: radiant/preferences.cpp:2233 msgid "Mouse chaser" -msgstr "" +msgstr "Mausverfolger" #: radiant/preferences.cpp:2227 #: radiant/preferences.cpp:2228 #: radiant/preferences.cpp:2239 msgid "ALT + multi-drag" -msgstr "" +msgstr "ALT + mehrfaches Ziehen" #: radiant/preferences.cpp:2239 #: radiant/preferences.cpp:2240 @@ -2298,13 +2298,13 @@ msgstr "" #: radiant/preferences.cpp:2304 #: radiant/preferences.cpp:2315 msgid "Rotation increment:" -msgstr "" +msgstr "Drehungsschrittweite:" #: radiant/preferences.cpp:2320 #: radiant/preferences.cpp:2321 #: radiant/preferences.cpp:2332 msgid "Undo Levels:" -msgstr "" +msgstr "Level rückgängig machen:" #: radiant/preferences.cpp:2337 #: radiant/preferences.cpp:2338 @@ -2316,25 +2316,25 @@ msgstr "" #: radiant/preferences.cpp:2368 #: radiant/preferences.cpp:2379 msgid "Snapshots" -msgstr "" +msgstr "Schnappschüsse" #: radiant/preferences.cpp:2373 #: radiant/preferences.cpp:2374 #: radiant/preferences.cpp:2385 msgid "Load last project on open" -msgstr "" +msgstr "Letztes Projekt beim Öffnen laden" #: radiant/preferences.cpp:2379 #: radiant/preferences.cpp:2380 #: radiant/preferences.cpp:2391 msgid "Load last map on open" -msgstr "" +msgstr "Letzte Karte beim Öffnen laden" #: radiant/preferences.cpp:2392 #: radiant/preferences.cpp:2393 #: radiant/preferences.cpp:2404 msgid "Auto save every" -msgstr "" +msgstr "Automatisch speichern alle" #: radiant/preferences.cpp:2405 #: radiant/preferences.cpp:2406 @@ -2346,13 +2346,13 @@ msgstr "Minuten" #: radiant/preferences.cpp:2433 #: radiant/preferences.cpp:2444 msgid "Prefab path:" -msgstr "" +msgstr "Fertigteilpfad:" #: radiant/preferences.cpp:2461 #: radiant/preferences.cpp:2462 #: radiant/preferences.cpp:2472 msgid "User INI path:" -msgstr "" +msgstr "Benutzer-INI-Pfad:" #: radiant/preferences.cpp:2499 #: radiant/preferences.cpp:2500 @@ -2376,31 +2376,31 @@ msgstr "Deaktivert" #: radiant/preferences.cpp:2522 #: radiant/preferences.cpp:2532 msgid "True Q3Map2 Style" -msgstr "" +msgstr "Wahrer Q3Map2-Stil" #: radiant/preferences.cpp:2522 #: radiant/preferences.cpp:2523 #: radiant/preferences.cpp:2533 msgid "Classic Style" -msgstr "" +msgstr "Klassischer Stil" #: radiant/preferences.cpp:2534 #: radiant/preferences.cpp:2535 #: radiant/preferences.cpp:2545 msgid "Use win32 file associations to open text files instead of builtin editor" -msgstr "" +msgstr "Win32-Dateizuordnungen zum Öffnen von Textdateien verwenden anstatt dem eingebauten Editor" #: radiant/preferences.cpp:2540 #: radiant/preferences.cpp:2541 #: radiant/preferences.cpp:2551 msgid "Use Custom Shader Editor" -msgstr "" +msgstr "Benutzerdefinierten Schattierereditor verwenden" #: radiant/preferences.cpp:2556 #: radiant/preferences.cpp:2557 #: radiant/preferences.cpp:2567 msgid "Custom Editor Command" -msgstr "" +msgstr "Benutzerdefinierter Editorbefehl" #: radiant/preferences.cpp:2577 #: radiant/preferences.cpp:3265 @@ -2415,19 +2415,19 @@ msgstr "..." #: radiant/preferences.cpp:2604 #: radiant/preferences.cpp:2614 msgid "Enable BSP process monitoring" -msgstr "" +msgstr "BSP-Prozessüberwachung aktivieren" #: radiant/preferences.cpp:2611 #: radiant/preferences.cpp:2612 #: radiant/preferences.cpp:2622 msgid "Stop compilation on leak" -msgstr "" +msgstr "Kompilierung bei Leck stoppen" #: radiant/preferences.cpp:2618 #: radiant/preferences.cpp:2619 #: radiant/preferences.cpp:2629 msgid "Run engine after compile" -msgstr "" +msgstr "Engine nach dem Kompilieren ausführen" #: radiant/preferences.cpp:2626 #: radiant/preferences.cpp:2627 @@ -2439,25 +2439,25 @@ msgstr "" #: radiant/preferences.cpp:2634 #: radiant/preferences.cpp:2644 msgid "Texturing compatible with q3map2" -msgstr "" +msgstr "Texturierung mit q3map2 kompatibel" #: radiant/preferences.cpp:3173 #: radiant/preferences.cpp:3174 #: radiant/preferences.cpp:3184 msgid "Select game directory" -msgstr "Wähle Spielverzeichnis" +msgstr "Spielverzeichnis auswählen" #: radiant/preferences.cpp:3197 #: radiant/preferences.cpp:3198 #: radiant/preferences.cpp:3208 msgid "Configure games" -msgstr "Konfigure Spiele" +msgstr "Spiele konfigurieren" #: radiant/preferences.cpp:3203 #: radiant/preferences.cpp:3204 #: radiant/preferences.cpp:3214 msgid "Select the game to configure" -msgstr "Wähle das Spiel das konfiguriert werden soll" +msgstr "Wählen Sie das zu konfigurierende Spiel aus" #: radiant/preferences.cpp:3216 #: radiant/preferences.cpp:3217 @@ -2469,13 +2469,13 @@ msgstr "Quake II" #: radiant/preferences.cpp:3220 #: radiant/preferences.cpp:3230 msgid "Quake III Arena and mods" -msgstr "Quake III Arena and mods" +msgstr "Quake III Arena und Mods" #: radiant/preferences.cpp:3222 #: radiant/preferences.cpp:3223 #: radiant/preferences.cpp:3233 msgid "Urban Terror (standalone)" -msgstr "Urban Terror (standalone)" +msgstr "Urban Terror (allein lauffähig)" #: radiant/preferences.cpp:3225 #: radiant/preferences.cpp:3226 @@ -2514,31 +2514,31 @@ msgstr "Name:" #: radiant/preferences.cpp:3253 #: radiant/preferences.cpp:3266 msgid "Engine directory:" -msgstr "Engine Verzeichnis:" +msgstr "Engine-Verzeichnis:" #: radiant/preferences.cpp:3272 #: radiant/preferences.cpp:3273 #: radiant/preferences.cpp:3286 msgid "Mod subdirectory:" -msgstr "Mod Unterverzeichnis..." +msgstr "Mod-Unterverzeichnis:" #: radiant/gtkdlgs.cpp:121 msgid "Edit Command" -msgstr "" +msgstr "Befehl bearbeiten" #: radiant/gtkdlgs.cpp:123 msgid "Add Command" -msgstr "" +msgstr "Befehl hinzufügen" #: radiant/gtkdlgs.cpp:142 msgid "Menu text" -msgstr "" +msgstr "Menütext" #: radiant/gtkdlgs.cpp:149 #: radiant/gtkdlgs.cpp:2818 #: radiant/gtkdlgs.cpp:2817 msgid "Command" -msgstr "Kommando" +msgstr "Befehl" #: radiant/gtkdlgs.cpp:501 msgid "Project Settings" @@ -2550,15 +2550,15 @@ msgstr "Hinzufügen..." #: radiant/gtkdlgs.cpp:550 msgid "Change..." -msgstr "Bearbeiten..." +msgstr "Ändern..." #: radiant/gtkdlgs.cpp:557 msgid "Remove" -msgstr "Löschen" +msgstr "Entfernen" #: radiant/gtkdlgs.cpp:564 msgid "Misc settings" -msgstr "Generelle Einstellungen" +msgstr "Verschiedene Einstellungen" #: radiant/gtkdlgs.cpp:570 msgid "" @@ -2568,7 +2568,7 @@ msgstr "" #: radiant/gtkdlgs.cpp:576 msgid "Menu commands" -msgstr "" +msgstr "Menübefehle" #: radiant/gtkdlgs.cpp:612 msgid "Project settings" @@ -2600,17 +2600,17 @@ msgstr "GtkRadiant " #: radiant/gtkdlgs.cpp:2684 #: radiant/gtkdlgs.cpp:2683 msgid "Credits" -msgstr "Credits" +msgstr "Danksagungen" #: radiant/gtkdlgs.cpp:2690 #: radiant/gtkdlgs.cpp:2689 msgid "Changelog" -msgstr "Changelog" +msgstr "Änderungsprotokoll" #: radiant/gtkdlgs.cpp:2696 #: radiant/gtkdlgs.cpp:2695 msgid "OpenGL Properties" -msgstr "OpenGL Eigenschaften" +msgstr "OpenGL-Eigenschaften" #: radiant/gtkdlgs.cpp:2707 #: radiant/gtkdlgs.cpp:2706 @@ -2630,12 +2630,12 @@ msgstr "Renderer:" #: radiant/gtkdlgs.cpp:2749 #: radiant/gtkdlgs.cpp:2748 msgid "OpenGL Extensions" -msgstr "OpenGL Erweiterungen" +msgstr "OpenGL-Erweiterungen" #: radiant/gtkdlgs.cpp:2791 #: radiant/gtkdlgs.cpp:2790 msgid "Mapped Commands" -msgstr "" +msgstr "Abgebildete Befehle" #: radiant/gtkdlgs.cpp:2824 #: radiant/gtkdlgs.cpp:1707 @@ -2646,28 +2646,28 @@ msgstr "Schlüssel" #: radiant/gtkdlgs.cpp:2989 #: radiant/gtkdlgs.cpp:2988 msgid "Load" -msgstr "" +msgstr "Laden" #: radiant/gtkdlgs.cpp:3039 #: radiant/gtkdlgs.cpp:3038 msgid "Cap" -msgstr "" +msgstr "Kappe" #: radiant/gtkdlgs.cpp:3094 #: radiant/gtkdlgs.cpp:3093 msgid "Endcap" -msgstr "" +msgstr "Endkappe" #: radiant/gtkdlgs.cpp:3101 #: radiant/gtkdlgs.cpp:3100 #, fuzzy msgid "Inverted Bevel" -msgstr "Invertieren" +msgstr "Invertierte Schräge" #: radiant/gtkdlgs.cpp:3108 #: radiant/gtkdlgs.cpp:3107 msgid "Inverted Endcap" -msgstr "" +msgstr "Invertierte Endkappe" #: radiant/gtkdlgs.cpp:3116 #: radiant/gtkdlgs.cpp:2571 @@ -2679,7 +2679,7 @@ msgstr "" #: radiant/gtkdlgs.cpp:3180 #: radiant/gtkdlgs.cpp:3179 msgid "Available Scripts - Not Implemented Yet" -msgstr "" +msgstr "Verfügbare Skripte - noch nicht implementiert" #: radiant/gtkdlgs.cpp:3193 #: radiant/gtkdlgs.cpp:3192 @@ -2693,7 +2693,7 @@ msgstr "" #: radiant/gtkdlgs.cpp:3269 #: radiant/gtkdlgs.cpp:3268 msgid "Run" -msgstr "" +msgstr "Ausführen" #: radiant/gtkdlgs.cpp:3276 #: radiant/gtkdlgs.cpp:3275 @@ -2708,7 +2708,7 @@ msgstr "Bearbeiten..." #: radiant/gtkdlgs.cpp:3330 #: radiant/gtkdlgs.cpp:3329 msgid "BrushScript Input" -msgstr "" +msgstr "BrushScript-Eingabe" #: radiant/gtkdlgs.cpp:3416 #: radiant/gtkdlgs.cpp:3415 @@ -2727,12 +2727,12 @@ msgstr "" #: radiant/gtkdlgs.cpp:3447 #: radiant/gtkdlgs.cpp:3446 msgid "Texture x:" -msgstr "Textur x:" +msgstr "Textur X:" #: radiant/gtkdlgs.cpp:3454 #: radiant/gtkdlgs.cpp:3453 msgid "Texture y:" -msgstr "Textur y:" +msgstr "Textur Y:" #: radiant/gtkdlgs.cpp:3492 #: radiant/gtkdlgs.cpp:3493 @@ -2760,14 +2760,14 @@ msgstr "Projektname:" #: radiant/gtkdlgs.cpp:3634 #: radiant/gtkdlgs.cpp:3632 msgid "Include game dll files" -msgstr "" +msgstr "Spiel-DLL-Dateien miteinbeziehen" #: radiant/gtkdlgs.cpp:3683 #: radiant/gtkdlgs.cpp:3709 #: radiant/gtkdlgs.cpp:3681 #: radiant/gtkdlgs.cpp:3707 msgid "Close the shader editor ?" -msgstr "Schließe den Shader Editor ?" +msgstr "Schattierereditor schließen?" #: radiant/gtkdlgs.cpp:3683 #: radiant/gtkdlgs.cpp:3709 @@ -2779,7 +2779,7 @@ msgstr "Radiant" #: radiant/gtkdlgs.cpp:3698 #: radiant/gtkdlgs.cpp:3696 msgid "Error saving file !" -msgstr "Fehler beim Speichern der Datei" +msgstr "Fehler beim Speichern der Datei!" #: radiant/gtkdlgs.cpp:3978 #: radiant/gtkdlgs.cpp:3974 @@ -2813,16 +2813,16 @@ msgstr "fs_game" #: radiant/gtkdlgs.cpp:1319 msgid "Map Info" -msgstr "Map Info" +msgstr "Karteninfo" #: radiant/gtkdlgs.cpp:1363 msgid "Total Brushes" -msgstr "" +msgstr "Pinsel insgesamt" #: radiant/gtkdlgs.cpp:1370 #, fuzzy msgid "Total Entities" -msgstr "Entities" +msgstr "Entitäten insgesamt" #: radiant/gtkdlgs.cpp:1377 msgid "" @@ -2836,12 +2836,12 @@ msgstr "" #: radiant/gtkdlgs.cpp:1416 msgid "Entity" -msgstr "Entity" +msgstr "Entität" #: radiant/gtkdlgs.cpp:1423 #, fuzzy msgid "Count" -msgstr "Kegel" +msgstr "Anzahl" #: radiant/gtkdlgs.cpp:1713 msgid "Value" @@ -2849,7 +2849,7 @@ msgstr "Wert" #: radiant/gtkdlgs.cpp:1792 msgid "Arbitrary rotation" -msgstr "Beliebig drehen" +msgstr "Beliebige Drehung" #: radiant/gtkdlgs.cpp:1811 msgid " X " @@ -2885,23 +2885,23 @@ msgid "" "You must restart for the\n" "settings to take effect" msgstr "" -"Du musst neu starten, damit\n" +"Sie müssen neu starten, damit\n" "die Änderungen wirksam werden" #: radiant/gtkdlgs.cpp:2120 #: radiant/gtkdlgs.cpp:2119 msgid "Find Brush" -msgstr "Finde Brush" +msgstr "Pinsel suchen" #: radiant/gtkdlgs.cpp:2139 #: radiant/gtkdlgs.cpp:2138 msgid "Entity number" -msgstr "Entitynummer" +msgstr "Entitätsnummer" #: radiant/gtkdlgs.cpp:2145 #: radiant/gtkdlgs.cpp:2144 msgid "Brush number" -msgstr "Brush Nummer" +msgstr "Pinselnummer" #: radiant/gtkdlgs.cpp:2216 #: radiant/gtkdlgs.cpp:2215 @@ -2921,7 +2921,7 @@ msgstr "" #: radiant/gtkdlgs.cpp:2306 #: radiant/gtkdlgs.cpp:2305 msgid "Width:" -msgstr "Weite:" +msgstr "Breite:" #: radiant/gtkdlgs.cpp:2313 #: radiant/gtkdlgs.cpp:2312 @@ -3023,19 +3023,19 @@ msgstr "" #: radiant/groupdialog.cpp:589 #: radiant/groupdialog.cpp:588 msgid "Open Wav File" -msgstr "Öffne WAV Datei" +msgstr "WAV-Datei öffnen" #: radiant/groupdialog.cpp:622 #: radiant/groupdialog.cpp:621 msgid "Open Model" -msgstr "Öffne Model" +msgstr "Modell öffnen" #: radiant/gtkmisc.cpp:1295 #: radiant/qe3.cpp:1492 #: radiant/gtkmisc.cpp:1298 #: radiant/qe3.cpp:1488 msgid "Open File" -msgstr "Öffne Datei" +msgstr "Datei öffnen" #: radiant/gtkmisc.cpp:1295 #: radiant/gtkmisc.cpp:1298 @@ -3045,7 +3045,7 @@ msgstr "Datei speichern" #: radiant/preferences.cpp:525 #: radiant/preferences.cpp:524 msgid "Executable for Custom Editor" -msgstr "" +msgstr "Programmdatei für benutzerdefinierten Editor" #: radiant/xywindow.cpp:135 msgid "Save Image" @@ -3053,7 +3053,7 @@ msgstr "Bild speichern" #: radiant/bp_dlg.cpp:71 msgid "Current map format is incompatible" -msgstr "" +msgstr "Aktuelles Kartenformat ist inkompatibel" #: radiant/bp_dlg.cpp:89 msgid "" @@ -3078,15 +3078,15 @@ msgstr "Konvertieren" #: radiant/bp_dlg.cpp:123 #, fuzzy msgid "Change default" -msgstr "Changelog" +msgstr "Standard ändern" #: radiant/bp_dlg.cpp:129 msgid "Abort load" -msgstr "" +msgstr "Laden abbrechen" #: radiant/mainframe.cpp:1422 msgid "_Print XY View" -msgstr "" +msgstr "XY-Ansicht _drucken" #: radiant/preferences.cpp:3248 msgid "Tremulous" @@ -3095,11 +3095,11 @@ msgstr "Tremulous" #: radiant/xywindow.cpp:133 #, fuzzy msgid "Save BMP Image" -msgstr "Speichere Map" +msgstr "BMP-Bild speichern" #: radiant/findtexturedialog.cpp:216 msgid "Find" -msgstr "" +msgstr "Suchen" #: radiant/gtkmisc.cpp:927 #: radiant/gtkmisc.cpp:940 @@ -3108,12 +3108,12 @@ msgstr "Ok" #: radiant/gtkmisc.cpp:1000 msgid "Go to URL" -msgstr "Öffne URL" +msgstr "URL aufrufen" #: radiant/patchdialog.cpp:317 #, fuzzy msgid "Patch Properties" -msgstr "OpenGL Eigenschaften" +msgstr "Patch-Eigenschaften" #: radiant/patchdialog.cpp:348 msgid "Row:" @@ -3135,7 +3135,7 @@ msgstr "T:" #: radiant/surfacedialog.cpp:759 #, fuzzy msgid "Texturing" -msgstr "Textureinstellungen" +msgstr "Texturierung" #: radiant/patchdialog.cpp:482 msgid "Horizontal Shift Step" @@ -3156,7 +3156,7 @@ msgstr "" #: radiant/patchdialog.cpp:510 #, fuzzy msgid "Rotate Step" -msgstr "Rotiere X" +msgstr "Schritt drehen" #: radiant/patchdialog.cpp:624 #: radiant/surfacedialog.cpp:812 @@ -3167,29 +3167,29 @@ msgstr "" #: radiant/surfacedialog.cpp:821 #, fuzzy msgid "Set..." -msgstr "Skalieren..." +msgstr "Festlegen..." #: radiant/patchdialog.cpp:636 #: radiant/surfacedialog.cpp:830 #, fuzzy msgid "Natural" -msgstr "Anleitung" +msgstr "Natürlich" #: radiant/patchdialog.cpp:642 #: radiant/surfacedialog.cpp:803 #: radiant/surfacedialog.cpp:839 #, fuzzy msgid "Fit" -msgstr "Filter" +msgstr "Anpassen" #: radiant/patchdialog.cpp:652 #: radiant/surfacedialog.cpp:868 msgid "Done" -msgstr "Schließen" +msgstr "Fertig" #: radiant/surfacedialog.cpp:546 msgid "Surface inspector" -msgstr "Surface inspector" +msgstr "Oberflächeninspektor" #: radiant/surfacedialog.cpp:562 msgid "Texture" @@ -3206,7 +3206,7 @@ msgstr "" #: radiant/surfacedialog.cpp:733 #, fuzzy msgid "Step" -msgstr "System" +msgstr "Schritt" #: radiant/surfacedialog.cpp:613 msgid "Vertical shift" @@ -3223,7 +3223,7 @@ msgstr "" #: radiant/surfacedialog.cpp:751 #, fuzzy msgid "Match Grid" -msgstr "Matrix" +msgstr "" #: radiant/surfacedialog.cpp:788 msgid "Height" @@ -3231,9 +3231,9 @@ msgstr "Höhe" #: radiant/surfacedialog.cpp:794 msgid "Axial" -msgstr "" +msgstr "Axial" #: radiant/surfacedialog.cpp:892 msgid "Test" -msgstr "" +msgstr "Test" diff --git a/radiant/brush.cpp b/radiant/brush.cpp index 05ec12fb..2d07acad 100644 --- a/radiant/brush.cpp +++ b/radiant/brush.cpp @@ -341,7 +341,7 @@ void Face_TextureVectors( face_t *f, float STfromXYZ[2][4] ){ #ifdef _DEBUG // this code is not supposed to be used while in BP mode, warning here can help spot the problem if ( g_qeglobals.m_bBrushPrimitMode && !g_qeglobals.bNeedConvert ) { - Sys_Printf( "Warning : illegal call of Face_TextureVectors in brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning : illegal call of Face_TextureVectors in brush primitive mode\n" ); } #endif @@ -867,7 +867,7 @@ void Brush_Build( brush_t *b, bool bSnap, bool bMarkMap, bool bConvert, bool bFi #ifdef _DEBUG if ( !g_qeglobals.m_bBrushPrimitMode && bConvert ) { - Sys_Printf( "Warning : conversion from brush primitive to old brush format not implemented\n" ); + Sys_FPrintf( SYS_WRN, "Warning : conversion from brush primitive to old brush format not implemented\n" ); } #endif @@ -1539,7 +1539,7 @@ const char* Brush_GetKeyValue( brush_t *b, const char *pKey ){ void CheckName( face_t *fa, char *pname ){ if ( !strlen( fa->texdef.GetName() ) ) { #ifdef _DEBUG - Sys_Printf( "WARNING: unexpected texdef.name is empty in Brush.cpp CheckName\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: unexpected texdef.name is empty in Brush.cpp CheckName\n" ); #endif fa->texdef.SetName( SHADER_NOT_FOUND ); strcpy( pname, SHADER_NOT_FOUND ); @@ -1592,7 +1592,7 @@ brush_t *Brush_Create( vec3_t mins, vec3_t maxs, texdef_t *texdef ){ if ( g_qeglobals.m_bBrushPrimitMode ) { // check texdef is empty .. if there are cases it's not we need to write some conversion code if ( texdef->shift[0] != 0 || texdef->shift[1] != 0 || texdef->scale[0] != 0 || texdef->scale[1] != 0 || texdef->rotate != 0 ) { - Sys_Printf( "Warning : non-zero texdef detected in Brush_Create .. need brush primitive conversion\n" ); + Sys_FPrintf( SYS_WRN, "Warning : non-zero texdef detected in Brush_Create .. need brush primitive conversion\n" ); } } #endif diff --git a/radiant/brush_primit.cpp b/radiant/brush_primit.cpp index 322c3b27..a69ab403 100644 --- a/radiant/brush_primit.cpp +++ b/radiant/brush_primit.cpp @@ -103,11 +103,11 @@ void FaceToBrushPrimitFace( face_t *f ){ strcpy(f->brushprimit_texdef.name,f->texdef.name); */ #ifdef DBG_BP if ( f->plane.normal[0] == 0.0f && f->plane.normal[1] == 0.0f && f->plane.normal[2] == 0.0f ) { - Sys_Printf( "Warning : f->plane.normal is (0,0,0) in FaceToBrushPrimitFace\n" ); + Sys_FPrintf( SYS_WRN, "Warning : f->plane.normal is (0,0,0) in FaceToBrushPrimitFace\n" ); } // check d_texture if ( !f->d_texture ) { - Sys_Printf( "Warning : f.d_texture is NULL in FaceToBrushPrimitFace\n" ); + Sys_FPrintf( SYS_WRN, "Warning : f.d_texture is NULL in FaceToBrushPrimitFace\n" ); return; } #endif @@ -162,10 +162,10 @@ void EmitBrushPrimitTextureCoordinates( face_t * f, winding_t * w ){ vec_t T = f->brushprimit_texdef.coords[1][0] * x + f->brushprimit_texdef.coords[1][1] * y + f->brushprimit_texdef.coords[1][2]; if ( fabs( S - w->points[i][3] ) > 1e-2 || fabs( T - w->points[i][4] ) > 1e-2 ) { if ( fabs( S - w->points[i][3] ) > 1e-4 || fabs( T - w->points[i][4] ) > 1e-4 ) { - Sys_Printf( "Warning : precision loss in brush -> brush primitive texture computation\n" ); + Sys_FPrintf( SYS_WRN, "Warning : precision loss in brush -> brush primitive texture computation\n" ); } else{ - Sys_Printf( "Warning : brush -> brush primitive texture computation bug detected\n" ); + Sys_FPrintf( SYS_WRN, "Warning : brush -> brush primitive texture computation bug detected\n" ); } } } @@ -181,14 +181,14 @@ void TexMatToFakeTexCoords( vec_t texMat[2][3], float shift[2], float *rot, floa #ifdef DBG_BP // check this matrix is orthogonal if ( fabs( texMat[0][0] * 1.0L * texMat[0][1] + texMat[1][0] * 1.0L * texMat[1][1] ) > ZERO_EPSILON ) { - Sys_Printf( "Warning : non orthogonal texture matrix in TexMatToFakeTexCoords\n" ); + Sys_FPrintf( SYS_WRN, "Warning : non orthogonal texture matrix in TexMatToFakeTexCoords\n" ); } #endif scale[0] = sqrt( texMat[0][0] * 1.0L * texMat[0][0] + texMat[1][0] * 1.0L * texMat[1][0] ); scale[1] = sqrt( texMat[0][1] * 1.0L * texMat[0][1] + texMat[1][1] * 1.0L * texMat[1][1] ); #ifdef DBG_BP if ( scale[0] < ZERO_EPSILON || scale[1] < ZERO_EPSILON ) { - Sys_Printf( "Warning : unexpected scale==0 in TexMatToFakeTexCoords\n" ); + Sys_FPrintf( SYS_WRN, "Warning : unexpected scale==0 in TexMatToFakeTexCoords\n" ); } #endif // compute rotate value @@ -196,7 +196,7 @@ void TexMatToFakeTexCoords( vec_t texMat[2][3], float shift[2], float *rot, floa #ifdef DBG_BP // check brushprimit_texdef[1][0] is not zero if ( fabs( texMat[1][0] ) < ZERO_EPSILON ) { - Sys_Printf( "Warning : unexpected texdef[1][0]==0 in TexMatToFakeTexCoords\n" ); + Sys_FPrintf( SYS_WRN, "Warning : unexpected texdef[1][0]==0 in TexMatToFakeTexCoords\n" ); } #endif // rotate is +-90 diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 8a952be0..87df69c1 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -1634,7 +1634,7 @@ void CamWnd::Cam_Draw(){ void CamWnd::OnExpose(){ if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: glXMakeCurrent failed..\n " ); + Sys_FPrintf( SYS_ERR, "ERROR: glXMakeCurrent failed..\n " ); Sys_Printf( "Please restart Radiant if the camera view is not working\n" ); } else diff --git a/radiant/eclass.cpp b/radiant/eclass.cpp index df503f4f..4b2e1fbc 100644 --- a/radiant/eclass.cpp +++ b/radiant/eclass.cpp @@ -445,7 +445,7 @@ eclass_t *Eclass_ForName( const char *name, qboolean has_brushes ){ #ifdef _DEBUG // grouping stuff, not an eclass if ( strcmp( name, "group_info" ) == 0 ) { - Sys_Printf( "WARNING: unexpected group_info entity in Eclass_ForName\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: unexpected group_info entity in Eclass_ForName\n" ); } #endif diff --git a/radiant/eclass_def.cpp b/radiant/eclass_def.cpp index dcef9b0d..d2dcb987 100644 --- a/radiant/eclass_def.cpp +++ b/radiant/eclass_def.cpp @@ -255,6 +255,12 @@ eclass_t *Eclass_InitFromText( char *text ){ ) { e->nShowFlags |= ECLASS_ANGLE; } + for ( i = 0 ; i < MAX_FLAGS ; i++ ) + { + if ( e->flagnames[i] && e->flagnames[i][0] != 0 && strcmpi( e->flagnames[i], "angle" ) && e->fixedsize ) { + e->nShowFlags |= ECLASS_ANGLE; + } + } if ( strcmpi( e->name, "path" ) == 0 ) { e->nShowFlags |= ECLASS_PATH; } diff --git a/radiant/filters.cpp b/radiant/filters.cpp index 7a59b0e4..f9669cff 100644 --- a/radiant/filters.cpp +++ b/radiant/filters.cpp @@ -139,10 +139,7 @@ bfilter_t *FilterAddBase( bfilter_t *pFilter ){ pFilter = FilterAddImpl( pFilter,1,0,"areaportal",EXCLUDE_AREAPORTALS,true ); pFilter = FilterAddImpl( pFilter,2,QER_TRANS,NULL,EXCLUDE_TRANSLUCENT,true ); pFilter = FilterAddImpl( pFilter,3,0,"trigger",EXCLUDE_TRIGGERS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"misc_model",EXCLUDE_MODELS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"misc_gamemodel",EXCLUDE_MODELS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"misc_model_static",EXCLUDE_MODELS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"model_static",EXCLUDE_MODELS,true ); + pFilter = FilterAddImpl( pFilter,4,ECLASS_MISCMODEL,NULL,EXCLUDE_MODELS,true ); pFilter = FilterAddImpl( pFilter,4,ECLASS_LIGHT,NULL,EXCLUDE_LIGHTS,true ); pFilter = FilterAddImpl( pFilter,4,ECLASS_PATH,NULL,EXCLUDE_PATHS,true ); pFilter = FilterAddImpl( pFilter,1,0,"lightgrid",EXCLUDE_LIGHTGRID,true ); diff --git a/radiant/glinterface.cpp b/radiant/glinterface.cpp index ea86be65..6f6307db 100644 --- a/radiant/glinterface.cpp +++ b/radiant/glinterface.cpp @@ -49,7 +49,7 @@ void WINAPI QERApp_UnHookGL2DWindow( IGL2DWindow* pGLW ){ } } #ifdef _DEBUG - Sys_Printf( "ERROR: IGL2DWindow* not found in QERApp_UnHookGL2DWindow\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: IGL2DWindow* not found in QERApp_UnHookGL2DWindow\n" ); #endif } @@ -73,7 +73,7 @@ void WINAPI QERApp_UnHookGL3DWindow( IGL3DWindow* pGLW ){ } } #ifdef _DEBUG - Sys_Printf( "ERROR: IGL3DWindow* not found in QERApp_UnHookGL3DWindow\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: IGL3DWindow* not found in QERApp_UnHookGL3DWindow\n" ); #endif } diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp index 4b2bb4ee..211eda02 100644 --- a/radiant/groupdialog.cpp +++ b/radiant/groupdialog.cpp @@ -826,7 +826,7 @@ void Group_AddToProperGroup( brush_t *b ){ Group_AddToItem(b, g->itemOwner); #ifdef _DEBUG else - Sys_Printf("WARNING: unexpected Group_ForName not found in Group_AddToProperGroup\n"); + Sys_FPrintf(SYS_WRN, "WARNING: unexpected Group_ForName not found in Group_AddToProperGroup\n"); #endif } else diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index f857e312..44778059 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -3793,8 +3793,47 @@ void DoTextEditor( const char* filename, int cursorpos ){ CString strEditCommand; #ifdef _WIN32 if ( g_PrefsDlg.m_bUseWin32Editor ) { - Sys_Printf( "opening file '%s' (line %d info ignored)\n", filename ); - ShellExecute( (HWND)GDK_WINDOW_HWND( g_pParentWnd->m_pWidget->window ), "open", filename, NULL, NULL, SW_SHOW ); + HINSTANCE result; + Sys_Printf( "Opening file '%s'.\n", filename ); + result = ShellExecute( (HWND)GDK_WINDOW_HWND( g_pParentWnd->m_pWidget->window ), "open", filename, NULL, NULL, SW_SHOW ); + if( (int)result <= 32 ) { + const char *errstr; + switch( (int)result ) { + case SE_ERR_OOM: + case 0: + errstr = _( "The operating system is out of memory or resources." ); + break; + case ERROR_FILE_NOT_FOUND: + //case SE_ERR_FNF: + errstr = _( "The specified file was not found." ); + break; + case SE_ERR_NOASSOC: + { + SHELLEXECUTEINFO sei = {0}; + sei.cbSize = sizeof( sei ); + sei.nShow = SW_SHOWNORMAL; + sei.lpFile = TEXT( filename ); + sei.fMask = SEE_MASK_CLASSNAME; + sei.lpVerb = TEXT( "open" ); + sei.lpClass = TEXT( ".txt" ); + + if( ShellExecuteEx( &sei ) ) + { + return; + } + errstr = _( "There is no application associated with the given file name extension." ); + break; + } + case ERROR_PATH_NOT_FOUND: + //case SE_ERR_PNF: + errstr = _( "The specified path was not found." ); + break; + default: + errstr = ""; + break; + } + Sys_FPrintf( SYS_WRN, "Failed to open file '%s'. %s\n", filename, errstr ); + } return; } #else diff --git a/radiant/main.cpp b/radiant/main.cpp index bd095550..31b3801a 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -414,7 +414,7 @@ void error_redirect( const gchar *domain, GLogLevelFlags log_level, const gchar #define GETTEXT_PACKAGE "radiant" #define LOCALEDIR "lang" -int main( int argc, char* argv[] ) { +int mainRadiant( int argc, char* argv[] ) { const char *libgl; int i, j, k; @@ -697,13 +697,13 @@ int main( int argc, char* argv[] ) { chomp++; buf[chomp] = '\0'; if ( strcmp( buf, RADIANT_MAJOR_VERSION ) ) { - Sys_Printf( "ERROR: file RADIANT_MAJOR doesn't match ('%s')\n", buf ); + Sys_FPrintf( SYS_ERR, "ERROR: file RADIANT_MAJOR doesn't match ('%s')\n", buf ); bVerIsGood = false; } } else { - Sys_Printf( "ERROR: can't find RADIANT_MAJOR in '%s'\n", ver_file_name.GetBuffer() ); + Sys_FPrintf( SYS_ERR, "ERROR: can't find RADIANT_MAJOR in '%s'\n", ver_file_name.GetBuffer() ); bVerIsGood = false; } ver_file_name = g_strAppPath; @@ -719,13 +719,13 @@ int main( int argc, char* argv[] ) { chomp++; buf[chomp] = '\0'; if ( strcmp( buf, RADIANT_MINOR_VERSION ) ) { - Sys_Printf( "ERROR: file RADIANT_MINOR doesn't match ('%s')\n", buf ); + Sys_FPrintf( SYS_ERR, "ERROR: file RADIANT_MINOR doesn't match ('%s')\n", buf ); bVerIsGood = false; } } else { - Sys_Printf( "ERROR: can't find RADIANT_MINOR in '%s'\n", ver_file_name.GetBuffer() ); + Sys_FPrintf( SYS_ERR, "ERROR: can't find RADIANT_MINOR in '%s'\n", ver_file_name.GetBuffer() ); bVerIsGood = false; } if ( !bVerIsGood ) { @@ -923,6 +923,76 @@ int main( int argc, char* argv[] ) { return 0; } + +#if defined( _WIN32 ) && defined( _MSC_VER ) +#include +#include +#include +#include //StringCchPrintf + +int GenerateDump( EXCEPTION_POINTERS* pExceptionPointers ) { + BOOL bMiniDumpSuccessful; + char szPath[MAX_PATH]; + char szFileName[MAX_PATH]; + char szAppName[] = "GTKRadiant"; + char* szVersion = RADIANT_VERSION; + DWORD dwBufferSize = MAX_PATH; + HANDLE hDumpFile; + SYSTEMTIME stLocalTime; + MINIDUMP_EXCEPTION_INFORMATION ExpParam; + + GetLocalTime( &stLocalTime ); + GetTempPath( dwBufferSize, szPath ); + + StringCchPrintf( szFileName, MAX_PATH, "%s%s", szPath, szAppName ); + CreateDirectory( szFileName, NULL ); + + StringCchPrintf( szFileName, MAX_PATH, "%s%s\\%s-%s-%04d%02d%02d-%02d%02d%02d.dmp", + szPath, szAppName, szAppName, szVersion, + stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay, + stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond ); + hDumpFile = CreateFile(szFileName, GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_WRITE|FILE_SHARE_READ, 0, CREATE_ALWAYS, 0, 0); + + ExpParam.ThreadId = GetCurrentThreadId(); + ExpParam.ExceptionPointers = pExceptionPointers; + ExpParam.ClientPointers = TRUE; + + bMiniDumpSuccessful = MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), + hDumpFile, MiniDumpWithDataSegs, &ExpParam, NULL, NULL); + + return EXCEPTION_EXECUTE_HANDLER; +} +#endif + +int main( int argc, char* argv[] ) { + +#if defined( _WIN32 ) && defined( _MSC_VER ) + __try { + return mainRadiant( argc, argv ); + } __except( GenerateDump( GetExceptionInformation() ) ) { + + char szPath[MAX_PATH]; + char szText[MAX_PATH]; + char szFileName[MAX_PATH]; + char szAppName[] = "GTKRadiant"; + SYSTEMTIME stLocalTime; + DWORD dwBufferSize = MAX_PATH; + + GetLocalTime( &stLocalTime ); + GetTempPath( dwBufferSize, szPath ); + + StringCchPrintf( szFileName, MAX_PATH, "%s%s", szPath, szAppName ); + + StringCchPrintf( szText, MAX_PATH, _("Application crashed!\nCreated a dump file in: \n%s"), szFileName ); + + MessageBox( NULL, szText, NULL, MB_ICONERROR ); + } +#else + return mainRadiant( argc, argv ); +#endif +} + // ydnar: quick and dirty fix, just make the buffer bigger #define BIG_PATH_MAX 4096 @@ -1098,7 +1168,7 @@ static gboolean RunBsp_CaptureOutput(void *data) { } if ( pid == -1 ) { - Sys_Printf( "Failed to wait for %d: %s\n", process->pid, strerror( errno ) ); + Sys_FPrintf( SYS_ERR, "ERROR: Failed to wait for %d: %s\n", process->pid, strerror( errno ) ); } else { Sys_Printf( "Process %d terminated with status %d\n", process->pid, process->status ); } diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 33b94d1a..4fb3b198 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -20,7 +20,7 @@ */ // -// Main Window for Q3Radiant +// Main Window for GtkRadiant // // Leonardo Zide (leo@lokigames.com) // @@ -44,7 +44,7 @@ extern "C" { #include "patchdialog.h" #include "filters.h" -// use this to verbose what happens with the beyboard +// use this to verbose what happens with the keyboard #ifdef _DEBUG // #define DBG_KBD #endif @@ -162,15 +162,25 @@ SCommandInfo g_Commands[] = {"CameraStrafeRight", GDK_period, 0, ID_CAMERA_STRAFERIGHT, "menu_camera_straferight"}, {"CameraStrafeLeft", GDK_comma, 0, ID_CAMERA_STRAFELEFT, "menu_camera_strafeleft"}, {"ToggleGrid", '0', 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, + {"ToggleGrid", GDK_KP_0, 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, {"SetGrid1", '1', 0, ID_GRID_1, "menu_grid_1"}, + {"SetGrid1", GDK_KP_1, 0, ID_GRID_1, "menu_grid_1"}, {"SetGrid2", '2', 0, ID_GRID_2, "menu_grid_2"}, + {"SetGrid2", GDK_KP_2, 0, ID_GRID_2, "menu_grid_2"}, {"SetGrid4", '3', 0, ID_GRID_4, "menu_grid_4"}, + {"SetGrid4", GDK_KP_3, 0, ID_GRID_4, "menu_grid_4"}, {"SetGrid8", '4', 0, ID_GRID_8, "menu_grid_8"}, + {"SetGrid8", GDK_KP_4, 0, ID_GRID_8, "menu_grid_8"}, {"SetGrid16", '5', 0, ID_GRID_16, "menu_grid_16"}, + {"SetGrid16", GDK_KP_5, 0, ID_GRID_16, "menu_grid_16"}, {"SetGrid32", '6', 0, ID_GRID_32, "menu_grid_32"}, + {"SetGrid32", GDK_KP_6, 0, ID_GRID_32, "menu_grid_32"}, {"SetGrid64", '7', 0, ID_GRID_64, "menu_grid_64"}, + {"SetGrid64", GDK_KP_7, 0, ID_GRID_64, "menu_grid_64"}, {"SetGrid128", '8', 0, ID_GRID_128, "menu_grid_128"}, + {"SetGrid128", GDK_KP_8, 0, ID_GRID_128, "menu_grid_128"}, {"SetGrid256", '9', 0, ID_GRID_256, "menu_grid_256"}, + {"SetGrid256", GDK_KP_9, 0, ID_GRID_256, "menu_grid_256"}, {"DragEdges", 'E', 0, ID_SELECTION_DRAGEDGES, "menu_selection_dragedges"}, {"DragVertices", 'V', 0, ID_SELECTION_DRAGVERTECIES, "menu_selection_dragvertecies"}, {"ViewEntityInfo", 'N', 0, ID_VIEW_ENTITY, "menu_view_entity"}, @@ -258,16 +268,26 @@ SCommandInfo g_Commands[] = {"Sleep", 'P', 0x05, ID_FILE_SLEEP, "menu_file_sleep"}, {"SimplePatchMesh", 'P', 0x01, ID_CURVE_SIMPLEPATCHMESH, "menu_simplepatchmesh"}, {"FilterWorldBrushes", '1', RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, + {"FilterWorldBrushes", GDK_KP_1, RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, {"FilterEntities", '2', RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, + {"FilterEntities", GDK_KP_2, RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, {"FilterAreaportals", '3', RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, + {"FilterAreaportals", GDK_KP_3, RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, {"FilterTranslucent", '4', RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, + {"FilterTranslucent", GDK_KP_4, RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, {"FilterLiquids", '5', RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, + {"FilterLiquids", GDK_KP_5, RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, {"FilterCaulk", '6', RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, + {"FilterCaulk", GDK_KP_6, RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, {"FilterClips", '7', RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, + {"FilterClips", GDK_KP_7, RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, {"FilterBotClips", 'M', RAD_ALT, ID_FILTER_BOTCLIPS, "menu_filter_botclips"}, {"FilterPaths", '8', RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, + {"FilterPaths", GDK_KP_8, RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, {"FilterClusterportals", '9', RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, + {"FilterClusterportals", GDK_KP_9, RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, {"FilterLights", '0', RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, + {"FilterLights", GDK_KP_0, RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, {"FilterPatches", 'P', RAD_CONTROL, ID_FILTER_PATCHES, "menu_filter_patches"}, {"FilterDetails", 'D', RAD_CONTROL, ID_FILTER_DETAILS, "menu_filter_details"}, {"FilterStructural", 'D', RAD_CONTROL | RAD_SHIFT, ID_FILTER_STRUCTURAL, "menu_filter_structural"}, @@ -2495,6 +2515,7 @@ void MainFrame::Create(){ MRU_Load(); create_main_toolbar( window, vbox ); create_plugin_toolbar( window,vbox ); + create_main_statusbar( window, vbox ); m_nCurrentStyle = g_PrefsDlg.m_nView; @@ -2515,7 +2536,7 @@ void MainFrame::Create(){ gtk_window_set_icon_from_file( GTK_WINDOW( window ), icon.GetBuffer(), &error ); if ( error != NULL ) { - Sys_Printf( "Failed to load icon: %s\n", error->message ); + Sys_FPrintf( SYS_ERR, "ERROR: Failed to load icon: %s\n", error->message ); g_error_free( error ); } } @@ -2608,7 +2629,7 @@ void MainFrame::Create(){ } } - gtk_paned_set_position( GTK_PANED( m_pSplits[0] ), g_PrefsDlg.mWindowInfo.nXYHeight + 28 ); + gtk_paned_set_position( GTK_PANED( m_pSplits[0] ), g_PrefsDlg.mWindowInfo.nXYHeight ); if ( CurrentStyle() == eRegular ) { gtk_paned_set_position( GTK_PANED( m_pSplits[2] ), g_PrefsDlg.mWindowInfo.nZWidth ); @@ -2876,8 +2897,6 @@ void MainFrame::Create(){ g_pParentWnd->OnEntitiesSetViewAs( 0 ); - create_main_statusbar( window, vbox ); - LoadCommandMap(); ShowMenuItemKeyBindings( window ); @@ -3184,7 +3203,7 @@ void MainFrame::OnSleep(){ { #ifdef DBG_SLEEP if (ent->md3Class) - Sys_Printf("WARNING: unexpected ent->md3Class!=NULL with ent->eclass->model!=NULL\n"); + Sys_FPrintf(SYS_WRN, "WARNING: unexpected ent->md3Class!=NULL with ent->eclass->model!=NULL\n"); #endif entitymodel_t *model; for (model = ent->eclass->model; model; model=model->pNext) @@ -3197,7 +3216,7 @@ void MainFrame::OnSleep(){ } #ifdef DBG_SLEEP else - Sys_Printf("WARNING: entity %p %s with fixedsize and no model no md3Class\n", ent, ent->eclass->name); + Sys_FPrintf(SYS_WRN, "WARNING: entity %p %s with fixedsize and no model no md3Class\n", ent, ent->eclass->name); #endif } } @@ -3478,7 +3497,7 @@ void MainFrame::LoadCommandMap(){ } } if ( j == g_nKeyCount ) { - Sys_Printf( "WARNING: failed to parse user command %s\n", value ); + Sys_FPrintf( SYS_WRN, "WARNING: failed to parse user command %s\n", value ); continue; } } diff --git a/radiant/map.cpp b/radiant/map.cpp index 078f7719..37cf8e99 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -391,7 +391,7 @@ void Map_ImportEntities( CPtrArray *ents, bool bAddSelected = false ){ } } else{ - Sys_Printf( "WARNING: no terrain shader found for brush\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: no terrain shader found for brush\n" ); } } } @@ -1038,7 +1038,7 @@ void Map_RegionSelectedBrushes( void ){ #ifdef _DEBUG if ( filtered_brushes.next != &filtered_brushes ) { - Sys_Printf( "WARNING: filtered_brushes list may not be empty in Map_RegionSelectedBrushes\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: filtered_brushes list may not be empty in Map_RegionSelectedBrushes\n" ); } #endif diff --git a/radiant/parse.cpp b/radiant/parse.cpp index ecfc4c4b..8ab9e1dd 100644 --- a/radiant/parse.cpp +++ b/radiant/parse.cpp @@ -57,14 +57,14 @@ skipspace: { if ( !*script_p ) { if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [01]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [01]\n",scriptline ); } return false; } if ( *script_p++ == '\n' ) { if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [02]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [02]\n",scriptline ); } scriptline++; } @@ -72,12 +72,12 @@ skipspace: if ( script_p[0] == '/' && script_p[1] == '/' ) { // comment field if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [03]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [03]\n",scriptline ); } while ( *script_p++ != '\n' ) if ( !*script_p ) { if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [04]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [04]\n",scriptline ); } return false; } diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index a7821649..7707afbb 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -694,7 +694,7 @@ void PatchDialog::GetPatchInfo(){ } else{ - Sys_Printf( "WARNING: no patch\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: no patch\n" ); } // fill in our internal structs m_nRow = 0; m_nCol = 0; diff --git a/radiant/pluginmanager.cpp b/radiant/pluginmanager.cpp index 1c77289a..3a9929c8 100644 --- a/radiant/pluginmanager.cpp +++ b/radiant/pluginmanager.cpp @@ -236,55 +236,57 @@ int refcount; times an ID is being referenced, and destroys any instance that is no longer in use */ class CModelManager : public IModelCache { -public: -CModelManager(){ - m_ptrs = g_ptr_array_new(); -} -virtual ~CModelManager(){ - g_ptr_array_free( m_ptrs, FALSE ); -} - -virtual void DeleteByID( const char *id, const char* version ){ - unsigned int i; - CModelWrapper *elem; - for ( i = 0; i < m_ptrs->len; i++ ) - { - elem = (CModelWrapper*)m_ptrs->pdata[i]; - if ( strcmp( elem->m_version.c_str(), version ) == 0 - && strcmp( elem->m_id.c_str(), id ) == 0 - && --elem->refcount == 0 ) { - g_ptr_array_remove_index_fast( m_ptrs, i ); - delete elem; - return; - } + public: + CModelManager(){ + m_ptrs = g_ptr_array_new(); + } + virtual ~CModelManager(){ + g_ptr_array_free( m_ptrs, FALSE ); } -} -virtual entity_interfaces_t *GetByID( const char *id, const char* version ){ - unsigned int i; - CModelWrapper *elem; - for ( i = 0; i < m_ptrs->len; i++ ) - { - elem = (CModelWrapper*)m_ptrs->pdata[i]; - if ( strcmp( elem->m_version.c_str(), version ) == 0 - && strcmp( elem->m_id.c_str(), id ) == 0 ) { - elem->refcount++; - return &elem->m_model; + virtual void DeleteByID( const char *id, const char* version ){ + unsigned int i; + CModelWrapper *elem; + for ( i = 0; i < m_ptrs->len; i++ ) + { + elem = (CModelWrapper*)m_ptrs->pdata[i]; + if (strcmp(elem->m_version.c_str(), version) == 0 + && strcmp(elem->m_id.c_str(), id) == 0) { + elem->refcount--; + if (elem->refcount == 0) { + g_ptr_array_remove_index_fast(m_ptrs, i); + delete elem; + } + return; + } } } - elem = new CModelWrapper( id, version ); - g_ptr_array_add( m_ptrs, elem ); + virtual entity_interfaces_t *GetByID( const char *id, const char* version ){ + unsigned int i; + CModelWrapper *elem; + for ( i = 0; i < m_ptrs->len; i++ ) + { + elem = (CModelWrapper*)m_ptrs->pdata[i]; + if ( strcmp( elem->m_version.c_str(), version ) == 0 + && strcmp( elem->m_id.c_str(), id ) == 0 ) { + elem->refcount++; + return &elem->m_model; + } + } - return &elem->m_model; -} + elem = new CModelWrapper( id, version ); + g_ptr_array_add( m_ptrs, elem ); -virtual void RefreshAll(){ - for ( unsigned int i = 0; i < m_ptrs->len; ++i ) - ( (CModelWrapper*)m_ptrs->pdata[i] )->Refresh(); -} -private: -GPtrArray *m_ptrs; // array of CModelWrapper* + return &elem->m_model; + } + + virtual void RefreshAll(){ + for ( unsigned int i = 0; i < m_ptrs->len; ++i ) + ( (CModelWrapper*)m_ptrs->pdata[i] )->Refresh(); + } + private: + GPtrArray *m_ptrs; // array of CModelWrapper* }; CModelManager g_model_cache; @@ -719,7 +721,7 @@ void CPlugInManager::Cleanup(){ //++timo FIXME: for now I leave a leak warning, we'd need a table to keep track of commited patches #ifdef _DEBUG if ( m_PluginPatches.GetSize() != 0 ) { - Sys_Printf( "WARNING: m_PluginPatches.GetSize() != 0 in CPlugInManager::Cleanup, possible leak\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: m_PluginPatches.GetSize() != 0 in CPlugInManager::Cleanup, possible leak\n" ); } #endif @@ -859,7 +861,7 @@ patchMesh_t* CPlugInManager::FindPatchHandle( int index ){ return pb->pPatch; } #ifdef _DEBUG - Sys_Printf( "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); #endif break; case EAllocatedPatches: @@ -868,7 +870,7 @@ patchMesh_t* CPlugInManager::FindPatchHandle( int index ){ return pPatch; } #ifdef _DEBUG - Sys_Printf( "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); #endif break; } @@ -1066,7 +1068,7 @@ _QERFaceData* WINAPI QERApp_GetFaceData( void* pv, int nFaceIndex ){ #ifdef _DEBUG if ( !pBrush->brush_faces ) { - Sys_Printf( "Warning : pBrush->brush_faces is NULL in QERApp_GetFaceData\n" ); + Sys_FPrintf( SYS_WRN, "Warning : pBrush->brush_faces is NULL in QERApp_GetFaceData\n" ); return NULL; } #endif @@ -1500,7 +1502,7 @@ qtexture_t* WINAPI QERApp_Texture_ForName( const char *name ){ gtk_glwidget_make_current( g_qeglobals_gui.d_glBase ); //++timo debugging - Sys_Printf( "WARNING: QERApp_Texture_ForName ... don't call that!!\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: QERApp_Texture_ForName ... don't call that!!\n" ); qtexture_t* qtex = QERApp_Texture_ForName2( name ); return qtex; } @@ -1547,7 +1549,7 @@ void CPlugInManager::CommitEntityHandleToMap( void* vpEntity ){ // fixedsize if ( e->fixedsize ) { if ( pe->brushes.onext != &pe->brushes ) { - Sys_Printf( "Warning : Fixed size entity with brushes in CPlugInManager::CommitEntityHandleToMap\n" ); + Sys_FPrintf( SYS_WRN, "Warning : Fixed size entity with brushes in CPlugInManager::CommitEntityHandleToMap\n" ); } // create a custom brush VectorAdd( e->mins, pe->origin, mins ); @@ -1590,7 +1592,7 @@ void CPlugInManager::CommitEntityHandleToMap( void* vpEntity ){ else { // brush entity if ( pe->brushes.next == &pe->brushes ) { - Sys_Printf( "Warning: Brush entity with no brushes in CPlugInManager::CommitEntityHandleToMap\n" ); + Sys_FPrintf( SYS_WRN, "Warning: Brush entity with no brushes in CPlugInManager::CommitEntityHandleToMap\n" ); } } @@ -1636,7 +1638,7 @@ void CPlugInManager::CommitEntityHandleToMap( void* vpEntity ){ world_entity = pe; } else{ - Sys_Printf( "Warning : unexpected world_entity == NULL in CommitEntityHandleToMap\n" ); + Sys_FPrintf( SYS_WRN, "Warning : unexpected world_entity == NULL in CommitEntityHandleToMap\n" ); } } } @@ -1673,7 +1675,7 @@ patchMesh_t* QERApp_GetSelectedPatch(){ } } #ifdef _DEBUG - Sys_Printf( "WARNING: QERApp_GetSelectedPatchTexdef called with no patch selected\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: QERApp_GetSelectedPatchTexdef called with no patch selected\n" ); #endif return NULL; } @@ -1765,7 +1767,7 @@ void WINAPI QERApp_DeletePatch( int index ){ } } #ifdef _DEBUG - Sys_Printf( "Warning: QERApp_DeletePatch: FindPatchHandle failed\n" ); + Sys_FPrintf( SYS_WRN, "Warning: QERApp_DeletePatch: FindPatchHandle failed\n" ); #endif } diff --git a/radiant/pmesh.cpp b/radiant/pmesh.cpp index aab43c20..041cd7ce 100644 --- a/radiant/pmesh.cpp +++ b/radiant/pmesh.cpp @@ -1378,7 +1378,7 @@ brush_t* Patch_GenericMesh( int nWidth, int nHeight, int nOrientation, bool bDel } if ( !bOverride && !QE_SingleBrush() ) { - Sys_Printf( "Error: you must have a single brush selected\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: you must have a single brush selected\n" ); return NULL; } @@ -4956,7 +4956,7 @@ void Patch_ShiftTextureST( patchMesh_t *p, float fx, float fy ){ #ifdef _DEBUG // NOTE: when called by Patch_ShiftTexture this warning may be bogus if ( ( ABS( fx ) >= 1 ) || ( ABS( fy ) >= 1 ) ) { - Sys_Printf( "WARNING: increments exceed 1 in Patch_ShiftTextureST\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: increments exceed 1 in Patch_ShiftTextureST\n" ); } #endif for ( int w = 0; w < p->width; w++ ) diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp index 358d3939..1904aa41 100644 --- a/radiant/qe3.cpp +++ b/radiant/qe3.cpp @@ -108,7 +108,7 @@ void WINAPI QE_CheckOpenGLForErrors( void ){ } else { - Sys_Printf( "Warning: OpenGL Error %s\n", qgluErrorString( (GLenum)i ) ); + Sys_FPrintf( SYS_WRN, "WARNING: OpenGL Error %s\n", qgluErrorString( (GLenum)i ) ); } } } @@ -802,13 +802,13 @@ qboolean QE_SingleBrush( bool bQuiet ){ if ( ( selected_brushes.next == &selected_brushes ) || ( selected_brushes.next->next != &selected_brushes ) ) { if ( !bQuiet ) { - Sys_Printf( "Error: you must have a single brush selected\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: you must have a single brush selected\n" ); } return false; } if ( selected_brushes.next->owner->eclass->fixedsize ) { if ( !bQuiet ) { - Sys_Printf( "Error: you cannot manipulate fixed size entities\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: you cannot manipulate fixed size entities\n" ); } return false; } diff --git a/radiant/radiant.vcxproj b/radiant/radiant.vcxproj index c9a72baf..86e281aa 100644 --- a/radiant/radiant.vcxproj +++ b/radiant/radiant.vcxproj @@ -21,23 +21,24 @@ {65D02375-63EE-4A8A-9F8E-504B1D5A1D02} Win32Proj + 8.1 Application - v110_xp + v140 Application - v110_xp + v140 Application - v110_xp + v140 Application - v110_xp + v140 @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;Dbghelp.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -93,7 +94,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -105,15 +106,15 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;Dbghelp.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -123,8 +124,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;Dbghelp.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Windows true @@ -134,7 +135,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -145,8 +146,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;Dbghelp.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Windows true diff --git a/radiant/select.cpp b/radiant/select.cpp index de8ea82e..b0584136 100644 --- a/radiant/select.cpp +++ b/radiant/select.cpp @@ -849,7 +849,7 @@ void ComputeAbsolute( face_t* f, vec3_t& p1, vec3_t& p2, vec3_t& p3 ){ #ifdef _DEBUG if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning : illegal call of ComputeAbsolute in brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning : illegal call of ComputeAbsolute in brush primitive mode\n" ); } #endif @@ -898,7 +898,7 @@ void AbsoluteToLocal( plane_t normal2, face_t* f, vec3_t& p1, vec3_t& p2, vec3_t #ifdef _DEBUG if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning : illegal call of AbsoluteToLocal in brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning : illegal call of AbsoluteToLocal in brush primitive mode\n" ); } #endif diff --git a/radiant/selectedface.cpp b/radiant/selectedface.cpp index 0b1ab2e5..f0a90ed5 100644 --- a/radiant/selectedface.cpp +++ b/radiant/selectedface.cpp @@ -56,7 +56,7 @@ int WINAPI QERApp_GetFaceInfo( int iface, _QERFaceData *pFaceData, winding_t *pW return 0; } if ( !g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning: unexpected QERApp_GetFaceInfo out of brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning: unexpected QERApp_GetFaceInfo out of brush primitive mode\n" ); return 0; } face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( iface ) ); @@ -77,7 +77,7 @@ int WINAPI QERApp_SetFaceInfo( int iface, _QERFaceData *pFaceData ){ return 0; } if ( !g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning: unexpected QERApp_SetFaceInfo out of brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning: unexpected QERApp_SetFaceInfo out of brush primitive mode\n" ); return 0; } face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( iface ) ); diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index fec10311..08f106fe 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -375,7 +375,7 @@ static void OnBtnMatchGrid( GtkWidget *widget, gpointer data ){ hscale = gtk_spin_button_get_value_as_float( GTK_SPIN_BUTTON( g_dlgSurface.GetDlgWidget( "hscale" ) ) ); vscale = gtk_spin_button_get_value_as_float( GTK_SPIN_BUTTON( g_dlgSurface.GetDlgWidget( "vscale" ) ) ); if ( hscale == 0.0f || vscale == 0.0f ) { - Sys_Printf( "ERROR: unexpected scale == 0.0f\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: unexpected scale == 0.0f\n" ); return; } DoSnapTToGrid( hscale, vscale ); diff --git a/radiant/surfaceplugin.cpp b/radiant/surfaceplugin.cpp index 4de5754c..8b215235 100644 --- a/radiant/surfaceplugin.cpp +++ b/radiant/surfaceplugin.cpp @@ -41,7 +41,7 @@ void QERApp_GetTwoSelectedPatch( patchMesh_t **p1, patchMesh_t **p2 ){ } } #ifdef _DEBUG - Sys_Printf( "WARNING: QERApp_GetTwoSelectedPatch failed (did not find two patches)\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: QERApp_GetTwoSelectedPatch failed (did not find two patches)\n" ); #endif return; } diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index a542e4dc..ec20e357 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1086,7 +1086,7 @@ IShader* Texture_NextPos( int *x, int *y ){ nCurrentShader++; pCurrentShader = QERApp_ActiveShader_ForIndex( nCurrentShader ); if ( pCurrentShader == NULL ) { - Sys_Printf( "ERROR: unexpected pCurrentShader == NULL in Texture_NextPos\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: unexpected pCurrentShader == NULL in Texture_NextPos\n" ); return NULL; } current_texture = pCurrentShader->getTexture(); @@ -1285,7 +1285,7 @@ void SelectTexture( int mx, int my, bool bShift, bool bFitScale ){ && my < y && y - my < nHeight + FONT_HEIGHT ) { if ( bShift ) { if ( pCurrentShader->IsDefault() ) { - Sys_Printf( "ERROR: %s is not a shader, it's a texture.\n", pCurrentShader->getName() ); + Sys_FPrintf( SYS_ERR, "ERROR: %s is not a shader, it's a texture.\n", pCurrentShader->getName() ); } else{ ViewShader( pCurrentShader->getShaderFileName(), pCurrentShader->getName() ); @@ -1321,7 +1321,7 @@ void SelectTexture( int mx, int my, bool bShift, bool bFitScale ){ #ifdef _DEBUG // this one is never supposed to be set as current one if ( pAuxShader->IsColor() ) { - Sys_Printf( "ERROR: unexpected pCurrentShader->IsColor() in SelectTexture\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: unexpected pCurrentShader->IsColor() in SelectTexture\n" ); } #endif // NOTE: IsColor is false, IsDefault the only remaining property @@ -1701,7 +1701,7 @@ void TexWnd::OnSize( int cx, int cy ){ void TexWnd::OnExpose() { int nOld = g_qeglobals.d_texturewin.m_nTotalHeight; if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: glXMakeCurrent failed..\n " ); + Sys_FPrintf( SYS_ERR, "ERROR: glXMakeCurrent failed..\n " ); Sys_Printf( "Please restart Radiant if the Texture view is not working\n" ); } else diff --git a/radiant/ui.cpp b/radiant/ui.cpp index 2289bdd6..973f15b7 100644 --- a/radiant/ui.cpp +++ b/radiant/ui.cpp @@ -170,7 +170,7 @@ void WINAPI QERApp_UnHookWindow( IWindowListener* pListen ){ } } #ifdef _DEBUG - Sys_Printf( "WARNING: IWindowListener not found in QERApp_UnHookWindow\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: IWindowListener not found in QERApp_UnHookWindow\n" ); #endif } @@ -198,7 +198,7 @@ bool DispatchOnLButtonUp( guint32 nFlags, int x, int y ){ void WINAPI QERApp_HookListener( IListener* pListen, int Msg ){ #ifdef _DEBUG if ( Msg >= RADIANT_MSGCOUNT ) { - Sys_Printf( "ERROR: bad index in QERApp_HookListener\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: bad index in QERApp_HookListener\n" ); return; } #endif @@ -221,7 +221,7 @@ int WINAPI QERApp_UnHookListener( IListener* pListen ){ void DispatchRadiantMsg( int Msg ){ #ifdef _DEBUG if ( Msg >= RADIANT_MSGCOUNT ) { - Sys_Printf( "ERROR: bad index in DispatchRadiantMsg\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: bad index in DispatchRadiantMsg\n" ); return; } #endif diff --git a/radiant/undo.cpp b/radiant/undo.cpp index f56a65b6..c5e9de70 100644 --- a/radiant/undo.cpp +++ b/radiant/undo.cpp @@ -227,7 +227,7 @@ void Undo_GeneralStart( const char *operation ){ if ( g_lastundo ) { if ( !g_lastundo->done ) { - Sys_Printf( "Undo_Start: WARNING last undo not finished.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING last undo not finished.\n" ); } } @@ -363,7 +363,7 @@ void Undo_AddBrush( brush_t *pBrush ){ return; } if ( g_lastundo->entitylist.next != &g_lastundo->entitylist ) { - Sys_Printf( "Undo_AddBrushList: WARNING adding brushes after entity.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING adding brushes after entity.\n" ); } //if the brush is already in the undo if ( Undo_BrushInUndo( g_lastundo, pBrush ) ) { @@ -406,7 +406,7 @@ void Undo_AddBrushList( brush_t *brushlist ){ return; } if ( g_lastundo->entitylist.next != &g_lastundo->entitylist ) { - Sys_Printf( "Undo_AddBrushList: WARNING adding brushes after entity.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING adding brushes after entity.\n" ); } //copy the brushes to the undo for ( pBrush = brushlist->next ; pBrush != NULL && pBrush != brushlist; pBrush = pBrush->next ) @@ -626,7 +626,7 @@ void Undo_Undo( qboolean bSilent ){ return; } if ( !g_lastundo->done ) { - Sys_Printf( "Undo_Undo: WARNING: last undo not yet finished!\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: last undo not yet finished!\n" ); } // get the last undo undo = g_lastundo; @@ -801,7 +801,7 @@ void Undo_Redo( void ){ } if ( g_lastundo ) { if ( !g_lastundo->done ) { - Sys_Printf( "WARNING: last undo not finished.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: last undo not finished.\n" ); } } // get the last redo diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp index 31b88d40..0e0c9c87 100644 --- a/radiant/watchbsp.cpp +++ b/radiant/watchbsp.cpp @@ -150,7 +150,7 @@ static void saxEndElement( message_info_t *data, const xmlChar *name ) { } if ( data->recurse == data->stop_depth ) { #ifdef _DEBUG - Sys_Printf( "Received error msg .. shutting down..\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: Received error msg .. shutting down..\n" ); #endif // tell there has been an error if ( g_pParentWnd->GetWatchBSP()->HasBSPPlugin() ) { @@ -358,7 +358,7 @@ void CWatchBSP::Reset(){ bool CWatchBSP::SetupListening(){ #ifdef _DEBUG if ( m_pListenSocket ) { - Sys_Printf( "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n" ); return false; } #endif @@ -442,7 +442,7 @@ void CWatchBSP::RoutineProcessing(){ #ifdef _DEBUG // some debug checks if ( !m_pListenSocket ) { - Sys_Printf( "ERROR: m_pListenSocket == NULL in CWatchBSP::RoutineProcessing EBeginStep state\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: m_pListenSocket == NULL in CWatchBSP::RoutineProcessing EBeginStep state\n" ); Reset(); break; } @@ -462,7 +462,7 @@ void CWatchBSP::RoutineProcessing(){ #ifdef _DEBUG // some debug checks if ( !m_pInSocket ) { - Sys_Printf( "ERROR: m_pInSocket == NULL in CWatchBSP::RoutineProcessing EWatching state\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: m_pInSocket == NULL in CWatchBSP::RoutineProcessing EWatching state\n" ); Reset(); break; } @@ -478,7 +478,7 @@ void CWatchBSP::RoutineProcessing(){ // (no use on windows) ret = select( m_pInSocket->socket + 1, &readfds, NULL, NULL, &tout ); if ( ret == SOCKET_ERROR ) { - Sys_Printf( "WARNING: SOCKET_ERROR in CWatchBSP::RoutineProcessing\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: SOCKET_ERROR in CWatchBSP::RoutineProcessing\n" ); Sys_Printf( "Terminating the connection.\n" ); Reset(); break; diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 72d1c53a..53c58ffe 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -3195,7 +3195,7 @@ void XYWnd::OnCreate(){ void XYWnd::OnExpose(){ bool bPaint = true; if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: glXMakeCurrent failed.. Error:%i\n",qglGetError() ); + Sys_FPrintf( SYS_ERR, "ERROR: glXMakeCurrent failed.. Error:%i\n",qglGetError() ); Sys_Printf( "Please restart Radiant if the Map view is not working\n" ); bPaint = false; } diff --git a/radiant/zwindow.cpp b/radiant/zwindow.cpp index 12e510a1..810ea526 100644 --- a/radiant/zwindow.cpp +++ b/radiant/zwindow.cpp @@ -90,7 +90,7 @@ void ZWnd::OnMouseMove( guint32 nFlags, int pointx, int pointy ){ void ZWnd::OnExpose(){ if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: wglMakeCurrent failed..\n " ); + Sys_FPrintf( SYS_ERR, "ERROR: wglMakeCurrent failed..\n " ); Sys_Printf( "Please restart Radiant if the Z view is not working\n" ); } else diff --git a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase b/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase index dfb0d41d..dc338837 100644 --- a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase +++ b/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase @@ -1,368 +1,368 @@ -*3DSMAX_ASCIIEXPORT 200 -*COMMENT "Generated by Q3Map2 (ydnar) -convert -format ase" -*SCENE { - *SCENE_FILENAME "wedge_45.bsp" - *SCENE_FIRSTFRAME 0 - *SCENE_LASTFRAME 100 - *SCENE_FRAMESPEED 30 - *SCENE_TICKSPERFRAME 160 - *SCENE_BACKGROUND_STATIC 0.0000 0.0000 0.0000 - *SCENE_AMBIENT_STATIC 0.0000 0.0000 0.0000 -} -*MATERIAL_LIST { - *MATERIAL_COUNT 2 - *MATERIAL 0 { - *MATERIAL_NAME "textures/radiant_regression_tests/tile_model" - *MATERIAL_CLASS "Standard" - *MATERIAL_DIFFUSE 1.000000 1.000000 0.833333 - *MATERIAL_SHADING Phong - *MAP_DIFFUSE { - *MAP_NAME "textures/radiant_regression_tests/tile_model" - *MAP_CLASS "Bitmap" - *MAP_SUBNO 1 - *MAP_AMOUNT 1.0 - *MAP_TYPE Screen - *BITMAP "..\textures\radiant_regression_tests\tile_model.tga" - *BITMAP_FILTER Pyramidal - } - } - *MATERIAL 1 { - *MATERIAL_NAME "noshader" - *MATERIAL_CLASS "Standard" - *MATERIAL_DIFFUSE 1.000000 1.000000 1.000000 - *MATERIAL_SHADING Phong - *MAP_DIFFUSE { - *MAP_NAME "noshader" - *MAP_CLASS "Bitmap" - *MAP_SUBNO 1 - *MAP_AMOUNT 1.0 - *MAP_TYPE Screen - *BITMAP "..\noshader.tga" - *BITMAP_FILTER Pyramidal - } - } -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf0" - *NODE_TM { - *NODE_NAME "mat0model0surf0" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 128.000000 0.000000 0.000000 - *MESH_VERTEX 1 64.000000 0.000000 64.000000 - *MESH_VERTEX 2 128.000000 128.000000 0.000000 - *MESH_VERTEX 3 64.000000 128.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 - *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 0 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 2 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 3 0.707107 0.000000 0.707107 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 1.000000 -1.000000 1.000000 - *MESH_TVERT 1 -1.000000 -1.000000 1.000000 - *MESH_TVERT 2 1.000000 3.000000 1.000000 - *MESH_TVERT 3 -1.000000 3.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf1" - *NODE_TM { - *NODE_NAME "mat0model0surf1" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 128.000000 64.000000 - *MESH_VERTEX 1 0.000000 128.000000 0.000000 - *MESH_VERTEX 2 64.000000 128.000000 64.000000 - *MESH_VERTEX 3 128.000000 128.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 - *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 0 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 1 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 2 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 3 0.000000 1.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 2.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 0.000000 2.000000 1.000000 - *MESH_TVERT 3 2.000000 0.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf2" - *NODE_TM { - *NODE_NAME "mat0model0surf2" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 64.000000 0.000000 64.000000 - *MESH_VERTEX 1 0.000000 0.000000 64.000000 - *MESH_VERTEX 2 64.000000 128.000000 64.000000 - *MESH_VERTEX 3 0.000000 128.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 - *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 0 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 1 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 2 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 3 0.000000 0.000000 1.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 1.000000 -1.000000 1.000000 - *MESH_TVERT 1 -1.000000 -1.000000 1.000000 - *MESH_TVERT 2 1.000000 3.000000 1.000000 - *MESH_TVERT 3 -1.000000 3.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf3" - *NODE_TM { - *NODE_NAME "mat0model0surf3" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 0.000000 64.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 0.000000 128.000000 64.000000 - *MESH_VERTEX 3 0.000000 128.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 - *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 0 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 1 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 2 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 3 -1.000000 0.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 2.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 2.000000 2.000000 1.000000 - *MESH_TVERT 3 2.000000 0.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf4" - *NODE_TM { - *NODE_NAME "mat0model0surf4" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 128.000000 0.000000 0.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 64.000000 0.000000 64.000000 - *MESH_VERTEX 3 0.000000 0.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 - *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 0 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 1 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 2 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 3 0.000000 -1.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 2.000000 0.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 0.000000 2.000000 1.000000 - *MESH_TVERT 3 -2.000000 2.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf5" - *NODE_TM { - *NODE_NAME "mat0model0surf5" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 128.000000 0.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 128.000000 128.000000 0.000000 - *MESH_VERTEX 3 128.000000 0.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 - *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 - *MESH_VERTEXNORMAL 0 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 1 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 2 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 3 0.000000 0.000000 -1.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 3.000000 1.000000 - *MESH_TVERT 1 -2.000000 -1.000000 1.000000 - *MESH_TVERT 2 2.000000 3.000000 1.000000 - *MESH_TVERT 3 2.000000 -1.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} +*3DSMAX_ASCIIEXPORT 200 +*COMMENT "Generated by Q3Map2 (ydnar) -convert -format ase" +*SCENE { + *SCENE_FILENAME "wedge_45.bsp" + *SCENE_FIRSTFRAME 0 + *SCENE_LASTFRAME 100 + *SCENE_FRAMESPEED 30 + *SCENE_TICKSPERFRAME 160 + *SCENE_BACKGROUND_STATIC 0.0000 0.0000 0.0000 + *SCENE_AMBIENT_STATIC 0.0000 0.0000 0.0000 +} +*MATERIAL_LIST { + *MATERIAL_COUNT 2 + *MATERIAL 0 { + *MATERIAL_NAME "textures/radiant_regression_tests/tile_model" + *MATERIAL_CLASS "Standard" + *MATERIAL_DIFFUSE 1.000000 1.000000 0.833333 + *MATERIAL_SHADING Phong + *MAP_DIFFUSE { + *MAP_NAME "textures/radiant_regression_tests/tile_model" + *MAP_CLASS "Bitmap" + *MAP_SUBNO 1 + *MAP_AMOUNT 1.0 + *MAP_TYPE Screen + *BITMAP "..\textures\radiant_regression_tests\tile_model.tga" + *BITMAP_FILTER Pyramidal + } + } + *MATERIAL 1 { + *MATERIAL_NAME "noshader" + *MATERIAL_CLASS "Standard" + *MATERIAL_DIFFUSE 1.000000 1.000000 1.000000 + *MATERIAL_SHADING Phong + *MAP_DIFFUSE { + *MAP_NAME "noshader" + *MAP_CLASS "Bitmap" + *MAP_SUBNO 1 + *MAP_AMOUNT 1.0 + *MAP_TYPE Screen + *BITMAP "..\noshader.tga" + *BITMAP_FILTER Pyramidal + } + } +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf0" + *NODE_TM { + *NODE_NAME "mat0model0surf0" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 128.000000 0.000000 0.000000 + *MESH_VERTEX 1 64.000000 0.000000 64.000000 + *MESH_VERTEX 2 128.000000 128.000000 0.000000 + *MESH_VERTEX 3 64.000000 128.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 + *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 0 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 2 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 3 0.707107 0.000000 0.707107 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 1.000000 -1.000000 1.000000 + *MESH_TVERT 1 -1.000000 -1.000000 1.000000 + *MESH_TVERT 2 1.000000 3.000000 1.000000 + *MESH_TVERT 3 -1.000000 3.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf1" + *NODE_TM { + *NODE_NAME "mat0model0surf1" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 128.000000 64.000000 + *MESH_VERTEX 1 0.000000 128.000000 0.000000 + *MESH_VERTEX 2 64.000000 128.000000 64.000000 + *MESH_VERTEX 3 128.000000 128.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 + *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 0 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 1 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 2 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 3 0.000000 1.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 2.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 0.000000 2.000000 1.000000 + *MESH_TVERT 3 2.000000 0.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf2" + *NODE_TM { + *NODE_NAME "mat0model0surf2" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 64.000000 0.000000 64.000000 + *MESH_VERTEX 1 0.000000 0.000000 64.000000 + *MESH_VERTEX 2 64.000000 128.000000 64.000000 + *MESH_VERTEX 3 0.000000 128.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 + *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 0 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 1 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 2 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 3 0.000000 0.000000 1.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 1.000000 -1.000000 1.000000 + *MESH_TVERT 1 -1.000000 -1.000000 1.000000 + *MESH_TVERT 2 1.000000 3.000000 1.000000 + *MESH_TVERT 3 -1.000000 3.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf3" + *NODE_TM { + *NODE_NAME "mat0model0surf3" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 0.000000 64.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 0.000000 128.000000 64.000000 + *MESH_VERTEX 3 0.000000 128.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 + *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 0 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 1 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 2 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 3 -1.000000 0.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 2.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 2.000000 2.000000 1.000000 + *MESH_TVERT 3 2.000000 0.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf4" + *NODE_TM { + *NODE_NAME "mat0model0surf4" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 128.000000 0.000000 0.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 64.000000 0.000000 64.000000 + *MESH_VERTEX 3 0.000000 0.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 + *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 0 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 1 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 2 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 3 0.000000 -1.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 2.000000 0.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 0.000000 2.000000 1.000000 + *MESH_TVERT 3 -2.000000 2.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf5" + *NODE_TM { + *NODE_NAME "mat0model0surf5" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 128.000000 0.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 128.000000 128.000000 0.000000 + *MESH_VERTEX 3 128.000000 0.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.707107 0.000000 0.707107 + *MESH_FACENORMAL 1 0.707107 0.000000 0.707107 + *MESH_VERTEXNORMAL 0 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 1 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 2 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 3 0.000000 0.000000 -1.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 3.000000 1.000000 + *MESH_TVERT 1 -2.000000 -1.000000 1.000000 + *MESH_TVERT 2 2.000000 3.000000 1.000000 + *MESH_TVERT 3 2.000000 -1.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} diff --git a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase b/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase index 4e23fd49..ec5987f6 100644 --- a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase +++ b/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase @@ -1,368 +1,368 @@ -*3DSMAX_ASCIIEXPORT 200 -*COMMENT "Generated by Q3Map2 (ydnar) -convert -format ase" -*SCENE { - *SCENE_FILENAME "wedge_shallow.bsp" - *SCENE_FIRSTFRAME 0 - *SCENE_LASTFRAME 100 - *SCENE_FRAMESPEED 30 - *SCENE_TICKSPERFRAME 160 - *SCENE_BACKGROUND_STATIC 0.0000 0.0000 0.0000 - *SCENE_AMBIENT_STATIC 0.0000 0.0000 0.0000 -} -*MATERIAL_LIST { - *MATERIAL_COUNT 2 - *MATERIAL 0 { - *MATERIAL_NAME "textures/radiant_regression_tests/tile_model" - *MATERIAL_CLASS "Standard" - *MATERIAL_DIFFUSE 1.000000 1.000000 0.833333 - *MATERIAL_SHADING Phong - *MAP_DIFFUSE { - *MAP_NAME "textures/radiant_regression_tests/tile_model" - *MAP_CLASS "Bitmap" - *MAP_SUBNO 1 - *MAP_AMOUNT 1.0 - *MAP_TYPE Screen - *BITMAP "..\textures\radiant_regression_tests\tile_model.tga" - *BITMAP_FILTER Pyramidal - } - } - *MATERIAL 1 { - *MATERIAL_NAME "noshader" - *MATERIAL_CLASS "Standard" - *MATERIAL_DIFFUSE 1.000000 1.000000 1.000000 - *MATERIAL_SHADING Phong - *MAP_DIFFUSE { - *MAP_NAME "noshader" - *MAP_CLASS "Bitmap" - *MAP_SUBNO 1 - *MAP_AMOUNT 1.0 - *MAP_TYPE Screen - *BITMAP "..\noshader.tga" - *BITMAP_FILTER Pyramidal - } - } -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf0" - *NODE_TM { - *NODE_NAME "mat0model0surf0" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 160.000000 0.000000 0.000000 - *MESH_VERTEX 1 64.000000 0.000000 64.000000 - *MESH_VERTEX 2 160.000000 128.000000 0.000000 - *MESH_VERTEX 3 64.000000 128.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 - *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 0 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 2 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 3 0.554700 0.000000 0.832050 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 2.000000 -1.000000 1.000000 - *MESH_TVERT 1 -1.000000 -1.000000 1.000000 - *MESH_TVERT 2 2.000000 3.000000 1.000000 - *MESH_TVERT 3 -1.000000 3.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf1" - *NODE_TM { - *NODE_NAME "mat0model0surf1" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 128.000000 64.000000 - *MESH_VERTEX 1 0.000000 128.000000 0.000000 - *MESH_VERTEX 2 64.000000 128.000000 64.000000 - *MESH_VERTEX 3 160.000000 128.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 - *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 0 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 1 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 2 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 3 0.000000 1.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 2.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 0.000000 2.000000 1.000000 - *MESH_TVERT 3 3.000000 0.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf2" - *NODE_TM { - *NODE_NAME "mat0model0surf2" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 64.000000 0.000000 64.000000 - *MESH_VERTEX 1 0.000000 0.000000 64.000000 - *MESH_VERTEX 2 64.000000 128.000000 64.000000 - *MESH_VERTEX 3 0.000000 128.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 - *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 0 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 1 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 2 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 3 0.000000 0.000000 1.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 1.000000 -1.000000 1.000000 - *MESH_TVERT 1 -1.000000 -1.000000 1.000000 - *MESH_TVERT 2 1.000000 3.000000 1.000000 - *MESH_TVERT 3 -1.000000 3.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf3" - *NODE_TM { - *NODE_NAME "mat0model0surf3" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 0.000000 64.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 0.000000 128.000000 64.000000 - *MESH_VERTEX 3 0.000000 128.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 - *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 0 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 1 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 2 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 3 -1.000000 0.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 2.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 2.000000 2.000000 1.000000 - *MESH_TVERT 3 2.000000 0.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf4" - *NODE_TM { - *NODE_NAME "mat0model0surf4" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 160.000000 0.000000 0.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 64.000000 0.000000 64.000000 - *MESH_VERTEX 3 0.000000 0.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 - *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 0 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 1 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 2 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 3 0.000000 -1.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 3.000000 0.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 0.000000 2.000000 1.000000 - *MESH_TVERT 3 -2.000000 2.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf5" - *NODE_TM { - *NODE_NAME "mat0model0surf5" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 128.000000 0.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 160.000000 128.000000 0.000000 - *MESH_VERTEX 3 160.000000 0.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 - *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 - *MESH_VERTEXNORMAL 0 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 1 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 2 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 3 0.000000 0.000000 -1.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 3.000000 1.000000 - *MESH_TVERT 1 -2.000000 -1.000000 1.000000 - *MESH_TVERT 2 3.000000 3.000000 1.000000 - *MESH_TVERT 3 3.000000 -1.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} +*3DSMAX_ASCIIEXPORT 200 +*COMMENT "Generated by Q3Map2 (ydnar) -convert -format ase" +*SCENE { + *SCENE_FILENAME "wedge_shallow.bsp" + *SCENE_FIRSTFRAME 0 + *SCENE_LASTFRAME 100 + *SCENE_FRAMESPEED 30 + *SCENE_TICKSPERFRAME 160 + *SCENE_BACKGROUND_STATIC 0.0000 0.0000 0.0000 + *SCENE_AMBIENT_STATIC 0.0000 0.0000 0.0000 +} +*MATERIAL_LIST { + *MATERIAL_COUNT 2 + *MATERIAL 0 { + *MATERIAL_NAME "textures/radiant_regression_tests/tile_model" + *MATERIAL_CLASS "Standard" + *MATERIAL_DIFFUSE 1.000000 1.000000 0.833333 + *MATERIAL_SHADING Phong + *MAP_DIFFUSE { + *MAP_NAME "textures/radiant_regression_tests/tile_model" + *MAP_CLASS "Bitmap" + *MAP_SUBNO 1 + *MAP_AMOUNT 1.0 + *MAP_TYPE Screen + *BITMAP "..\textures\radiant_regression_tests\tile_model.tga" + *BITMAP_FILTER Pyramidal + } + } + *MATERIAL 1 { + *MATERIAL_NAME "noshader" + *MATERIAL_CLASS "Standard" + *MATERIAL_DIFFUSE 1.000000 1.000000 1.000000 + *MATERIAL_SHADING Phong + *MAP_DIFFUSE { + *MAP_NAME "noshader" + *MAP_CLASS "Bitmap" + *MAP_SUBNO 1 + *MAP_AMOUNT 1.0 + *MAP_TYPE Screen + *BITMAP "..\noshader.tga" + *BITMAP_FILTER Pyramidal + } + } +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf0" + *NODE_TM { + *NODE_NAME "mat0model0surf0" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 160.000000 0.000000 0.000000 + *MESH_VERTEX 1 64.000000 0.000000 64.000000 + *MESH_VERTEX 2 160.000000 128.000000 0.000000 + *MESH_VERTEX 3 64.000000 128.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 + *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 0 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 2 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 3 0.554700 0.000000 0.832050 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 2.000000 -1.000000 1.000000 + *MESH_TVERT 1 -1.000000 -1.000000 1.000000 + *MESH_TVERT 2 2.000000 3.000000 1.000000 + *MESH_TVERT 3 -1.000000 3.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf1" + *NODE_TM { + *NODE_NAME "mat0model0surf1" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 128.000000 64.000000 + *MESH_VERTEX 1 0.000000 128.000000 0.000000 + *MESH_VERTEX 2 64.000000 128.000000 64.000000 + *MESH_VERTEX 3 160.000000 128.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 + *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 0 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 1 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 2 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 3 0.000000 1.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 2.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 0.000000 2.000000 1.000000 + *MESH_TVERT 3 3.000000 0.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf2" + *NODE_TM { + *NODE_NAME "mat0model0surf2" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 64.000000 0.000000 64.000000 + *MESH_VERTEX 1 0.000000 0.000000 64.000000 + *MESH_VERTEX 2 64.000000 128.000000 64.000000 + *MESH_VERTEX 3 0.000000 128.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 + *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 0 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 1 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 2 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 3 0.000000 0.000000 1.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 1.000000 -1.000000 1.000000 + *MESH_TVERT 1 -1.000000 -1.000000 1.000000 + *MESH_TVERT 2 1.000000 3.000000 1.000000 + *MESH_TVERT 3 -1.000000 3.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf3" + *NODE_TM { + *NODE_NAME "mat0model0surf3" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 0.000000 64.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 0.000000 128.000000 64.000000 + *MESH_VERTEX 3 0.000000 128.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 + *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 0 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 1 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 2 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 3 -1.000000 0.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 2.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 2.000000 2.000000 1.000000 + *MESH_TVERT 3 2.000000 0.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf4" + *NODE_TM { + *NODE_NAME "mat0model0surf4" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 160.000000 0.000000 0.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 64.000000 0.000000 64.000000 + *MESH_VERTEX 3 0.000000 0.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 + *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 0 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 1 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 2 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 3 0.000000 -1.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 3.000000 0.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 0.000000 2.000000 1.000000 + *MESH_TVERT 3 -2.000000 2.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf5" + *NODE_TM { + *NODE_NAME "mat0model0surf5" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 128.000000 0.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 160.000000 128.000000 0.000000 + *MESH_VERTEX 3 160.000000 0.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.554700 0.000000 0.832050 + *MESH_FACENORMAL 1 0.554700 0.000000 0.832050 + *MESH_VERTEXNORMAL 0 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 1 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 2 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 3 0.000000 0.000000 -1.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 3.000000 1.000000 + *MESH_TVERT 1 -2.000000 -1.000000 1.000000 + *MESH_TVERT 2 3.000000 3.000000 1.000000 + *MESH_TVERT 3 3.000000 -1.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} diff --git a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase b/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase index 0e8727e0..59689a3e 100644 --- a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase +++ b/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase @@ -1,368 +1,368 @@ -*3DSMAX_ASCIIEXPORT 200 -*COMMENT "Generated by Q3Map2 (ydnar) -convert -format ase" -*SCENE { - *SCENE_FILENAME "wedge_steep.bsp" - *SCENE_FIRSTFRAME 0 - *SCENE_LASTFRAME 100 - *SCENE_FRAMESPEED 30 - *SCENE_TICKSPERFRAME 160 - *SCENE_BACKGROUND_STATIC 0.0000 0.0000 0.0000 - *SCENE_AMBIENT_STATIC 0.0000 0.0000 0.0000 -} -*MATERIAL_LIST { - *MATERIAL_COUNT 2 - *MATERIAL 0 { - *MATERIAL_NAME "textures/radiant_regression_tests/tile_model" - *MATERIAL_CLASS "Standard" - *MATERIAL_DIFFUSE 1.000000 1.000000 0.833333 - *MATERIAL_SHADING Phong - *MAP_DIFFUSE { - *MAP_NAME "textures/radiant_regression_tests/tile_model" - *MAP_CLASS "Bitmap" - *MAP_SUBNO 1 - *MAP_AMOUNT 1.0 - *MAP_TYPE Screen - *BITMAP "..\textures\radiant_regression_tests\tile_model.tga" - *BITMAP_FILTER Pyramidal - } - } - *MATERIAL 1 { - *MATERIAL_NAME "noshader" - *MATERIAL_CLASS "Standard" - *MATERIAL_DIFFUSE 1.000000 1.000000 1.000000 - *MATERIAL_SHADING Phong - *MAP_DIFFUSE { - *MAP_NAME "noshader" - *MAP_CLASS "Bitmap" - *MAP_SUBNO 1 - *MAP_AMOUNT 1.0 - *MAP_TYPE Screen - *BITMAP "..\noshader.tga" - *BITMAP_FILTER Pyramidal - } - } -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf0" - *NODE_TM { - *NODE_NAME "mat0model0surf0" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 112.000000 0.000000 0.000000 - *MESH_VERTEX 1 64.000000 0.000000 64.000000 - *MESH_VERTEX 2 112.000000 128.000000 0.000000 - *MESH_VERTEX 3 64.000000 128.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 - *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 0 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 2 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 3 0.800000 0.000000 0.600000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 0.000000 1.000000 - *MESH_TVERT 1 -2.000000 2.000000 1.000000 - *MESH_TVERT 2 2.000000 0.000000 1.000000 - *MESH_TVERT 3 2.000000 2.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf1" - *NODE_TM { - *NODE_NAME "mat0model0surf1" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 128.000000 64.000000 - *MESH_VERTEX 1 0.000000 128.000000 0.000000 - *MESH_VERTEX 2 64.000000 128.000000 64.000000 - *MESH_VERTEX 3 112.000000 128.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 - *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 0 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 1 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 2 0.000000 1.000000 0.000000 - *MESH_VERTEXNORMAL 3 0.000000 1.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -1.000000 2.000000 1.000000 - *MESH_TVERT 1 -1.000000 0.000000 1.000000 - *MESH_TVERT 2 1.000000 2.000000 1.000000 - *MESH_TVERT 3 2.500000 0.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf2" - *NODE_TM { - *NODE_NAME "mat0model0surf2" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 64.000000 0.000000 64.000000 - *MESH_VERTEX 1 0.000000 0.000000 64.000000 - *MESH_VERTEX 2 64.000000 128.000000 64.000000 - *MESH_VERTEX 3 0.000000 128.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 - *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 0 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 1 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 2 0.000000 0.000000 1.000000 - *MESH_VERTEXNORMAL 3 0.000000 0.000000 1.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 1.000000 -1.000000 1.000000 - *MESH_TVERT 1 -1.000000 -1.000000 1.000000 - *MESH_TVERT 2 1.000000 3.000000 1.000000 - *MESH_TVERT 3 -1.000000 3.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf3" - *NODE_TM { - *NODE_NAME "mat0model0surf3" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 0.000000 64.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 0.000000 128.000000 64.000000 - *MESH_VERTEX 3 0.000000 128.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 - *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 0 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 1 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 2 -1.000000 0.000000 0.000000 - *MESH_VERTEXNORMAL 3 -1.000000 0.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -2.000000 2.000000 1.000000 - *MESH_TVERT 1 -2.000000 0.000000 1.000000 - *MESH_TVERT 2 2.000000 2.000000 1.000000 - *MESH_TVERT 3 2.000000 0.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf4" - *NODE_TM { - *NODE_NAME "mat0model0surf4" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 112.000000 0.000000 0.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 64.000000 0.000000 64.000000 - *MESH_VERTEX 3 0.000000 0.000000 64.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 - *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 0 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 1 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 2 0.000000 -1.000000 0.000000 - *MESH_VERTEXNORMAL 3 0.000000 -1.000000 0.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 2.500000 0.000000 1.000000 - *MESH_TVERT 1 -1.000000 0.000000 1.000000 - *MESH_TVERT 2 1.000000 2.000000 1.000000 - *MESH_TVERT 3 -1.000000 2.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} -*GEOMOBJECT { - *NODE_NAME "mat0model0surf5" - *NODE_TM { - *NODE_NAME "mat0model0surf5" - *INHERIT_POS 0 0 0 - *INHERIT_ROT 0 0 0 - *INHERIT_SCL 0 0 0 - *TM_ROW0 1.0 0 0 - *TM_ROW1 0 1.0 0 - *TM_ROW2 0 0 1.0 - *TM_ROW3 0 0 0 - *TM_POS 0.000000 0.000000 0.000000 - } - *MESH { - *TIMEVALUE 0 - *MESH_NUMVERTEX 4 - *MESH_NUMFACES 2 - *COMMENT "SURFACETYPE MST_PLANAR" - *MESH_VERTEX_LIST { - *MESH_VERTEX 0 0.000000 128.000000 0.000000 - *MESH_VERTEX 1 0.000000 0.000000 0.000000 - *MESH_VERTEX 2 112.000000 128.000000 0.000000 - *MESH_VERTEX 3 112.000000 0.000000 0.000000 - } - *MESH_NORMALS { - *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 - *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 - *MESH_VERTEXNORMAL 0 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 1 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 2 0.000000 0.000000 -1.000000 - *MESH_VERTEXNORMAL 3 0.000000 0.000000 -1.000000 - } - *MESH_FACE_LIST { - *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 - } - *MESH_NUMTVERTEX 4 - *MESH_TVERTLIST { - *MESH_TVERT 0 -1.000000 3.000000 1.000000 - *MESH_TVERT 1 -1.000000 -1.000000 1.000000 - *MESH_TVERT 2 2.500000 3.000000 1.000000 - *MESH_TVERT 3 2.500000 -1.000000 1.000000 - } - *MESH_NUMTVFACES 2 - *MESH_TFACELIST { - *MESH_TFACE 0 0 2 1 - *MESH_TFACE 1 2 3 1 - } - } - *PROP_MOTIONBLUR 0 - *PROP_CASTSHADOW 1 - *PROP_RECVSHADOW 1 - *MATERIAL_REF 0 -} +*3DSMAX_ASCIIEXPORT 200 +*COMMENT "Generated by Q3Map2 (ydnar) -convert -format ase" +*SCENE { + *SCENE_FILENAME "wedge_steep.bsp" + *SCENE_FIRSTFRAME 0 + *SCENE_LASTFRAME 100 + *SCENE_FRAMESPEED 30 + *SCENE_TICKSPERFRAME 160 + *SCENE_BACKGROUND_STATIC 0.0000 0.0000 0.0000 + *SCENE_AMBIENT_STATIC 0.0000 0.0000 0.0000 +} +*MATERIAL_LIST { + *MATERIAL_COUNT 2 + *MATERIAL 0 { + *MATERIAL_NAME "textures/radiant_regression_tests/tile_model" + *MATERIAL_CLASS "Standard" + *MATERIAL_DIFFUSE 1.000000 1.000000 0.833333 + *MATERIAL_SHADING Phong + *MAP_DIFFUSE { + *MAP_NAME "textures/radiant_regression_tests/tile_model" + *MAP_CLASS "Bitmap" + *MAP_SUBNO 1 + *MAP_AMOUNT 1.0 + *MAP_TYPE Screen + *BITMAP "..\textures\radiant_regression_tests\tile_model.tga" + *BITMAP_FILTER Pyramidal + } + } + *MATERIAL 1 { + *MATERIAL_NAME "noshader" + *MATERIAL_CLASS "Standard" + *MATERIAL_DIFFUSE 1.000000 1.000000 1.000000 + *MATERIAL_SHADING Phong + *MAP_DIFFUSE { + *MAP_NAME "noshader" + *MAP_CLASS "Bitmap" + *MAP_SUBNO 1 + *MAP_AMOUNT 1.0 + *MAP_TYPE Screen + *BITMAP "..\noshader.tga" + *BITMAP_FILTER Pyramidal + } + } +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf0" + *NODE_TM { + *NODE_NAME "mat0model0surf0" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 112.000000 0.000000 0.000000 + *MESH_VERTEX 1 64.000000 0.000000 64.000000 + *MESH_VERTEX 2 112.000000 128.000000 0.000000 + *MESH_VERTEX 3 64.000000 128.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 + *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 0 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 2 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 3 0.800000 0.000000 0.600000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 0.000000 1.000000 + *MESH_TVERT 1 -2.000000 2.000000 1.000000 + *MESH_TVERT 2 2.000000 0.000000 1.000000 + *MESH_TVERT 3 2.000000 2.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf1" + *NODE_TM { + *NODE_NAME "mat0model0surf1" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 128.000000 64.000000 + *MESH_VERTEX 1 0.000000 128.000000 0.000000 + *MESH_VERTEX 2 64.000000 128.000000 64.000000 + *MESH_VERTEX 3 112.000000 128.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 + *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 0 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 1 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 2 0.000000 1.000000 0.000000 + *MESH_VERTEXNORMAL 3 0.000000 1.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -1.000000 2.000000 1.000000 + *MESH_TVERT 1 -1.000000 0.000000 1.000000 + *MESH_TVERT 2 1.000000 2.000000 1.000000 + *MESH_TVERT 3 2.500000 0.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf2" + *NODE_TM { + *NODE_NAME "mat0model0surf2" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 64.000000 0.000000 64.000000 + *MESH_VERTEX 1 0.000000 0.000000 64.000000 + *MESH_VERTEX 2 64.000000 128.000000 64.000000 + *MESH_VERTEX 3 0.000000 128.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 + *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 0 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 1 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 2 0.000000 0.000000 1.000000 + *MESH_VERTEXNORMAL 3 0.000000 0.000000 1.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 1.000000 -1.000000 1.000000 + *MESH_TVERT 1 -1.000000 -1.000000 1.000000 + *MESH_TVERT 2 1.000000 3.000000 1.000000 + *MESH_TVERT 3 -1.000000 3.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf3" + *NODE_TM { + *NODE_NAME "mat0model0surf3" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 0.000000 64.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 0.000000 128.000000 64.000000 + *MESH_VERTEX 3 0.000000 128.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 + *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 0 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 1 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 2 -1.000000 0.000000 0.000000 + *MESH_VERTEXNORMAL 3 -1.000000 0.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -2.000000 2.000000 1.000000 + *MESH_TVERT 1 -2.000000 0.000000 1.000000 + *MESH_TVERT 2 2.000000 2.000000 1.000000 + *MESH_TVERT 3 2.000000 0.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf4" + *NODE_TM { + *NODE_NAME "mat0model0surf4" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 112.000000 0.000000 0.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 64.000000 0.000000 64.000000 + *MESH_VERTEX 3 0.000000 0.000000 64.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 + *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 0 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 1 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 2 0.000000 -1.000000 0.000000 + *MESH_VERTEXNORMAL 3 0.000000 -1.000000 0.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 2.500000 0.000000 1.000000 + *MESH_TVERT 1 -1.000000 0.000000 1.000000 + *MESH_TVERT 2 1.000000 2.000000 1.000000 + *MESH_TVERT 3 -1.000000 2.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} +*GEOMOBJECT { + *NODE_NAME "mat0model0surf5" + *NODE_TM { + *NODE_NAME "mat0model0surf5" + *INHERIT_POS 0 0 0 + *INHERIT_ROT 0 0 0 + *INHERIT_SCL 0 0 0 + *TM_ROW0 1.0 0 0 + *TM_ROW1 0 1.0 0 + *TM_ROW2 0 0 1.0 + *TM_ROW3 0 0 0 + *TM_POS 0.000000 0.000000 0.000000 + } + *MESH { + *TIMEVALUE 0 + *MESH_NUMVERTEX 4 + *MESH_NUMFACES 2 + *COMMENT "SURFACETYPE MST_PLANAR" + *MESH_VERTEX_LIST { + *MESH_VERTEX 0 0.000000 128.000000 0.000000 + *MESH_VERTEX 1 0.000000 0.000000 0.000000 + *MESH_VERTEX 2 112.000000 128.000000 0.000000 + *MESH_VERTEX 3 112.000000 0.000000 0.000000 + } + *MESH_NORMALS { + *MESH_FACENORMAL 0 0.800000 0.000000 0.600000 + *MESH_FACENORMAL 1 0.800000 0.000000 0.600000 + *MESH_VERTEXNORMAL 0 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 1 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 2 0.000000 0.000000 -1.000000 + *MESH_VERTEXNORMAL 3 0.000000 0.000000 -1.000000 + } + *MESH_FACE_LIST { + *MESH_FACE 0 A: 0 B: 2 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + *MESH_FACE 1 A: 2 B: 3 C: 1 AB: 1 BC: 1 CA: 1 *MESH_SMOOTHING 0 *MESH_MTLID 0 + } + *MESH_NUMTVERTEX 4 + *MESH_TVERTLIST { + *MESH_TVERT 0 -1.000000 3.000000 1.000000 + *MESH_TVERT 1 -1.000000 -1.000000 1.000000 + *MESH_TVERT 2 2.500000 3.000000 1.000000 + *MESH_TVERT 3 2.500000 -1.000000 1.000000 + } + *MESH_NUMTVFACES 2 + *MESH_TFACELIST { + *MESH_TFACE 0 0 2 1 + *MESH_TFACE 1 2 3 1 + } + } + *PROP_MOTIONBLUR 0 + *PROP_CASTSHADOW 1 + *PROP_RECVSHADOW 1 + *MATERIAL_REF 0 +} diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.c index 8f2493e6..3e49696c 100644 --- a/tools/quake3/common/aselib.c +++ b/tools/quake3/common/aselib.c @@ -217,7 +217,7 @@ polyset_t *ASE_GetSurfaceAnimation( int which, int *pNumFrames, int skipFrameSta { numFramesInAnimation = pObject->anim.numFrames; if ( maxFrames != -1 ) { - Sys_Printf( "WARNING: ASE_GetSurfaceAnimation maxFrames > numFramesInAnimation\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: ASE_GetSurfaceAnimation maxFrames > numFramesInAnimation\n" ); } } diff --git a/tools/quake3/common/polylib.c b/tools/quake3/common/polylib.c index 10117781..ed4f8741 100644 --- a/tools/quake3/common/polylib.c +++ b/tools/quake3/common/polylib.c @@ -94,7 +94,7 @@ winding_accu_t *AllocWindingAccu( int points ){ c_peak_windings = c_active_windings; } } - s = sizeof( vec_accu_t ) * 3 * points + sizeof( int ); + s = sizeof(*w) + (points > 4 ? sizeof(vec3_accu_t) * (points - 4) : 0); w = safe_malloc( s ); memset( w, 0, s ); return w; diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj index 7d2faa75..9d54d6ac 100644 --- a/tools/quake3/common/quake3-common.vcxproj +++ b/tools/quake3/common/quake3-common.vcxproj @@ -21,23 +21,24 @@ {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v110_xp + v140 @@ -75,7 +76,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -89,7 +90,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -102,7 +103,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -113,7 +114,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/tools/quake3/common/scriplib.c b/tools/quake3/common/scriplib.c index 2a18e96f..acd8d5ad 100644 --- a/tools/quake3/common/scriplib.c +++ b/tools/quake3/common/scriplib.c @@ -153,7 +153,7 @@ qboolean EndOfScript( qboolean crossline ){ } if ( script->buffer == NULL ) { - Sys_Printf( "WARNING: Attempt to free already freed script buffer\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Attempt to free already freed script buffer\n" ); } else{ free( script->buffer ); diff --git a/tools/quake3/common/unzip.c b/tools/quake3/common/unzip.c index d0659b18..1d4a919b 100644 --- a/tools/quake3/common/unzip.c +++ b/tools/quake3/common/unzip.c @@ -1199,8 +1199,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len)); -voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); -void zcfree OF((voidp opaque, voidp ptr)); +static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); +static void zcfree OF((voidp opaque, voidp ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) diff --git a/tools/quake3/q3data/q3data.vcxproj b/tools/quake3/q3data/q3data.vcxproj index 534b6b8a..aa46f6d8 100644 --- a/tools/quake3/q3data/q3data.vcxproj +++ b/tools/quake3/q3data/q3data.vcxproj @@ -21,28 +21,29 @@ {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB} q3data + 8.1 Application - v110_xp + v140 MultiByte true Application - v110_xp + v140 MultiByte true Application - v110_xp + v140 MultiByte Application - v110_xp + v140 MultiByte @@ -77,7 +78,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -87,8 +88,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true false @@ -98,7 +99,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -107,8 +108,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true false @@ -117,7 +118,7 @@ - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -125,8 +126,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true true true @@ -137,7 +138,7 @@ - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -145,8 +146,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true true true diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c index 8a9dcdca..0d7eb221 100644 --- a/tools/quake3/q3map2/brush.c +++ b/tools/quake3/q3map2/brush.c @@ -93,12 +93,7 @@ brush_t *AllocBrush( int numSides ){ brush_t *bb; size_t c; - - /* allocate and clear */ - if ( numSides <= 0 ) { - Error( "AllocBrush called with numsides = %d", numSides ); - } - c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] ); + c = sizeof(*bb) + (numSides > 6 ? sizeof(side_t)*(numSides - 6) : 0); bb = safe_malloc( c ); memset( bb, 0, c ); if ( numthreads == 1 ) { diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c index 5f9faa4a..384933d6 100644 --- a/tools/quake3/q3map2/bsp.c +++ b/tools/quake3/q3map2/bsp.c @@ -188,7 +188,7 @@ static void SetCloneModelNumbers( void ){ /* get the model num */ value3 = ValueForKey( &entities[ j ], "model" ); if ( value3[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Cloned entity %s referenced entity without model\n", value2 ); + Sys_FPrintf( SYS_WRN, "WARNING: Cloned entity %s referenced entity without model\n", value2 ); continue; } models = atoi( &value2[ 1 ] ); @@ -847,7 +847,7 @@ int BSPMain( int argc, char **argv ){ Sys_Printf( "-bsp argument unnecessary\n" ); } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/bsp_analyze.c b/tools/quake3/q3map2/bsp_analyze.c new file mode 100644 index 00000000..c42c96a8 --- /dev/null +++ b/tools/quake3/q3map2/bsp_analyze.c @@ -0,0 +1,195 @@ +/* ------------------------------------------------------------------------------- + + Copyright (C) 1999-2007 id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. + + This file is part of GtkRadiant. + + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + ------------------------------------------------------------------------------- + + This code has been altered significantly from its original form, to support + several games based on the Quake III Arena engine, in the form of "Q3Map2." + + ------------------------------------------------------------------------------- */ + + + +/* dependencies */ +#include "q3map2.h" + + + +/* + AnalyzeBSPMain() - ydnar + analyzes a Quake engine BSP file + */ + +typedef struct abspHeader_s +{ + char ident[ 4 ]; + int version; + + bspLump_t lumps[ 1 ]; /* unknown size */ +} +abspHeader_t; + +typedef struct abspLumpTest_s +{ + int radix, minCount; + char *name; +} +abspLumpTest_t; + +int AnalyzeBSPMain( int argc, char **argv ){ + abspHeader_t *header; + int size, i, version, offset, length, lumpInt, count; + char ident[ 5 ]; + void *lump; + float lumpFloat; + char lumpString[ 1024 ], source[ 1024 ]; + qboolean lumpSwap = qfalse; + abspLumpTest_t *lumpTest; + static abspLumpTest_t lumpTests[] = + { + { sizeof( bspPlane_t ), 6, "IBSP LUMP_PLANES" }, + { sizeof( bspBrush_t ), 1, "IBSP LUMP_BRUSHES" }, + { 8, 6, "IBSP LUMP_BRUSHSIDES" }, + { sizeof( bspBrushSide_t ), 6, "RBSP LUMP_BRUSHSIDES" }, + { sizeof( bspModel_t ), 1, "IBSP LUMP_MODELS" }, + { sizeof( bspNode_t ), 2, "IBSP LUMP_NODES" }, + { sizeof( bspLeaf_t ), 1, "IBSP LUMP_LEAFS" }, + { 104, 3, "IBSP LUMP_DRAWSURFS" }, + { 44, 3, "IBSP LUMP_DRAWVERTS" }, + { 4, 6, "IBSP LUMP_DRAWINDEXES" }, + { 128 * 128 * 3, 1, "IBSP LUMP_LIGHTMAPS" }, + { 256 * 256 * 3, 1, "IBSP LUMP_LIGHTMAPS (256 x 256)" }, + { 512 * 512 * 3, 1, "IBSP LUMP_LIGHTMAPS (512 x 512)" }, + { 0, 0, NULL } + }; + + + /* arg checking */ + if ( argc < 1 ) { + Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] \n" ); + return 0; + } + + /* process arguments */ + for ( i = 1; i < ( argc - 1 ); i++ ) + { + /* -format map|ase|... */ + if ( !strcmp( argv[ i ], "-lumpswap" ) ) { + Sys_Printf( "Swapped lump structs enabled\n" ); + lumpSwap = qtrue; + } + } + + /* clean up map name */ + strcpy( source, ExpandArg( argv[ i ] ) ); + Sys_Printf( "Loading %s\n", source ); + + /* load the file */ + size = LoadFile( source, (void**) &header ); + if ( size == 0 || header == NULL ) { + Sys_Printf( "Unable to load %s.\n", source ); + return -1; + } + + /* analyze ident/version */ + memcpy( ident, header->ident, 4 ); + ident[ 4 ] = '\0'; + version = LittleLong( header->version ); + + Sys_Printf( "Identity: %s\n", ident ); + Sys_Printf( "Version: %d\n", version ); + Sys_Printf( "---------------------------------------\n" ); + + /* analyze each lump */ + for ( i = 0; i < 100; i++ ) + { + /* call of duty swapped lump pairs */ + if ( lumpSwap ) { + offset = LittleLong( header->lumps[ i ].length ); + length = LittleLong( header->lumps[ i ].offset ); + } + + /* standard lump pairs */ + else + { + offset = LittleLong( header->lumps[ i ].offset ); + length = LittleLong( header->lumps[ i ].length ); + } + + /* extract data */ + lump = (byte*) header + offset; + lumpInt = LittleLong( (int) *( (int*) lump ) ); + lumpFloat = LittleFloat( (float) *( (float*) lump ) ); + memcpy( lumpString, (char*) lump, ( length < 1024 ? length : 1024 ) ); + lumpString[ 1023 ] = '\0'; + + /* print basic lump info */ + Sys_Printf( "Lump: %d\n", i ); + Sys_Printf( "Offset: %d bytes\n", offset ); + Sys_Printf( "Length: %d bytes\n", length ); + + /* only operate on valid lumps */ + if ( length > 0 ) { + /* print data in 4 formats */ + Sys_Printf( "As hex: %08X\n", lumpInt ); + Sys_Printf( "As int: %d\n", lumpInt ); + Sys_Printf( "As float: %f\n", lumpFloat ); + Sys_Printf( "As string: %s\n", lumpString ); + + /* guess lump type */ + if ( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' ) { + Sys_Printf( "Type guess: IBSP LUMP_ENTITIES\n" ); + } + else if ( strstr( lumpString, "textures/" ) ) { + Sys_Printf( "Type guess: IBSP LUMP_SHADERS\n" ); + } + else + { + /* guess based on size/count */ + for ( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ ) + { + if ( ( length % lumpTest->radix ) != 0 ) { + continue; + } + count = length / lumpTest->radix; + if ( count < lumpTest->minCount ) { + continue; + } + Sys_Printf( "Type guess: %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix ); + } + } + } + + Sys_Printf( "---------------------------------------\n" ); + + /* end of file */ + if ( offset + length >= size ) { + break; + } + } + + /* last stats */ + Sys_Printf( "Lump count: %d\n", i + 1 ); + Sys_Printf( "File size: %d bytes\n", size ); + + /* return to caller */ + return 0; +} diff --git a/tools/quake3/q3map2/bsp_info.c b/tools/quake3/q3map2/bsp_info.c new file mode 100644 index 00000000..2cc79cf1 --- /dev/null +++ b/tools/quake3/q3map2/bsp_info.c @@ -0,0 +1,94 @@ +/* ------------------------------------------------------------------------------- + + Copyright (C) 1999-2007 id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. + + This file is part of GtkRadiant. + + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + ------------------------------------------------------------------------------- + + This code has been altered significantly from its original form, to support + several games based on the Quake III Arena engine, in the form of "Q3Map2." + + ------------------------------------------------------------------------------- */ + + + +/* dependencies */ +#include "q3map2.h" + + + +/* + BSPInfoMain() + emits statistics about the bsp file + */ + +int BSPInfoMain( int count, char **fileNames ){ + int i; + char source[ 1024 ], ext[ 64 ]; + int size; + FILE *f; + + + /* dummy check */ + if ( count < 1 ) { + Sys_Printf( "No files to dump info for.\n" ); + return -1; + } + + /* enable info mode */ + infoMode = qtrue; + + /* walk file list */ + for ( i = 0; i < count; i++ ) + { + Sys_Printf( "---------------------------------\n" ); + + /* mangle filename and get size */ + strcpy( source, fileNames[ i ] ); + ExtractFileExtension( source, ext ); + if ( !Q_stricmp( ext, "map" ) ) { + StripExtension( source ); + } + DefaultExtension( source, ".bsp" ); + f = fopen( source, "rb" ); + if ( f ) { + size = Q_filelength( f ); + fclose( f ); + } + else{ + size = 0; + } + + /* load the bsp file and print lump sizes */ + Sys_Printf( "%s\n", source ); + LoadBSPFile( source ); + PrintBSPFileSizes(); + + /* print sizes */ + Sys_Printf( "\n" ); + Sys_Printf( " total %9d\n", size ); + Sys_Printf( " %9d KB\n", size / 1024 ); + Sys_Printf( " %9d MB\n", size / ( 1024 * 1024 ) ); + + Sys_Printf( "---------------------------------\n" ); + } + + /* return count */ + return i; +} diff --git a/tools/quake3/q3map2/bsp_scale.c b/tools/quake3/q3map2/bsp_scale.c new file mode 100644 index 00000000..57b14716 --- /dev/null +++ b/tools/quake3/q3map2/bsp_scale.c @@ -0,0 +1,143 @@ +/* ------------------------------------------------------------------------------- + + Copyright (C) 1999-2007 id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. + + This file is part of GtkRadiant. + + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + ------------------------------------------------------------------------------- + + This code has been altered significantly from its original form, to support + several games based on the Quake III Arena engine, in the form of "Q3Map2." + + ------------------------------------------------------------------------------- */ + + + +/* dependencies */ +#include "q3map2.h" + + + +/* + ScaleBSPMain() + amaze and confuse your enemies with wierd scaled maps! + */ + +int ScaleBSPMain( int argc, char **argv ){ + int i; + float f, scale; + vec3_t vec; + char str[ 1024 ]; + + + /* arg checking */ + if ( argc < 2 ) { + Sys_Printf( "Usage: q3map -scale [-v] \n" ); + return 0; + } + + /* get scale */ + scale = atof( argv[ argc - 2 ] ); + if ( scale == 0.0f ) { + Sys_Printf( "Usage: q3map -scale [-v] \n" ); + Sys_Printf( "Non-zero scale value required.\n" ); + return 0; + } + + /* do some path mangling */ + strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); + StripExtension( source ); + DefaultExtension( source, ".bsp" ); + + /* load the bsp */ + Sys_Printf( "Loading %s\n", source ); + LoadBSPFile( source ); + ParseEntities(); + + /* note it */ + Sys_Printf( "--- ScaleBSP ---\n" ); + Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities ); + + /* scale entity keys */ + for ( i = 0; i < numBSPEntities && i < numEntities; i++ ) + { + /* scale origin */ + GetVectorForKey( &entities[ i ], "origin", vec ); + if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) ) { + VectorScale( vec, scale, vec ); + sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] ); + SetKeyValue( &entities[ i ], "origin", str ); + } + + /* scale door lip */ + f = FloatForKey( &entities[ i ], "lip" ); + if ( f ) { + f *= scale; + sprintf( str, "%f", f ); + SetKeyValue( &entities[ i ], "lip", str ); + } + } + + /* scale models */ + for ( i = 0; i < numBSPModels; i++ ) + { + VectorScale( bspModels[ i ].mins, scale, bspModels[ i ].mins ); + VectorScale( bspModels[ i ].maxs, scale, bspModels[ i ].maxs ); + } + + /* scale nodes */ + for ( i = 0; i < numBSPNodes; i++ ) + { + VectorScale( bspNodes[ i ].mins, scale, bspNodes[ i ].mins ); + VectorScale( bspNodes[ i ].maxs, scale, bspNodes[ i ].maxs ); + } + + /* scale leafs */ + for ( i = 0; i < numBSPLeafs; i++ ) + { + VectorScale( bspLeafs[ i ].mins, scale, bspLeafs[ i ].mins ); + VectorScale( bspLeafs[ i ].maxs, scale, bspLeafs[ i ].maxs ); + } + + /* scale drawverts */ + for ( i = 0; i < numBSPDrawVerts; i++ ) + VectorScale( bspDrawVerts[ i ].xyz, scale, bspDrawVerts[ i ].xyz ); + + /* scale planes */ + for ( i = 0; i < numBSPPlanes; i++ ) + bspPlanes[ i ].dist *= scale; + + /* scale gridsize */ + GetVectorForKey( &entities[ 0 ], "gridsize", vec ); + if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) { + VectorCopy( gridSize, vec ); + } + VectorScale( vec, scale, vec ); + sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] ); + SetKeyValue( &entities[ 0 ], "gridsize", str ); + + /* write the bsp */ + UnparseEntities(); + StripExtension( source ); + DefaultExtension( source, "_s.bsp" ); + Sys_Printf( "Writing %s\n", source ); + WriteBSPFile( source ); + + /* return to sender */ + return 0; +} diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c index 524d5cc3..881ea2d5 100644 --- a/tools/quake3/q3map2/bspfile_abstract.c +++ b/tools/quake3/q3map2/bspfile_abstract.c @@ -277,7 +277,7 @@ int GetLumpElements( bspHeader_t *header, int lump, int size ){ /* check for odd size */ if ( header->lumps[ lump ].length % size ) { if ( force ) { - Sys_Printf( "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); + Sys_FPrintf( SYS_WRN, "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); return 0; } else{ @@ -321,7 +321,7 @@ int CopyLump( bspHeader_t *header, int lump, void *dest, int size ){ } if ( length % size ) { if ( force ) { - Sys_Printf( "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump ); + Sys_FPrintf( SYS_WRN, "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump ); return 0; } else{ diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c index 0bbb5816..628bec2f 100644 --- a/tools/quake3/q3map2/convert_ase.c +++ b/tools/quake3/q3map2/convert_ase.c @@ -242,7 +242,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){ /* get shader */ si = ShaderInfoForShader( shader->shader ); if ( si == NULL ) { - Sys_Printf( "WARNING: NULL shader in BSP\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: NULL shader in BSP\n" ); return; } diff --git a/tools/quake3/q3map2/convert_bsp.c b/tools/quake3/q3map2/convert_bsp.c new file mode 100644 index 00000000..ad434a01 --- /dev/null +++ b/tools/quake3/q3map2/convert_bsp.c @@ -0,0 +1,113 @@ +/* ------------------------------------------------------------------------------- + + Copyright (C) 1999-2007 id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. + + This file is part of GtkRadiant. + + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + ------------------------------------------------------------------------------- + + This code has been altered significantly from its original form, to support + several games based on the Quake III Arena engine, in the form of "Q3Map2." + + ------------------------------------------------------------------------------- */ + + + +/* dependencies */ +#include "q3map2.h" + + + +/* + ConvertBSPMain() + main argument processing function for bsp conversion + */ + +int ConvertBSPMain( int argc, char **argv ){ + int i; + int ( *convertFunc )( char * ); + game_t *convertGame; + + + /* set default */ + convertFunc = ConvertBSPToASE; + convertGame = NULL; + + /* arg checking */ + if ( argc < 1 ) { + Sys_Printf( "Usage: q3map -convert [-format ] [-v] \n" ); + return 0; + } + + /* process arguments */ + for ( i = 1; i < ( argc - 1 ); i++ ) + { + /* -format map|ase|... */ + if ( !strcmp( argv[ i ], "-format" ) ) { + i++; + if ( !Q_stricmp( argv[ i ], "ase" ) ) { + convertFunc = ConvertBSPToASE; + } + else if ( !Q_stricmp( argv[ i ], "map" ) ) { + convertFunc = ConvertBSPToMap; + } + else + { + convertGame = GetGame( argv[ i ] ); + if ( convertGame == NULL ) { + Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] ); + } + } + } + } + + /* clean up map name */ + strcpy( source, ExpandArg( argv[ i ] ) ); + StripExtension( source ); + DefaultExtension( source, ".bsp" ); + + LoadShaderInfo(); + + Sys_Printf( "Loading %s\n", source ); + + /* ydnar: load surface file */ + //% LoadSurfaceExtraFile( source ); + + LoadBSPFile( source ); + + /* parse bsp entities */ + ParseEntities(); + + /* bsp format convert? */ + if ( convertGame != NULL ) { + /* set global game */ + game = convertGame; + + /* write bsp */ + StripExtension( source ); + DefaultExtension( source, "_c.bsp" ); + Sys_Printf( "Writing %s\n", source ); + WriteBSPFile( source ); + + /* return to sender */ + return 0; + } + + /* normal convert */ + return convertFunc( source ); +} diff --git a/tools/quake3/q3map2/decals.c b/tools/quake3/q3map2/decals.c index cd5525c7..64244ca5 100644 --- a/tools/quake3/q3map2/decals.c +++ b/tools/quake3/q3map2/decals.c @@ -337,7 +337,7 @@ static int MakeDecalProjector( shaderInfo_t *si, vec4_t projection, float distan /* limit check */ if ( numProjectors >= MAX_PROJECTORS ) { - Sys_Printf( "WARNING: MAX_PROJECTORS (%d) exceeded, no more decal projectors available.\n", MAX_PROJECTORS ); + Sys_FPrintf( SYS_WRN, "WARNING: MAX_PROJECTORS (%d) exceeded, no more decal projectors available.\n", MAX_PROJECTORS ); return -2; } @@ -431,7 +431,7 @@ void ProcessDecals( void ){ /* any patches? */ if ( e->patches == NULL ) { - Sys_Printf( "WARNING: Decal entity without any patch meshes, ignoring.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Decal entity without any patch meshes, ignoring.\n" ); e->epairs = NULL; /* fixme: leak! */ continue; } @@ -442,7 +442,7 @@ void ProcessDecals( void ){ /* no target? */ if ( e2 == NULL ) { - Sys_Printf( "WARNING: Decal entity without a valid target, ignoring.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Decal entity without a valid target, ignoring.\n" ); continue; } diff --git a/tools/quake3/q3map2/exportents.c b/tools/quake3/q3map2/exportents.c index 578f9e42..b1236608 100644 --- a/tools/quake3/q3map2/exportents.c +++ b/tools/quake3/q3map2/exportents.c @@ -64,7 +64,7 @@ void ExportEntities( void ){ /* sanity check */ if ( bspEntData == NULL || bspEntDataSize == 0 ) { - Sys_Printf( "WARNING: No BSP entity data. aborting...\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP entity data. aborting...\n" ); return; } diff --git a/tools/quake3/q3map2/fixaas.c b/tools/quake3/q3map2/fixaas.c new file mode 100644 index 00000000..fc4eb94b --- /dev/null +++ b/tools/quake3/q3map2/fixaas.c @@ -0,0 +1,119 @@ +/* ------------------------------------------------------------------------------- + + Copyright (C) 1999-2007 id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. + + This file is part of GtkRadiant. + + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + ------------------------------------------------------------------------------- + + This code has been altered significantly from its original form, to support + several games based on the Quake III Arena engine, in the form of "Q3Map2." + + ------------------------------------------------------------------------------- */ + + + +/* dependencies */ +#include "q3map2.h" + + + +/* + MD4BlockChecksum() + calculates an md4 checksum for a block of data + */ + +static int MD4BlockChecksum( void * buffer, int length ) { + unsigned char digest[16]; + int checksum; + + md4_get_digest( buffer, length, digest ); + /* I suppose it has to be done that way for legacy reasons? */ + checksum = digest[0] & ( digest[1] << 8 ) & ( digest[2] << 16 ) & ( digest[3] << 24 ); + checksum ^= digest[4] & ( digest[5] << 8 ) & ( digest[6] << 16 ) & ( digest[7] << 24 ); + checksum ^= digest[8] & ( digest[9] << 8 ) & ( digest[10] << 16 ) & ( digest[11] << 24 ); + checksum ^= digest[12] & ( digest[13] << 8 ) & ( digest[14] << 16 ) & ( digest[15] << 24 ); + return checksum; +} + +/* + FixAASMain() + resets an aas checksum to match the given BSP + */ + +int FixAASMain( int argc, char **argv ){ + int length, checksum; + void *buffer; + FILE *file; + char aas[ 1024 ], **ext; + char *exts[] = + { + ".aas", + "_b0.aas", + "_b1.aas", + NULL + }; + + + /* arg checking */ + if ( argc < 2 ) { + Sys_Printf( "Usage: q3map -fixaas [-v] \n" ); + return 0; + } + + /* do some path mangling */ + strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); + StripExtension( source ); + DefaultExtension( source, ".bsp" ); + + /* note it */ + Sys_Printf( "--- FixAAS ---\n" ); + + /* load the bsp */ + Sys_Printf( "Loading %s\n", source ); + length = LoadFile( source, &buffer ); + + /* create bsp checksum */ + Sys_Printf( "Creating checksum...\n" ); + checksum = LittleLong( MD4BlockChecksum( buffer, length ) ); + + /* write checksum to aas */ + ext = exts; + while ( *ext ) + { + /* mangle name */ + strcpy( aas, source ); + StripExtension( aas ); + strcat( aas, *ext ); + Sys_Printf( "Trying %s\n", aas ); + ext++; + + /* fix it */ + file = fopen( aas, "r+b" ); + if ( !file ) { + continue; + } + if ( fwrite( &checksum, 4, 1, file ) != 1 ) { + Error( "Error writing checksum to %s", aas ); + } + fclose( file ); + } + + /* return to sender */ + return 0; +} diff --git a/tools/quake3/q3map2/image.c b/tools/quake3/q3map2/image.c index 2af46a6f..e54bef94 100644 --- a/tools/quake3/q3map2/image.c +++ b/tools/quake3/q3map2/image.c @@ -67,13 +67,13 @@ static void LoadDDSBuffer( byte *buffer, int size, byte **pixels, int *width, in /* get dds info */ if ( DDSGetInfo( (ddsBuffer_t*) buffer, &w, &h, &pf ) ) { - Sys_Printf( "WARNING: Invalid DDS texture\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Invalid DDS texture\n" ); return; } /* only certain types of dds textures are supported */ if ( pf != DDS_PF_ARGB8888 && pf != DDS_PF_DXT1 && pf != DDS_PF_DXT3 && pf != DDS_PF_DXT5 ) { - Sys_Printf( "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); + Sys_FPrintf( SYS_WRN, "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); return; } @@ -139,27 +139,27 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in /* determine if this is a png file */ if ( png_sig_cmp( buffer, 0, 8 ) != 0 ) { - Sys_Printf( "WARNING: Invalid PNG file\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Invalid PNG file\n" ); return; } /* create png structs */ png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); if ( png == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG read struct\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG read struct\n" ); return; } info = png_create_info_struct( png ); if ( info == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG info struct\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG info struct\n" ); png_destroy_read_struct( &png, NULL, NULL ); return; } end = png_create_info_struct( png ); if ( end == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG end info struct\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG end info struct\n" ); png_destroy_read_struct( &png, &info, NULL ); return; } @@ -172,7 +172,7 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in /* set error longjmp */ if ( setjmp( png_jmpbuf(png) ) ) { - Sys_Printf( "WARNING: An error occurred reading PNG image\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: An error occurred reading PNG image\n" ); png_destroy_read_struct( &png, &info, &end ); return; } @@ -402,7 +402,7 @@ image_t *ImageLoad( const char *filename ){ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 ); if ( size > 0 ) { if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) { - Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); + Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); } } else diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c index 943c88e7..2af9ac49 100644 --- a/tools/quake3/q3map2/light.c +++ b/tools/quake3/q3map2/light.c @@ -426,7 +426,7 @@ void CreateEntityLights( void ){ /* get target */ e2 = FindTargetEntity( target ); if ( e2 == NULL ) { - Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n", + Sys_FPrintf( SYS_WRN, "WARNING: light at (%i %i %i) has missing target\n", (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] ); } else @@ -1996,7 +1996,7 @@ int LightMain( int argc, char **argv ){ /* must be a power of 2 and greater than 2 */ if ( ( ( lmCustomSize - 1 ) & lmCustomSize ) || lmCustomSize < 2 ) { - Sys_Printf( "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); lmCustomSize = game->lightmapSize; } i++; @@ -2249,7 +2249,7 @@ int LightMain( int argc, char **argv ){ /* unhandled args */ else{ - Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c index cb0430ea..8d653e3b 100644 --- a/tools/quake3/q3map2/light_ydnar.c +++ b/tools/quake3/q3map2/light_ydnar.c @@ -1613,7 +1613,7 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float //% normal2 = SUPER_NORMAL( x, y ); } else{ - Sys_Printf( "WARNING: Spurious lightmap S vector\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap S vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 0 ] ); @@ -1637,7 +1637,7 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float //% normal2 = SUPER_NORMAL( x, y ); } else{ - Sys_Printf( "WARNING: Spurious lightmap T vector\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap T vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 1 ] ); @@ -1966,7 +1966,7 @@ void IlluminateRawLightmap( int rawLightmapNum ){ /* max of MAX_LIGHTMAPS (4) styles allowed to hit a surface/lightmap */ if ( lightmapNum >= MAX_LIGHTMAPS ) { - Sys_Printf( "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); + Sys_FPrintf( SYS_WRN, "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); continue; } @@ -3366,7 +3366,7 @@ void SetupEnvelopes( qboolean forGrid, qboolean fastFlag ){ for ( i = 0; i < 3; i++ ) { if ( mins[ i ] > light->origin[ i ] || maxs[ i ] < light->origin[ i ] ) { - //% Sys_Printf( "WARNING: Light PVS bounds (%.0f, %.0f, %.0f) -> (%.0f, %.0f, %.0f)\ndo not encompass light %d (%f, %f, %f)\n", + //% Sys_FPrintf( SYS_WRN, "WARNING: Light PVS bounds (%.0f, %.0f, %.0f) -> (%.0f, %.0f, %.0f)\ndo not encompass light %d (%f, %f, %f)\n", //% mins[ 0 ], mins[ 1 ], mins[ 2 ], //% maxs[ 0 ], maxs[ 1 ], maxs[ 2 ], //% numLights, light->origin[ 0 ], light->origin[ 1 ], light->origin[ 2 ] ); diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c index 9f8d6bec..2079cbb0 100644 --- a/tools/quake3/q3map2/lightmaps_ydnar.c +++ b/tools/quake3/q3map2/lightmaps_ydnar.c @@ -127,7 +127,7 @@ void ExportLightmaps( void ){ /* sanity check */ if ( bspLightBytes == NULL ) { - Sys_Printf( "WARNING: No BSP lightmap data\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP lightmap data\n" ); return; } @@ -226,7 +226,7 @@ int ImportLightmapsMain( int argc, char **argv ){ buffer = NULL; len = vfsLoadFile( filename, (void*) &buffer, -1 ); if ( len < 0 ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to load image %s\n", filename ); continue; } @@ -237,11 +237,11 @@ int ImportLightmapsMain( int argc, char **argv ){ /* sanity check it */ if ( pixels == NULL ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to load image %s\n", filename ); continue; } if ( width != game->lightmapSize || height != game->lightmapSize ) { - Sys_Printf( "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", + Sys_FPrintf( SYS_WRN, "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", filename, width, height, game->lightmapSize, game->lightmapSize ); } @@ -734,7 +734,7 @@ qboolean AddSurfaceToRawLightmap( int num, rawLightmap_t *lm ){ /* check for bogus axis */ if ( faxis[ axisNum ] == 0.0f ) { - Sys_Printf( "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); lm->w = lm->h = 0; return qfalse; } @@ -946,7 +946,7 @@ void SetupSurfaceLightmaps( void ){ superSample = 1; } else if ( superSample > 8 ) { - Sys_Printf( "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); + Sys_FPrintf( SYS_WRN, "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); superSample = 8; } diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index 206af096..3a92b6f5 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -91,504 +91,6 @@ static void ExitQ3Map( void ){ } } -static int MD4BlockChecksum( void * buffer, int length ) { - unsigned char digest[16]; - int checksum; - - md4_get_digest( buffer, length, digest ); - /* I suppose it has to be done that way for legacy reasons? */ - checksum = digest[0] & ( digest[1] << 8 ) & ( digest[2] << 16 ) & ( digest[3] << 24 ); - checksum ^= digest[4] & ( digest[5] << 8 ) & ( digest[6] << 16 ) & ( digest[7] << 24 ); - checksum ^= digest[8] & ( digest[9] << 8 ) & ( digest[10] << 16 ) & ( digest[11] << 24 ); - checksum ^= digest[12] & ( digest[13] << 8 ) & ( digest[14] << 16 ) & ( digest[15] << 24 ); - return checksum; -} - -/* - FixAAS() - resets an aas checksum to match the given BSP - */ - -int FixAAS( int argc, char **argv ){ - int length, checksum; - void *buffer; - FILE *file; - char aas[ 1024 ], **ext; - char *exts[] = - { - ".aas", - "_b0.aas", - "_b1.aas", - NULL - }; - - - /* arg checking */ - if ( argc < 2 ) { - Sys_Printf( "Usage: q3map -fixaas [-v] \n" ); - return 0; - } - - /* do some path mangling */ - strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); - StripExtension( source ); - DefaultExtension( source, ".bsp" ); - - /* note it */ - Sys_Printf( "--- FixAAS ---\n" ); - - /* load the bsp */ - Sys_Printf( "Loading %s\n", source ); - length = LoadFile( source, &buffer ); - - /* create bsp checksum */ - Sys_Printf( "Creating checksum...\n" ); - checksum = LittleLong( MD4BlockChecksum( buffer, length ) ); - - /* write checksum to aas */ - ext = exts; - while ( *ext ) - { - /* mangle name */ - strcpy( aas, source ); - StripExtension( aas ); - strcat( aas, *ext ); - Sys_Printf( "Trying %s\n", aas ); - ext++; - - /* fix it */ - file = fopen( aas, "r+b" ); - if ( !file ) { - continue; - } - if ( fwrite( &checksum, 4, 1, file ) != 1 ) { - Error( "Error writing checksum to %s", aas ); - } - fclose( file ); - } - - /* return to sender */ - return 0; -} - - - -/* - AnalyzeBSP() - ydnar - analyzes a Quake engine BSP file - */ - -typedef struct abspHeader_s -{ - char ident[ 4 ]; - int version; - - bspLump_t lumps[ 1 ]; /* unknown size */ -} -abspHeader_t; - -typedef struct abspLumpTest_s -{ - int radix, minCount; - char *name; -} -abspLumpTest_t; - -int AnalyzeBSP( int argc, char **argv ){ - abspHeader_t *header; - int size, i, version, offset, length, lumpInt, count; - char ident[ 5 ]; - void *lump; - float lumpFloat; - char lumpString[ 1024 ], source[ 1024 ]; - qboolean lumpSwap = qfalse; - abspLumpTest_t *lumpTest; - static abspLumpTest_t lumpTests[] = - { - { sizeof( bspPlane_t ), 6, "IBSP LUMP_PLANES" }, - { sizeof( bspBrush_t ), 1, "IBSP LUMP_BRUSHES" }, - { 8, 6, "IBSP LUMP_BRUSHSIDES" }, - { sizeof( bspBrushSide_t ), 6, "RBSP LUMP_BRUSHSIDES" }, - { sizeof( bspModel_t ), 1, "IBSP LUMP_MODELS" }, - { sizeof( bspNode_t ), 2, "IBSP LUMP_NODES" }, - { sizeof( bspLeaf_t ), 1, "IBSP LUMP_LEAFS" }, - { 104, 3, "IBSP LUMP_DRAWSURFS" }, - { 44, 3, "IBSP LUMP_DRAWVERTS" }, - { 4, 6, "IBSP LUMP_DRAWINDEXES" }, - { 128 * 128 * 3, 1, "IBSP LUMP_LIGHTMAPS" }, - { 256 * 256 * 3, 1, "IBSP LUMP_LIGHTMAPS (256 x 256)" }, - { 512 * 512 * 3, 1, "IBSP LUMP_LIGHTMAPS (512 x 512)" }, - { 0, 0, NULL } - }; - - - /* arg checking */ - if ( argc < 1 ) { - Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] \n" ); - return 0; - } - - /* process arguments */ - for ( i = 1; i < ( argc - 1 ); i++ ) - { - /* -format map|ase|... */ - if ( !strcmp( argv[ i ], "-lumpswap" ) ) { - Sys_Printf( "Swapped lump structs enabled\n" ); - lumpSwap = qtrue; - } - } - - /* clean up map name */ - strcpy( source, ExpandArg( argv[ i ] ) ); - Sys_Printf( "Loading %s\n", source ); - - /* load the file */ - size = LoadFile( source, (void**) &header ); - if ( size == 0 || header == NULL ) { - Sys_Printf( "Unable to load %s.\n", source ); - return -1; - } - - /* analyze ident/version */ - memcpy( ident, header->ident, 4 ); - ident[ 4 ] = '\0'; - version = LittleLong( header->version ); - - Sys_Printf( "Identity: %s\n", ident ); - Sys_Printf( "Version: %d\n", version ); - Sys_Printf( "---------------------------------------\n" ); - - /* analyze each lump */ - for ( i = 0; i < 100; i++ ) - { - /* call of duty swapped lump pairs */ - if ( lumpSwap ) { - offset = LittleLong( header->lumps[ i ].length ); - length = LittleLong( header->lumps[ i ].offset ); - } - - /* standard lump pairs */ - else - { - offset = LittleLong( header->lumps[ i ].offset ); - length = LittleLong( header->lumps[ i ].length ); - } - - /* extract data */ - lump = (byte*) header + offset; - lumpInt = LittleLong( (int) *( (int*) lump ) ); - lumpFloat = LittleFloat( (float) *( (float*) lump ) ); - memcpy( lumpString, (char*) lump, ( length < 1024 ? length : 1024 ) ); - lumpString[ 1023 ] = '\0'; - - /* print basic lump info */ - Sys_Printf( "Lump: %d\n", i ); - Sys_Printf( "Offset: %d bytes\n", offset ); - Sys_Printf( "Length: %d bytes\n", length ); - - /* only operate on valid lumps */ - if ( length > 0 ) { - /* print data in 4 formats */ - Sys_Printf( "As hex: %08X\n", lumpInt ); - Sys_Printf( "As int: %d\n", lumpInt ); - Sys_Printf( "As float: %f\n", lumpFloat ); - Sys_Printf( "As string: %s\n", lumpString ); - - /* guess lump type */ - if ( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' ) { - Sys_Printf( "Type guess: IBSP LUMP_ENTITIES\n" ); - } - else if ( strstr( lumpString, "textures/" ) ) { - Sys_Printf( "Type guess: IBSP LUMP_SHADERS\n" ); - } - else - { - /* guess based on size/count */ - for ( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ ) - { - if ( ( length % lumpTest->radix ) != 0 ) { - continue; - } - count = length / lumpTest->radix; - if ( count < lumpTest->minCount ) { - continue; - } - Sys_Printf( "Type guess: %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix ); - } - } - } - - Sys_Printf( "---------------------------------------\n" ); - - /* end of file */ - if ( offset + length >= size ) { - break; - } - } - - /* last stats */ - Sys_Printf( "Lump count: %d\n", i + 1 ); - Sys_Printf( "File size: %d bytes\n", size ); - - /* return to caller */ - return 0; -} - - - -/* - BSPInfo() - emits statistics about the bsp file - */ - -int BSPInfo( int count, char **fileNames ){ - int i; - char source[ 1024 ], ext[ 64 ]; - int size; - FILE *f; - - - /* dummy check */ - if ( count < 1 ) { - Sys_Printf( "No files to dump info for.\n" ); - return -1; - } - - /* enable info mode */ - infoMode = qtrue; - - /* walk file list */ - for ( i = 0; i < count; i++ ) - { - Sys_Printf( "---------------------------------\n" ); - - /* mangle filename and get size */ - strcpy( source, fileNames[ i ] ); - ExtractFileExtension( source, ext ); - if ( !Q_stricmp( ext, "map" ) ) { - StripExtension( source ); - } - DefaultExtension( source, ".bsp" ); - f = fopen( source, "rb" ); - if ( f ) { - size = Q_filelength( f ); - fclose( f ); - } - else{ - size = 0; - } - - /* load the bsp file and print lump sizes */ - Sys_Printf( "%s\n", source ); - LoadBSPFile( source ); - PrintBSPFileSizes(); - - /* print sizes */ - Sys_Printf( "\n" ); - Sys_Printf( " total %9d\n", size ); - Sys_Printf( " %9d KB\n", size / 1024 ); - Sys_Printf( " %9d MB\n", size / ( 1024 * 1024 ) ); - - Sys_Printf( "---------------------------------\n" ); - } - - /* return count */ - return i; -} - - - -/* - ScaleBSPMain() - amaze and confuse your enemies with wierd scaled maps! - */ - -int ScaleBSPMain( int argc, char **argv ){ - int i; - float f, scale; - vec3_t vec; - char str[ 1024 ]; - - - /* arg checking */ - if ( argc < 2 ) { - Sys_Printf( "Usage: q3map -scale [-v] \n" ); - return 0; - } - - /* get scale */ - scale = atof( argv[ argc - 2 ] ); - if ( scale == 0.0f ) { - Sys_Printf( "Usage: q3map -scale [-v] \n" ); - Sys_Printf( "Non-zero scale value required.\n" ); - return 0; - } - - /* do some path mangling */ - strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); - StripExtension( source ); - DefaultExtension( source, ".bsp" ); - - /* load the bsp */ - Sys_Printf( "Loading %s\n", source ); - LoadBSPFile( source ); - ParseEntities(); - - /* note it */ - Sys_Printf( "--- ScaleBSP ---\n" ); - Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities ); - - /* scale entity keys */ - for ( i = 0; i < numBSPEntities && i < numEntities; i++ ) - { - /* scale origin */ - GetVectorForKey( &entities[ i ], "origin", vec ); - if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) ) { - VectorScale( vec, scale, vec ); - sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] ); - SetKeyValue( &entities[ i ], "origin", str ); - } - - /* scale door lip */ - f = FloatForKey( &entities[ i ], "lip" ); - if ( f ) { - f *= scale; - sprintf( str, "%f", f ); - SetKeyValue( &entities[ i ], "lip", str ); - } - } - - /* scale models */ - for ( i = 0; i < numBSPModels; i++ ) - { - VectorScale( bspModels[ i ].mins, scale, bspModels[ i ].mins ); - VectorScale( bspModels[ i ].maxs, scale, bspModels[ i ].maxs ); - } - - /* scale nodes */ - for ( i = 0; i < numBSPNodes; i++ ) - { - VectorScale( bspNodes[ i ].mins, scale, bspNodes[ i ].mins ); - VectorScale( bspNodes[ i ].maxs, scale, bspNodes[ i ].maxs ); - } - - /* scale leafs */ - for ( i = 0; i < numBSPLeafs; i++ ) - { - VectorScale( bspLeafs[ i ].mins, scale, bspLeafs[ i ].mins ); - VectorScale( bspLeafs[ i ].maxs, scale, bspLeafs[ i ].maxs ); - } - - /* scale drawverts */ - for ( i = 0; i < numBSPDrawVerts; i++ ) - VectorScale( bspDrawVerts[ i ].xyz, scale, bspDrawVerts[ i ].xyz ); - - /* scale planes */ - for ( i = 0; i < numBSPPlanes; i++ ) - bspPlanes[ i ].dist *= scale; - - /* scale gridsize */ - GetVectorForKey( &entities[ 0 ], "gridsize", vec ); - if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) { - VectorCopy( gridSize, vec ); - } - VectorScale( vec, scale, vec ); - sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] ); - SetKeyValue( &entities[ 0 ], "gridsize", str ); - - /* write the bsp */ - UnparseEntities(); - StripExtension( source ); - DefaultExtension( source, "_s.bsp" ); - Sys_Printf( "Writing %s\n", source ); - WriteBSPFile( source ); - - /* return to sender */ - return 0; -} - - - -/* - ConvertBSPMain() - main argument processing function for bsp conversion - */ - -int ConvertBSPMain( int argc, char **argv ){ - int i; - int ( *convertFunc )( char * ); - game_t *convertGame; - - - /* set default */ - convertFunc = ConvertBSPToASE; - convertGame = NULL; - - /* arg checking */ - if ( argc < 1 ) { - Sys_Printf( "Usage: q3map -convert [-format ] [-v] \n" ); - return 0; - } - - /* process arguments */ - for ( i = 1; i < ( argc - 1 ); i++ ) - { - /* -format map|ase|... */ - if ( !strcmp( argv[ i ], "-format" ) ) { - i++; - if ( !Q_stricmp( argv[ i ], "ase" ) ) { - convertFunc = ConvertBSPToASE; - } - else if ( !Q_stricmp( argv[ i ], "map" ) ) { - convertFunc = ConvertBSPToMap; - } - else - { - convertGame = GetGame( argv[ i ] ); - if ( convertGame == NULL ) { - Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] ); - } - } - } - } - - /* clean up map name */ - strcpy( source, ExpandArg( argv[ i ] ) ); - StripExtension( source ); - DefaultExtension( source, ".bsp" ); - - LoadShaderInfo(); - - Sys_Printf( "Loading %s\n", source ); - - /* ydnar: load surface file */ - //% LoadSurfaceExtraFile( source ); - - LoadBSPFile( source ); - - /* parse bsp entities */ - ParseEntities(); - - /* bsp format convert? */ - if ( convertGame != NULL ) { - /* set global game */ - game = convertGame; - - /* write bsp */ - StripExtension( source ); - DefaultExtension( source, "_c.bsp" ); - Sys_Printf( "Writing %s\n", source ); - WriteBSPFile( source ); - - /* return to sender */ - return 0; - } - - /* normal convert */ - return convertFunc( source ); -} - - /* main() @@ -691,17 +193,17 @@ int main( int argc, char **argv ){ /* fixaas */ if ( !strcmp( argv[ 1 ], "-fixaas" ) ) { - r = FixAAS( argc - 1, argv + 1 ); + r = FixAASMain( argc - 1, argv + 1 ); } /* analyze */ else if ( !strcmp( argv[ 1 ], "-analyze" ) ) { - r = AnalyzeBSP( argc - 1, argv + 1 ); + r = AnalyzeBSPMain( argc - 1, argv + 1 ); } /* info */ else if ( !strcmp( argv[ 1 ], "-info" ) ) { - r = BSPInfo( argc - 2, argv + 2 ); + r = BSPInfoMain( argc - 2, argv + 2 ); } /* vis */ @@ -716,7 +218,7 @@ int main( int argc, char **argv ){ /* vlight */ else if ( !strcmp( argv[ 1 ], "-vlight" ) ) { - Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); argv[ 1 ] = "-fast"; /* eek a hack */ r = LightMain( argc, argv ); } diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c index 9c3041c9..f491b7b7 100644 --- a/tools/quake3/q3map2/map.c +++ b/tools/quake3/q3map2/map.c @@ -1399,13 +1399,13 @@ void LoadEntityIndexMap( entity_t *e ){ value = ValueForKey( e, "layers" ); } if ( value[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has missing \"_layers\" or \"layers\" key\n", indexMapFilename ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" has missing \"_layers\" or \"layers\" key\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } numLayers = atoi( value ); if ( numLayers < 1 ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has < 1 layer (%d)\n", indexMapFilename, numLayers ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" has < 1 layer (%d)\n", indexMapFilename, numLayers ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } @@ -1416,7 +1416,7 @@ void LoadEntityIndexMap( entity_t *e ){ value = ValueForKey( e, "shader" ); } if ( value[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has missing \"_shader\" or \"shader\" key\n", indexMapFilename ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" has missing \"_shader\" or \"shader\" key\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } @@ -1475,7 +1475,7 @@ void LoadEntityIndexMap( entity_t *e ){ /* the index map must be at least 2x2 pixels */ if ( w < 2 || h < 2 ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" is smaller than 2x2 pixels\n", indexMapFilename ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" is smaller than 2x2 pixels\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); free( pixels ); return; @@ -1555,7 +1555,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ /* conformance check */ if ( strcmp( token, "{" ) ) { - Sys_Printf( "WARNING: ParseEntity: { not found, found %s on line %d - last entity was at: <%4.2f, %4.2f, %4.2f>...\n" + Sys_FPrintf( SYS_WRN, "WARNING: ParseEntity: { not found, found %s on line %d - last entity was at: <%4.2f, %4.2f, %4.2f>...\n" "Continuing to process map, but resulting BSP may be invalid.\n", token, scriptline, entities[ numEntities ].origin[ 0 ], entities[ numEntities ].origin[ 1 ], entities[ numEntities ].origin[ 2 ] ); return qfalse; @@ -1581,7 +1581,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ { /* get initial token */ if ( !GetToken( qtrue ) ) { - Sys_Printf( "WARNING: ParseEntity: EOF without closing brace\n" + Sys_FPrintf( SYS_WRN, "WARNING: ParseEntity: EOF without closing brace\n" "Continuing to process map, but resulting BSP may be invalid.\n" ); return qfalse; } @@ -1603,7 +1603,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ } else if ( !strcmp( token, "terrainDef" ) ) { //% ParseTerrain(); - Sys_Printf( "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ + Sys_FPrintf( SYS_WRN, "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ } else if ( !strcmp( token, "brushDef" ) ) { if ( g_bBrushPrimit == BPRIMIT_OLDBRUSHES ) { @@ -1814,7 +1814,7 @@ void LoadMapFile( char *filename, qboolean onlyLights ){ /* get brush counts */ numMapBrushes = CountBrushList( entities[ 0 ].brushes ); if ( (float) c_detail / (float) numMapBrushes < 0.10f && numMapBrushes > 500 ) { - Sys_Printf( "WARNING: Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); } /* emit some statistics */ diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c index a6daedf0..a3028fdb 100644 --- a/tools/quake3/q3map2/model.c +++ b/tools/quake3/q3map2/model.c @@ -58,11 +58,11 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_WARNING: - Sys_Printf( "WARNING: %s\n", str ); + Sys_FPrintf( SYS_WRN, "WARNING: %s\n", str ); break; case PICO_ERROR: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_ERR, "ERROR: %s\n", str ); break; case PICO_FATAL: @@ -427,7 +427,7 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade { /* overflow hack */ if ( ( nummapplanes + 64 ) >= ( MAX_MAP_PLANES >> 1 ) ) { - Sys_Printf( "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", + Sys_FPrintf( SYS_WRN, "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", MAX_MAP_PLANES, name ); break; } @@ -609,7 +609,7 @@ void AddTriangleModels( entity_t *e ){ /* get model name */ model = ValueForKey( e2, "model" ); if ( model[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: misc_model at %i %i %i without a model key\n", + Sys_FPrintf( SYS_WRN, "WARNING: misc_model at %i %i %i without a model key\n", (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] ); continue; } @@ -680,7 +680,7 @@ void AddTriangleModels( entity_t *e ){ /* split the string */ split = strchr( remap->from, ';' ); if ( split == NULL ) { - Sys_Printf( "WARNING: Shader _remap key found in misc_model without a ; character\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Shader _remap key found in misc_model without a ; character\n" ); free( remap ); remap = remap2; continue; diff --git a/tools/quake3/q3map2/portals.c b/tools/quake3/q3map2/portals.c index ff1e9845..c8b5cd27 100644 --- a/tools/quake3/q3map2/portals.c +++ b/tools/quake3/q3map2/portals.c @@ -519,7 +519,7 @@ void MakeTreePortals_r( node_t *node ){ CalcNodeBounds( node ); if ( node->mins[0] >= node->maxs[0] ) { - Sys_Printf( "WARNING: node without a volume\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: node without a volume\n" ); Sys_Printf( "node has %d tiny portals\n", node->tinyportals ); Sys_Printf( "node reference point %1.2f %1.2f %1.2f\n", node->referencepoint[0], node->referencepoint[1], @@ -777,7 +777,7 @@ void FloodAreas_r( node_t *node ){ // note the current area as bounding the portal if ( b->portalareas[ 1 ] != -1 ) { - Sys_Printf( "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); + Sys_FPrintf( SYS_WRN, "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); return; } if ( b->portalareas[ 0 ] != -1 ) { @@ -864,7 +864,7 @@ void CheckAreas_r( node_t *node ){ if ( node->cluster != -1 ) { if ( node->area == -1 ) { - Sys_Printf( "WARNING: cluster %d has area set to -1\n", node->cluster ); + Sys_FPrintf( SYS_WRN, "WARNING: cluster %d has area set to -1\n", node->cluster ); } } if ( node->areaportal ) { @@ -872,7 +872,7 @@ void CheckAreas_r( node_t *node ){ // check if the areaportal touches two areas if ( b->portalareas[0] == -1 || b->portalareas[1] == -1 ) { - Sys_Printf( "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); + Sys_FPrintf( SYS_WRN, "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); } } } diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 0da3f836..39959228 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -335,7 +335,11 @@ extern int unz_GAME_QL; #define MAX_MAP_PORTALS 0x20000 #define MAX_MAP_LIGHTING 0x800000 #define MAX_MAP_LIGHTGRID 0x100000 //% 0x800000 /* ydnar: set to points, not bytes */ -#define MAX_MAP_VISIBILITY 0x200000 + +// some recent QL maps have started hitting the limit (old value was 0x200000). QBall +// below has been 'borrowed' from the netradiant fork +#define MAX_MAP_VISCLUSTERS 0x4000 // <= MAX_MAP_LEAFS +#define MAX_MAP_VISIBILITY ( VIS_HEADER_SIZE + MAX_MAP_VISCLUSTERS * ( ( ( MAX_MAP_VISCLUSTERS + 63 ) & ~63 ) >> 3 ) ) #define MAX_MAP_DRAW_SURFS 0x20000 #define MAX_MAP_DRAW_VERTS 0x100000 @@ -1461,20 +1465,36 @@ vec_t Random( void ); char *Q_strncpyz( char *dst, const char *src, size_t len ); char *Q_strcat( char *dst, size_t dlen, const char *src ); char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ); -int BSPInfo( int count, char **fileNames ); -int ScaleBSPMain( int argc, char **argv ); -int ConvertMain( int argc, char **argv ); - /* path_init.c */ game_t *GetGame( char *arg ); void InitPaths( int *argc, char **argv ); +/* fixaas.c */ +int FixAASMain( int argc, char **argv ); + + /* bsp.c */ int BSPMain( int argc, char **argv ); +/* bsp_analyze.c */ +int AnalyzeBSPMain( int argc, char **argv ); + + +/* bsp_info.c */ +int BSPInfoMain( int argc, char **argv ); + + +/* bsp_scale.c */ +int ScaleBSPMain( int argc, char **argv ); + + +/* convert_bsp.c */ +int ConvertBSPMain( int argc, char **argv ); + + /* convert_map.c */ int ConvertBSPToMap( char *bspName ); diff --git a/tools/quake3/q3map2/q3map2.vcproj b/tools/quake3/q3map2/q3map2.vcproj index f2a747e8..b71a4459 100644 --- a/tools/quake3/q3map2/q3map2.vcproj +++ b/tools/quake3/q3map2/q3map2.vcproj @@ -222,6 +222,18 @@ RelativePath=".\bsp.c" > + + + + + + @@ -230,6 +242,10 @@ RelativePath=".\facebsp.c" > + + @@ -318,6 +334,10 @@ RelativePath=".\convert_ase.c" > + + diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 0add46ac..ba745ac9 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -21,23 +21,24 @@ {CD40B764-1D47-4FAE-8C6A-EF036E478D65} Win32Proj + 8.1 Application - v110_xp + v140 Application - v110_xp + v140 Application - v110_xp + v140 Application - v110_xp + v140 @@ -77,7 +78,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -89,8 +90,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -99,7 +100,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -111,15 +112,15 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc/x64;$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories) true Console - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -129,8 +130,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console true @@ -140,7 +141,7 @@ - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -151,8 +152,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc/x64;$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories) true Console true @@ -173,8 +174,12 @@ + + + + @@ -197,6 +202,7 @@ + diff --git a/tools/quake3/q3map2/q3map2.vcxproj.filters b/tools/quake3/q3map2/q3map2.vcxproj.filters index be4de04a..b98e973f 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj.filters +++ b/tools/quake3/q3map2/q3map2.vcxproj.filters @@ -50,12 +50,24 @@ src + + src + + + src + + + src + src src + + src + src @@ -122,6 +134,9 @@ src + + src + src diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c index f747a27d..978856ef 100644 --- a/tools/quake3/q3map2/shaders.c +++ b/tools/quake3/q3map2/shaders.c @@ -357,7 +357,7 @@ void WriteMapShaderFile( void ){ /* open shader file */ file = fopen( mapShaderFile, "w" ); if ( file == NULL ) { - Sys_Printf( "WARNING: Unable to open map shader file %s for writing\n", mapShaderFile ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to open map shader file %s for writing\n", mapShaderFile ); return; } @@ -755,7 +755,7 @@ static void LoadShaderImages( shaderInfo_t *si ){ if ( si->shaderImage == NULL ) { si->shaderImage = ImageLoad( DEFAULT_IMAGE ); if ( warnImage && strcmp( si->shader, "noshader" ) ) { - Sys_Printf( "WARNING: Couldn't find image for shader %s\n", si->shader ); + Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find image for shader %s\n", si->shader ); } } @@ -809,7 +809,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){ /* dummy check */ if ( shaderName == NULL || shaderName[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Null or empty shader name\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Null or empty shader name\n" ); shaderName = "missing"; } @@ -1042,7 +1042,7 @@ static void ParseShaderFile( const char *filename ){ else if ( !Q_stricmp( token, "surfaceparm" ) ) { GetTokenAppend( shaderText, qfalse ); if ( ApplySurfaceParm( token, &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) { - Sys_Printf( "WARNING: Unknown surfaceparm: \"%s\"\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown surfaceparm: \"%s\"\n", token ); } } @@ -1485,7 +1485,7 @@ static void ParseShaderFile( const char *filename ){ } else { - Sys_Printf( "WARNING: Unknown value for lightmap axis: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown value for lightmap axis: %s\n", token ); VectorClear( si->lightmapAxis ); } } @@ -1500,7 +1500,7 @@ static void ParseShaderFile( const char *filename ){ /* must be a power of 2 */ if ( ( ( si->lmCustomWidth - 1 ) & si->lmCustomWidth ) || ( ( si->lmCustomHeight - 1 ) & si->lmCustomHeight ) ) { - Sys_Printf( "WARNING: Non power-of-two lightmap size specified (%d, %d)\n", + Sys_FPrintf( SYS_WRN, "WARNING: Non power-of-two lightmap size specified (%d, %d)\n", si->lmCustomWidth, si->lmCustomHeight ); si->lmCustomWidth = lmCustomSize; si->lmCustomHeight = lmCustomSize; @@ -1635,7 +1635,7 @@ static void ParseShaderFile( const char *filename ){ } else { - Sys_Printf( "WARNING: Unknown q3map_tcGen method: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_tcGen method: %s\n", token ); VectorClear( si->vecs[ 0 ] ); VectorClear( si->vecs[ 1 ] ); } @@ -1720,7 +1720,7 @@ static void ParseShaderFile( const char *filename ){ /* unknown */ else{ - Sys_Printf( "WARNING: Unknown colorMod method: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown colorMod method: %s\n", token ); } } @@ -1758,7 +1758,7 @@ static void ParseShaderFile( const char *filename ){ TCModRotate( si->mod, a ); } else{ - Sys_Printf( "WARNING: Unknown q3map_tcMod method: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_tcMod method: %s\n", token ); } } @@ -1848,7 +1848,7 @@ static void ParseShaderFile( const char *filename ){ GetTokenAppend( shaderText, qfalse ); sprintf( temp, "*mat_%s", token ); if ( ApplySurfaceParm( temp, &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) { - Sys_Printf( "WARNING: Unknown material \"%s\"\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown material \"%s\"\n", token ); } } @@ -1870,7 +1870,7 @@ static void ParseShaderFile( const char *filename ){ { //% Sys_FPrintf( SYS_VRB, "Attempting to match %s with a known surfaceparm\n", token ); if ( ApplySurfaceParm( &token[ 6 ], &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) { - ; //% Sys_Printf( "WARNING: Unknown q3map_* directive \"%s\"\n", token ); + ; //% Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_* directive \"%s\"\n", token ); } } } @@ -1932,7 +1932,7 @@ static void ParseCustomInfoParms( void ){ /* any content? */ if ( !parsedContent ) { - Sys_Printf( "WARNING: Couldn't find valid custom contentsflag section\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find valid custom contentsflag section\n" ); return; } @@ -1958,7 +1958,7 @@ static void ParseCustomInfoParms( void ){ /* any content? */ if ( !parsedContent ) { - Sys_Printf( "WARNING: Couldn't find valid custom surfaceflag section\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find valid custom surfaceflag section\n" ); } } diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c index 061e8ab6..3813cb1c 100644 --- a/tools/quake3/q3map2/surface.c +++ b/tools/quake3/q3map2/surface.c @@ -568,7 +568,7 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){ if ( fabs( dist ) > PLANAR_EPSILON ) { //% if( ds->planeNum >= 0 ) //% { - //% Sys_Printf( "WARNING: Planar surface marked unplanar (%f > %f)\n", fabs( dist ), PLANAR_EPSILON ); + //% Sys_FPrintf( SYS_WRN, "WARNING: Planar surface marked unplanar (%f > %f)\n", fabs( dist ), PLANAR_EPSILON ); //% ds->verts[ i ].color[ 0 ][ 0 ] = ds->verts[ i ].color[ 0 ][ 2 ] = 0; //% } ds->planar = qfalse; @@ -589,7 +589,7 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){ ds->planeNum = -1; VectorClear( ds->lightmapVecs[ 2 ] ); //% if( ds->type == SURF_META || ds->type == SURF_FACE ) - //% Sys_Printf( "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); + //% Sys_FPrintf( SYS_WRN, "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); } /* ----------------------------------------------------------------- @@ -1148,7 +1148,7 @@ mapDrawSurface_t *DrawSurfaceForMesh( entity_t *e, parseMesh_t *p, mesh_t *mesh /* spew forth errors */ if ( VectorLength( plane ) < 0.001f ) { - Sys_Printf( "BOGUS " ); + Sys_Printf( "DrawSurfaceForMesh: bogus plane\n" ); } /* test each vert */ @@ -2450,7 +2450,7 @@ void EmitDrawIndexes( mapDrawSurface_t *ds, bspDrawSurface_t *out ){ /* validate the index */ if ( ds->type != SURFACE_PATCH ) { if ( bspDrawIndexes[ numBSPDrawIndexes ] < 0 || bspDrawIndexes[ numBSPDrawIndexes ] >= ds->numVerts ) { - Sys_Printf( "WARNING: %d %s has invalid index %d (%d)\n", + Sys_FPrintf( SYS_WRN, "WARNING: %d %s has invalid index %d (%d)\n", numBSPDrawSurfaces, ds->shaderInfo->shader, bspDrawIndexes[ numBSPDrawIndexes ], @@ -3671,7 +3671,7 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree ){ bspDrawSurface_t *out; out = &bspDrawSurfaces[ numBSPDrawSurfaces - 1 ]; if ( out->numVerts == 3 && out->numIndexes > 3 ) { - Sys_Printf( "\nWARNING: Potentially bad %s surface (%d: %d, %d)\n %s\n", + Sys_FPrintf( SYS_WRN, "WARNING: Potentially bad %s surface (%d: %d, %d)\n %s\n", surfaceTypes[ ds->type ], numBSPDrawSurfaces - 1, out->numVerts, out->numIndexes, si->shader ); } diff --git a/tools/quake3/q3map2/surface_extra.c b/tools/quake3/q3map2/surface_extra.c index 81c195e4..c86058c6 100644 --- a/tools/quake3/q3map2/surface_extra.c +++ b/tools/quake3/q3map2/surface_extra.c @@ -340,7 +340,7 @@ void LoadSurfaceExtraFile( const char *path ){ Sys_Printf( "Loading %s\n", srfPath ); size = LoadFile( srfPath, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to find surface file %s, using defaults.\n", srfPath ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to find surface file %s, using defaults.\n", srfPath ); return; } diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c index d4a5018c..3b1db208 100644 --- a/tools/quake3/q3map2/surface_meta.c +++ b/tools/quake3/q3map2/surface_meta.c @@ -1358,7 +1358,7 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri, ( bi == ds->indexes[ i ] && ci == ds->indexes[ i + 2 ] && ai == ds->indexes[ i + 1 ] ) || ( ci == ds->indexes[ i ] && ai == ds->indexes[ i + 2 ] && bi == ds->indexes[ i + 1 ] ) ) { /* warn about it */ - Sys_Printf( "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n", + Sys_FPrintf( SYS_WRN, "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n", ds->verts[ ai ].xyz[ 0 ], ds->verts[ ai ].xyz[ 1 ], ds->verts[ ai ].xyz[ 2 ], ds->verts[ bi ].xyz[ 0 ], ds->verts[ bi ].xyz[ 1 ], ds->verts[ bi ].xyz[ 2 ], ds->verts[ ci ].xyz[ 0 ], ds->verts[ ci ].xyz[ 1 ], ds->verts[ ci ].xyz[ 2 ] ); diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.c index e97144bc..43c9ffaa 100644 --- a/tools/quake3/q3map2/vis.c +++ b/tools/quake3/q3map2/vis.c @@ -203,7 +203,7 @@ void ClusterMerge( int leafnum ){ numvis = LeafVectorFromPortalVector( portalvector, uncompressed ); // if (uncompressed[leafnum>>3] & (1<<(leafnum&7))) -// Sys_Printf ("WARNING: Leaf portals saw into leaf\n"); +// Sys_FPrintf( SYS_WRN, "WARNING: Leaf portals saw into leaf\n"); // uncompressed[leafnum>>3] |= (1<<(leafnum&7)); @@ -1113,7 +1113,7 @@ int VisMain( int argc, char **argv ){ } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/writebsp.c b/tools/quake3/q3map2/writebsp.c index 8fd073cd..fecd7855 100644 --- a/tools/quake3/q3map2/writebsp.c +++ b/tools/quake3/q3map2/writebsp.c @@ -162,7 +162,7 @@ void EmitLeaf( node_t *node ){ { /* something is corrupting brushes */ if ( (size_t) b < 256 ) { - Sys_Printf( "WARNING: Node brush list corrupted (0x%08X)\n", b ); + Sys_FPrintf( SYS_WRN, "WARNING: Node brush list corrupted (0x%08X)\n", b ); break; } //% if( b->guard != 0xDEADBEEF ) diff --git a/tools/urt/tools/quake3/q3map2/bsp.c b/tools/urt/tools/quake3/q3map2/bsp.c index 24c49420..500333b6 100644 --- a/tools/urt/tools/quake3/q3map2/bsp.c +++ b/tools/urt/tools/quake3/q3map2/bsp.c @@ -115,7 +115,7 @@ static void SetCloneModelNumbers( void ){ /* get the model num */ value3 = ValueForKey( &entities[ j ], "model" ); if ( value3[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Cloned entity %s referenced entity without model\n", value2 ); + Sys_FPrintf( SYS_WRN, "WARNING: Cloned entity %s referenced entity without model\n", value2 ); continue; } models = atoi( &value2[ 1 ] ); @@ -783,7 +783,7 @@ int BSPMain( int argc, char **argv ){ Sys_Printf( "-bsp argument unnecessary\n" ); } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/urt/tools/quake3/q3map2/bspfile_abstract.c b/tools/urt/tools/quake3/q3map2/bspfile_abstract.c index 116f3d33..39935e06 100644 --- a/tools/urt/tools/quake3/q3map2/bspfile_abstract.c +++ b/tools/urt/tools/quake3/q3map2/bspfile_abstract.c @@ -259,7 +259,7 @@ int GetLumpElements( bspHeader_t *header, int lump, int size ){ /* check for odd size */ if ( header->lumps[ lump ].length % size ) { if ( force ) { - Sys_Printf( "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); + Sys_FPrintf( SYS_WRN, "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); return 0; } else{ @@ -303,7 +303,7 @@ int CopyLump( bspHeader_t *header, int lump, void *dest, int size ){ } if ( length % size ) { if ( force ) { - Sys_Printf( "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump ); + Sys_FPrintf( SYS_WRN, "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump ); return 0; } else{ diff --git a/tools/urt/tools/quake3/q3map2/convert_ase.c b/tools/urt/tools/quake3/q3map2/convert_ase.c index 0bbb5816..628bec2f 100644 --- a/tools/urt/tools/quake3/q3map2/convert_ase.c +++ b/tools/urt/tools/quake3/q3map2/convert_ase.c @@ -242,7 +242,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){ /* get shader */ si = ShaderInfoForShader( shader->shader ); if ( si == NULL ) { - Sys_Printf( "WARNING: NULL shader in BSP\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: NULL shader in BSP\n" ); return; } diff --git a/tools/urt/tools/quake3/q3map2/decals.c b/tools/urt/tools/quake3/q3map2/decals.c index cd5525c7..64244ca5 100644 --- a/tools/urt/tools/quake3/q3map2/decals.c +++ b/tools/urt/tools/quake3/q3map2/decals.c @@ -337,7 +337,7 @@ static int MakeDecalProjector( shaderInfo_t *si, vec4_t projection, float distan /* limit check */ if ( numProjectors >= MAX_PROJECTORS ) { - Sys_Printf( "WARNING: MAX_PROJECTORS (%d) exceeded, no more decal projectors available.\n", MAX_PROJECTORS ); + Sys_FPrintf( SYS_WRN, "WARNING: MAX_PROJECTORS (%d) exceeded, no more decal projectors available.\n", MAX_PROJECTORS ); return -2; } @@ -431,7 +431,7 @@ void ProcessDecals( void ){ /* any patches? */ if ( e->patches == NULL ) { - Sys_Printf( "WARNING: Decal entity without any patch meshes, ignoring.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Decal entity without any patch meshes, ignoring.\n" ); e->epairs = NULL; /* fixme: leak! */ continue; } @@ -442,7 +442,7 @@ void ProcessDecals( void ){ /* no target? */ if ( e2 == NULL ) { - Sys_Printf( "WARNING: Decal entity without a valid target, ignoring.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Decal entity without a valid target, ignoring.\n" ); continue; } diff --git a/tools/urt/tools/quake3/q3map2/exportents.c b/tools/urt/tools/quake3/q3map2/exportents.c index 578f9e42..b1236608 100644 --- a/tools/urt/tools/quake3/q3map2/exportents.c +++ b/tools/urt/tools/quake3/q3map2/exportents.c @@ -64,7 +64,7 @@ void ExportEntities( void ){ /* sanity check */ if ( bspEntData == NULL || bspEntDataSize == 0 ) { - Sys_Printf( "WARNING: No BSP entity data. aborting...\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP entity data. aborting...\n" ); return; } diff --git a/tools/urt/tools/quake3/q3map2/image.c b/tools/urt/tools/quake3/q3map2/image.c index 891bdc9a..39a19854 100644 --- a/tools/urt/tools/quake3/q3map2/image.c +++ b/tools/urt/tools/quake3/q3map2/image.c @@ -67,13 +67,13 @@ static void LoadDDSBuffer( byte *buffer, int size, byte **pixels, int *width, in /* get dds info */ if ( DDSGetInfo( (ddsBuffer_t*) buffer, &w, &h, &pf ) ) { - Sys_Printf( "WARNING: Invalid DDS texture\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Invalid DDS texture\n" ); return; } /* only certain types of dds textures are supported */ if ( pf != DDS_PF_ARGB8888 && pf != DDS_PF_DXT1 && pf != DDS_PF_DXT3 && pf != DDS_PF_DXT5 ) { - Sys_Printf( "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); + Sys_FPrintf( SYS_WRN, "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); return; } @@ -139,27 +139,27 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in /* determine if this is a png file */ if ( png_sig_cmp( buffer, 0, 8 ) != 0 ) { - Sys_Printf( "WARNING: Invalid PNG file\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Invalid PNG file\n" ); return; } /* create png structs */ png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); if ( png == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG read struct\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG read struct\n" ); return; } info = png_create_info_struct( png ); if ( info == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG info struct\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG info struct\n" ); png_destroy_read_struct( &png, NULL, NULL ); return; } end = png_create_info_struct( png ); if ( end == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG end info struct\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to create PNG end info struct\n" ); png_destroy_read_struct( &png, &info, NULL ); return; } @@ -172,7 +172,7 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in /* set error longjmp */ if ( setjmp( png_jmpbuf(png) ) ) { - Sys_Printf( "WARNING: An error occurred reading PNG image\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: An error occurred reading PNG image\n" ); png_destroy_read_struct( &png, &info, &end ); return; } @@ -402,7 +402,7 @@ image_t *ImageLoad( const char *filename ){ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 ); if ( size > 0 ) { if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) { - Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); + Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); } } else diff --git a/tools/urt/tools/quake3/q3map2/light.c b/tools/urt/tools/quake3/q3map2/light.c index e4cf8aca..41bbc18e 100644 --- a/tools/urt/tools/quake3/q3map2/light.c +++ b/tools/urt/tools/quake3/q3map2/light.c @@ -424,7 +424,7 @@ void CreateEntityLights( void ){ /* get target */ e2 = FindTargetEntity( target ); if ( e2 == NULL ) { - Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n", + Sys_FPrintf( SYS_WRN, "WARNING: light at (%i %i %i) has missing target\n", (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] ); } else @@ -2210,7 +2210,7 @@ int LightMain( int argc, char **argv ){ /* must be a power of 2 and greater than 2 */ if ( ( ( lmCustomSize - 1 ) & lmCustomSize ) || lmCustomSize < 2 ) { - Sys_Printf( "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); lmCustomSize = game->lightmapSize; } i++; @@ -2476,7 +2476,7 @@ int LightMain( int argc, char **argv ){ /* unhandled args */ else{ - Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); } } diff --git a/tools/urt/tools/quake3/q3map2/light_ydnar.c b/tools/urt/tools/quake3/q3map2/light_ydnar.c index 94e26e12..674777d1 100644 --- a/tools/urt/tools/quake3/q3map2/light_ydnar.c +++ b/tools/urt/tools/quake3/q3map2/light_ydnar.c @@ -1783,7 +1783,7 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float //% normal2 = SUPER_NORMAL( x, y ); } else{ - Sys_Printf( "WARNING: Spurious lightmap S vector\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap S vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 0 ] ); @@ -1807,7 +1807,7 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float //% normal2 = SUPER_NORMAL( x, y ); } else{ - Sys_Printf( "WARNING: Spurious lightmap T vector\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap T vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 1 ] ); @@ -2138,7 +2138,7 @@ void IlluminateRawLightmap( int rawLightmapNum ){ /* max of MAX_LIGHTMAPS (4) styles allowed to hit a surface/lightmap */ if ( lightmapNum >= MAX_LIGHTMAPS ) { - Sys_Printf( "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); + Sys_FPrintf( SYS_WRN, "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); continue; } @@ -3621,7 +3621,7 @@ void SetupEnvelopes( qboolean forGrid, qboolean fastFlag ){ for ( i = 0; i < 3; i++ ) { if ( mins[ i ] > light->origin[ i ] || maxs[ i ] < light->origin[ i ] ) { - //% Sys_Printf( "WARNING: Light PVS bounds (%.0f, %.0f, %.0f) -> (%.0f, %.0f, %.0f)\ndo not encompass light %d (%f, %f, %f)\n", + //% Sys_FPrintf( SYS_WRN, "WARNING: Light PVS bounds (%.0f, %.0f, %.0f) -> (%.0f, %.0f, %.0f)\ndo not encompass light %d (%f, %f, %f)\n", //% mins[ 0 ], mins[ 1 ], mins[ 2 ], //% maxs[ 0 ], maxs[ 1 ], maxs[ 2 ], //% numLights, light->origin[ 0 ], light->origin[ 1 ], light->origin[ 2 ] ); diff --git a/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c index ea276d2c..f434cc41 100644 --- a/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c +++ b/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c @@ -125,7 +125,7 @@ void ExportLightmaps( void ){ /* sanity check */ if ( bspLightBytes == NULL ) { - Sys_Printf( "WARNING: No BSP lightmap data\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP lightmap data\n" ); return; } @@ -224,7 +224,7 @@ int ImportLightmapsMain( int argc, char **argv ){ buffer = NULL; len = vfsLoadFile( filename, (void*) &buffer, -1 ); if ( len < 0 ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to load image %s\n", filename ); continue; } @@ -235,11 +235,11 @@ int ImportLightmapsMain( int argc, char **argv ){ /* sanity check it */ if ( pixels == NULL ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to load image %s\n", filename ); continue; } if ( width != game->lightmapSize || height != game->lightmapSize ) { - Sys_Printf( "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", + Sys_FPrintf( SYS_WRN, "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", filename, width, height, game->lightmapSize, game->lightmapSize ); } @@ -786,7 +786,7 @@ qboolean AddSurfaceToRawLightmap( int num, rawLightmap_t *lm ){ /* check for bogus axis */ if ( faxis[ axisNum ] == 0.0f ) { - Sys_Printf( "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); lm->w = lm->h = 0; return qfalse; } @@ -1007,7 +1007,7 @@ void SetupSurfaceLightmaps( void ){ superSample = 1; } else if ( superSample > 8 ) { - Sys_Printf( "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); + Sys_FPrintf( SYS_WRN, "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); superSample = 8; } diff --git a/tools/urt/tools/quake3/q3map2/main.c b/tools/urt/tools/quake3/q3map2/main.c index 4000bd38..924881b9 100644 --- a/tools/urt/tools/quake3/q3map2/main.c +++ b/tools/urt/tools/quake3/q3map2/main.c @@ -601,7 +601,7 @@ int main( int argc, char **argv ){ /* vlight */ else if ( !strcmp( argv[ 1 ], "-vlight" ) ) { - Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); argv[ 1 ] = "-fast"; /* eek a hack */ r = LightMain( argc, argv ); } diff --git a/tools/urt/tools/quake3/q3map2/map.c b/tools/urt/tools/quake3/q3map2/map.c index f087784d..203b0b42 100644 --- a/tools/urt/tools/quake3/q3map2/map.c +++ b/tools/urt/tools/quake3/q3map2/map.c @@ -1239,13 +1239,13 @@ void LoadEntityIndexMap( entity_t *e ){ value = ValueForKey( e, "layers" ); } if ( value[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has missing \"_layers\" or \"layers\" key\n", indexMapFilename ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" has missing \"_layers\" or \"layers\" key\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } numLayers = atoi( value ); if ( numLayers < 1 ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has < 1 layer (%d)\n", indexMapFilename, numLayers ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" has < 1 layer (%d)\n", indexMapFilename, numLayers ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } @@ -1256,7 +1256,7 @@ void LoadEntityIndexMap( entity_t *e ){ value = ValueForKey( e, "shader" ); } if ( value[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has missing \"_shader\" or \"shader\" key\n", indexMapFilename ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" has missing \"_shader\" or \"shader\" key\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } @@ -1315,7 +1315,7 @@ void LoadEntityIndexMap( entity_t *e ){ /* the index map must be at least 2x2 pixels */ if ( w < 2 || h < 2 ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" is smaller than 2x2 pixels\n", indexMapFilename ); + Sys_FPrintf( SYS_WRN, "WARNING: Entity with index/alpha map \"%s\" is smaller than 2x2 pixels\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); free( pixels ); return; @@ -1395,7 +1395,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ /* conformance check */ if ( strcmp( token, "{" ) ) { - Sys_Printf( "WARNING: ParseEntity: { not found, found %s on line %d - last entity was at: <%4.2f, %4.2f, %4.2f>...\n" + Sys_FPrintf( SYS_WRN, "WARNING: ParseEntity: { not found, found %s on line %d - last entity was at: <%4.2f, %4.2f, %4.2f>...\n" "Continuing to process map, but resulting BSP may be invalid.\n", token, scriptline, entities[ numEntities ].origin[ 0 ], entities[ numEntities ].origin[ 1 ], entities[ numEntities ].origin[ 2 ] ); return qfalse; @@ -1421,7 +1421,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ { /* get initial token */ if ( !GetToken( qtrue ) ) { - Sys_Printf( "WARNING: ParseEntity: EOF without closing brace\n" + Sys_FPrintf( SYS_WRN, "WARNING: ParseEntity: EOF without closing brace\n" "Continuing to process map, but resulting BSP may be invalid.\n" ); return qfalse; } @@ -1443,7 +1443,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ } else if ( !strcmp( token, "terrainDef" ) ) { //% ParseTerrain(); - Sys_Printf( "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ + Sys_FPrintf( SYS_WRN, "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ } else if ( !strcmp( token, "brushDef" ) ) { if ( g_bBrushPrimit == BPRIMIT_OLDBRUSHES ) { @@ -1654,7 +1654,7 @@ void LoadMapFile( char *filename, qboolean onlyLights ){ /* get brush counts */ numMapBrushes = CountBrushList( entities[ 0 ].brushes ); if ( (float) c_detail / (float) numMapBrushes < 0.10f && numMapBrushes > 500 ) { - Sys_Printf( "WARNING: Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); } /* emit some statistics */ diff --git a/tools/urt/tools/quake3/q3map2/model.c b/tools/urt/tools/quake3/q3map2/model.c index f4413b4d..9361c65d 100644 --- a/tools/urt/tools/quake3/q3map2/model.c +++ b/tools/urt/tools/quake3/q3map2/model.c @@ -58,11 +58,11 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_WARNING: - Sys_Printf( "WARNING: %s\n", str ); + Sys_FPrintf( SYS_WRN, "WARNING: %s\n", str ); break; case PICO_ERROR: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_ERR, "ERROR: %s\n", str ); break; case PICO_FATAL: @@ -449,7 +449,7 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade { /* overflow hack */ if ( ( nummapplanes + 64 ) >= ( MAX_MAP_PLANES >> 1 ) ) { - Sys_Printf( "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", + Sys_FPrintf( SYS_WRN, "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", MAX_MAP_PLANES, name ); break; } @@ -599,12 +599,12 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade } else { - Sys_Printf( "WARNING: Model %s unable to generate brush - Case 1. %s\n", name,ds->shaderInfo->shader ); + Sys_FPrintf( SYS_WRN, "WARNING: Model %s unable to generate brush - Case 1. %s\n", name,ds->shaderInfo->shader ); } } else { - Sys_Printf( "WARNING: Model %s unable to generate brush - Case 2. %s\n", name,ds->shaderInfo->shader ); + Sys_FPrintf( SYS_WRN, "WARNING: Model %s unable to generate brush - Case 2. %s\n", name,ds->shaderInfo->shader ); } } } @@ -676,7 +676,7 @@ void AddTriangleModels( entity_t *e ){ /* get model name */ model = ValueForKey( e2, "model" ); if ( model[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: misc_model at %i %i %i without a model key\n", + Sys_FPrintf( SYS_WRN, "WARNING: misc_model at %i %i %i without a model key\n", (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] ); continue; } @@ -747,7 +747,7 @@ void AddTriangleModels( entity_t *e ){ /* split the string */ split = strchr( remap->from, ';' ); if ( split == NULL ) { - Sys_Printf( "WARNING: Shader _remap key found in misc_model without a ; character\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Shader _remap key found in misc_model without a ; character\n" ); free( remap ); remap = remap2; continue; diff --git a/tools/urt/tools/quake3/q3map2/portals.c b/tools/urt/tools/quake3/q3map2/portals.c index ff1e9845..c8b5cd27 100644 --- a/tools/urt/tools/quake3/q3map2/portals.c +++ b/tools/urt/tools/quake3/q3map2/portals.c @@ -519,7 +519,7 @@ void MakeTreePortals_r( node_t *node ){ CalcNodeBounds( node ); if ( node->mins[0] >= node->maxs[0] ) { - Sys_Printf( "WARNING: node without a volume\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: node without a volume\n" ); Sys_Printf( "node has %d tiny portals\n", node->tinyportals ); Sys_Printf( "node reference point %1.2f %1.2f %1.2f\n", node->referencepoint[0], node->referencepoint[1], @@ -777,7 +777,7 @@ void FloodAreas_r( node_t *node ){ // note the current area as bounding the portal if ( b->portalareas[ 1 ] != -1 ) { - Sys_Printf( "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); + Sys_FPrintf( SYS_WRN, "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); return; } if ( b->portalareas[ 0 ] != -1 ) { @@ -864,7 +864,7 @@ void CheckAreas_r( node_t *node ){ if ( node->cluster != -1 ) { if ( node->area == -1 ) { - Sys_Printf( "WARNING: cluster %d has area set to -1\n", node->cluster ); + Sys_FPrintf( SYS_WRN, "WARNING: cluster %d has area set to -1\n", node->cluster ); } } if ( node->areaportal ) { @@ -872,7 +872,7 @@ void CheckAreas_r( node_t *node ){ // check if the areaportal touches two areas if ( b->portalareas[0] == -1 || b->portalareas[1] == -1 ) { - Sys_Printf( "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); + Sys_FPrintf( SYS_WRN, "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); } } } diff --git a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj index 8c02e9b4..271053b4 100644 --- a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj +++ b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj @@ -21,29 +21,30 @@ {7AF7537E-94C3-4680-8F5E-C1CE30DC2041} q3map2 + 8.1 Application - v110_xp + v140 false MultiByte Application - v110_xp + v140 false MultiByte Application - v110_xp + v140 false MultiByte Application - v110_xp + v140 false MultiByte @@ -96,7 +97,7 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,10 +116,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) .\Release/q3map2.pdb true .\Release/q3map2.map @@ -145,7 +146,7 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -164,10 +165,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) .\Release/q3map2.pdb true .\Release/q3map2.map @@ -193,7 +194,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -211,10 +212,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) libcd;libcmtd;%(IgnoreSpecificDefaultLibraries) true .\Debug/FS_q3map2_1.pdb @@ -242,7 +243,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebugDLL .\Debug/q3map2.pch @@ -259,10 +260,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) libcd;libcmtd;%(IgnoreSpecificDefaultLibraries) true .\Debug/FS_q3map2_1.pdb diff --git a/tools/urt/tools/quake3/q3map2/shaders.c b/tools/urt/tools/quake3/q3map2/shaders.c index 863a59ef..932c5d07 100644 --- a/tools/urt/tools/quake3/q3map2/shaders.c +++ b/tools/urt/tools/quake3/q3map2/shaders.c @@ -357,7 +357,7 @@ void WriteMapShaderFile( void ){ /* open shader file */ file = fopen( mapShaderFile, "w" ); if ( file == NULL ) { - Sys_Printf( "WARNING: Unable to open map shader file %s for writing\n", mapShaderFile ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to open map shader file %s for writing\n", mapShaderFile ); return; } @@ -754,7 +754,7 @@ static void LoadShaderImages( shaderInfo_t *si ){ if ( si->shaderImage == NULL ) { si->shaderImage = ImageLoad( DEFAULT_IMAGE ); if ( warnImage && strcmp( si->shader, "noshader" ) ) { - Sys_Printf( "WARNING: Couldn't find image for shader %s\n", si->shader ); + Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find image for shader %s\n", si->shader ); } } @@ -813,7 +813,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){ /* dummy check */ if ( shaderName == NULL || shaderName[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Null or empty shader name\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Null or empty shader name\n" ); shaderName = "missing"; } @@ -1046,7 +1046,7 @@ static void ParseShaderFile( const char *filename ){ else if ( !Q_stricmp( token, "surfaceparm" ) ) { GetTokenAppend( shaderText, qfalse ); if ( ApplySurfaceParm( token, &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) { - Sys_Printf( "WARNING: Unknown surfaceparm: \"%s\"\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown surfaceparm: \"%s\"\n", token ); } } @@ -1489,7 +1489,7 @@ static void ParseShaderFile( const char *filename ){ } else { - Sys_Printf( "WARNING: Unknown value for lightmap axis: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown value for lightmap axis: %s\n", token ); VectorClear( si->lightmapAxis ); } } @@ -1504,7 +1504,7 @@ static void ParseShaderFile( const char *filename ){ /* must be a power of 2 */ if ( ( ( si->lmCustomWidth - 1 ) & si->lmCustomWidth ) || ( ( si->lmCustomHeight - 1 ) & si->lmCustomHeight ) ) { - Sys_Printf( "WARNING: Non power-of-two lightmap size specified (%d, %d)\n", + Sys_FPrintf( SYS_WRN, "WARNING: Non power-of-two lightmap size specified (%d, %d)\n", si->lmCustomWidth, si->lmCustomHeight ); si->lmCustomWidth = lmCustomSize; si->lmCustomHeight = lmCustomSize; @@ -1639,7 +1639,7 @@ static void ParseShaderFile( const char *filename ){ } else { - Sys_Printf( "WARNING: Unknown q3map_tcGen method: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_tcGen method: %s\n", token ); VectorClear( si->vecs[ 0 ] ); VectorClear( si->vecs[ 1 ] ); } @@ -1724,7 +1724,7 @@ static void ParseShaderFile( const char *filename ){ /* unknown */ else{ - Sys_Printf( "WARNING: Unknown colorMod method: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown colorMod method: %s\n", token ); } } @@ -1762,7 +1762,7 @@ static void ParseShaderFile( const char *filename ){ TCModRotate( si->mod, a ); } else{ - Sys_Printf( "WARNING: Unknown q3map_tcMod method: %s\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_tcMod method: %s\n", token ); } } @@ -1852,7 +1852,7 @@ static void ParseShaderFile( const char *filename ){ GetTokenAppend( shaderText, qfalse ); sprintf( temp, "*mat_%s", token ); if ( ApplySurfaceParm( temp, &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) { - Sys_Printf( "WARNING: Unknown material \"%s\"\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown material \"%s\"\n", token ); } } @@ -1875,7 +1875,7 @@ static void ParseShaderFile( const char *filename ){ { Sys_FPrintf( SYS_VRB, "Attempting to match %s with a known surfaceparm\n", token ); if ( ApplySurfaceParm( &token[ 6 ], &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) { - Sys_Printf( "WARNING: Unknown q3map_* directive \"%s\"\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_* directive \"%s\"\n", token ); } } #endif @@ -1938,7 +1938,7 @@ static void ParseCustomInfoParms( void ){ /* any content? */ if ( !parsedContent ) { - Sys_Printf( "WARNING: Couldn't find valid custom contentsflag section\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find valid custom contentsflag section\n" ); return; } @@ -1964,7 +1964,7 @@ static void ParseCustomInfoParms( void ){ /* any content? */ if ( !parsedContent ) { - Sys_Printf( "WARNING: Couldn't find valid custom surfaceflag section\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find valid custom surfaceflag section\n" ); } } diff --git a/tools/urt/tools/quake3/q3map2/surface.c b/tools/urt/tools/quake3/q3map2/surface.c index 32a5a9b8..2aec087b 100644 --- a/tools/urt/tools/quake3/q3map2/surface.c +++ b/tools/urt/tools/quake3/q3map2/surface.c @@ -568,7 +568,7 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){ if ( fabs( dist ) > PLANAR_EPSILON ) { //% if( ds->planeNum >= 0 ) //% { - //% Sys_Printf( "WARNING: Planar surface marked unplanar (%f > %f)\n", fabs( dist ), PLANAR_EPSILON ); + //% Sys_FPrintf( SYS_WRN, "WARNING: Planar surface marked unplanar (%f > %f)\n", fabs( dist ), PLANAR_EPSILON ); //% ds->verts[ i ].color[ 0 ][ 0 ] = ds->verts[ i ].color[ 0 ][ 2 ] = 0; //% } ds->planar = qfalse; @@ -589,7 +589,7 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){ ds->planeNum = -1; VectorClear( ds->lightmapVecs[ 2 ] ); //% if( ds->type == SURF_META || ds->type == SURF_FACE ) - //% Sys_Printf( "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); + //% Sys_FPrintf( SYS_WRN, "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); } /* ----------------------------------------------------------------- @@ -2450,7 +2450,7 @@ void EmitDrawIndexes( mapDrawSurface_t *ds, bspDrawSurface_t *out ){ /* validate the index */ if ( ds->type != SURFACE_PATCH ) { if ( bspDrawIndexes[ numBSPDrawIndexes ] < 0 || bspDrawIndexes[ numBSPDrawIndexes ] >= ds->numVerts ) { - Sys_Printf( "WARNING: %d %s has invalid index %d (%d)\n", + Sys_FPrintf( SYS_WRN, "WARNING: %d %s has invalid index %d (%d)\n", numBSPDrawSurfaces, ds->shaderInfo->shader, bspDrawIndexes[ numBSPDrawIndexes ], @@ -3671,7 +3671,7 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree ){ bspDrawSurface_t *out; out = &bspDrawSurfaces[ numBSPDrawSurfaces - 1 ]; if ( out->numVerts == 3 && out->numIndexes > 3 ) { - Sys_Printf( "\nWARNING: Potentially bad %s surface (%d: %d, %d)\n %s\n", + Sys_FPrintf( SYS_WRN, "WARNING: Potentially bad %s surface (%d: %d, %d)\n %s\n", surfaceTypes[ ds->type ], numBSPDrawSurfaces - 1, out->numVerts, out->numIndexes, si->shader ); } diff --git a/tools/urt/tools/quake3/q3map2/surface_extra.c b/tools/urt/tools/quake3/q3map2/surface_extra.c index 81c195e4..c86058c6 100644 --- a/tools/urt/tools/quake3/q3map2/surface_extra.c +++ b/tools/urt/tools/quake3/q3map2/surface_extra.c @@ -340,7 +340,7 @@ void LoadSurfaceExtraFile( const char *path ){ Sys_Printf( "Loading %s\n", srfPath ); size = LoadFile( srfPath, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to find surface file %s, using defaults.\n", srfPath ); + Sys_FPrintf( SYS_WRN, "WARNING: Unable to find surface file %s, using defaults.\n", srfPath ); return; } diff --git a/tools/urt/tools/quake3/q3map2/surface_meta.c b/tools/urt/tools/quake3/q3map2/surface_meta.c index 21a65146..eee5612d 100644 --- a/tools/urt/tools/quake3/q3map2/surface_meta.c +++ b/tools/urt/tools/quake3/q3map2/surface_meta.c @@ -1365,7 +1365,7 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri, ( bi == ds->indexes[ i ] && ci == ds->indexes[ i + 2 ] && ai == ds->indexes[ i + 1 ] ) || ( ci == ds->indexes[ i ] && ai == ds->indexes[ i + 2 ] && bi == ds->indexes[ i + 1 ] ) ) { /* warn about it */ - Sys_Printf( "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n", + Sys_FPrintf( SYS_WRN, "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n", ds->verts[ ai ].xyz[ 0 ], ds->verts[ ai ].xyz[ 1 ], ds->verts[ ai ].xyz[ 2 ], ds->verts[ bi ].xyz[ 0 ], ds->verts[ bi ].xyz[ 1 ], ds->verts[ bi ].xyz[ 2 ], ds->verts[ ci ].xyz[ 0 ], ds->verts[ ci ].xyz[ 1 ], ds->verts[ ci ].xyz[ 2 ] ); diff --git a/tools/urt/tools/quake3/q3map2/vis.c b/tools/urt/tools/quake3/q3map2/vis.c index adbefa4b..73420f59 100644 --- a/tools/urt/tools/quake3/q3map2/vis.c +++ b/tools/urt/tools/quake3/q3map2/vis.c @@ -203,7 +203,7 @@ void ClusterMerge( int leafnum ){ numvis = LeafVectorFromPortalVector( portalvector, uncompressed ); // if (uncompressed[leafnum>>3] & (1<<(leafnum&7))) -// Sys_Printf ("WARNING: Leaf portals saw into leaf\n"); +// Sys_FPrintf( SYS_WRN, "WARNING: Leaf portals saw into leaf\n"); // uncompressed[leafnum>>3] |= (1<<(leafnum&7)); @@ -1119,7 +1119,7 @@ int VisMain( int argc, char **argv ){ } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/urt/tools/quake3/q3map2/writebsp.c b/tools/urt/tools/quake3/q3map2/writebsp.c index 47758f5c..988055d8 100644 --- a/tools/urt/tools/quake3/q3map2/writebsp.c +++ b/tools/urt/tools/quake3/q3map2/writebsp.c @@ -165,7 +165,7 @@ void EmitLeaf( node_t *node ){ { /* something is corrupting brushes */ if ( (int) b < 256 ) { - Sys_Printf( "WARNING: Node brush list corrupted (0x%08X)\n", b ); + Sys_FPrintf( SYS_WRN, "WARNING: Node brush list corrupted (0x%08X)\n", b ); break; } //% if( b->guard != 0xDEADBEEF )