sync with upstream

apps/opencs/view/filter/editwidget.hpp

@@ -5,7 +5,7 @@
 
 #include <QLineEdit>
 #include <QPalette>
-#include <QtCore/qnamespace.h>
+#include <qt4/QtCore/qnamespace.h>
 
 #include "../../model/filter/parser.hpp"
 #include "../../model/filter/node.hpp"

apps/opencs/view/filter/filterbox.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include <QWidget>
-#include <QtCore/qnamespace.h>
+#include <qt4/QtCore/qnamespace.h>
 
 #include "../../model/filter/node.hpp"
 #include "../../model/world/universalid.hpp"

apps/opencs/view/filter/recordfilterbox.hpp

@@ -4,7 +4,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <QWidget>
-#include <QtCore/qnamespace.h>
+#include <qt4/QtCore/qnamespace.h>
 
 #include <QHBoxLayout>
 

apps/opencs/view/world/tablesubview.hpp

@@ -3,7 +3,7 @@
 
 #include "../doc/subview.hpp"
 
-#include <QtCore/qnamespace.h>
+#include <qt4/QtCore/qnamespace.h>
 
 class QModelIndex;
 

apps/openmw/mwmechanics/aicombat.cpp

@@ -240,21 +240,17 @@ namespace MWMechanics
             //target is at far distance: build path to target OR follow target (if previously actor had reached it once)
             mFollowTarget = false;
 
-            buildNewPath(actor); //may fail to build a path, check before use
+            buildNewPath(actor);
 
             //delete visited path node
             mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]);
 
-            //if no new path leave mTargetAngle unchanged
-            if(!mPathFinder.getPath().empty())
-            {
-                //try shortcut
-                if(vDir.length() < mPathFinder.getDistToNext(pos.pos[0],pos.pos[1],pos.pos[2]) && MWBase::Environment::get().getWorld()->getLOS(actor, mTarget)) 
-                    mTargetAngle = Ogre::Radian( Ogre::Math::ACos(vDir.y / vDir.length()) * sgn(Ogre::Math::ASin(vDir.x / vDir.length())) ).valueDegrees();
-                else
-                    mTargetAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
-                mRotate = true;
-            }
+            //try shortcut
+            if(vDir.length() < mPathFinder.getDistToNext(pos.pos[0],pos.pos[1],pos.pos[2]) && MWBase::Environment::get().getWorld()->getLOS(actor, mTarget)) 
+                mTargetAngle = Ogre::Radian( Ogre::Math::ACos(vDir.y / vDir.length()) * sgn(Ogre::Math::ASin(vDir.x / vDir.length())) ).valueDegrees();
+            else
+                mTargetAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
+            mRotate = true;
             
             mMovement.mPosition[1] = 1;
             mReadyToAttack = false;
@@ -304,13 +300,9 @@ namespace MWMechanics
         dest.mZ = mTarget.getRefData().getPosition().pos[2];
         Ogre::Vector3 newPathTarget = Ogre::Vector3(dest.mX, dest.mY, dest.mZ);
 
-        float dist = -1; //hack to indicate first time, to construct a new path
-        if(!mPathFinder.getPath().empty())
-        {
-            ESM::Pathgrid::Point lastPt = mPathFinder.getPath().back();
-            Ogre::Vector3 currPathTarget(lastPt.mX, lastPt.mY, lastPt.mZ);
-            dist = Ogre::Math::Abs((newPathTarget - currPathTarget).length());
-        }
+        ESM::Pathgrid::Point lastPt = mPathFinder.getPath().back();
+        Ogre::Vector3 currPathTarget(lastPt.mX, lastPt.mY, lastPt.mZ);
+        float dist = Ogre::Math::Abs((newPathTarget - currPathTarget).length());
 
         float targetPosThreshold;
         bool isOutside = actor.getCell()->mCell->isExterior();
@@ -319,7 +311,7 @@ namespace MWMechanics
         else
             targetPosThreshold = 100;
 
-        if((dist < 0) || (dist > targetPosThreshold))
+        if(dist > targetPosThreshold)   
         {
             //construct new path only if target has moved away more than on <targetPosThreshold>
             ESM::Position pos = actor.getRefData().getPosition();
@@ -340,11 +332,8 @@ namespace MWMechanics
                 //maybe here is a mistake (?): PathFinder::getPathSize() returns number of grid points in the path,
                 //not the actual path length. Here we should know if the new path is actually more effective.
                 //if(pathFinder2.getPathSize() < mPathFinder.getPathSize())
-                if(!mPathFinder.getPath().empty())
-                {
-                    newPathFinder.syncStart(mPathFinder.getPath());
-                    mPathFinder = newPathFinder;
-                }
+                newPathFinder.syncStart(mPathFinder.getPath());
+                mPathFinder = newPathFinder;
             }
         }
     }

apps/openmw/mwmechanics/pathfinding.cpp

@@ -391,8 +391,6 @@ namespace MWMechanics
 
     void PathFinder::syncStart(const std::list<ESM::Pathgrid::Point> &path)
     {
-        if (mPath.size() < 2)
-            return; //nothing to pop
         std::list<ESM::Pathgrid::Point>::const_iterator oldStart = path.begin();
         std::list<ESM::Pathgrid::Point>::iterator iter = ++mPath.begin();
         

credits.txt

@@ -20,7 +20,6 @@ Artem Kotsynyak (greye)
 athile
 Britt Mathis (galdor557)
 BrotherBrick
-cc9cii
 Chris Robinson (KittyCat)
 Cory F. Cohen (cfcohen)
 Cris Mihalache (Mirceam)