From: Mircea Kitsune Date: Sun, 10 Apr 2011 18:55:06 +0000 (+0300) Subject: Use 16 instead of 100. Needs to be done with a bitmask though. X-Git-Tag: xonotic-v0.6.0~110^2^2~113 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e738cc4769480e2512a9eba7d072337ad88b209a;p=xonotic%2Fxonotic-data.pk3dir.git Use 16 instead of 100. Needs to be done with a bitmask though. --- diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc index f3fe88bf8..af5864d79 100644 --- a/qcsrc/client/gibs.qc +++ b/qcsrc/client/gibs.qc @@ -300,12 +300,12 @@ void Ent_DamageEffect() e = get_weaponinfo(type); - if(specnum1 >= 100) + if(specnum1 >= 16) { - // The server sends the specnum increased by 100 when the target is a dead body (a trick used to save bandwidth) - // Species range from 0 to 15, and could never reach 100, so this should never risk causing a conflict. + // The server sends the specnum increased by 16 when the target is a dead body (a trick used to save bandwidth) + // Species range from 0 to 15, so 16 could never be reached, and may be used for other info. // Revert the species back and mark that this is a dead body. - specnum1 -= 100; + specnum1 -= 16; is_body = TRUE; } diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc index fa32eedd9..f8ed4fe0d 100644 --- a/qcsrc/server/g_violence.qc +++ b/qcsrc/server/g_violence.qc @@ -85,9 +85,9 @@ void Violence_DamageEffect(entity pl, float type) e.team = num_for_edict(pl.owner); // Use a trick to indicate this is a copied dead body and not an alive player to the client (saves an extra WriteByte). - // Do this by increasing species with 100 (species range from 0 to 15, and there could never be 100 of them). + // Do this by increasing species with 16. Species range from 0 to 15, so 16 could never be reached, and may be used for other info. // The client will notice this and turn them back, while also noting what the server is trying to say. - e.state += 100; + e.state += 16; } else e.team = num_for_edict(pl);