mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-05 06:40:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicated code.

Browse Source
This commit is contained in:
dteviot 2015-07-12 17:14:48 +12:00
parent 0b089a5564
commit 22059d68f6
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/openmw/mwmechanics/aiwander.cpp
View File

@ -225,8 +225,6 @@ namespace MWMechanics
storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], DESTINATION_TOLERANCE))
{
stopWalking(actor, storage);
moveNow = false;
walking = false;
chooseAction = true;
mHasReturnPosition = false;
}
@ -329,17 +327,8 @@ namespace MWMechanics
{
// End package if duration is complete or mid-night hits:
MWWorld::TimeStamp currentTime = world->getTimeStamp();
if(currentTime.getHour() >= mStartTime.getHour() + mDuration)
{
if(!mRepeat)
{
stopWalking(actor, storage);
return true;
}
else
mStartTime = currentTime;
}
else if(int(currentTime.getHour()) == 0 && currentTime.getDay() != mStartTime.getDay())
if((currentTime.getHour() >= mStartTime.getHour() + mDuration) ||
(int(currentTime.getHour()) == 0 && currentTime.getDay() != mStartTime.getDay()))
{
if(!mRepeat)
{
@ -447,8 +436,6 @@ namespace MWMechanics
mObstacleCheck.clear();
stopWalking(actor, storage);
storage.mMoveNow = false;
storage.mWalking = false;
storage.mChooseAction = true;
mStuckCount = 0;
}
@ -494,8 +481,6 @@ namespace MWMechanics
if (storage.mWalking)
{
stopWalking(actor, storage);
storage.mMoveNow = false;
storage.mWalking = false;
mObstacleCheck.clear();
storage.mIdleNow = true;
getRandomIdle(storage.mPlayedIdle);
@ -601,6 +586,8 @@ namespace MWMechanics
{
storage.mPathFinder.clearPath();
actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
storage.mMoveNow = false;
storage.mWalking = false;
}
void AiWander::playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect)