From 248cdf1f3fb3c56002e40742a605778c04db62f2 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Wed, 22 Jul 2015 14:36:55 +0100 Subject: [PATCH] Public function error messages --- addons/spectator/functions/fnc_transitionCamera.sqf | 1 - addons/spectator/functions/fnc_updateCameraModes.sqf | 2 +- addons/spectator/functions/fnc_updateVisionModes.sqf | 2 +- addons/spectator/stringtable.xml | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/spectator/functions/fnc_transitionCamera.sqf b/addons/spectator/functions/fnc_transitionCamera.sqf index 15c1c9591d..198929af66 100644 --- a/addons/spectator/functions/fnc_transitionCamera.sqf +++ b/addons/spectator/functions/fnc_transitionCamera.sqf @@ -36,7 +36,6 @@ if !(_newMode in GVAR(availableModes)) then { if (GVAR(unitList) isEqualTo []) then { _newMode = 0; _newUnit = objNull; - [LSTRING(NoUnits)] call EFUNC(common,displayTextStructured); }; // Reset gun cam if not internal diff --git a/addons/spectator/functions/fnc_updateCameraModes.sqf b/addons/spectator/functions/fnc_updateCameraModes.sqf index ada68f8cf8..ec2837ffb8 100644 --- a/addons/spectator/functions/fnc_updateCameraModes.sqf +++ b/addons/spectator/functions/fnc_updateCameraModes.sqf @@ -35,7 +35,7 @@ _newModes sort true; // Can't become an empty array if (_newModes isEqualTo []) then { - [["[ACE Spectator]","Cannot remove all camera modes"]] call EFUNC(common,displayTextStructured); + ["Cannot remove all camera modes (%1)", QFUNC(updateCameraModes)] call BIS_fnc_error; } else { GVAR(availableModes) = _newModes; }; diff --git a/addons/spectator/functions/fnc_updateVisionModes.sqf b/addons/spectator/functions/fnc_updateVisionModes.sqf index c08ca6f3f3..b2b2cd75d6 100644 --- a/addons/spectator/functions/fnc_updateVisionModes.sqf +++ b/addons/spectator/functions/fnc_updateVisionModes.sqf @@ -43,7 +43,7 @@ _newModes sort true; // Can't become an empty array if (_newModes isEqualTo []) then { - [["[ACE Spectator]","Cannot remove all vision modes"]] call EFUNC(common,displayTextStructured); + ["Cannot remove all vision modes (%1)", QFUNC(updateVisionModes)] call BIS_fnc_error; } else { GVAR(availableVisions) = _newModes; }; diff --git a/addons/spectator/stringtable.xml b/addons/spectator/stringtable.xml index d3d5884837..d7d5cc7959 100644 --- a/addons/spectator/stringtable.xml +++ b/addons/spectator/stringtable.xml @@ -81,9 +81,6 @@ Spectator Controls - - No units available to spectate, entering free camera. - Free