Merge.

2012-05-27 01:56:15 +01:00
parent cdbaac15a1 693c0cf41b
commit c6405bfb63
8 changed files with 31 additions and 7 deletions
@@ -263,7 +263,7 @@ stock Float:operator--(Float:oper)

 stock Float:operator-(Float:oper)
 {
-	return oper^Float:((-1)^((-1)/2));				/* IEEE values are sign/magnitude */
+	return oper^Float:cellmin;				/* IEEE values are sign/magnitude */
 }

 stock Float:operator*(Float:oper1, oper2)
@@ -115,7 +115,10 @@ enum TFCond
 	TFCond_CritOnWin,
 	TFCond_CritOnFlagCapture,
 	TFCond_CritOnKill,
-	TFCond_RestrictToMelee
+	TFCond_RestrictToMelee,
+	
+	TFCond_CritMmmph = 44,
+	TFCond_DefenseBuffMmmph,
 };

 enum TFHoliday