Merge commit '37bef590b1d2161b16b2bd33349fc8b56af60920' into master-merge

diff --git a/Makefile b/Makefile
index 29471bdefd3dd6964fa350a88863c40977da6541..e66cd7f2f37985519d84678d0c6b31c80dd3e882 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ MAKEFILE_CONF      ?= Makefile.conf
 # user customizable stuf
 # you may override this in Makefile.conf or the environment
 BUILD              ?= debug
-# or: release, or: extradebug, or: profile, or: debug
+# or: release, or: debug, or: extradebug, or: profile, or: native
 OS                 ?= $(shell uname)
 # or: Linux, Win32, Darwin
 LDFLAGS            ?=

diff --git a/contrib/bobtoolz/visfind.cpp b/contrib/bobtoolz/visfind.cpp
index 629c163336688a4b1ca5808e84a0f7eef5617801..33aa5bc881b69d032584244de5cf23755c48320c 100644 (file)
--- a/contrib/bobtoolz/visfind.cpp
+++ b/contrib/bobtoolz/visfind.cpp
@@ -209,7 +209,7 @@ std::list<DWinding*> *CreateTrace( dleaf_t *leaf, int c, vis_header *header, byt
                }
        }
 
-       delete repeatlist;
+       delete [] repeatlist;
 
        return pointlist;
 }

diff --git a/libs/os/file.h b/libs/os/file.h
index 144627e65a9dcea34a7ad9adf8a03aef9a613d9d..252085c2b8013628ecbcbd541ed47373410827d6 100644 (file)
--- a/libs/os/file.h
+++ b/libs/os/file.h
@@ -30,6 +30,19 @@
 #if GDEF_OS_WINDOWS
 #define S_ISDIR( mode ) ( mode & _S_IFDIR )
 #include <io.h> // _access()
+
+#ifndef F_OK
+#define F_OK 0x00
+#endif
+
+#ifndef W_OK
+#define W_OK 0x02
+#endif
+
+#ifndef R_OK
+#define R_OK 0x04
+#endif
+
 #define access( path, mode ) _access( path, mode )
 #else
 #include <unistd.h> // access()

diff --git a/libs/picomodel/picointernal.c b/libs/picomodel/picointernal.c
index 0a8597f840416e107c87b2653da4e2765a561c0e..54866de101522a7440d3952a0b8cea1f22011a67 100644 (file)
--- a/libs/picomodel/picointernal.c
+++ b/libs/picomodel/picointernal.c
@@ -602,12 +602,12 @@ int _pico_nofname( const char *path, char *dest, int destSize ){
  *  string otherwise. given 'path' is not altered. -sea
  */
 const char *_pico_nopath( const char *path ){
-       const char *src;
-       src = path + ( strlen( path ) - 1 );
-
        if ( path == NULL ) {
                return "";
        }
+       const char *src;
+       src = path + ( strlen( path ) - 1 );
+
        if ( !strchr( path,'/' ) && !strchr( path,'\\' ) ) {
                return ( path );
        }

diff --git a/libs/render.h b/libs/render.h
index d568edb386216a826a823d6d6799cf24ce45ec83..b2e6c5e92da32472977e1a439845d3b4deea3350 100644 (file)
--- a/libs/render.h
+++ b/libs/render.h
@@ -84,7 +84,7 @@ void insert( RenderIndex index ){
        m_data.push_back( index );
 }
 void swap( IndexBuffer& other ){
-       std::swap( m_data, m_data );
+       std::swap( m_data, other.m_data );
 }
 };
 

diff --git a/plugins/entity/doom3group.cpp b/plugins/entity/doom3group.cpp
index ceb19b0b876055350f306b2989fcf0efe567bcac..b3daa405a8320077de5f72b10cbd5c40017111b1 100644 (file)
--- a/plugins/entity/doom3group.cpp
+++ b/plugins/entity/doom3group.cpp
@@ -91,8 +91,8 @@ NameKeys m_nameKeys;
 TraversableObserverPairRelay m_traverseObservers;
 Doom3GroupOrigin m_funcStaticOrigin;
 RenderablePivot m_renderOrigin;
-RenderableNamedEntity m_renderName;
 mutable Vector3 m_name_origin;
+RenderableNamedEntity m_renderName;
 ModelSkinKey m_skin;
 
 public:
@@ -259,8 +259,8 @@ Doom3Group( EntityClass* eclass, scene::Node& node, const Callback<void()>& tran
        m_named( m_entity ),
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_origin ),
-       m_renderName( m_named, m_name_origin ),
        m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_skin( SkinChangedCaller( *this ) ),
        m_curveNURBS( boundsChanged ),
        m_curveCatmullRom( boundsChanged ),
@@ -278,7 +278,8 @@ Doom3Group( const Doom3Group& other, scene::Node& node, const Callback<void()>&
        m_named( m_entity ),
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_origin ),
-       m_renderName( m_named, g_vector3_identity ),
+       m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_skin( SkinChangedCaller( *this ) ),
        m_curveNURBS( boundsChanged ),
        m_curveCatmullRom( boundsChanged ),

diff --git a/plugins/entity/group.cpp b/plugins/entity/group.cpp
index bad7fc54e793b102a8bcd2caae1f6bd896497b9d..b2c01e9f1f3496d96509c81c4c87968e3023cf12 100644 (file)
--- a/plugins/entity/group.cpp
+++ b/plugins/entity/group.cpp
@@ -63,8 +63,8 @@ NameKeys m_nameKeys;
 OriginKey m_originKey;
 Vector3 m_origin;
 
-RenderableNamedEntity m_renderName;
 mutable Vector3 m_name_origin;
+RenderableNamedEntity m_renderName;
 
 Callback<void()> m_transformChanged;
 Callback<void()> m_evaluateTransform;
@@ -83,8 +83,8 @@ Group( EntityClass* eclass, scene::Node& node, const Callback<void()>& transform
        m_nameKeys( m_entity ),
        m_originKey( OriginChangedCaller( *this ) ),
        m_origin( ORIGINKEY_IDENTITY ),
-       m_renderName( m_named, m_name_origin ),
        m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_transformChanged( transformChanged ),
        m_evaluateTransform( evaluateTransform ){
        construct();
@@ -96,7 +96,8 @@ Group( const Group& other, scene::Node& node, const Callback<void()>& transformC
        m_nameKeys( m_entity ),
        m_originKey( OriginChangedCaller( *this ) ),
        m_origin( ORIGINKEY_IDENTITY ),
-       m_renderName( m_named, g_vector3_identity ),
+       m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_transformChanged( transformChanged ),
        m_evaluateTransform( evaluateTransform ){
        construct();

diff --git a/plugins/entity/light.cpp b/plugins/entity/light.cpp
index 65ac614e25ad1aa3b6bb8dfd457f084cda3b0331..890d2e8cd33e49e58a0d660bf0f47063750da519 100644 (file)
--- a/plugins/entity/light.cpp
+++ b/plugins/entity/light.cpp
@@ -655,11 +655,11 @@ void render( RenderStateFlags state ) const {
        aabb_draw_wire( points );
 }
 };
-
+/*
 inline void default_extents( Vector3& extents ){
        extents = Vector3( 12, 12, 12 );
 }
-
+*/
 class ShaderRef
 {
 CopiedString m_name;
@@ -773,6 +773,8 @@ Doom3GroupOrigin m_funcStaticOrigin;
 LightRadii m_radii;
 Doom3LightRadius m_doom3Radius;
 
+AABB m_aabb_light;
+
 RenderLightRadiiWire m_radii_wire;
 RenderLightRadiiFill m_radii_fill;
 RenderLightRadiiBox m_radii_box;
@@ -805,16 +807,14 @@ RenderLightProjection m_renderProjection;
 
 LightShader m_shader;
 
-AABB m_aabb_light;
-
 Callback<void()> m_transformChanged;
 Callback<void()> m_boundsChanged;
 Callback<void()> m_evaluateTransform;
 
 void construct(){
        default_rotation( m_rotation );
-       m_aabb_light.origin = Vector3( 0, 0, 0 );
-       default_extents( m_aabb_light.extents );
+       //m_aabb_light.origin = Vector3( 0, 0, 0 );
+       //default_extents( m_aabb_light.extents );
 
        m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );
        m_keyObservers.insert( Static<KeyIsName>::instance().m_nameKey, NamedEntity::IdentifierChangedCaller( m_named ) );
@@ -982,6 +982,7 @@ Light( EntityClass* eclass, scene::Node& node, const Callback<void()>& transform
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_originKey.m_origin ),
        m_doom3Radius( EntityClass_valueForKey( m_entity.getEntityClass(), "light_radius" ) ),
+       m_aabb_light( Vector3( 0, 0, 0 ), Vector3( 12, 12, 12 ) ),
        m_radii_wire( m_radii, m_aabb_light.origin ),
        m_radii_fill( m_radii, m_aabb_light.origin ),
        m_radii_box( m_aabb_light.origin ),
@@ -1005,6 +1006,7 @@ Light( const Light& other, scene::Node& node, const Callback<void()>& transformC
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_originKey.m_origin ),
        m_doom3Radius( EntityClass_valueForKey( m_entity.getEntityClass(), "light_radius" ) ),
+       m_aabb_light( Vector3( 0, 0, 0 ), Vector3( 12, 12, 12 ) ),
        m_radii_wire( m_radii, m_aabb_light.origin ),
        m_radii_fill( m_radii, m_aabb_light.origin ),
        m_radii_box( m_aabb_light.origin ),

diff --git a/radiant/console.cpp b/radiant/console.cpp
index abb1def4655cb9fcb0c62ad3afbfdc2236dae0b7..489f8d61f4773dcae99d991ffab2c7d6d7236ed8 100644 (file)
--- a/radiant/console.cpp
+++ b/radiant/console.cpp
@@ -140,6 +140,9 @@ ui::Widget Console_constructWindow( ui::Window toplevel ){
        return scr;
 }
 
+//#pragma GCC push_options
+//#pragma GCC optimize ("O0")
+
 class GtkTextBufferOutputStream : public TextOutputStream
 {
 GtkTextBuffer* textBuffer;
@@ -148,72 +151,74 @@ GtkTextTag* tag;
 public:
 GtkTextBufferOutputStream( GtkTextBuffer* textBuffer, GtkTextIter* iter, GtkTextTag* tag ) : textBuffer( textBuffer ), iter( iter ), tag( tag ){
 }
-std::size_t write( const char* buffer, std::size_t length ){
+std::size_t __attribute__((optimize("O0"))) write( const char* buffer, std::size_t length ){
        gtk_text_buffer_insert_with_tags( textBuffer, iter, buffer, gint( length ), tag, NULL );
        return length;
 }
 };
 
+//#pragma GCC pop_options
+
 // This function is meant to be used with gtk_idle_add. It will free its argument.
 static gboolean Gtk_Idle_Print( gpointer data ){
        Gtk_Idle_Print_Data *args = reinterpret_cast<Gtk_Idle_Print_Data *>(data);
        g_assert(g_console);
 
-       auto buffer = gtk_text_view_get_buffer( g_console );
+                       auto buffer = gtk_text_view_get_buffer( g_console );
 
-       GtkTextIter iter;
-       gtk_text_buffer_get_end_iter( buffer, &iter );
+                       GtkTextIter iter;
+                       gtk_text_buffer_get_end_iter( buffer, &iter );
 
-       static auto end = gtk_text_buffer_create_mark( buffer, "end", &iter, FALSE );
+                       static auto end = gtk_text_buffer_create_mark( buffer, "end", &iter, FALSE );
 
-       const GdkColor yellow = { 0, 0xb0ff, 0xb0ff, 0x0000 };
-       const GdkColor red = { 0, 0xffff, 0x0000, 0x0000 };
+                       const GdkColor yellow = { 0, 0xb0ff, 0xb0ff, 0x0000 };
+                       const GdkColor red = { 0, 0xffff, 0x0000, 0x0000 };
 
-       static auto error_tag = gtk_text_buffer_create_tag( buffer, "red_foreground", "foreground-gdk", &red, NULL );
-       static auto warning_tag = gtk_text_buffer_create_tag( buffer, "yellow_foreground", "foreground-gdk", &yellow, NULL );
-       static auto standard_tag = gtk_text_buffer_create_tag( buffer, "black_foreground", NULL );
-       GtkTextTag* tag;
+                       static auto error_tag = gtk_text_buffer_create_tag( buffer, "red_foreground", "foreground-gdk", &red, NULL );
+                       static auto warning_tag = gtk_text_buffer_create_tag( buffer, "yellow_foreground", "foreground-gdk", &yellow, NULL );
+                       static auto standard_tag = gtk_text_buffer_create_tag( buffer, "black_foreground", NULL );
+                       GtkTextTag* tag;
        switch ( args->level )
-       {
-       case SYS_WRN:
-               tag = warning_tag;
-               break;
-       case SYS_ERR:
-               tag = error_tag;
-               break;
-       case SYS_STD:
-       case SYS_VRB:
-       default:
-               tag = standard_tag;
-               break;
-       }
-
-       {
-               GtkTextBufferOutputStream textBuffer( buffer, &iter, tag );
-               if ( !globalCharacterSet().isUTF8() ) {
-                       BufferedTextOutputStream<GtkTextBufferOutputStream> buffered( textBuffer );
+                       {
+                       case SYS_WRN:
+                               tag = warning_tag;
+                               break;
+                       case SYS_ERR:
+                               tag = error_tag;
+                               break;
+                       case SYS_STD:
+                       case SYS_VRB:
+                       default:
+                               tag = standard_tag;
+                               break;
+                       }
+
+                       {
+                               GtkTextBufferOutputStream textBuffer( buffer, &iter, tag );
+                               if ( !globalCharacterSet().isUTF8() ) {
+                                       BufferedTextOutputStream<GtkTextBufferOutputStream> buffered( textBuffer );
                        buffered << StringRange( args->buf, args->buf + args->length );
-               }
-               else
-               {
+                               }
+                               else
+                               {
                        textBuffer << StringRange( args->buf, args->buf + args->length );
-               }
-       }
+                               }
+                       }
 
-       // update console widget immediatly if we're doing something time-consuming
+                       // update console widget immediatly if we're doing something time-consuming
        if ( args->contains_newline ) {
-               gtk_text_view_scroll_mark_onscreen( g_console, end );
+                               gtk_text_view_scroll_mark_onscreen( g_console, end );
 
-               if ( !ScreenUpdates_Enabled() && gtk_widget_get_realized( g_console ) ) {
-                       ScreenUpdates_process();
-               }
-       }
+                               if ( !ScreenUpdates_Enabled() && gtk_widget_get_realized( g_console ) ) {
+                                       ScreenUpdates_process();
+                               }
+                       }
 
        free( args->buf );
        free( args );
 
        return FALSE; // call this once, not repeatedly
-}
+               }
 
 // Print logs to the in-game console and/or to the log file.
 // This function is thread safe.

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 41e9461e5046007f29658be29691819f54c46c9b..7d9057b1cedc56174fcbccf870d34d6844d99e7c 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
@@ -261,7 +261,7 @@ void HomePaths_Realise(){
                        if ( shfolder ) {
                                FreeLibrary( shfolder );
                        }
-                       if ( SHGetFolderPath( NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir ) ) {
+                       if ( SUCCEEDED( SHGetFolderPath( NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir ) ) ) {
                                path.clear();
                                path << DirectoryCleaned( mydocsdir ) << "My Games/" << ( prefix + 1 ) << "/";
                                // win32: only add it if it already exists

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 30758606c0ce174a93f8dd4a312536e3b871e9f0..a689f71c63f11f2b9497ca2e605f05a7b6a6dc9b 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
@@ -107,7 +107,7 @@ CGameDescription::CGameDescription( xmlDocPtr pDoc, const CopiedString& gameFile
        // read the user-friendly game name
        xmlNodePtr pNode = pDoc->children;
 
-       while ( strcmp( (const char*)pNode->name, "game" ) && pNode != 0 )
+       while ( pNode != 0 && strcmp( (const char*)pNode->name, "game" ) )
        {
                pNode = pNode->next;
        }

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 75ce075616d11fd680908eb8963155cf99ae282e..34a31b1efb008b84d9d77aba657a7b3fe955d8a9 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1758,6 +1758,7 @@ void TextureBrowser_constructTreeStore(){
        TextureGroups groups = TextureGroups_constructTreeView();
        auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING ));
        TextureGroups_constructTreeModel( groups, store );
+       std::set<CopiedString>::iterator iter;
 
        gtk_tree_view_set_model(GlobalTextureBrowser().m_treeViewTree, store);
 
@@ -1765,7 +1766,7 @@ void TextureBrowser_constructTreeStore(){
 }
 
 void TextureBrowser_constructTreeStoreTags(){
-       TextureGroups groups;
+       //TextureGroups groups;
        TextureBrowser &textureBrowser = GlobalTextureBrowser();
        auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING ));
        auto model = GlobalTextureBrowser().m_all_tags_list;

diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index 9754831701be404ed3dbbaa139cc326a644c6958..33fbdfd5e7f68ff108525b2dddd583841ae65032 100644 (file)
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -211,6 +211,7 @@ void BuildMonitor_Construct(){
 
 void BuildMonitor_Destroy(){
        delete g_pWatchBSP;
+       g_pWatchBSP = NULL;
 }
 
 CWatchBSP *GetWatchBSP(){

diff --git a/tools/heretic2/common/cmdlib.c b/tools/heretic2/common/cmdlib.c
index 244452272c09a2e81c2ab024db56e89ef327db4a..9852623b02176d7e6ba0dca593febd90ec38bdac 100644 (file)
--- a/tools/heretic2/common/cmdlib.c
+++ b/tools/heretic2/common/cmdlib.c
@@ -889,7 +889,7 @@ int ParseNum( const char *str ){
    // all output ends up through here
    void FPrintf (int flag, char *buf)
    {
-   printf(buf);
+   printf( "%s", buf );
 
    }
 

diff --git a/tools/quake2/qdata/images.c b/tools/quake2/qdata/images.c
index 00f30e05701dd2389ed641576cb42f04d1e19c23..6a50cdb717537d116ad41b0b31ccdcdc67b2c40e 100644 (file)
--- a/tools/quake2/qdata/images.c
+++ b/tools/quake2/qdata/images.c
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright (C) 1999-2007 id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
@@ -692,7 +692,7 @@ void Cmd_Mipdir( void ){
        GetToken( false );
        strcpy( mip_prefix, token );
        // create the directory if needed
-       sprintf( filename, "%stextures", gamedir, mip_prefix );
+       sprintf( filename, "%stextures", gamedir );
        Q_mkdir( filename );
        sprintf( filename, "%stextures/%s", gamedir, mip_prefix );
        Q_mkdir( filename );

diff --git a/tools/quake2/qdata/video.c b/tools/quake2/qdata/video.c
index b6fe51173cb3a3121c8fd5c6a1cb472ddebd8be2..500ac1f960744b523d91f45e8678eea8aac66a10 100644 (file)
--- a/tools/quake2/qdata/video.c
+++ b/tools/quake2/qdata/video.c
@@ -1194,7 +1194,7 @@ void Cmd_Video( void ){
        // build the dictionary
        for ( frame = startframe ;  ; frame++ )
        {
-               printf( "counting ", frame );
+               printf( "counting %i", frame );
                in = LoadFrame( base, frame, digits, &palette );
                if ( !in.data ) {
                        break;
@@ -1213,7 +1213,7 @@ void Cmd_Video( void ){
        // compress it with the dictionary
        for ( frame = startframe ;  ; frame++ )
        {
-               printf( "packing ", frame );
+               printf( "packing %i", frame );
                in = LoadFrame( base, frame, digits, &palette );
                if ( !in.data ) {
                        break;

diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.c
index 5ade8802ca7eac347f2ebe14f81c85b36c89802c..1a7c6b8a0be3ff655c8437074dba4fde9d7280c9 100644 (file)
--- a/tools/quake3/common/inout.c
+++ b/tools/quake3/common/inout.c
@@ -72,7 +72,7 @@ xmlNodePtr xml_NodeForVec( vec3_t v ){
 
        sprintf( buf, "%f %f %f", v[0], v[1], v[2] );
        ret = xmlNewNode( NULL, (xmlChar*)"point" );
-       xmlNodeSetContent( ret, (xmlChar*)buf );
+       xmlNodeAddContent( ret, (xmlChar*)buf );
        return ret;
 }
 
@@ -150,14 +150,14 @@ void xml_Select( char *msg, int entitynum, int brushnum, qboolean bError ){
        // now build a proper "select" XML node
        sprintf( buf, "Entity %i, Brush %i: %s", entitynum, brushnum, msg );
        node = xmlNewNode( NULL, (xmlChar*)"select" );
-       xmlNodeSetContent( node, (xmlChar*)buf );
+       xmlNodeAddContent( node, (xmlChar*)buf );
        level[0] = (int)'0' + ( bError ? SYS_ERR : SYS_WRN )  ;
        level[1] = 0;
        xmlSetProp( node, (xmlChar*)"level", (xmlChar*)&level );
        // a 'select' information
        sprintf( buf, "%i %i", entitynum, brushnum );
        select = xmlNewNode( NULL, (xmlChar*)"brush" );
-       xmlNodeSetContent( select, (xmlChar*)buf );
+       xmlNodeAddContent( select, (xmlChar*)buf );
        xmlAddChild( node, select );
        xml_SendNode( node );
 
@@ -177,14 +177,14 @@ void xml_Point( char *msg, vec3_t pt ){
        char level[2];
 
        node = xmlNewNode( NULL, (xmlChar*)"pointmsg" );
-       xmlNodeSetContent( node, (xmlChar*)msg );
+       xmlNodeAddContent( node, (xmlChar*)msg );
        level[0] = (int)'0' + SYS_ERR;
        level[1] = 0;
        xmlSetProp( node, (xmlChar*)"level", (xmlChar *)&level );
        // a 'point' node
        sprintf( buf, "%g %g %g", pt[0], pt[1], pt[2] );
        point = xmlNewNode( NULL, (xmlChar*)"point" );
-       xmlNodeSetContent( point, (xmlChar*)buf );
+       xmlNodeAddContent( point, (xmlChar*)buf );
        xmlAddChild( node, point );
        xml_SendNode( node );
 
@@ -201,7 +201,7 @@ void xml_Winding( char *msg, vec3_t p[], int numpoints, qboolean die ){
        int i;
 
        node = xmlNewNode( NULL, (xmlChar*)"windingmsg" );
-       xmlNodeSetContent( node, (xmlChar*)msg );
+       xmlNodeAddContent( node, (xmlChar*)msg );
        level[0] = (int)'0' + SYS_ERR;
        level[1] = 0;
        xmlSetProp( node, (xmlChar*)"level", (xmlChar *)&level );
@@ -218,7 +218,7 @@ void xml_Winding( char *msg, vec3_t p[], int numpoints, qboolean die ){
        }
 
        winding = xmlNewNode( NULL, (xmlChar*)"winding" );
-       xmlNodeSetContent( winding, (xmlChar*)buf );
+       xmlNodeAddContent( winding, (xmlChar*)buf );
        xmlAddChild( node, winding );
        xml_SendNode( node );
 
@@ -289,7 +289,7 @@ void FPrintf( int flag, char *buf ){
        node = xmlNewNode( NULL, (xmlChar*)"message" );
        {
                gchar* utf8 = g_locale_to_utf8( buf, -1, NULL, NULL, NULL );
-               xmlNodeSetContent( node, (xmlChar*)utf8 );
+               xmlNodeAddContent( node, (xmlChar*)utf8 );
                g_free( utf8 );
        }
        level[0] = (int)'0' + flag;

diff --git a/tools/quake3/common/vfs.h b/tools/quake3/common/vfs.h
index 14d6b4a6a06c8983b4a5c26aa1996d99a20fc1fe..15dd5e3b41f427965ed6a425ab6041904c870c92 100644 (file)
--- a/tools/quake3/common/vfs.h
+++ b/tools/quake3/common/vfs.h
@@ -39,6 +39,11 @@
 #if GDEF_OS_WINDOWS
 #include <wtypes.h>
 #include <io.h>
+
+#ifndef R_OK
+#define R_OK 04
+#endif
+
 #define S_ISDIR( mode ) ( mode & _S_IFDIR )
 #else // !GDEF_OS_WINDOWS
 #include <dirent.h>

diff --git a/tools/quake3/q3map2/fog.c b/tools/quake3/q3map2/fog.c
index 900e0cb8eb568b01819829942731cf2d2c85c2bc..5b2ca6f79483de33db476d6986f057ed07fffa3d 100644 (file)
--- a/tools/quake3/q3map2/fog.c
+++ b/tools/quake3/q3map2/fog.c
@@ -712,7 +712,7 @@ int FogForBounds( vec3_t mins, vec3_t maxs, float epsilon ){
  */
 
 void CreateMapFogs( void ){
-       int i;
+       int i, j;
        entity_t    *entity;
        brush_t     *brush;
        fog_t       *fog;
@@ -759,10 +759,10 @@ void CreateMapFogs( void ){
                                VectorScale( fog->si->fogDir, -1.0f, invFogDir );
 
                                /* find the brush side */
-                               for ( i = 0; i < brush->numsides; i++ )
+                               for ( j = 0; j < brush->numsides; j++ )
                                {
-                                       if ( VectorCompare( invFogDir, mapplanes[ brush->sides[ i ].planenum ].normal ) ) {
-                                               fog->visibleSide = i;
+                                       if ( VectorCompare( invFogDir, mapplanes[ brush->sides[ j ].planenum ].normal ) ) {
+                                               fog->visibleSide = j;
                                                //%     Sys_Printf( "Brush num: %d Side num: %d\n", fog->brushNum, fog->visibleSide );
                                                break;
                                        }

diff --git a/tools/quake3/q3map2/light_bounce.c b/tools/quake3/q3map2/light_bounce.c
index 7858116d84a41a71ed58a26f100a2101f0f97b8e..e738429008fbb6362e93ddf9e194419b14fd3e91 100644 (file)
--- a/tools/quake3/q3map2/light_bounce.c
+++ b/tools/quake3/q3map2/light_bounce.c
@@ -586,7 +586,7 @@ static void RadSubdivideDiffuseLight( int lightmapNum, bspDrawSurface_t *ds, raw
                VectorMA( light->origin, 1.0f, light->normal, light->origin );
                light->dist = DotProduct( light->origin, normal );
 
-               /* optionally create a point splashsplash light for first pass */
+               /* optionally create a point backsplash light for first pass */
                if ( original && si->backsplashFraction > 0 ) {
                        /* allocate a new point light */
                        splash = safe_malloc0( sizeof( *splash ) );

diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c
index aa71f82696ea053be8900fa8a2b5da80b535fba0..c024dd3eb39fe4597f88b2c7b45b16d507ae0e46 100644 (file)
--- a/tools/quake3/q3map2/light_ydnar.c
+++ b/tools/quake3/q3map2/light_ydnar.c
@@ -1828,7 +1828,7 @@ static void SubsampleRawLuxel_r( rawLightmap_t *lm, trace_t *trace, vec3_t sampl
        int b, samples, mapped, lighted;
        int cluster[ 4 ];
        vec4_t luxel[ 4 ];
-       vec3_t deluxel[ 3 ];
+       vec3_t deluxel[ 4 ];
        vec3_t origin[ 4 ], normal[ 4 ];
        float biasDirs[ 4 ][ 2 ] = { { -1.0f, -1.0f }, { 1.0f, -1.0f }, { -1.0f, 1.0f }, { 1.0f, 1.0f } };
        vec3_t color, direction = { 0, 0, 0 }, total;
@@ -3172,7 +3172,6 @@ void IlluminateVertexes( int num ){
 void SetupBrushesFlags( unsigned int mask_any, unsigned int test_any, unsigned int mask_all, unsigned int test_all ){
        int i, j, b;
        unsigned int compileFlags, allCompileFlags;
-       qboolean inside;
        bspBrush_t      *brush;
        bspBrushSide_t  *side;
        bspShader_t     *shader;
@@ -3199,10 +3198,9 @@ void SetupBrushesFlags( unsigned int mask_any, unsigned int test_any, unsigned i
                brush = &bspBrushes[ b ];
 
                /* check all sides */
-               inside = qtrue;
                compileFlags = 0;
                allCompileFlags = ~( 0u );
-               for ( j = 0; j < brush->numSides && inside; j++ )
+               for ( j = 0; j < brush->numSides; j++ )
                {
                        /* do bsp shader calculations */
                        side = &bspBrushSides[ brush->firstSide + j ];

diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c
index 1f2fa613838d9ed18502723fa7355a39707940b4..77765fe4ed8a63243b9c71f3895f1544c27c8848 100644 (file)
--- a/tools/quake3/q3map2/surface.c
+++ b/tools/quake3/q3map2/surface.c
@@ -82,7 +82,7 @@ void FinishSurface( mapDrawSurface_t *ds ){
 
 
        /* dummy check */
-       if ( ds->type <= SURFACE_BAD || ds->type >= NUM_SURFACE_TYPES || ds == NULL || ds->shaderInfo == NULL ) {
+       if ( ds == NULL || ds->shaderInfo == NULL || ds->type <= SURFACE_BAD || ds->type >= NUM_SURFACE_TYPES ) {
                return;
        }
 
@@ -3377,7 +3377,7 @@ int AddSurfaceModels( mapDrawSurface_t *ds ){
                        alpha /= ds->numVerts;
                        centroid.color[ 0 ][ 0 ] = 0xFF;
                        centroid.color[ 0 ][ 1 ] = 0xFF;
-                       centroid.color[ 0 ][ 2 ] = 0xFF;
+                       //centroid.color[ 0 ][ 2 ] = 0xFF;
                        centroid.color[ 0 ][ 2 ] = ( alpha > 255.0f ? 0xFF : alpha );
 
                        /* head vert is centroid */

diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c
index d7af5374fa7859bd9516d52521d8de86a06c99f9..e569e070d8c0cd41e77bf5868e3b8af6450aa7e9 100644 (file)
--- a/tools/quake3/q3map2/surface_meta.c
+++ b/tools/quake3/q3map2/surface_meta.c
@@ -1711,6 +1711,9 @@ static void MetaTrianglesToSurface( int numPossibles, metaTriangle_t *possibles,
                ClearBounds( ds->mins, ds->maxs );
 
                /* clear verts/indexes */
+//             memset( verts, 0, sizeof( verts ) );
+//             memset( indexes, 0, sizeof( indexes ) );
+               //is more correct, but upper works ok too
                memset( verts, 0, sizeof( *verts ) * maxSurfaceVerts );
                memset( indexes, 0, sizeof( *indexes ) * maxSurfaceIndexes );
 

diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c
index f62ad047b8af9ea80bac94d9a27ad415c0a8f983..fe180508ee3ee8ab3df9df58d04eb64b0875656b 100644 (file)
--- a/tools/quake3/q3map2/tjunction.c
+++ b/tools/quake3/q3map2/tjunction.c
@@ -605,7 +605,7 @@ int EdgeCompare( const void *elem1, const void *elem2 ) {
        if ( d1 < d2 ) {
                return -1;
        }
-       if ( d2 > d1 ) {
+       if ( d1 > d2 ) {
                return 1;
        }
        return 0;