Fixing Linux SCons build.

[xonotic/netradiant.git] / plugins / surface_quake2 / surfacedialog.cpp

diff --git a/plugins/surface_quake2/surfacedialog.cpp b/plugins/surface_quake2/surfacedialog.cpp
index 7f92210aa9d6d0f0d79743a10f85da421e6584b5..b1b7ec4c05db041ab0748a7756ba2a1696d0478a 100644 (file)
--- a/plugins/surface_quake2/surfacedialog.cpp
+++ b/plugins/surface_quake2/surfacedialog.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"
@@ -42,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "gtkr_vector.h"
 
-std::vector<texdef_to_face_t> g_texdef_face_vector;
+vector<texdef_to_face_t> g_texdef_face_vector;
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
@@ -224,7 +223,7 @@ void IsFaceConflicting()
 {
   texdef_t* tmp_texdef;
   texdef_to_face_t* temp_texdef_face_list;
-  char buf[12];
+//  char buf[12];
   char texture_name[128];
 
   if (texdef_face_list_empty())
@@ -262,7 +261,7 @@ void IsFaceConflicting()
   {
     temp_texdef_face_list = get_texdef_face_list()->next;
 
-    for (temp_texdef_face_list; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
+    for (; temp_texdef_face_list; temp_texdef_face_list = temp_texdef_face_list->next)
     {
       tmp_texdef = &temp_texdef_face_list->texdef;
       if ( texdef_SI_values.shift[0] != tmp_texdef->shift[0] )
@@ -320,7 +319,7 @@ static void PopulateTextureComboList()
   texdef_to_face_t* temp_texdef_face_list;
   char blank[1];
   GList *items = NULL;
-  GList *tmp_item;
+//  GList *tmp_item;
   int num_of_list_items = 0;
 
   blank[0] = 0;
@@ -386,7 +385,7 @@ static void GetTexdefInfo_from_Radiant()
 
   if (!texdef_face_list_empty())
   {
-    texdef_to_face_t* p = get_texdef_face_list();
+//    texdef_to_face_t* p = get_texdef_face_list();
     GetSelFacesTexdef( get_texdef_face_list() );
   }
 
@@ -1875,7 +1874,7 @@ static void on_fit_button_clicked (GtkButton *button, gpointer user_data)
 static void on_axial_button_clicked (GtkButton *button, gpointer user_data)
 {
   texdef_t* tmp_texdef;
-  texdef_t* tmp_orig_texdef;
+//  texdef_t* tmp_orig_texdef;
   texdef_to_face_t* temp_texdef_face_list;
 
   if (!texdef_face_list_empty() && g_bListenChanged)