Revert "Revert "aus #613 neuen cmd connectToServer genutzt; script_mo…

…d.hpp und script_macros.hpp con common nutzen"" (#654) This reverts commit 514bfde.
TacticalBaconDevs · Oct 23, 2021 · eea5731 · eea5731
1 parent 514bfde
commit eea5731
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 146 deletions.
diff --git a/addons/advSlingload/script_component.hpp b/addons/advSlingload/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT advSlingload
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/ai/script_component.hpp b/addons/ai/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT ai
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/ares_compositions/script_component.hpp b/addons/ares_compositions/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT ares_compositions
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/arsenal/script_component.hpp b/addons/arsenal/script_component.hpp
@@ -3,12 +3,12 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT arsenal
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
 
 /*
     Addon spezifisch

diff --git a/addons/building/script_component.hpp b/addons/building/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT building
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/bw/script_component.hpp b/addons/bw/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT bw
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/config/script_component.hpp b/addons/config/script_component.hpp
@@ -3,10 +3,10 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT config
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 // #define ENABLE_PERFORMANCE_COUNTERS
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/eden/script_component.hpp b/addons/eden/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT eden
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/eos/script_component.hpp b/addons/eos/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT eos
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/extension/functions/fnc_callExtension.sqf b/addons/extension/functions/fnc_callExtension.sqf
@@ -10,7 +10,8 @@ params [
     ["_codeReturn", false, [false]]
 ];
 
-if (!canSuspend) exitWith {"ERROR: Suspending not allowed in this contex"};
+// Darf nicht <Suspend> dann kommt nichts zurück
+//if (!canSuspend) exitWith {"ERROR: Suspending not allowed in this contex"};
 
 private _array = [_cmd];
 if (!isNil {_data}) then {_array pushBack _data};
@@ -25,9 +26,10 @@ if (_errorCode < 0 || {_returnCode < 0}) then
     systemChat _msg;
 };
 
-if (_returnCode > 1) then
+// TODO: Darf nicht <Suspend> dann kommt nichts zurück
+/*if (_returnCode > 1) then
 {
     _result = [_returnCode] call FUNC(getFromCache);
-};
+};*/
 
 if (_codeReturn) then {_returnCode} else {_result};
diff --git a/addons/extension/script_component.hpp b/addons/extension/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT extension
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/medical/script_component.hpp b/addons/medical/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT medical
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/menubutton/config.cpp b/addons/menubutton/config.cpp
@@ -14,9 +14,9 @@ class CfgPatches
         name = "TBMod MenuButton";
 
         requiredAddons[] = {
-            "TBMod_main"
+            "TBMod_common"
         };
-        addonRootClass = "TBMod_main";
+        addonRootClass = "TBMod_common";
     };
 };
 
@@ -27,13 +27,12 @@ class RscDisplayMain: RscStandardDisplay
 {
     class Spotlight
     {
-        class TB_missionServer
+        class GVAR(missionServer)
         {
-            text = "";
-            textIsQuote = 0;
+            text = "TacticalBacon Server";
             picture = PATHTOF(button.paa);
-            //video = "\a3\Ui_f\Video\spotlight_1_Apex.ogv";
-            action = QUOTE([_this, 'server.tacticalbacon.de', '2302', 'tbm'] call COMPILE_SCRIPT(joinServer)); // execVM QPATHTOF
+            //action = QUOTE([_this, 'server.tacticalbacon.de', '2302', 'tbm'] call COMPILE_SCRIPT(joinServer)); // execVM QPATHTOF
+            action = "connectToServer ['server.tacticalbacon.de', 2302, 'tbm']";
             actionText = "Join TacticalBacon Server";
             condition = "true";
         };

diff --git a/addons/menubutton/joinServer.sqf b/addons/menubutton/joinServer.sqf
diff --git a/addons/menubutton/script_component.hpp b/addons/menubutton/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT menubutton
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/nachschub/script_component.hpp b/addons/nachschub/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT nachschub
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/persistence/script_component.hpp b/addons/persistence/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT persistence
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/poppy/script_component.hpp b/addons/poppy/script_component.hpp
@@ -3,12 +3,12 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT poppy
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
 
 #define LOADOUT_INDEXES [ \
     "uniform", "vest", "backpack", \

diff --git a/addons/rhs/script_component.hpp b/addons/rhs/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT rhs
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/skins/script_component.hpp b/addons/skins/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT skins
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/spectrum/script_component.hpp b/addons/spectrum/script_component.hpp
@@ -3,10 +3,10 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT spectrum
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 // #define ENABLE_PERFORMANCE_COUNTERS
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/stealthvehicle/script_component.hpp b/addons/stealthvehicle/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT stealthvehicle
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"
diff --git a/addons/taser/script_component.hpp b/addons/taser/script_component.hpp
@@ -3,9 +3,9 @@
     Developed by http://tacticalbacon.de
 */
 #define COMPONENT taser
-#include "\x\TBMod\addons\main\script_mod.hpp"
+#include "\x\TBMod\addons\common\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#include "\x\TBMod\addons\main\script_macros.hpp"
+#include "\x\TBMod\addons\common\script_macros.hpp"