diff --git a/battlefield.lua b/battlefield.lua
--- a/battlefield.lua
+++ b/battlefield.lua
@@ -180,7 +180,7 @@ battlefield = function(tab)
                             elseif s:canShoot(s.plX, s.plY, tx, ty) and (have(item_colt) and not s.underwater) or (have(item_harpoon)) then
                                 if have(item_colt) and not s.underwater and item_colt.bullets == 0 then
                                     pr [[Ваш револьвер не заряжен. ]];
-                                elseif have(item_harpoon) and item_harpoon.charge == 0 then
+                                elseif have(item_harpoon) and item_harpoon.charge == 0 and s.underwater or not have(item_colt) then
                                     pr [[Ваше ружье не заряжено. ]];
                                 else
                                     s.ui_state = {tx, ty, 'shoot', s.obj[i]};