nlc

spring · Nov 14, 2019 · 4b8602b · 4b8602b
1 parent 8e4be27
commit 4b8602b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/rts/Lua/LuaSyncedCtrl.cpp b/rts/Lua/LuaSyncedCtrl.cpp
@@ -1701,7 +1701,7 @@ int LuaSyncedCtrl::SetUnitUseWeapons(lua_State* L)
 		return 0;
 
 	unit->forceUseWeapons = luaL_optboolean(L, 2, unit->forceUseWeapons);
-	unit->blockUseWeapons = luaL_optboolean(L, 3, unit->blockUseWeapons);
+	unit->allowUseWeapons = luaL_optboolean(L, 3, unit->allowUseWeapons);
 	return 0;
 }
 

diff --git a/rts/Sim/Units/Unit.cpp b/rts/Sim/Units/Unit.cpp
@@ -2817,7 +2817,7 @@ CR_REG_METADATA(CUnit, (
 	CR_MEMBER(onTempHoldFire),
 
 	CR_MEMBER(forceUseWeapons),
-	CR_MEMBER(blockUseWeapons),
+	CR_MEMBER(allowUseWeapons),
 
 	CR_MEMBER(deathScriptFinished),
 	CR_MEMBER(delayedWreckLevel),

diff --git a/rts/Sim/Units/Unit.h b/rts/Sim/Units/Unit.h
@@ -159,7 +159,7 @@ class CUnit : public CSolidObject
 
 	bool HaveTarget() const { return (curTarget.type != Target_None); }
 	bool CanUpdateWeapons() const {
-		return (forceUseWeapons || (!blockUseWeapons && !onTempHoldFire !isDead && !beingBuilt && !IsStunned()));
+		return (forceUseWeapons || (allowUseWeapons && !onTempHoldFire !isDead && !beingBuilt && !IsStunned()));
 	}
 
 	void SetNeutral(bool b);
@@ -502,7 +502,7 @@ class CUnit : public CSolidObject
 
 	// Lua overrides for CanUpdateWeapons
 	bool forceUseWeapons = false;
-	bool blockUseWeapons = false;
+	bool allowUseWeapons =  true;
 
 	// signals if script has finished executing Killed and the unit can be deleted
 	bool deathScriptFinished = false;