mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1503 from akortunov/regressions

Browse Source 
Handle Trespassing crime differently from Theft
This commit is contained in:
scrawl 2017-10-15 09:08:52 +00:00 committed by GitHub
commit bbf9b0c0a7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View File

@ -1123,6 +1123,10 @@ namespace MWMechanics
if (playerFollowers.find(*it) != playerFollowers.end()) if (playerFollowers.find(*it) != playerFollowers.end())
continue; continue;
// NPC will complain about theft even if he will do nothing about it
if (type == OT_Theft || type == OT_Pickpocket)
MWBase::Environment::get().getDialogueManager()->say(*it, "thief");
crimeSeen = true; crimeSeen = true;
} }
} }
@ -1243,9 +1247,7 @@ namespace MWMechanics
{ {
reported = true; reported = true;
if (type == OT_Theft || type == OT_Pickpocket) if (type == OT_Trespassing)
MWBase::Environment::get().getDialogueManager()->say(*it, "thief");
else if (type == OT_Trespassing)
MWBase::Environment::get().getDialogueManager()->say(*it, "intruder"); MWBase::Environment::get().getDialogueManager()->say(*it, "intruder");
} }