mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 11:53:53 +00:00
Code Issues Releases Wiki Activity

Correction to teleportation changes.

Browse source 
OMW Bug #2400
Related to OMW Bug #1533

Don't crash on confiscating items if a prison marker cannot be found.
This commit is contained in:
Jordan Ayers 2015-02-24 21:10:01 -06:00
parent 691ebd2372
commit 659a8ba279
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwworld/worldimp.cpp
View file

@ -3075,6 +3075,11 @@ namespace MWWorld
void World::confiscateStolenItems(const Ptr &ptr) void World::confiscateStolenItems(const Ptr &ptr)
{ {
MWWorld::Ptr prisonMarker = getClosestMarker( ptr, "prisonmarker" ); MWWorld::Ptr prisonMarker = getClosestMarker( ptr, "prisonmarker" );
if ( prisonMarker.isEmpty() )
{
std::cerr << "Failed to confiscate items: no closest prison marker found." << std::endl;
return;
}
std::string prisonName = prisonMarker.mRef->mRef.getDestCell(); std::string prisonName = prisonMarker.mRef->mRef.getDestCell();
if ( prisonName.empty() ) if ( prisonName.empty() )
{ {