Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						e735c1a51a 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h 
						
						
					 
					
						2018-11-05 12:53:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						18ca3e8660 
					 
					
						
						
							
							Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits.  
						
						 
						
						
						
						
					 
					
						2018-10-31 14:35:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						b5028efc1f 
					 
					
						
						
							
							Fix: Protect against a few out of bounds or uninitialised usage errors  
						
						 
						
						
						
						
					 
					
						2018-10-31 12:41:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						f5b1115039 
					 
					
						
						
							
							Doc: Lots and lots of doxymentation fixes  
						
						 
						
						
						
						
					 
					
						2018-10-31 12:35:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						385a2552e9 
					 
					
						
						
							
							Merge branch 'enhanced_viewport_overlay' into jgrpp  
						
						 
						
						
						
						
					 
					
						2018-03-11 22:21:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						55a503e6f2 
					 
					
						
						
							
							(svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:  
						
						 
						
						... 
						
						
						
						- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases. 
						
						
					 
					
						2018-03-11 15:08:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						a537fd5d0e 
					 
					
						
						
							
							(svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:  
						
						 
						
						... 
						
						
						
						- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases. 
						
						
					 
					
						2018-03-11 15:08:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						07d841d0ef 
					 
					
						
						
							
							(svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent.  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:21:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						30f73d907a 
					 
					
						
						
							
							(svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent.  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:21:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						d9d669dcf8 
					 
					
						
						
							
							(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:19:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						29dca1be3b 
					 
					
						
						
							
							(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:19:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						7c406f0d9d 
					 
					
						
						
							
							(svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:18:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						2a3d0cea50 
					 
					
						
						
							
							(svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:18:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						4fc178aebd 
					 
					
						
						
							
							(svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent.  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:17:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						aee8ffc73b 
					 
					
						
						
							
							(svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent.  
						
						 
						
						
						
						
					 
					
						2018-03-11 13:17:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						740e4543c3 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	src/industry_cmd.cpp 
						
						
					 
					
						2017-12-10 12:41:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						82ae414e8d 
					 
					
						
						
							
							(svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.  
						
						 
						
						... 
						
						
						
						-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry. 
						
						
					 
					
						2017-10-25 15:38:14 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						ffdcbb8f21 
					 
					
						
						
							
							(svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.  
						
						 
						
						... 
						
						
						
						-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry. 
						
						
					 
					
						2017-10-25 15:38:14 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						d733955d33 
					 
					
						
						
							
							Add road vehicle state to UpdateViewport()->GetImage() var whitelist.  
						
						 
						
						... 
						
						
						
						Minor refactoring of var check. 
						
						
					 
					
						2016-09-10 01:03:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						7b56097f50 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp 
						
						
					 
					
						2016-07-24 10:16:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						3ac94e97c8 
					 
					
						
						
							
							Cache the result of GetImage() in Vehicle::UpdateViewport() where possible.  
						
						 
						
						... 
						
						
						
						Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty. 
						
						
					 
					
						2016-07-08 19:07:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						2782993dd7 
					 
					
						
						
							
							(svn r27600) -Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo.  
						
						 
						
						
						
						
					 
					
						2016-06-13 17:34:18 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						a073b276ba 
					 
					
						
						
							
							(svn r27600) -Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo.  
						
						 
						
						
						
						
					 
					
						2016-06-13 17:34:18 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						2be4215f43 
					 
					
						
						
							
							(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values  
						
						 
						
						
						
						
					 
					
						2014-04-23 20:13:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						0463dbdc9e 
					 
					
						
						
							
							(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values  
						
						 
						
						
						
						
					 
					
						2014-04-23 20:13:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						101b982263 
					 
					
						
						
							
							(svn r26475) -Fix: potentially undefined shifts in NewGRF code  
						
						 
						
						
						
						
					 
					
						2014-04-20 15:47:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						bbed2ff956 
					 
					
						
						
							
							(svn r26475) -Fix: potentially undefined shifts in NewGRF code  
						
						 
						
						
						
						
					 
					
						2014-04-20 15:47:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						ce92faf682 
					 
					
						
						
							
							(svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor.  
						
						 
						
						
						
						
					 
					
						2014-03-03 20:02:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						6b61c4608f 
					 
					
						
						
							
							(svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor.  
						
						 
						
						
						
						
					 
					
						2014-03-03 20:02:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						cefdd69748 
					 
					
						
						
							
							(svn r26173) -Change: [NewGRF] Reset the temporary storage registers for every sprite resolving.  
						
						 
						
						
						
						
					 
					
						2013-12-23 18:08:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						a9e8d7a361 
					 
					
						
						
							
							(svn r26173) -Change: [NewGRF] Reset the temporary storage registers for every sprite resolving.  
						
						 
						
						
						
						
					 
					
						2013-12-23 18:08:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						badbd2f894 
					 
					
						
						
							
							(svn r26172) -Codechange: Make SpriteGroup::Resolve aware of nested calls.  
						
						 
						
						
						
						
					 
					
						2013-12-23 18:08:16 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						3eea1befa7 
					 
					
						
						
							
							(svn r26172) -Codechange: Make SpriteGroup::Resolve aware of nested calls.  
						
						 
						
						
						
						
					 
					
						2013-12-23 18:08:16 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						6c63c98d7f 
					 
					
						
						
							
							(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.  
						
						 
						
						
						
						
					 
					
						2013-11-24 14:41:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						db894b0b3f 
					 
					
						
						
							
							(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.  
						
						 
						
						
						
						
					 
					
						2013-11-24 14:41:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								planetmaker 
							
						 
					 
					
						
						
							
						
						f00d9976f9 
					 
					
						
						
							
							(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)  
						
						 
						
						
						
						
					 
					
						2013-01-08 22:46:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								planetmaker 
							
						 
					 
					
						
						
							
						
						c24374f99c 
					 
					
						
						
							
							(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)  
						
						 
						
						
						
						
					 
					
						2013-01-08 22:46:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						f5131bd588 
					 
					
						
						
							
							(svn r24695) -Fix/Cleanup: Remove remaining (incorrect) usages of ResolverObject::scope and count.  
						
						 
						
						
						
						
					 
					
						2012-11-11 12:57:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						b65ece1ea9 
					 
					
						
						
							
							(svn r24695) -Fix/Cleanup: Remove remaining (incorrect) usages of ResolverObject::scope and count.  
						
						 
						
						
						
						
					 
					
						2012-11-11 12:57:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						6c1ff5f772 
					 
					
						
						
							
							(svn r24693) -Doc: Add some doxymentation into the newgrf code.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:46:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						33ff55a8f1 
					 
					
						
						
							
							(svn r24693) -Doc: Add some doxymentation into the newgrf code.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:46:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						8a297ca5f1 
					 
					
						
						
							
							(svn r24692) -Cleanup: Cleanup final parts of the old resolver code.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:45:59 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						4c9bea2a71 
					 
					
						
						
							
							(svn r24692) -Cleanup: Cleanup final parts of the old resolver code.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:45:59 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						818332f3e8 
					 
					
						
						
							
							(svn r24679) -Codechange: Add resolver classes for towns.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:38:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						b985c4c0f8 
					 
					
						
						
							
							(svn r24679) -Codechange: Add resolver classes for towns.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:38:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						6a619b40d5 
					 
					
						
						
							
							(svn r24678) -Codechange: Introduce scope resolver base class and prepare for adding derived classes.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:37:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						438495b433 
					 
					
						
						
							
							(svn r24678) -Codechange: Introduce scope resolver base class and prepare for adding derived classes.  
						
						 
						
						
						
						
					 
					
						2012-11-10 20:37:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						d5eeab43b7 
					 
					
						
						
							
							(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files  
						
						 
						
						
						
						
					 
					
						2012-01-03 21:32:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						6d6be50ae0 
					 
					
						
						
							
							(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files  
						
						 
						
						
						
						
					 
					
						2012-01-03 21:32:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						33d71b45fe 
					 
					
						
						
							
							(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free  
						
						 
						
						
						
						
					 
					
						2011-11-12 13:00:29 +00:00