X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rifle.qc;h=941a528a4b0b4fa9eac087b0222cc3c4d60b9d93;hb=22042893e4c8ce0f178043ace460c7831c3df4d2;hp=d89d44571d113daff23598475bc780c6e9f0d47c;hpb=6d6a01255c7a5c146bbeb3daae6f527dd40f98d4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_rifle.qc b/qcsrc/server/w_rifle.qc index d89d44571..941a528a4 100644 --- a/qcsrc/server/w_rifle.qc +++ b/qcsrc/server/w_rifle.qc @@ -116,7 +116,7 @@ float w_rifle(float req) self.bot_secondary_riflemooth = 0; if(self.bot_secondary_riflemooth == 0) { - if(bot_aim(autocvar_g_balance_rifle_primary_speed, 0, autocvar_g_balance_rifle_primary_lifetime, TRUE)) + if(bot_aim(autocvar_g_balance_rifle_primary_speed, 0, autocvar_g_balance_rifle_primary_lifetime, FALSE)) { self.BUTTON_ATCK = TRUE; if(random() < 0.01) self.bot_secondary_riflemooth = 1; @@ -124,7 +124,7 @@ float w_rifle(float req) } else { - if(bot_aim(autocvar_g_balance_rifle_secondary_speed, 0, autocvar_g_balance_rifle_secondary_lifetime, TRUE)) + if(bot_aim(autocvar_g_balance_rifle_secondary_speed, 0, autocvar_g_balance_rifle_secondary_lifetime, FALSE)) { self.BUTTON_ATCK2 = TRUE; if(random() < 0.03) self.bot_secondary_riflemooth = 0; @@ -147,7 +147,7 @@ float w_rifle(float req) self.rifle_accumulator += autocvar_g_balance_rifle_primary_burstcost; } if (self.BUTTON_ATCK2) - { + { if (autocvar_g_balance_rifle_secondary) { if(autocvar_g_balance_rifle_secondary_reload) @@ -183,13 +183,13 @@ float w_rifle(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_nails >= autocvar_g_balance_rifle_primary_ammo; - ammo_amount += self.weapon_load[WEP_RIFLE] >= autocvar_g_balance_rifle_primary_ammo; + ammo_amount += self.(weapon_load[WEP_RIFLE]) >= autocvar_g_balance_rifle_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_nails >= autocvar_g_balance_rifle_secondary_ammo; - ammo_amount += self.weapon_load[WEP_RIFLE] >= autocvar_g_balance_rifle_secondary_ammo; + ammo_amount += self.(weapon_load[WEP_RIFLE]) >= autocvar_g_balance_rifle_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER)