changed brush model API - now uses function pointers for some of the brush model...

[xonotic/darkplaces.git] / sv_move.c

diff --git a/sv_move.c b/sv_move.c
index 6fcff3c35d87dd2b8cdc1a03f91d80d83e0204b9..7c0b0ff1d3927fdf977873768713e4dc86634473 100644 (file)
--- a/sv_move.c
+++ b/sv_move.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 
 See the GNU General Public License for more details.
 
 
 See the GNU General Public License for more details.
 


@@ -51,7 +51,7 @@ qboolean SV_CheckBottom (edict_t *ent)
                {
                        start[0] = x ? maxs[0] : mins[0];
                        start[1] = y ? maxs[1] : mins[1];
                {
                        start[0] = x ? maxs[0] : mins[0];
                        start[1] = y ? maxs[1] : mins[1];

-                       if (Mod_PointContents(start, sv.worldmodel) != CONTENTS_SOLID)
+                       if (sv.worldmodel->PointContents(sv.worldmodel, start) != CONTENTS_SOLID)

                                goto realcheck;
                }
 
                                goto realcheck;
                }
 


@@ -138,7 +138,7 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
                        if (trace.fraction == 1)
                        {
                                VectorCopy(trace.endpos, traceendpos);
                        if (trace.fraction == 1)
                        {
                                VectorCopy(trace.endpos, traceendpos);

-                               if ( ((int)ent->v->flags & FL_SWIM) && Mod_PointContents(traceendpos, sv.worldmodel) == CONTENTS_EMPTY )
+                               if ( ((int)ent->v->flags & FL_SWIM) && sv.worldmodel->PointContents(sv.worldmodel, traceendpos) == CONTENTS_EMPTY )

                                        return false;   // swim monster left water
 
                                VectorCopy (traceendpos, ent->v->origin);
                                        return false;   // swim monster left water
 
                                VectorCopy (traceendpos, ent->v->origin);