apply misc fixes from Markus Fischer and Rambetter

[xonotic/netradiant.git] / radiant / qe3.h

diff --git a/radiant/qe3.h b/radiant/qe3.h
index e1b9d2bc7f30094f06a566f3201a6d6ee76603fb..87890189f9e9e407694d2a87739ad02505dda136 100644 (file)
--- a/radiant/qe3.h
+++ b/radiant/qe3.h
@@ -48,7 +48,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <stdio.h>
 
-// http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=672
 // this is the version to expect from template projects
 #define PROJECT_VERSION 2
 
@@ -141,11 +140,11 @@ vec_t Rad_rint (vec_t in);
 
 double I_FloatTime (void);
 
-void   Error (char *error, ...);
-int    CheckParm (char *check);
+void   Error (const char *error, ...);
+int    CheckParm (const char *check);
 void   ParseCommandLine (char *lpCmdLine);
 
-int    ParseNum (char *str);
+int    ParseNum (const char *str);
 
 char*  COM_Parse (char *data);
 char*  Get_COM_Token();
@@ -273,7 +272,7 @@ bool read_var (const char *filename, const char *section, const char *key, char
 // entityw.c
 //
 void FillClassList (void);
-bool UpdateEntitySel(eclass_t *pec);   
+bool UpdateEntitySel(eclass_t *pec);
 void SetInspectorMode(int iType);
 void SetSpawnFlags(void);
 void GetSpawnFlags(void);
@@ -367,7 +366,7 @@ qboolean IsBrushSelected(brush_t* bSel);
 
 // curve brushes
 
-void Curve_MakeCurvedBrush (qboolean negative, qboolean top, qboolean bottom, 
+void Curve_MakeCurvedBrush (qboolean negative, qboolean top, qboolean bottom,
                                        qboolean s1, qboolean s2, qboolean s3, qboolean s4);
 
 void Curve_Invert (void);
@@ -387,7 +386,7 @@ patchMesh_t* MakeNewPatch();
 brush_t* AddBrushForPatch(patchMesh_t *pm, bool bLinkToWorld = true);
 brush_t* Patch_GenericMesh(int nWidth, int nHeight, int nOrientation = 2, bool bDeleteSource = true, bool bOverride = false);
 //void Patch_ReadFile (char *name);
-//void Patch_WriteFile (char *name); 
+//void Patch_WriteFile (char *name);
 void Patch_BuildPoints (brush_t *b);
 void Patch_Move(patchMesh_t *p, const vec3_t vMove, bool bRebuild = false);
 //++timo had to add a default value for bSnap (see Patch_ApplyMatrix call from Select_ApplyMatrix in select.cpp)
@@ -536,6 +535,7 @@ void BrushPrimitFaceToFace(face_t *f);
 void EmitBrushPrimitTextureCoordinates(face_t *, winding_t *);
 // EmitTextureCoordinates, is old code used for brush to brush primitive conversion
 void EmitTextureCoordinates ( float *xyzst, qtexture_t *q, face_t *f);
+void Face_TexdefFromTextureCoordinates ( float *xyzst1, float *xyzst2, float *xyzst3, qtexture_t *q, face_t *f);
 //void BrushPrimit_Parse(brush_t *);
 // compute a fake shift scale rot representation from the texture matrix
 void TexMatToFakeTexCoords( vec_t texMat[2][3], float shift[2], float *rot, float scale[2] );
@@ -571,7 +571,7 @@ qboolean IsBrushPrimitMode();
 //
 // eclass.cpp
 //
-#include "ieclass.h"  
+#include "ieclass.h"
 
 /*!
   \todo those are at the eclass manager level, but some documentation about what they do will be helpful
@@ -589,7 +589,7 @@ eclass_t** Get_EClass_E();
 void Set_Eclass_Found(qboolean);
 qboolean Get_Parsing_Single();
 
-// .def loading, builtin module  
+// .def loading, builtin module
 #include "eclass_def.h"
 extern CSynapseBuiltinClientDef eclass_def;
 
@@ -605,7 +605,7 @@ support for one additional/optional entity format
 extern bool g_bHaveEClassExt;
 extern _EClassTable g_EClassExtTable;
 
-  
+
 #include "iplugin.h"
 // for interfaces, we require main plugin header included
 #include "qerplugin.h"
@@ -789,7 +789,7 @@ extern qtexture_t   *current_texture;
 extern void SaveWithRegion(char *name); // save the current map, sets the map name in the name buffer (deals with regioning)
 extern void RunBsp (char *command);
 extern void Map_Snapshot();
-//extern void WXY_Print();
+extern void WXY_Print();
 extern void AddProp( void );
 extern qboolean DoColor(int iIndex);
 extern entity_t        *edit_entity;