mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-04 01:26:39 +00:00 
			
		
		
		
	Merge pull request #2340 from akortunov/hitfix
Fix arguments order for raytracing in the getHitContact()
This commit is contained in:
		
						commit
						85076d6bfd
					
				
					 2 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -76,6 +76,7 @@
 | 
			
		|||
    Bug #4979: AiTravel maximum range depends on "actors processing range" setting
 | 
			
		||||
    Bug #4980: Drowning mechanics is applied for actors indifferently from distance to player
 | 
			
		||||
    Bug #4984: "Friendly hits" feature should be used only for player's followers
 | 
			
		||||
    Bug #4990: Dead bodies prevent you from hitting
 | 
			
		||||
    Feature #1774: Handle AvoidNode
 | 
			
		||||
    Feature #2229: Improve pathfinding AI
 | 
			
		||||
    Feature #3025: Analogue gamepad movement controls
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -676,7 +676,7 @@ namespace MWPhysics
 | 
			
		|||
    {
 | 
			
		||||
        // First of all, try to hit where you aim to
 | 
			
		||||
        int hitmask = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor;
 | 
			
		||||
        RayResult result = castRay(origin, origin + (orient * osg::Vec3f(0.0f, queryDistance, 0.0f)), actor, targets, CollisionType_Actor, hitmask);
 | 
			
		||||
        RayResult result = castRay(origin, origin + (orient * osg::Vec3f(0.0f, queryDistance, 0.0f)), actor, targets, hitmask, CollisionType_Actor);
 | 
			
		||||
 | 
			
		||||
        if (result.mHit)
 | 
			
		||||
        {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue