fix #4416

get rid of CMD_LOOPBACKATTACK which served as a toggle for allowing aircraft to execute loopings, gadgets can set this now (via passing key "loopbackAttack" to MoveCtrl.SetAirMoveTypeData)
spring · Jun 15, 2014 · 0361f97 · 0361f97
1 parent cf9dd70
commit 0361f97
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 165 deletions.
diff --git a/rts/Game/UI/CursorIcons.cpp b/rts/Game/UI/CursorIcons.cpp
@@ -179,7 +179,6 @@ const CMouseCursor* CCursorIcons::GetCursor(int cmd) const
 		case CMD_FIGHT:           cursorName = "Fight";        break;
 		case CMD_ATTACK:          cursorName = "Attack";       break;
 		case CMD_AREA_ATTACK:     cursorName = "Area attack";  break;
-		case CMD_LOOPBACKATTACK:  cursorName = "Attack";       break;
 		case CMD_GUARD:           cursorName = "Guard";        break;
 		case CMD_REPAIR:          cursorName = "Repair";       break;
 		case CMD_LOAD_ONTO:       cursorName = "Load units";   break;

diff --git a/rts/Lua/LuaConstCMD.cpp b/rts/Lua/LuaConstCMD.cpp
@@ -70,7 +70,7 @@ bool LuaConstCMD::PushEntries(lua_State* L)
 	PUSH_CMD(RESURRECT);
 	PUSH_CMD(CAPTURE);
 	PUSH_CMD(AUTOREPAIRLEVEL);
-	PUSH_CMD(LOOPBACKATTACK);
+	LuaInsertDualMapPair(L, "LOOPBACKATTACK", CMD_ATTACK); // backward compability (TODO: find a way to print a warning when used!)
 	PUSH_CMD(IDLEMODE);
 
 	return true;