]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/automatic_sendcvar' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 24 Aug 2019 17:09:17 +0000 (17:09 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 24 Aug 2019 17:09:17 +0000 (17:09 +0000)
Automatic sendcvar

Closes #2270

See merge request xonotic/xonotic-data.pk3dir!694

1  2 
qcsrc/common/state.qc

diff --combined qcsrc/common/state.qc
index 1ffb45178d86684bbabd7f9c86cce1a8507d1229,24c0b7c6f4dc6789415ce61b639bde0a68848664..0f40acfc6856b65ad68446091b5a9142d3d16e13
@@@ -5,9 -5,6 +5,9 @@@ void Inventory_delete(entity this)
  
  void PlayerState_attach(entity this)
  {
 +      if (PS(this))
 +              return;
 +
        this._ps = NEW(PlayerState, this);
  
        Inventory_new(PS(this));
@@@ -41,8 -38,6 +41,6 @@@ void ClientState_attach(entity this
  {
        this._cs = NEW(ClientState, this);
  
-     GetCvars(this, CS(this), 0);  // get other cvars from player
        // TODO: fold all of these into ClientState
  
        DecodeLevelParms(this);