]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
prevent crouching while slap with blaster serverside
authorFreddy <schro.sb@gmail.com>
Tue, 26 Jul 2016 18:14:14 +0000 (20:14 +0200)
committerFreddy <schro.sb@gmail.com>
Tue, 26 Jul 2016 18:14:14 +0000 (20:14 +0200)
qcsrc/server/cl_client.qc

index e0b7e116eae253a3b6f85f3dc43e352b69774f99..63e710d9d980fc29558e969841415a05aeb261fb 100644 (file)
@@ -215,7 +215,7 @@ void PutObserverInServer(entity this)
                // needed for player sounds
                this.model = "";
                FixPlayermodel(this);
-        } 
+        }
         setmodel(this, MDL_Null);
         setsize(this, STAT(PL_CROUCH_MIN, NULL), STAT(PL_CROUCH_MAX, NULL));
         this.view_ofs = '0 0 0';
@@ -463,7 +463,7 @@ void PutClientInServer(entity this)
                PutObserverInServer(this);
        } else if (IS_PLAYER(this)) {
                if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
-               
+
                PlayerState_attach(this);
                accuracy_resend(this);
 
@@ -2285,7 +2285,7 @@ void PlayerPreThink (entity this)
                        do_crouch = false;
                } else if (STAT(FROZEN, this)) {
                        do_crouch = false;
-        } else if ((PS(this).m_weapon == WEP_SHOTGUN || PS(this).m_weapon == WEP_SHOCKWAVE) && this.(weaponentity).wframe == WFRAME_FIRE2 && time < this.(weaponentity).weapon_nextthink) {
+        } else if ((PS(this).m_weapon == WEP_SHOTGUN || PS(this).m_weapon == WEP_SHOCKWAVE || PS(this).m_weapon == WEP_BLASTER) && this.(weaponentity).wframe == WFRAME_FIRE2 && time < this.(weaponentity).weapon_nextthink) {
                    // WEAPONTODO: predict
                        do_crouch = false;
         }