a major rename - instead of q1bsp code having surf, and q3bsp code having face, both...

[xonotic/darkplaces.git] / pr_cmds.c

diff --git a/pr_cmds.c b/pr_cmds.c
index 367ad4f146f560a42640b01d2fbbd8d123e6d84b..925fa93809c649ea4cf1d595c4f4b9ea0ffa94c4 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -2600,22 +2600,22 @@ void PF_te_plasmaburn (void)
        MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
-static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
+static void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
 {
        int i, j;
        vec3_t v1, clipplanenormal, normal;
        vec_t clipplanedist, clipdist;
        VectorCopy(p, out);
-       if (surf->flags & SURF_PLANEBACK)
-               VectorNegate(surf->plane->normal, normal);
+       if (surface->flags & SURF_PLANEBACK)
+               VectorNegate(surface->plane->normal, normal);
        else
-               VectorCopy(surf->plane->normal, normal);
-       for (i = 0, j = surf->mesh.num_vertices - 1;i < surf->mesh.num_vertices;j = i, i++)
+               VectorCopy(surface->plane->normal, normal);
+       for (i = 0, j = surface->mesh.num_vertices - 1;i < surface->mesh.num_vertices;j = i, i++)
        {
-               VectorSubtract(&surf->mesh.data_vertex3f[j * 3], &surf->mesh.data_vertex3f[i * 3], v1);
+               VectorSubtract(&surface->mesh.data_vertex3f[j * 3], &surface->mesh.data_vertex3f[i * 3], v1);
                VectorNormalizeFast(v1);
                CrossProduct(v1, normal, clipplanenormal);
-               clipplanedist = DotProduct(&surf->mesh.data_vertex3f[i * 3], clipplanenormal);
+               clipplanedist = DotProduct(&surface->mesh.data_vertex3f[i * 3], clipplanenormal);
                clipdist = DotProduct(out, clipplanenormal) - clipplanedist;
                if (clipdist > 0)
                {
@@ -2625,7 +2625,7 @@ static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
        }
 }
 
-static msurface_t *getsurface(edict_t *ed, int surfnum)
+static msurface_t *getsurface(edict_t *ed, int surfacenum)
 {
        int modelindex;
        model_t *model;
@@ -2635,74 +2635,74 @@ static msurface_t *getsurface(edict_t *ed, int surfnum)
        if (modelindex < 1 || modelindex >= MAX_MODELS)
                return NULL;
        model = sv.models[modelindex];
-       if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+       if (surfacenum < 0 || surfacenum >= model->nummodelsurfaces)
                return NULL;
-       return model->brushq1.surfaces + surfnum + model->firstmodelsurface;
+       return model->brushq1.surfaces + surfacenum + model->firstmodelsurface;
 }
 
 
 //PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
 void PF_getsurfacenumpoints(void)
 {
-       msurface_t *surf;
+       msurface_t *surface;
        // return 0 if no such surface
-       if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+       if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
        {
                G_FLOAT(OFS_RETURN) = 0;
                return;
        }
 
-       G_FLOAT(OFS_RETURN) = surf->mesh.num_vertices;
+       G_FLOAT(OFS_RETURN) = surface->mesh.num_vertices;
 }
 //PF_getsurfacepoint,     // #435 vector(entity e, float s, float n) getsurfacepoint = #435;
 void PF_getsurfacepoint(void)
 {
        edict_t *ed;
-       msurface_t *surf;
+       msurface_t *surface;
        int pointnum;
        VectorClear(G_VECTOR(OFS_RETURN));
        ed = G_EDICT(OFS_PARM0);
        if (!ed || ed->e->free)
                return;
-       if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+       if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
                return;
        pointnum = G_FLOAT(OFS_PARM2);
-       if (pointnum < 0 || pointnum >= surf->mesh.num_vertices)
+       if (pointnum < 0 || pointnum >= surface->mesh.num_vertices)
                return;
        // FIXME: implement rotation/scaling
-       VectorAdd(&surf->mesh.data_vertex3f[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
+       VectorAdd(&surface->mesh.data_vertex3f[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
 }
 //PF_getsurfacenormal,    // #436 vector(entity e, float s) getsurfacenormal = #436;
 void PF_getsurfacenormal(void)
 {
-       msurface_t *surf;
+       msurface_t *surface;
        VectorClear(G_VECTOR(OFS_RETURN));
-       if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+       if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
                return;
        // FIXME: implement rotation/scaling
-       if (surf->flags & SURF_PLANEBACK)
-               VectorNegate(surf->plane->normal, G_VECTOR(OFS_RETURN));
+       if (surface->flags & SURF_PLANEBACK)
+               VectorNegate(surface->plane->normal, G_VECTOR(OFS_RETURN));
        else
-               VectorCopy(surf->plane->normal, G_VECTOR(OFS_RETURN));
+               VectorCopy(surface->plane->normal, G_VECTOR(OFS_RETURN));
 }
 //PF_getsurfacetexture,   // #437 string(entity e, float s) getsurfacetexture = #437;
 void PF_getsurfacetexture(void)
 {
-       msurface_t *surf;
+       msurface_t *surface;
        G_INT(OFS_RETURN) = 0;
-       if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+       if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
                return;
-       G_INT(OFS_RETURN) = PR_SetString(surf->texinfo->texture->name);
+       G_INT(OFS_RETURN) = PR_SetString(surface->texinfo->texture->name);
 }
 //PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
 void PF_getsurfacenearpoint(void)
 {
-       int surfnum, best, modelindex;
+       int surfacenum, best, modelindex;
        vec3_t clipped, p;
        vec_t dist, bestdist;
        edict_t *ed;
        model_t *model;
-       msurface_t *surf;
+       msurface_t *surface;
        vec_t *point;
        G_FLOAT(OFS_RETURN) = -1;
        ed = G_EDICT(OFS_PARM0);
@@ -2721,19 +2721,19 @@ void PF_getsurfacenearpoint(void)
        VectorSubtract(point, ed->v->origin, p);
        best = -1;
        bestdist = 1000000000;
-       for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
+       for (surfacenum = 0;surfacenum < model->nummodelsurfaces;surfacenum++)
        {
-               surf = model->brushq1.surfaces + surfnum + model->firstmodelsurface;
-               dist = PlaneDiff(p, surf->plane);
+               surface = model->brushq1.surfaces + surfacenum + model->firstmodelsurface;
+               dist = PlaneDiff(p, surface->plane);
                dist = dist * dist;
                if (dist < bestdist)
                {
-                       clippointtosurface(surf, p, clipped);
+                       clippointtosurface(surface, p, clipped);
                        VectorSubtract(clipped, p, clipped);
                        dist += DotProduct(clipped, clipped);
                        if (dist < bestdist)
                        {
-                               best = surfnum;
+                               best = surfacenum;
                                bestdist = dist;
                        }
                }
@@ -2744,17 +2744,17 @@ void PF_getsurfacenearpoint(void)
 void PF_getsurfaceclippedpoint(void)
 {
        edict_t *ed;
-       msurface_t *surf;
+       msurface_t *surface;
        vec3_t p, out;
        VectorClear(G_VECTOR(OFS_RETURN));
        ed = G_EDICT(OFS_PARM0);
        if (!ed || ed->e->free)
                return;
-       if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+       if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
                return;
        // FIXME: implement rotation/scaling
        VectorSubtract(G_VECTOR(OFS_PARM2), ed->v->origin, p);
-       clippointtosurface(surf, p, out);
+       clippointtosurface(surface, p, out);
        // FIXME: implement rotation/scaling
        VectorAdd(out, ed->v->origin, G_VECTOR(OFS_RETURN));
 }