Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/contrib/bobtoolz/misc.h b/contrib/bobtoolz/misc.h
index 7774a3f2761209667d6c655dd1294c87472c8fee..4383935630ce910e15ab51943f5639e1d9435a0e 100644 (file)
--- a/contrib/bobtoolz/misc.h
+++ b/contrib/bobtoolz/misc.h
@@ -17,23 +17,30 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-vec_t Min( vec_t a, vec_t b );
+#if !defined( INCLUDED_MISC_H )
+#define INCLUDED_MISC_H
+
+#include "mathlib.h"
+#include <list>
+#include "str.h"
+#include "iscenegraph.h"
+
+const double MAX_ROUND_ERROR = 0.05;
 
-epair_t* GetNextChainItem( epair_t* lastItem, const char* key, const char* value );
+vec_t Min( vec_t a, vec_t b );
 
 // reads current texture into global, returns pointer to it
 const char* GetCurrentTexture();
 
+class _QERFaceData;
 void FillDefaultTexture( _QERFaceData* faceData, vec3_t va, vec3_t vb, vec3_t vc, const char* texture );
 
-void Sys_ERROR( const char* text, ... );
-
-void BuildMiniPrt( list<Str>* exclusionList );
+void BuildMiniPrt( std::list<Str>* exclusionList );
 
 void MoveBlock( int dir, vec3_t min, vec3_t max, float dist );
 void SetInitialStairPos( int dir, vec3_t min, vec3_t max, float width );
 
-entity_s* FindEntityFromTargetname( const char* targetname, int* entNum );
+const scene::Path* FindEntityFromTargetname( const char* targetname );
 
 char* UnixToDosPath( char* path );
 
@@ -45,4 +52,6 @@ float Determinant3x3( float a1, float a2, float a3,
                                          float c1, float c2, float c3 );
 
 bool GetEntityCentre( const char* entity, vec3_t centre );
-void MakeNormal( vec_t* va, vec_t* vb, vec_t* vc, vec_t* out );
+void MakeNormal( const vec_t* va, const vec_t* vb, const vec_t* vc, vec_t* out );
+
+#endif