mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 11:36:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2340 from akortunov/hitfix

Browse source 
Fix arguments order for raytracing in the getHitContact()
This commit is contained in:
Alexei Dobrohotov 2019-04-22 20:40:51 +03:00 committed by GitHub
commit 85076d6bfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -76,6 +76,7 @@
Bug #4979: AiTravel maximum range depends on "actors processing range" setting 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 #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 #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 #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls Feature #3025: Analogue gamepad movement controls

2
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -676,7 +676,7 @@ namespace MWPhysics
{ {
// First of all, try to hit where you aim to // First of all, try to hit where you aim to
int hitmask = CollisionType_World | CollisionType_Door | CollisionType_HeightMap | CollisionType_Actor; 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) if (result.mHit)
{ {