refactored plugin api; refactored callback library; added signals library

[xonotic/netradiant.git] / contrib / bobtoolz / DPatch.h

diff --git a/contrib/bobtoolz/DPatch.h b/contrib/bobtoolz/DPatch.h
index 4d85e90939f70c2426235003d85f7debecba4d5b..d1442ce45dd3e539c3979efa99b9ea9528510e1f 100644 (file)
--- a/contrib/bobtoolz/DPatch.h
+++ b/contrib/bobtoolz/DPatch.h
@@ -24,10 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #if !defined(AFX_DPATCH_H__26C6B083_CE5B_420B_836B_1DDA733C04CE__INCLUDED_)
 #define AFX_DPATCH_H__26C6B083_CE5B_420B_836B_1DDA733C04CE__INCLUDED_
 
-#include "StdAfx.h"    // Added by ClassView
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
+#include <list>
 
 typedef struct
 {      
@@ -43,7 +40,10 @@ typedef struct {
   float lightmap[2];
 } drawVert_t;
 
-class Patch;
+namespace scene
+{
+  class Node;
+}
 
 #define MAX_PATCH_WIDTH 16
 #define MAX_PATCH_HEIGHT 16
@@ -53,16 +53,15 @@ class Patch;
 class DPatch  
 {
 public:
-       list<DPatch> Split(bool rows, bool cols);
+       std::list<DPatch> Split(bool rows, bool cols);
        void Transpose();
        void Invert();
        DPatch* MergePatches(patch_merge_t merge_info, DPatch* p1, DPatch* p2);
        patch_merge_t IsMergable(DPatch* other);
   bool ResetTextures(const char *oldTextureName, const char *newTextureName);
-       void RemoveFromRadiant(void);
        scene::Node* QER_brush;
-       void LoadFromBrush(scene::Node* brush);
-       void BuildInRadiant(void* entity = NULL);
+       void LoadFromBrush(scene::Node& brush);
+       void BuildInRadiant(scene::Node* entity = NULL);
        void SetTexture(const char* textureName);
        char texture[256];
        int width, height;