moved all type-specific model fields to respective structures (alias, sprite, brush)

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 63afdeeabb1bdfd0ff612d964495b98482645e68..ad5aa985f7181853696ffd1836b0acee5887610a 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -854,18 +854,18 @@ qboolean SV_CheckWater (edict_t *ent)
 
        ent->v->waterlevel = 0;
        ent->v->watertype = CONTENTS_EMPTY;
-       cont = sv.worldmodel->PointContents(sv.worldmodel, point);
+       cont = sv.worldmodel->brushq1.PointContents(sv.worldmodel, point);
        if (cont <= CONTENTS_WATER)
        {
                ent->v->watertype = cont;
                ent->v->waterlevel = 1;
                point[2] = ent->v->origin[2] + (ent->v->mins[2] + ent->v->maxs[2])*0.5;
-               cont = sv.worldmodel->PointContents(sv.worldmodel, point);
+               cont = sv.worldmodel->brushq1.PointContents(sv.worldmodel, point);
                if (cont <= CONTENTS_WATER)
                {
                        ent->v->waterlevel = 2;
                        point[2] = ent->v->origin[2] + ent->v->view_ofs[2];
-                       cont = sv.worldmodel->PointContents(sv.worldmodel, point);
+                       cont = sv.worldmodel->brushq1.PointContents(sv.worldmodel, point);
                        if (cont <= CONTENTS_WATER)
                                ent->v->waterlevel = 3;
                }
@@ -1136,7 +1136,7 @@ SV_CheckWaterTransition
 void SV_CheckWaterTransition (edict_t *ent)
 {
        int cont;
-       cont = sv.worldmodel->PointContents(sv.worldmodel, ent->v->origin);
+       cont = sv.worldmodel->brushq1.PointContents(sv.worldmodel, ent->v->origin);
        if (!ent->v->watertype)
        {
                // just spawned here