From d919c2436d1a23443177dffe34022ab0085f6a9c Mon Sep 17 00:00:00 2001
From: Glowbal <thomasskooi@live.nl>
Date: Sun, 8 Mar 2015 16:56:57 +0100
Subject: [PATCH] Clientside display text option for weapon reload
---
addons/reload/CfgEventHandlers.hpp | 2 +-
addons/reload/config.cpp | 11 +++++++++++
addons/reload/functions/fnc_checkAmmo.sqf | 4 ++--
addons/reload/stringtable.xml | 6 ++++++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/addons/reload/CfgEventHandlers.hpp b/addons/reload/CfgEventHandlers.hpp
index 8de6a01f06..05860b3f9f 100644
--- a/addons/reload/CfgEventHandlers.hpp
+++ b/addons/reload/CfgEventHandlers.hpp
@@ -14,7 +14,7 @@ class Extended_PostInit_EventHandlers {
class Extended_Take_EventHandlers {
class CAManBase {
class ACE_AmmoIndicatorReload {
- clientTake = QUOTE(if (_this select 0 == ACE_player && {(_this select 1) in [ARR_3(uniformContainer (_this select 0), vestContainer (_this select 0), backpackContainer (_this select 0))]} && {_this select 2 == currentMagazine (_this select 0)}) then {[ARR_3(_this select 0, vehicle (_this select 0), true)] call FUNC(checkAmmo)};);
+ clientTake = QUOTE(if !(GVAR(DisplayText)) exitwith {}; if (_this select 0 == ACE_player && {(_this select 1) in [ARR_3(uniformContainer (_this select 0), vestContainer (_this select 0), backpackContainer (_this select 0))]} && {_this select 2 == currentMagazine (_this select 0)}) then {[ARR_3(_this select 0, vehicle (_this select 0), true)] call FUNC(checkAmmo)};);
};
};
};
diff --git a/addons/reload/config.cpp b/addons/reload/config.cpp
index 6e0c14049d..84d17090a8 100644
--- a/addons/reload/config.cpp
+++ b/addons/reload/config.cpp
@@ -17,3 +17,14 @@ class CfgPatches {
#include "CfgActions.hpp"
#include "RscInGameUI.hpp"
+
+class ACE_Settings {
+ class GVAR(DisplayText) {
+ typeName = "BOOL";
+ isClientSetable = 1;
+ value = 1;
+ displayName = "$STR_ACE_reload_SettingDisplayTextName";
+ description = "$STR_ACE_reload_SettingDisplayTextDesc";
+ };
+};
+
diff --git a/addons/reload/functions/fnc_checkAmmo.sqf b/addons/reload/functions/fnc_checkAmmo.sqf
index fab1ebf333..99aa6b10bf 100644
--- a/addons/reload/functions/fnc_checkAmmo.sqf
+++ b/addons/reload/functions/fnc_checkAmmo.sqf
@@ -2,12 +2,12 @@
* Author: commy2
*
* Count the ammo of the currently loaded magazine or count rifle grenades. Play animation and display message.
- *
+ *
* Argument:
* 0: The player (Object)
* 1: The vehicle (Object)
* 2: Skip the animation? Used after reloading (Bool)
- *
+ *
* Return value:
* Nothing
*/
diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml
index 1f39b0e743..859b186ef7 100644
--- a/addons/reload/stringtable.xml
+++ b/addons/reload/stringtable.xml
@@ -2,6 +2,12 @@
<!-- Edited with tabler - 2014-09-09 -->
<Project name="ACE">
<Package name="Reload">
+ <Key ID="STR_ACE_reload_SettingDisplayTextName">
+ <English>Check ammo on weapon reload</English>
+ </Key>
+ <Key ID="STR_ACE_reload_SettingDisplayTextDesc">
+ <English>Check the ammo in your new magazine on magazine reload.</English>
+ </Key>
<Key ID="STR_ACE_Reload_checkAmmo">
<English>Check Ammo</English>
<German>Munition prüfen</German>