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

Fall back to sides first

Browse source
This commit is contained in:
scrawl 2016-02-29 17:26:52 +01:00
parent 6df71f6250
commit be62ae758a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1336,8 +1336,11 @@ namespace MWWorld
osg::Vec3f pos(ipos.asVec3()); osg::Vec3f pos(ipos.asVec3());
osg::Quat orientation(ipos.rot[2], osg::Vec3f(0,0,-1)); osg::Quat orientation(ipos.rot[2], osg::Vec3f(0,0,-1));
int fallbackDirections[4] = {direction, (direction+3)%4, (direction+2)%4, (direction+1)%4};
for (int i=0; i<4; ++i) for (int i=0; i<4; ++i)
{ {
direction = fallbackDirections[i];
// check if spawn point is safe, fall back to another direction if not // check if spawn point is safe, fall back to another direction if not
osg::Vec3f spawnPoint = pos; osg::Vec3f spawnPoint = pos;
if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance; if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
@ -1355,7 +1358,6 @@ namespace MWWorld
ipos.pos[2] = spawnPoint.z(); ipos.pos[2] = spawnPoint.z();
break; break;
} }
direction = (direction+1) % 4;
} }
ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0]; ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];