optimized rtlighting passes by using RSurf_DrawBatch_Simple, this took a lot of code...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 427fe1cb0e0ee8ab436a3c6b0600dc7c1d176945..fa9b29b116f9c05b863cab219511d6ab73bf2c13 100644 (file)
--- a/world.c
+++ b/world.c
@@ -254,9 +254,27 @@ void SV_TouchAreaGrid(prvm_edict_t *ent)
                touch = touchedicts[i];
                if (touch != ent && (int)touch->fields.server->solid == SOLID_TRIGGER && touch->fields.server->touch)
                {
+                       prvm_eval_t *val;
                        prog->globals.server->self = PRVM_EDICT_TO_PROG(touch);
                        prog->globals.server->other = PRVM_EDICT_TO_PROG(ent);
                        prog->globals.server->time = sv.time;
+                       prog->globals.server->trace_allsolid = false;
+                       prog->globals.server->trace_startsolid = false;
+                       prog->globals.server->trace_fraction = 1;
+                       prog->globals.server->trace_inwater = false;
+                       prog->globals.server->trace_inopen = true;
+                       VectorCopy (touch->fields.server->origin, prog->globals.server->trace_endpos);
+                       VectorSet (prog->globals.server->trace_plane_normal, 0, 0, 1);
+                       prog->globals.server->trace_plane_dist = 0;
+                       prog->globals.server->trace_ent = PRVM_EDICT_TO_PROG(ent);
+                       if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dpstartcontents)))
+                               val->_float = 0;
+                       if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dphitcontents)))
+                               val->_float = 0;
+                       if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dphitq3surfaceflags)))
+                               val->_float = 0;
+                       if ((val = PRVM_GETGLOBALFIELDVALUE(gval_trace_dphittexturename)))
+                               val->string = 0;
                        PRVM_ExecuteProgram (touch->fields.server->touch, "QC function self.touch is missing");
                }
        }
@@ -320,7 +338,7 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 
        if (ent->fields.server->solid == SOLID_BSP)
        {
-               int modelindex = ent->fields.server->modelindex;
+               int modelindex = (int)ent->fields.server->modelindex;
                if (modelindex < 0 || modelindex > MAX_MODELS)
                {
                        Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
@@ -424,7 +442,7 @@ trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t
 
        if ((int) ent->fields.server->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
        {
-               unsigned int modelindex = ent->fields.server->modelindex;
+               unsigned int modelindex = (unsigned int)ent->fields.server->modelindex;
                // if the modelindex is 0, it shouldn't be SOLID_BSP!
                if (modelindex == 0)
                {
@@ -576,7 +594,7 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 
        // clip to world
        cliptrace = SV_ClipMoveToWorld(clipstart, clipmins, clipmaxs, clipend, type, hitsupercontentsmask);
-       cliptrace.startsolid = cliptrace.bmodelstartsolid;
+       cliptrace.bmodelstartsolid = cliptrace.startsolid;
        if (cliptrace.startsolid || cliptrace.fraction < 1)
                cliptrace.ent = prog->edicts;
        if (type == MOVE_WORLDONLY)