Fixing fire.h and material_value.c

Censor · Censor · commit de059825efa8 · 2013-05-18T14:40:02.000-04:00
Small, but useful fixes.
diff --git a/src/fire.h b/src/fire.h
@@ -65,7 +65,12 @@ along with this program. If not, see http://www.gnu.org/licenses/.
 
 #define true 1
 #define false 0
+#if defined(__GNUC__)
 #define bool uint8
+#elif defined(__INTEL_COMPILER) || defined(_MSC_VER)
+#define bool boolean // Added 5/17/2013
+#endif
+
 
 #define HasPopCNT
 #define HasPreFetch
diff --git a/src/material_value.c b/src/material_value.c
@@ -485,10 +485,9 @@ static int WhiteWeight(int wP, int wN, int wB, int wBL, int wBD, int wR, int wQ,
 					wWeight = 7;
 			}
         }
-        if (wQ == 1 && wPhase == 4 && bPhase >= 2 && bP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco
-            wWeight = 5;
 	}
-    
+    if (wQ == 1 && wPhase == 4 && bPhase >= 2 && bP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco
+		wWeight = 5;
     return wWeight;
     }
 static int BlackWeight(int wP, int wN, int wB, int wBL, int wBD, int wR, int wQ, int bP, int bN, int bB, int bBL,
@@ -833,10 +832,9 @@ static int BlackWeight(int wP, int wN, int wB, int wBL, int wBD, int wR, int wQ,
 					bWeight = 7;
 			}
 		}  
-        if (bQ == 1 && bPhase == 4 && wPhase >= 2 && wP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco
-		    bWeight = 5;
     }
-	
+	if (bQ == 1 && bPhase == 4 && wPhase >= 2 && wP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco
+		bWeight = 5;
     return bWeight;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -485,10 +485,9 @@ static int WhiteWeight(int wP, int wN, int wB, int wBL, int wBD, int wR, int wQ,`
`485`	`485`	`wWeight = 7;`
`486`	`486`	`}`
`487`	`487`	`}`
`488`		`- if (wQ == 1 && wPhase == 4 && bPhase >= 2 && bP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco`
`489`		`- wWeight = 5;`
`490`	`488`	`}`
`491`		`-`
	`489`	`+ if (wQ == 1 && wPhase == 4 && bPhase >= 2 && bP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco`
	`490`	`+ wWeight = 5;`
`492`	`491`	`return wWeight;`
`493`	`492`	`}`
`494`	`493`	`static int BlackWeight(int wP, int wN, int wB, int wBL, int wBD, int wR, int wQ, int bP, int bN, int bB, int bBL,`
`@@ -833,10 +832,9 @@ static int BlackWeight(int wP, int wN, int wB, int wBL, int wBD, int wR, int wQ,`
`833`	`832`	`bWeight = 7;`
`834`	`833`	`}`
`835`	`834`	`}`
`836`		`- if (bQ == 1 && bPhase == 4 && wPhase >= 2 && wP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco`
`837`		`- bWeight = 5;`
`838`	`835`	`}`
`839`		`-`
	`836`	`+ if (bQ == 1 && bPhase == 4 && wPhase >= 2 && wP >= 1) // Added on 3/29/2013, recommended by Jose Maria Velasco`
	`837`	`+ bWeight = 5;`
`840`	`838`	`return bWeight;`
`841`	`839`	`}`
`842`	`840`