refactored plugin api; refactored callback library; added signals library

[xonotic/netradiant.git] / contrib / bobtoolz / DShape.cpp

diff --git a/contrib/bobtoolz/DShape.cpp b/contrib/bobtoolz/DShape.cpp
index ebe2c0da1ad6f8e66a0e9759c70163ac15be4061..9201d29cfa14831387a15d8fec6234475eaa9b53 100644 (file)
--- a/contrib/bobtoolz/DShape.cpp
+++ b/contrib/bobtoolz/DShape.cpp
@@ -21,9 +21,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 //////////////////////////////////////////////////////////////////////
 
-#include "StdAfx.h"
+#include "DShape.h"
 
-#include "gtkr_list.h"
+#include <list>
+#include <time.h>
 #include "str.h"
 
 #include "DPoint.h"
@@ -32,7 +33,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "DEPair.h"
 #include "DPatch.h"
 #include "DEntity.h"
-#include "DShape.h"
 
 //#include "dialogs-gtk.h"
 
@@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-bool bFacesAll[6] = {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE};
+bool bFacesAll[6] = {true, true, true, true, true, true};
 
 DShape::DShape()
 {
@@ -104,16 +104,16 @@ void DShape::BuildRegularPrism(vec3_t min, vec3_t max, int nSides, bool bAlignTo
        DBrush* pB = m_Container.GetWorldSpawn()->NewBrush(m_nNextBrush++);
 
        for(i = 1; i <= nSides; i++)
-               pB->AddFace(vc[i-1], vc[i], vd[i], GetCurrentTexture(), FALSE);
+               pB->AddFace(vc[i-1], vc[i], vd[i], GetCurrentTexture(), false);
 
-       pB->AddFace(vc[2], vc[1], vc[0], "textures/common/caulk", FALSE);
-       pB->AddFace(vd[0], vd[1], vd[2], "textures/common/caulk", FALSE);
+       pB->AddFace(vc[2], vc[1], vc[0], "textures/common/caulk", false);
+       pB->AddFace(vd[0], vd[1], vd[2], "textures/common/caulk", false);
 }
 
 void DShape::Commit()
 {
        m_Container.GetWorldSpawn()->FixBrushes();
-       m_Container.BuildInRadiant(TRUE);
+       m_Container.BuildInRadiant(true);
 }
 
 void DShape::BuildInversePrism(vec3_t min, vec3_t max, int nSides, bool bAlignTop)
@@ -180,11 +180,11 @@ void DShape::BuildInversePrism(vec3_t min, vec3_t max, int nSides, bool bAlignTo
                
                if(top[1] != bottom[1]) // internal line is flat already if true
                {                       
-                       pB->AddFace(va[i-1], top, vb[i-1], "textures/common/caulk", FALSE);
-                       pB->AddFace(va[i], vb[i], bottom, "textures/common/caulk", FALSE);
+                       pB->AddFace(va[i-1], top, vb[i-1], "textures/common/caulk", false);
+                       pB->AddFace(va[i], vb[i], bottom, "textures/common/caulk", false);
                }       // add cut-off planes
 
-               pB->AddFace(va[i-1], vb[i-1], vb[i], GetCurrentTexture(), FALSE);
+               pB->AddFace(va[i-1], vb[i-1], vb[i], GetCurrentTexture(), false);
                // add internal polygon plane
        }
 }
@@ -264,11 +264,11 @@ void DShape::BuildBorderedPrism(vec3_t min, vec3_t max, int nSides, int nBorder,
        {
                DBrush* pB = GetBoundingCube(min, max, "textures/common/caulk");
 
-               pB->AddFace(origin, vc[i-1], vd[i-1], "textures/common/caulk", FALSE);
-               pB->AddFace(origin, vd[i], vc[i], "textures/common/caulk", FALSE); 
+               pB->AddFace(origin, vc[i-1], vd[i-1], "textures/common/caulk", false);
+               pB->AddFace(origin, vd[i], vc[i], "textures/common/caulk", false); 
 
-               pB->AddFace(vc[i-1], vc[i], vd[i], GetCurrentTexture(), FALSE);
-               pB->AddFace(vb[i], va[i], va[i-1], GetCurrentTexture(), FALSE);
+               pB->AddFace(vc[i-1], vc[i], vd[i], GetCurrentTexture(), false);
+               pB->AddFace(vb[i], va[i], va[i-1], GetCurrentTexture(), false);
        }
 }
 
@@ -343,18 +343,18 @@ DBrush* DShape::GetBoundingCube(vec3_t min, vec3_t max, const char *textureName,
        //----- Add Six Cube Faces ---------
 
        if(bUseFaces[0])
-               pB->AddFace(v1, v2, v3, textureName, FALSE);
+               pB->AddFace(v1, v2, v3, textureName, false);
        if(bUseFaces[1])
-               pB->AddFace(v1, v3, v6, textureName, FALSE);
+               pB->AddFace(v1, v3, v6, textureName, false);
        if(bUseFaces[2])
-               pB->AddFace(v1, v7, v2, textureName, FALSE);
+               pB->AddFace(v1, v7, v2, textureName, false);
 
        if(bUseFaces[3])
-               pB->AddFace(v5, v6, v3, textureName, FALSE);
+               pB->AddFace(v5, v6, v3, textureName, false);
        if(bUseFaces[4])
-               pB->AddFace(v5, v2, v7, textureName, FALSE);
+               pB->AddFace(v5, v2, v7, textureName, false);
        if(bUseFaces[5])
-               pB->AddFace(v5, v7, v6, textureName, FALSE);
+               pB->AddFace(v5, v7, v6, textureName, false);
 
        //----------------------------------
 
@@ -364,7 +364,7 @@ DBrush* DShape::GetBoundingCube(vec3_t min, vec3_t max, const char *textureName,
 bool DShape::BuildPit(vec3_t min, vec3_t max)
 {
        if((max[2] - min[2]) < 196)
-               return FALSE;
+               return false;
 
        srand(time(NULL));
 
@@ -465,5 +465,5 @@ bool DShape::BuildPit(vec3_t min, vec3_t max)
 
 // ****** END NODROP ********
 
-       return TRUE;
+       return true;
 }