fixed compile errors

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@54 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/contrib/prtview/portals.cpp b/contrib/prtview/portals.cpp
index e5dea3082cca69a791467d33015e80d59361a54a..d3bef1b6bee63e0f29e90d83a6060b18e9c1daf1 100644 (file)
--- a/contrib/prtview/portals.cpp
+++ b/contrib/prtview/portals.cpp
@@ -247,7 +247,7 @@ void CPortals::Load()
                return;
        }
 
                return;
        }
 

-       if(portal_count < 0)
+       if(portal_count == 0)

        {
                fclose(in);
 
        {
                fclose(in);
 

diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp
index 48ba7ce81bbc7bb9b172aa58de243c5c5139a83e..ae0ed5a2b47644563fbfd9ed1c52477a96128be8 100644 (file)
--- a/libs/gtkutil/glfont.cpp
+++ b/libs/gtkutil/glfont.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "glfont.h"
 
 #include "igl.h"
 #include "glfont.h"
 
 #include "igl.h"

-#include <gtk/gtkglwidget.h>
+//#include <gtk/gtkglwidget.h>

 
 GLFont glfont_create(const char* font_string)
 {
 
 GLFont glfont_create(const char* font_string)
 {

diff --git a/radiant/brush.h b/radiant/brush.h
index b0a932d86deeacfdeea692e4e27bd6fdb3ada5ae..8d31d3e739f1b1e29e9df264b841b3ff3896b340 100644 (file)
--- a/radiant/brush.h
+++ b/radiant/brush.h
@@ -4101,7 +4101,7 @@ public:
 template<typename Functor>
 inline const Functor& Brush_ForEachFaceInstance(BrushInstance& brush, const Functor& functor)
 {
 template<typename Functor>
 inline const Functor& Brush_ForEachFaceInstance(BrushInstance& brush, const Functor& functor)
 {

-  brush.forEachFaceInstance(FaceInstanceVisitAll<Functor>(functor)));
+  brush.forEachFaceInstance(FaceInstanceVisitAll<Functor>(functor));

   return functor;
 }
 
   return functor;
 }
 


@@ -4140,7 +4140,7 @@ public:
   {
     if(path.top().get().visible())
     {
   {
     if(path.top().get().visible())
     {

-      BrushInstance* brush = Instance_getIBrush(instance);
+      BrushInstance* brush = Instance_getBrush(instance);

       if(brush != 0)
       {
         m_functor(*brush);
       if(brush != 0)
       {
         m_functor(*brush);