diff options
author | Mikko Tiusanen <ams@daug.net> | 2014-08-20 20:32:12 +0300 |
---|---|---|
committer | Mikko Tiusanen <ams@daug.net> | 2014-08-20 20:32:12 +0300 |
commit | 613030b05c409cef42b0e98d5180a41f8f67c661 (patch) | |
tree | 480cdbf625d7dcce1bb5477ab1dca6c9d8102106 /src/game/g_local.h | |
parent | 7ad16ee1fea76bab54d97a78c1063b7c2c2adef6 (diff) | |
parent | 0a382e146ac52e111c90ad1e093ade77b710d993 (diff) |
Merge branch 'master' of https://github.com/mtiusane/new-edge
Diffstat (limited to 'src/game/g_local.h')
-rw-r--r-- | src/game/g_local.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/g_local.h b/src/game/g_local.h index 7052fe4..4f03aad 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -245,6 +245,7 @@ struct gentity_s int lastDamageTime; int nextRegenTime; + int nextBleedTime; qboolean ownerClear; // used for missle tracking @@ -399,6 +400,7 @@ struct gclient_s int damage_knockback; // impact damage vec3_t damage_from; // origin for vector calculation qboolean damage_fromWorld; // if true, don't use the damage_from vector + int damage_headshot; // the number of head-shots taken in a frame // int lastkilled_client;// last client that this client killed |