X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fviewloc.qc;h=db75434bfb6f98bd226f81bc72c07bbec718683b;hb=42e255d014f2c6a1871177ea511f630624cdfb57;hp=af67533a831fe4622afc39a7b519b369a92917cb;hpb=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc index af67533a8..db75434bf 100644 --- a/qcsrc/common/triggers/trigger/viewloc.qc +++ b/qcsrc/common/triggers/trigger/viewloc.qc @@ -1,8 +1,8 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../../../lib/warpzone/util_server.qh" - #include "../../../server/defs.qh" + #include + #include #endif REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC) @@ -23,7 +23,7 @@ void viewloc_think() for(e = findradius((self.absmin + self.absmax) * 0.5, vlen(self.absmax - self.absmin) * 0.5 + 1); e; e = e.chain) if(!e.viewloc) if(IS_PLAYER(e)) // should we support non-player entities with this? - //if(e.deadflag == DEAD_NO) // death view is handled separately, we can't override this just yet + //if(!IS_DEAD(e)) // death view is handled separately, we can't override this just yet { vector emin = e.absmin; vector emax = e.absmax; @@ -55,8 +55,8 @@ bool trigger_viewloc_send(entity this, entity to, int sf) return true; } -void viewloc_init() -{SELFPARAM(); +void viewloc_init(entity this) +{ entity e; for(e = world; (e = find(e, targetname, self.target)); ) if(e.classname == "target_viewlocation_start")