mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2871 from Capostrophic/tcl

Browse Source 
Don't "disable" player's collision shape in TCL (#5435)
This commit is contained in:
Bret Curtis 2020-05-30 17:57:27 +02:00 committed by GitHub
commit d3b3b74945
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

@ -20,6 +20,7 @@
Bug #5424: Creatures do not headtrack player Bug #5424: Creatures do not headtrack player
Bug #5425: Poison effect only appears for one frame Bug #5425: Poison effect only appears for one frame
Bug #5427: GetDistance unknown ID error is misleading Bug #5427: GetDistance unknown ID error is misleading
Bug #5435: Enemies can't hurt the player when collision is off
Bug #5441: Enemies can't push a player character when in critical strike stance Bug #5441: Enemies can't push a player character when in critical strike stance
Feature #5362: Show the soul gems' trapped soul in count dialog Feature #5362: Show the soul gems' trapped soul in count dialog

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

@ -648,7 +648,7 @@ namespace MWPhysics
bool cmode = found->second->getCollisionMode(); bool cmode = found->second->getCollisionMode();
cmode = !cmode; cmode = !cmode;
found->second->enableCollisionMode(cmode); found->second->enableCollisionMode(cmode);
found->second->enableCollisionBody(cmode); // NB: Collision body isn't disabled for vanilla TCL compatibility
return cmode; return cmode;
} }