qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-30 16:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

now only svs is reverenced where it shouldn't be, and that's to set info

Browse source 
strings (skybox and *progs). skybox is easy to take care of (aditional parse
functions), but I haven't yet decided what to do with *progs. Also, progs code
needs a bit of a cleanup, but that will come later.
This commit is contained in:
Bill Currie 2001-01-02 03:22:46 +00:00
parent ff89f60c74
commit 2debf6f669
13 changed files with 160 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/world.c
View file

@ -316,8 +316,8 @@ SV_TouchLinks (edict_t *ent, areanode_t *node)
old_self = sv_progs.pr_global_struct->self;
old_other = sv_progs.pr_global_struct->other;
sv_progs.pr_global_struct->self = EDICT_TO_PROG (touch);
sv_progs.pr_global_struct->other = EDICT_TO_PROG (ent);
sv_progs.pr_global_struct->self = EDICT_TO_PROG (&sv_progs, touch);
sv_progs.pr_global_struct->other = EDICT_TO_PROG (&sv_progs, ent);
sv_progs.pr_global_struct->time = sv.time;
PR_ExecuteProgram (&sv_progs, touch->v.touch);
@ -777,9 +777,9 @@ SV_ClipToLinks (areanode_t *node, moveclip_t * clip)
if (clip->trace.allsolid)
return;
if (clip->passedict) {
if (PROG_TO_EDICT (touch->v.owner) == clip->passedict)
if (PROG_TO_EDICT (&sv_progs, touch->v.owner) == clip->passedict)
continue; // don't clip against own missiles
if (PROG_TO_EDICT (clip->passedict->v.owner) == touch)
if (PROG_TO_EDICT (&sv_progs, clip->passedict->v.owner) == touch)
continue; // don't clip against owner
}