(svn r2110) - Fix: Fixed test for various flags (e.g. newtrains in usset). result is bool so !! any non-zero values before assigning them to it - they apparently didn't fit. ;-)
This commit is contained in:
		
							
								
								
									
										5
									
								
								newgrf.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								newgrf.c
									
									
									
									
									
								
							@@ -1667,8 +1667,9 @@ static void SkipIf(byte *buf, int len)
 | 
				
			|||||||
			return;
 | 
								return;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						DEBUG(grf, 7) ("Test condtype %d, param %x, condval %x", condtype, param_val, cond_val);
 | 
				
			||||||
	switch (condtype) {
 | 
						switch (condtype) {
 | 
				
			||||||
		case 0: result = (param_val & (1 << cond_val));
 | 
							case 0: result = !!(param_val & (1 << cond_val));
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		case 1: result = !(param_val & (1 << cond_val));
 | 
							case 1: result = !(param_val & (1 << cond_val));
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
@@ -1681,7 +1682,7 @@ static void SkipIf(byte *buf, int len)
 | 
				
			|||||||
			break;
 | 
								break;
 | 
				
			||||||
		case 5: result = (param_val > cond_val);
 | 
							case 5: result = (param_val > cond_val);
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		case 6: result = param_val; /* GRFID is active (only for param-num=88) */
 | 
							case 6: result = !!param_val; /* GRFID is active (only for param-num=88) */
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		case 7: result = !param_val; /* GRFID is not active (only for param-num=88) */
 | 
							case 7: result = !param_val; /* GRFID is not active (only for param-num=88) */
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user