X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Faim.qc;h=c278be915a2278a3eabd89966c990cf6ad44c75e;hp=7c87db0ff76de8684573b6705a57830e6af5e6a6;hb=62b183277ee958dbf27d096f6a9bfb322d392bbe;hpb=b7d363a108963ca13647ee25b58c5a531366cf49 diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc index 7c87db0ff..c278be915 100644 --- a/qcsrc/server/bot/default/aim.qc +++ b/qcsrc/server/bot/default/aim.qc @@ -9,7 +9,7 @@ #include "../../weapons/weaponsystem.qh" -#include "../../mutators/all.qh" +#include "../../mutators/_mod.qh" // traces multiple trajectories to find one that will impact the target // 'end' vector is the place it aims for, @@ -323,7 +323,7 @@ vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, flo return targorigin + targvelocity * (shotdelay + vlen(targorigin - shotorg) / shotspeed); } -bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, bool applygravity) +bool bot_aim(entity this, .entity weaponentity, float shotspeed, float shotspeedupward, float maxshottime, bool applygravity) { float f, r, hf, distanceratio; vector v; @@ -343,12 +343,12 @@ bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshott shotspeedupward *= W_WeaponSpeedFactor(this); if (!shotspeed) { - LOG_TRACE("bot_aim: WARNING: weapon ", PS(this).m_weapon.m_name, " shotspeed is zero!\n"); + LOG_TRACE("bot_aim: WARNING: weapon ", this.(weaponentity).m_weapon.m_name, " shotspeed is zero!"); shotspeed = 1000000; } if (!maxshottime) { - LOG_TRACE("bot_aim: WARNING: weapon ", PS(this).m_weapon.m_name, " maxshottime is zero!\n"); + LOG_TRACE("bot_aim: WARNING: weapon ", this.(weaponentity).m_weapon.m_name, " maxshottime is zero!"); maxshottime = 1; } makevectors(this.v_angle);