X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=9feef58cc8738836ded4e6b168adf4c8e2e8786d;hp=78b45fae37864270e14a40aa830643c6cf105a27;hb=392daf627bb137aadf4c156dc8dfc4906475840e;hpb=fc4ffd914a2b01d1d8724ea1982e5c1de1bfdaeb diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 78b45fae37..9feef58cc8 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -1050,6 +1050,9 @@ void Ent_Init() g_balance_grenadelauncher_secondary_bouncefactor = ReadCoord(); g_balance_grenadelauncher_secondary_bouncestop = ReadCoord(); + nex_scope = !ReadByte(); + campingrifle_scope = !ReadByte(); + if(!postinit) PostInit(); } @@ -1275,14 +1278,7 @@ void Net_WeaponComplain() { complain_weapon_type = ReadByte(); complain_weapon_time = time; -} - -void Net_CampingrifleScope() { - campingrifle_scope = TRUE; -} - -void Net_NexScope() { - nex_scope = TRUE; + weapontime = time; // ping the weapon panel } // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer. @@ -1355,12 +1351,13 @@ float CSQC_Parse_TempEntity() Net_WeaponComplain(); bHandled = true; break; - case TE_CSQC_CAMPINGRIFLE_SCOPE: - Net_CampingrifleScope(); + case TE_CSQC_NEX_VELOCITY: + nex_minvelocity = ReadShort(); + nex_maxvelocity = ReadShort(); bHandled = true; break; - case TE_CSQC_NEX_SCOPE: - Net_NexScope(); + case TE_CSQC_CR_MAXBULLETS: + cr_maxbullets = ReadByte(); bHandled = true; break; default: