diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp index c63a95c3364..4494b0fb3b6 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp @@ -3617,7 +3617,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo Bool handled = false; - if (specificBarrelToUse < 0 || specificBarrelToUse > wbvec.size()) + if (specificBarrelToUse < 0 || specificBarrelToUse >= wbvec.size()) specificBarrelToUse = 0; const ModelConditionInfo::WeaponBarrelInfo& info = wbvec[specificBarrelToUse]; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp index 1135b17de8f..7fb0fe0873a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp @@ -3718,7 +3718,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo Bool handled = false; - if (specificBarrelToUse < 0 || specificBarrelToUse > wbvec.size()) + if (specificBarrelToUse < 0 || specificBarrelToUse >= wbvec.size()) specificBarrelToUse = 0; const ModelConditionInfo::WeaponBarrelInfo& info = wbvec[specificBarrelToUse];