Fix some mistakes in combat override (#46)

* Added New Flag

.

* Fix wrong definitions

They are used as SWING_SWINGING in combat_override, but defined as war_swing_swinging.

* Fix wrong combat flag checks

Author: xwerswoodx

_incomplete/combat_override.scp

@@ -45,15 +45,15 @@ endif
 if (<CanSee <src>>)													// If I can see my target.
 																	// And my target is being ridden (should not happen) or ! CanSeeLos (Ignoring windows if i'm shooting).
 	if ( (<src.brain> && <src.flags>&statf_ridden) || !<CanSeeLosFlag <src>,<qval ( <Action>==archery || <action>==throwing )? LOS_NB_WINDOWS : 0>>)
-		if ( !<serv.CombatFlags>&200 || <Swing>!=SWING_SWINGING)	// I'm going to stop (unless i'm preparing to hit and Combat_StayInRange is not set).
+		if ( !<serv.CombatFlags>&0200 || <Swing>!=SWING_SWINGING)	// I'm going to stop (unless i'm preparing to hit and Combat_StayInRange is not set).
 			argn1 SWING_READY
 			return 1
 		endif
 		argn1 SWING_EQUIPPING
 		return 1
 	endif
 else
-	if ( !<serv.CombatFlags>&200 || <Swing>!=SWING_SWINGING)		// same here but without LOS check.
+	if ( !<serv.CombatFlags>&0200 || <Swing>!=SWING_SWINGING)		// same here but without LOS check.
 		argn1 SWING_READY
 		return 1
 	endif
@@ -94,7 +94,7 @@ if (<weapon>)
 
 		if ( <local.dist> > <local.maxdist )							// If my target is far than my weapon's max distance...
 
-			if ( !<serv.CombatFlags>&200 || <Swing>!=SWING_SWINGING)	// and I'm not preparing to hit or not Combat_StayInRange
+			if ( !<serv.CombatFlags>&0200 || <Swing>!=SWING_SWINGING)	// and I'm not preparing to hit or not Combat_StayInRange
 				argn1 SWING_READY
 				return 1
 			endif

core/defs.scp

@@ -577,9 +577,9 @@ can_u_none			020
 can_o_nosleep 		010000000
 
 [DEFNAME swing_types]
-war_swing_equipping		0	// we are recoiling our weapon.
-war_swing_ready			1	// we can swing at any time.
-war_swing_swinging		2	// we are swinging our weapon.
+swing_equipping		0	// we are recoiling our weapon.
+swing_ready			1	// we can swing at any time.
+swing_swinging		2	// we are swinging our weapon.
 
 [DEFNAME theme_packs]
 theme_gothic		1