(svn r2971) - Newgrf: Support loading VarAction2 parameter for variables 0x60-0x7F. This parameter isn't used yet.
This commit is contained in:
		
							
								
								
									
										3
									
								
								newgrf.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								newgrf.c
									
									
									
									
									
								
							@@ -1268,6 +1268,9 @@ static void NewSpriteGroup(byte *buf, int len)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		dg->var_scope = numloaded == 0x82 ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 | 
							dg->var_scope = numloaded == 0x82 ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 | 
				
			||||||
		dg->variable = grf_load_byte(&buf);
 | 
							dg->variable = grf_load_byte(&buf);
 | 
				
			||||||
 | 
							/* Variables 0x60 - 0x7F include an extra parameter */
 | 
				
			||||||
 | 
							if (IS_BYTE_INSIDE(dg->variable, 0x60, 0x80))
 | 
				
			||||||
 | 
								dg->parameter = grf_load_byte(&buf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		dg->shift_num = grf_load_byte(&buf);
 | 
							dg->shift_num = grf_load_byte(&buf);
 | 
				
			||||||
		dg->and_mask = grf_load_byte(&buf);
 | 
							dg->and_mask = grf_load_byte(&buf);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1
									
								
								sprite.h
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								sprite.h
									
									
									
									
									
								
							@@ -70,6 +70,7 @@ typedef struct DeterministicSpriteGroup {
 | 
				
			|||||||
	// Take this variable:
 | 
						// Take this variable:
 | 
				
			||||||
	VarSpriteGroupScope var_scope;
 | 
						VarSpriteGroupScope var_scope;
 | 
				
			||||||
	byte variable;
 | 
						byte variable;
 | 
				
			||||||
 | 
						byte parameter; ///< Used for variables between 0x60 and 0x7F inclusive.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Do this with it:
 | 
						// Do this with it:
 | 
				
			||||||
	byte shift_num;
 | 
						byte shift_num;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user