rewrote most of the RSurfShader_ functions to use R_Mesh_Draw_GetBuffer instead of...

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 624b94314a18c7b24cd431f3cd2a041b248b0a08..eaea6224cf0aaa27c93499ceda2a6f65744bd53f 100644 (file)
--- a/world.h
+++ b/world.h
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // world.h
 
+#ifndef WORLD_H
+#define WORLD_H
+
 #include "collision.h"
 
 #define        MOVE_NORMAL             0
@@ -26,33 +29,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define        MOVE_MISSILE    2
 
 
-void SV_ClearWorld (void);
 // called after the world model has been loaded, before linking any entities
+void SV_ClearWorld (void);
 
-void SV_UnlinkEdict (edict_t *ent);
 // call before removing an entity, and before trying to move one,
 // so it doesn't clip against itself
-// flags ent->v.modified
+void SV_UnlinkEdict (edict_t *ent);
 
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers);
 // Needs to be called any time an entity changes origin, mins, maxs, or solid
-// flags ent->v.modified
 // sets ent->v.absmin and ent->v.absmax
 // if touchtriggers, calls prog functions for the intersected triggers
+void SV_LinkEdict (edict_t *ent, qboolean touch_triggers);
 
-extern int SV_HullPointContents (hull_t *hull, int num, vec3_t p);
-// LordHavoc: waste of time to wrap it
-//int SV_PointContents (vec3_t p);
-#define SV_PointContents(testpoint) SV_HullPointContents(&sv.worldmodel->hulls[0], 0, (testpoint))
-// returns the CONTENTS_* value from the world at the given point.
-// does not check any entities at all
-// the non-true version remaps the water current contents to content_water
-
-edict_t        *SV_TestEntityPosition (edict_t *ent);
+// returns true if the entity is in solid currently
+int SV_TestEntityPosition (edict_t *ent);
 
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict);
 // mins and maxs are relative
-
 // if the entire move stays in a solid volume, trace.allsolid will be set
 
 // if the starting point is in a solid, it will be allowed to move out
@@ -62,3 +54,7 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e
 // shouldn't be considered solid objects
 
 // passedict is explicitly excluded from clipping checks (normally NULL)
+trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict);
+
+#endif
+