Remove stupid functions.sqf

Altis_Life.Altis/Functions.hpp

@@ -33,19 +33,7 @@ class Tonic {
         class index {};
         class isNumber {};
         class playerQuery {};
-    };
-};
-
-class TON_Cellphone {
-    tag = "TON_cell";
-    class cellphone {
-        file = "core\functions\TON\cell";
-        class adminmsg {};
-        class adminmsgall {};
-        class emsrequest {};
-        class textadmin {};
-        class textcop {};
-        class textmsg {};
+        class sendMessage {};
     };
 };
 

Altis_Life.Altis/core/functions/TON/fn_clientMessage.sqf

@@ -10,6 +10,7 @@
         2 = message to admin
         3 = message from admin
         4 = admin message to all
+        5 = ems message
 */
 params [
     ["_msg", "", [""]],

Altis_Life.Altis/core/functions/TON/fn_sendMessage.sqf

@@ -0,0 +1,70 @@
+/*
+    File: fn_sendMessage.sqf
+    Author: blackfisch
+
+    Description: send message to target
+*/
+params [
+    ["_ehParams", [], []],
+    ["_target", "player", [""]]
+];
+_ehParams params [
+    ["_control", controlNull, [controlNull]]
+];
+
+if (isNull _control) exitWith {hint "An error occured"};
+_control ctrlEnable false;
+
+private _to = call compile format ["%1",(lbData[3004,(lbCurSel 3004)])];
+if (!(_target in ["admin", "adminAll"]) && {isNil "_to" || {isNull _to}}) exitWith {
+    _control ctrlEnable true;
+};
+
+private _msg = ctrlText 3003;
+if (_msg isEqualTo "") exitWith {
+    hint localize "STR_CELLMSG_EnterMSG";
+    _control ctrlEnable true;
+};
+
+private _maxLength = getNumber(missionConfigFile >> "Life_Settings" >> "message_maxlength");
+if (_maxLength > -1 && {(count _msg) > _maxLength}) exitWith {
+    hint localize "STR_CELLMSG_LIMITEXCEEDED";
+    _control ctrlEnable true;
+};
+
+private _targetFunction = 0;
+private _sender = player getVariable ["realName", profileName];
+private _toName = (if (isNil "_to" || {isNull _to}) then {"ERROR"} else {_to getVariable ["realname", name _to]});
+private _confirmMessage = "STR_CELLMSG_ToPerson";
+
+switch (_target) do {
+    case "cop": {
+        _to = west;
+        _targetFunction = 1;
+        _confirmMessage = "STR_CELLMSG_ToPolice";
+    };
+    case "med": {
+        _to = independent;
+        _targetFunction = 5;
+        _confirmMessage = "STR_CELLMSG_ToEMS";
+    };
+    case "admin": {
+        _to = -2;
+        _targetFunction = 2;
+        _confirmMessage = "STR_CELLMSG_ToAdmin";
+    };
+    case "adminToPlayer": {
+        _targetFunction = 3;
+        _confirmMessage = "STR_CELLMSG_AdminToPerson";
+    };
+    case "adminAll": {
+        _to = -2;
+        _targetFunction = 4;
+        _confirmMessage = "STR_CELLMSG_AdminToAll";
+    };
+};
+
+[_msg,_sender,_targetFunction, mapGridPosition player] remoteExecCall ["TON_fnc_clientMessage",_to];
+call life_fnc_cellphone;
+hint format [localize _confirmMessage,_toName,_msg];
+_control ctrlEnable true;

Altis_Life.Altis/dialog/cell_phone.hpp

@@ -60,7 +60,7 @@ class Life_cell_phone {
             idc = 3015;
             text = "$STR_CELL_TextMSGBtn";
             colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5};
-            onButtonClick = "[] call TON_cell_fnc_textmsg";
+            onButtonClick = "[_this, 'player'] call TON_fnc_sendMessage";
             x = 0.11;
             y = 0.35;
             w = 0.2;
@@ -79,7 +79,7 @@ class Life_cell_phone {
             idc = 3016;
             text = "$STR_CELL_TextPolice";
             colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5};
-            onButtonClick = "[] call TON_cell_fnc_textcop";
+            onButtonClick = "[_this, 'cop'] call TON_fnc_sendMessage";
             x = 0.32;
             y = 0.35;
             w = 0.2;
@@ -90,7 +90,7 @@ class Life_cell_phone {
             idc = 3017;
             text = "$STR_CELL_TextAdmins";
             colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5};
-            onButtonClick = "[] call TON_cell_fnc_textadmin";
+            onButtonClick = "[_this, 'admin'] call TON_fnc_sendMessage";
             x = 0.53;
             y = 0.35;
             w = 0.2;
@@ -101,7 +101,7 @@ class Life_cell_phone {
             idc = 3020;
             text = "$STR_CELL_AdminMsg";
             colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5};
-            onButtonClick = "[] call TON_cell_fnc_adminmsg";
+            onButtonClick = "[_this, 'adminToPlayer'] call TON_fnc_sendMessage";
             x = 0.32;
             y = 0.4;
             w = 0.2;
@@ -112,7 +112,7 @@ class Life_cell_phone {
             idc = 3021;
             text = "$STR_CELL_AdminMSGAll";
             colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5};
-            onButtonClick = "[] call TON_cell_fnc_adminmsgall";
+            onButtonClick = "[_this, 'adminAll'] call TON_fnc_sendMessage";
             x = 0.53;
             y = 0.4;
             w = 0.2;
@@ -123,7 +123,7 @@ class Life_cell_phone {
             idc = 3022;
             text = "$STR_CELL_EMSRequest";
             colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", 0.5};
-            onButtonClick = "[] call TON_cell_fnc_emsrequest";
+            onButtonClick = "[_this, 'med'] call TON_fnc_sendMessage";
             x = 0.11;
             y = 0.45;
             w = 0.2;
@@ -140,4 +140,4 @@ class Life_cell_phone {
             h = (1 / 25);
         };
     };
-};
+};

Altis_Life.Altis/stringtable.xml

@@ -1490,6 +1490,30 @@
             <Polish>You have sent a message to all EMS Units.</Polish>
 			<Chinesesimp>你已经向所有医护人员发送了消息.</Chinesesimp>
         </Key>
+        <Key ID="STR_CELLMSG_ToPolice">
+            <Original>You have sent a message to all Police Units.</Original>
+            <Czech>You have sent a message to all Police Units.</Czech>
+            <Spanish>You have sent a message to all Police Units.</Spanish>
+            <Russian>You have sent a message to all Police Units.</Russian>
+            <German>Du hast eine Nachricht an alle Polizisten gesendet.</German>
+            <French>Vous avez envoyé un message à tous les Police.</French>
+            <Italian>You have sent a message to all Police Units.</Italian>
+            <Portuguese>You have sent a message to all Police Units.</Portuguese>
+            <Polish>You have sent a message to all Police Units.</Polish>
+			<Chinesesimp></Chinesesimp>
+        </Key>
+        <Key ID="STR_CELLMSG_ToAdmin">
+            <Original>You have sent a message to all Admins.</Original>
+            <Czech>You have sent a message to all Admins.</Czech>
+            <Spanish>You have sent a message to all Admins.</Spanish>
+            <Russian>You have sent a message to all Admins.</Russian>
+            <German>Du hast eine Nachricht an alle Admins gesendet.</German>
+            <French>Vous avez envoyé un message à tous les Admins.</French>
+            <Italian>You have sent a message to all Admins.</Italian>
+            <Portuguese>You have sent a message to all Admins.</Portuguese>
+            <Polish>You have sent a message to all Admins.</Polish>
+			<Chinesesimp></Chinesesimp>
+        </Key>
         <Key ID="STR_CELLMSG_ToPerson">
             <Original>You sent %1 a message: %2</Original>
             <Czech>You sent %1 a message: %2</Czech>
@@ -1527,16 +1551,16 @@
 			<Chinesesimp>管理员消息发送给: %1 - 信息: %2</Chinesesimp>
         </Key>
         <Key ID="STR_CELLMSG_AdminToAll">
-            <Original>Admin Message Sent To All: %1</Original>
-            <Czech>Admin Message Sent To All: %1</Czech>
-            <Spanish>Admin Message Sent To All: %1</Spanish>
-            <Russian>Admin Message Sent To All: %1</Russian>
-            <German>Admin Nachricht Gesendet an Alle: %1</German>
-            <French>Message admin envoyé à tous les joueurs : %1</French>
-            <Italian>Admin Message Sent To All: %1</Italian>
-            <Portuguese>Admin Message Sent To All: %1</Portuguese>
-            <Polish>Admin Message Sent To All: %1</Polish>
-			<Chinesesimp>管理员发送信息到全体: %1</Chinesesimp>
+            <Original>Admin Message Sent To All: %2</Original>
+            <Czech>Admin Message Sent To All: %2</Czech>
+            <Spanish>Admin Message Sent To All: %2</Spanish>
+            <Russian>Admin Message Sent To All: %2</Russian>
+            <German>Admin Nachricht Gesendet an Alle: %2</German>
+            <French>Message admin envoyé à tous les joueurs : %2</French>
+            <Italian>Admin Message Sent To All: %2</Italian>
+            <Portuguese>Admin Message Sent To All: %2</Portuguese>
+            <Polish>Admin Message Sent To All: %2</Polish>
+			<Chinesesimp>管理员发送信息到全体: %2</Chinesesimp>
         </Key>
     </Package>
     <Package name="Chop_Shop">
@@ -13391,4 +13415,4 @@
 			<Chinesesimp>%1 - %2 将 $%3 存进他们的银行账户。银行存款余额：$%4  手上现金：$%5</Chinesesimp>
         </Key>
     </Package>
-</Project>
+</Project>