Skip to content
Snippets Groups Projects

Fix crylink and vaporizer being able to fire with empty magazines

Merged Dr. Jaska requested to merge drjaska/wep-reload-fixes into master
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
@@ -255,11 +255,11 @@ METHOD(Vaporizer, wr_think, void(entity thiswep, entity actor, .entity weaponent
// if the laser uses load, we also consider its ammo for reloading
if(WEP_CVAR(vaporizer, reload_ammo) && WEP_CVAR_SEC(vaporizer, ammo) && actor.(weaponentity).clip_load < min(vaporizer_ammo, WEP_CVAR_SEC(vaporizer, ammo))) { // forced reload
thiswep.wr_reload(thiswep, actor, weaponentity);
actor.(weaponentity).hagar_load = false; // minstagib exclusive var
actor.(weaponentity).hagar_load = false; // rocket minsta exclusive var
return;
} else if(WEP_CVAR(vaporizer, reload_ammo) && actor.(weaponentity).clip_load < vaporizer_ammo) { // forced reload
thiswep.wr_reload(thiswep, actor, weaponentity);
actor.(weaponentity).hagar_load = false; // minstagib exclusive var
actor.(weaponentity).hagar_load = false; // rocket minsta exclusive var
return;
}
if((fire & 1) && (GetResource(actor, RES_CELLS) || !autocvar_g_rm) && !weaponLocked(actor))
Loading