Manual merge of possible fix for #2 part 2.

This commit is contained in:
Walter Julius Hennecke 2014-02-16 22:52:41 +01:00
parent 4e9772fdca
commit ec81239d22
1 changed files with 2 additions and 0 deletions

View File

@ -581,6 +581,8 @@ struct gclient_s {
// for selfdestruct and shiphealth // for selfdestruct and shiphealth
int nokilli; //!< if 1 this player won't be killed if the ship is killed int nokilli; //!< if 1 this player won't be killed if the ship is killed
int myship; //!< entnum of the shiphealth entity this client currently holds info from int myship; //!< entnum of the shiphealth entity this client currently holds info from
int respawnDisabledTime;
}; };