Merge pull request #136 from GNCLORD-MDB/fix_GPS_Statusbug

Fix für GPS, Beam und Shop
OperationPandoraTrigger · Apr 1, 2021 · 6e63b98 · 6e63b98
2 parents f7cbc7a + b130dc5
commit 6e63b98
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/addons/OPT/GELDZEIT/fn_beam.sqf b/addons/OPT/GELDZEIT/fn_beam.sqf
@@ -106,18 +106,18 @@ switch GVAR(Fraktionauswahl) do
 
     default
     {
-        ERROR_LOG("GeldzeitBeam: Fehlerhafte Datenübergabe - Keine Fraktionauswahl erkannt");
+        ERROR_LOG("GeldzeitBeam: Fehlerhafte Datenübergabe - Keine Fraktionauswahl erkannt");
     };
 };
 
 if !(isNull _Basis) then
 {
     (["Basis"] call BIS_fnc_rscLayer) cutText ["Teleport...", "BLACK OUT", 3]; // fade out in black
-
     // beam player
-    vehicle player setPosASL [(random 100) - 50, (random 100) - 50, 1000 + random 100];
-    vehicle player setVectorUp [0,0,1];
-    vehicle player setPosASL (getPosASL _Basis vectorAdd [(random 2) + 2, (random 2) + 2, 0.2]);
-
+    private _TempLogic = "Land_HelipadEmpty_F" createvehicle [(getPos _Basis select 0)-20*sin(random 360),(getPos _Basis select 1)-20*cos(random 360)];
+    vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0, 0, 10]);
+    vehicle player setVectorUp surfaceNormal position _TempLogic;
+    vehicle player setPosASL (getPosASL _TempLogic vectorAdd [0, 0, 0.2]);
+    deleteVehicle _TempLogic;
     (["Basis"] call BIS_fnc_rscLayer) cutText ["", "BLACK IN", 3];
 };
diff --git a/addons/OPT/GPS/fn_gps.sqf b/addons/OPT/GPS/fn_gps.sqf
@@ -106,7 +106,7 @@ GVAR(markerplayer) = [] call FUNC(createPlayerMarker);
                     {
                         _marker setMarkerTextLocal _name;
 
-                        if ((lifeState _obj isEqualTo "INCAPACITATED") or (_obj getVariable "OPT_isUnconscious" == 1)) then 
+                        if ((lifeState _obj isEqualTo "INCAPACITATED") and !(incapacitatedState _obj == "")) then 
                         {
                             _marker setMarkerTextLocal "";
                             _marker setMarkerPosLocal [0,0];

diff --git a/addons/OPT/GPS/fn_gps_Unconscious.sqf b/addons/OPT/GPS/fn_gps_Unconscious.sqf
@@ -46,7 +46,7 @@ for "_i" from 1 to (GVAR(unitnumberUnconscious)) do
         _Sideidunit = getnumber (configFile >> "CfgVehicles" >> (typeof _x) >> "side");
         _sideidplayer = playerSide call BIS_fnc_sideID;   
 
-        if ((_Sideidunit == _sideidplayer) and ((lifeState _x isEqualTo "INCAPACITATED") or (_x getVariable "OPT_isUnconscious" == 1))) then 
+        if ((_Sideidunit == _sideidplayer) and (lifeState _x isEqualTo "INCAPACITATED") and !(incapacitatedState _x == "")) then 
         {
             _unitsToMarkisUnconscious pushBack _x;
         };

diff --git a/addons/OPT/REVIVE/fn_clientInitEH.sqf b/addons/OPT/REVIVE/fn_clientInitEH.sqf
@@ -162,10 +162,12 @@ GVAR(missionEH_draw3D) = addMissionEventHandler ["Draw3D",
 {
     private _nearbyUnits = playableUnits select 
     {
+    _sideidplayer = playerSide call BIS_fnc_sideID;  
         (_x distance player) < 30 and
         lifeState _x isEqualTo "INCAPACITATED" and
+        !(incapacitatedState _x == "") and
         _x != player and
-        SIDE _x == PLAYERSIDE
+        ((getnumber (configFile >> "CfgVehicles" >> (typeof _x) >> "side")) isEqualTo (playerSide call BIS_fnc_sideID))
     };
     {
         private _name = NAME _x;

diff --git a/addons/OPT/REVIVE/fn_dialog.sqf b/addons/OPT/REVIVE/fn_dialog.sqf
@@ -94,12 +94,12 @@ GVAR(startzeit) = time;
             _sidesoldat =getnumber (configFile >> "CfgVehicles" >> (typeof _x) >> "side"); 
             _sideplayer =getnumber (configFile >> "CfgVehicles" >> (typeof player) >> "side");
 
-            if ((_sidesoldat isEqualTo _sideplayer) and (typeOf _x in GVAR(SaniKlassen)) and !(lifeState _x isEqualTo "INCAPACITATED") and GVAR(onlysani)) then 
+            if ((_sidesoldat isEqualTo _sideplayer) and (typeOf _x in GVAR(SaniKlassen)) and !(lifeState _x isEqualTo "INCAPACITATED") and (incapacitatedState _x == "") and GVAR(onlysani)) then 
             {
                 _poolplayer pushBack _x;
             };
             //alle Spieler
-            if ((_sidesoldat isEqualTo _sideplayer) and !(lifeState _x isEqualTo "INCAPACITATED") and !GVAR(onlysani)) then 
+            if ((_sidesoldat isEqualTo _sideplayer) and !(lifeState _x isEqualTo "INCAPACITATED") and (incapacitatedState _x == "") and !GVAR(onlysani)) then 
             {
                 _poolplayer pushBack _x;
             };

diff --git a/addons/OPT/REVIVE/macros.hpp b/addons/OPT/REVIVE/macros.hpp
@@ -1,2 +1,3 @@
 #define MODULE REVIVE
 #include "\opt\opt\addons\opt\macros.hpp"
+
diff --git a/addons/OPT/SHOP/fn_einlesenInShopDialog.sqf b/addons/OPT/SHOP/fn_einlesenInShopDialog.sqf
@@ -150,7 +150,7 @@ switch (GVAR(vehicleType)) do
             };        
         }; 
         GVAR(moveInVeh) = true;
-        _konfig ctrlEnable true;       
+        _konfig ctrlEnable false;       
     };
 
     case "vehicles":
@@ -183,7 +183,7 @@ switch (GVAR(vehicleType)) do
             };        
         }; 
         GVAR(moveInVeh) = true;
-        _konfig ctrlEnable true;       
+        _konfig ctrlEnable false;       
     };
 
     case "supplies" : 
@@ -251,7 +251,7 @@ switch (GVAR(vehicleType)) do
             };        
         }; 
         GVAR(moveInVeh) = true;
-        _konfig ctrlEnable true;       
+        _konfig ctrlEnable false;       
     };
     default 
     {

diff --git a/dependencies/CLib b/dependencies/CLib