diff --git a/.gitignore b/.gitignore index 6f35cf6f..afed6944 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /install/q3map2 /install/q3map2_urt /install/radiant.bin +/install/share /packs /site.sconf /.sconsign.dblite @@ -13,3 +14,5 @@ *.so .settings .DS_Store +*.obj +*.tlog diff --git a/libs/synapse/synapse.cpp b/libs/synapse/synapse.cpp index ceac6a64..74cc07f3 100644 --- a/libs/synapse/synapse.cpp +++ b/libs/synapse/synapse.cpp @@ -789,8 +789,7 @@ void CSynapseClient::Shutdown(){ APIDescriptor_t *pAPI = *iAPI; if ( pAPI->mRefCount != 0 ) { Syn_Printf( "WARNING: ~CSynapseClient '%s' has non-zero ref count for interface '%s' '%s'\n", GetInfo(), pAPI->major_name, pAPI->minor_name ); - } - else{ + } else { delete pAPI; } *iAPI = NULL; diff --git a/radiant/glwidget.cpp b/radiant/glwidget.cpp index d8d5456b..1aa9d1fc 100644 --- a/radiant/glwidget.cpp +++ b/radiant/glwidget.cpp @@ -204,13 +204,8 @@ gboolean WINAPI gtk_glwidget_make_current( GtkWidget *widget ){ // Think about rewriting this font stuff to use OpenGL display lists and glBitmap(). // Bit maps together with display lists may offer a performance increase, but // they would not allow antialiased fonts. -#ifdef _WIN32 -static const char font_string[] = "Courier bold"; -static const int font_height = 9; -#else -static const char font_string[] = "Monospace"; +static const char font_string[] = "Monospace bold"; static const int font_height = 10; -#endif static int font_ascent = -1; static int font_descent = -1; static int y_offset_bitmap_render_pango_units = -1;