vermie

diff --git a/contrib/vmap_extractor_v3/vmapextract/model.cpp b/contrib/vmap_extractor_v3/vmapextract/model.cpp
index a2493f7..3710c53 100644
--- a/contrib/vmap_extractor_v3/vmapextract/model.cpp
+++ b/contrib/vmap_extractor_v3/vmapextract/model.cpp
@@ -160,6 +160,7 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID,
     fwrite(&tileX, sizeof(uint32), 1, pDirfile);
     fwrite(&tileY, sizeof(uint32), 1, pDirfile);
     fwrite(&flags, sizeof(uint32), 1, pDirfile);
+    uint16 mddfFlags = 0; fwrite(&mddfFlags, sizeof(uint16), 1, pDirfile);  // should be read as last uint16 from MDDF

vermie

namespace RAConsole
{
	class Program
	{
		static void Main(string[] args)
		{
			TcpClient raClient = new TcpClient(new IPEndPoint(IPAddress.Any, 0));
			raClient.Connect(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 3443));

			NetworkStream stream = raClient.GetStream();

vermie

diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
index 28ca4d1..bea47dc 100644
--- a/contrib/mmap/src/MapBuilder.cpp
+++ b/contrib/mmap/src/MapBuilder.cpp
@@ -209,6 +209,8 @@ namespace MMAP
             return;
         }
 
+        return;
+

vermie

diff --git a/src/game/MoveMap.cpp b/src/game/MoveMap.cpp
index 0dbdef4..094a9cf 100644
--- a/src/game/MoveMap.cpp
+++ b/src/game/MoveMap.cpp
@@ -36,6 +36,7 @@ void Map::LoadNavMesh(int gx, int gy)
         if(!file)
         {
             sLog.outDebug("Error: Could not open mmap file '%s'", fileName);
+            perror(fileName);
             delete [] fileName;

vermie

diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
index e7fc2e3..dde03c7 100644
--- a/contrib/mmap/src/MapBuilder.cpp
+++ b/contrib/mmap/src/MapBuilder.cpp
@@ -31,14 +31,15 @@ namespace MMAP
     MapBuilder::MapBuilder(float maxWalkableAngle,
                            bool skipLiquid,
                            bool skipContinents, bool skipJunkMaps, bool skipBattlegrounds,
-                           bool hiResHeightmaps, bool debugOutput) :
+                           bool hiResHeightmaps, bool debugOutput, bool newTilesOnly) :

vermie

diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
index dde03c7..546085c 100644
--- a/contrib/mmap/src/MapBuilder.cpp
+++ b/contrib/mmap/src/MapBuilder.cpp
@@ -39,12 +39,15 @@ namespace MMAP
                            m_skipJunkMaps       (skipJunkMaps),
                            m_skipBattlegrounds  (skipBattlegrounds),
                            m_maxWalkableAngle   (maxWalkableAngle),
-                           m_newTilesOnly       (newTilesOnly)
+                           m_newTilesOnly       (newTilesOnly),

vermie

diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
index 43330f5..453b936 100644
--- a/contrib/mmap/src/MapBuilder.cpp
+++ b/contrib/mmap/src/MapBuilder.cpp
@@ -650,10 +650,9 @@ namespace MMAP
 
         // old code for non-statically assigned bitmask sizes:
         ///*** calculate number of bits needed to store tiles & polys ***/
-        //uint32 tileCount = tiles->size() * rcSqr(TILES_PER_MMTILE);
-        //tileBits = dtIlog2(dtNextPow2(tileCount);

vermie

struct LightTimer
{
    public:
        LightTimer() : i_expiryTime(0) {}
        explicit LightTimer(uint32 expiry) : i_expiryTime(expiry) {}

        //if Update() returns true - timer has elapsed
        //and you should call Reset() method
        bool Elapsed(uint32 diff) { return (i_expiryTime -= diff) < 0; }

vermie

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 52f78e9..e21f71b 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1431,6 +1431,10 @@ void Creature::SetDeathState(DeathState s)
             UpdateSpeed(MOVE_RUN, false);
         }
 
+        // FIXME: may not be blizzlike
+        if (Pet* pet = GetPet())

vermie

diff --git a/src/game/ChargeMovementGenerator.cpp b/src/game/ChargeMovementGenerator.cpp
new file mode 100644
index 0000000..73838f2
--- /dev/null
+++ b/src/game/ChargeMovementGenerator.cpp
@@ -0,0 +1,126 @@
+
+#include "ChargeMovementGenerator.h"
+
+template<class T, class U>