Merge branch 'master' into release-3.15.2

CBATeam · Nov 17, 2020 · e4ec856 · e4ec856
2 parents c2b9f3f + deb7d2b
commit e4ec856
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml
@@ -28,10 +28,12 @@
         <Key ID="STR_CBA_AI_InvisibleTargetVehicle">
             <English>Invisible Target Vehicle</English>
             <German>Unsichtbares Ziel - Fahrzeug</German>
+            <French>Véhicule cible invisible</French>
         </Key>
         <Key ID="STR_CBA_AI_InvisibleTargetAir">
             <English>Invisible Target Airplane</English>
             <German>Unsichtbares Ziel - Flugzeug</German>
+            <French>Avion cible invisible</French>
         </Key>
     </Package>
 </Project>
diff --git a/addons/statemachine/script_component.hpp b/addons/statemachine/script_component.hpp
@@ -20,7 +20,7 @@
 #define ONSTATEENTERED(var) (var + "_onStateEntered")
 #define ONSTATELEAVING(var) (var + "_onStateLeaving")
 #define GET_FUNCTION(var,cfg) private var = getText (cfg); \
-    if (isNil var) then { \
+    if (isNil var || {!((missionNamespace getVariable var) isEqualType {})}) then { \
         var = compile var; \
     } else { \
         var = missionNamespace getVariable var;\