X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Faccuracy.qc;h=ca837e7d3816292a69e0c9e42304429130253f37;hb=2eaae8108bea200c5f29cb18a78db6a8522b8c7c;hp=139d8e7a39efe9430bf018574b66173bc839dde5;hpb=410ff5f6cc4f7d5d8282ba9d93fe6a65d1c74489;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc index 139d8e7a3..ca837e7d3 100644 --- a/qcsrc/server/accuracy.qc +++ b/qcsrc/server/accuracy.qc @@ -5,7 +5,7 @@ float accuracy_byte(float n, float d) { - //print(sprintf("accuracy: %d / %d\n", n, d)); + //printf("accuracy: %d / %d\n", n, d); if(n <= 0) return 0; if(n > d) @@ -25,7 +25,7 @@ float accuracy_send(entity to, float sf) a = a.accuracy; if(to != a.owner) - if not(self.owner.cvar_cl_accuracy_data_share && autocvar_sv_accuracy_data_share) + if (!(self.owner.cvar_cl_accuracy_data_share && autocvar_sv_accuracy_data_share)) sf = 0; // note: zero sendflags can never be sent... so we can use that to say that we send no accuracy! WriteInt24_t(MSG_ENTITY, sf); @@ -109,12 +109,13 @@ void accuracy_add(entity e, float w, float fired, float hit) float accuracy_isgooddamage(entity attacker, entity targ) { - float targ_isvalid = ((g_invasion) ? targ.flags & FL_MONSTER : IS_CLIENT(targ)); + frag_attacker = attacker; + frag_target = targ; + float mutator_check = MUTATOR_CALLHOOK(AccuracyTargetValid); if(!warmup_stage) - if(targ_isvalid) - if(!targ.frozen) if(targ.deadflag == DEAD_NO) + if(mutator_check == MUT_ACCADD_INVALID || (mutator_check == MUT_ACCADD_VALID && IS_CLIENT(targ))) if(DIFF_TEAM(attacker, targ)) return TRUE; return FALSE;