From 64d9be91694399d9034bfb93f8a47240c7e37ff5 Mon Sep 17 00:00:00 2001
From: Marko <markokil321@hotmail.com>
Date: Sat, 9 Aug 2014 11:41:43 +0200
Subject: [PATCH] Update player_goFishing.sqf

Added better message when trying to fish while in combat, to avoid confusion.
---
 SQF/dayz_code/actions/player_goFishing.sqf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SQF/dayz_code/actions/player_goFishing.sqf b/SQF/dayz_code/actions/player_goFishing.sqf
index b7f0b4a13..1d1ef6c02 100644
--- a/SQF/dayz_code/actions/player_goFishing.sqf
+++ b/SQF/dayz_code/actions/player_goFishing.sqf
@@ -17,7 +17,7 @@ if(!(surfaceIsWater _position)) exitWith {DZE_ActionInProgress = false; cutText
 if((currentWeapon player) != "MeleeFishingPole") exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_67"), "PLAIN DOWN"]; };
 
 if(dayz_isSwimming) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26", "PLAIN DOWN"]; };
-if(player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_68"), "PLAIN DOWN"];};
+if(player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_312"), "PLAIN DOWN"];};
 
 _isOk = true;
 _counter = 0;
@@ -81,4 +81,4 @@ while {_isOk} do {
 		};
 	};
 };
-DZE_ActionInProgress = false;
\ No newline at end of file
+DZE_ActionInProgress = false;