From cc8115baa35775a5270fbc171d56bd96f588b4c0 Mon Sep 17 00:00:00 2001
From: "False.Genesis" <False.Genesis@fda9a0ab-4e26-0410-ba80-894f06a4b443>
Date: Thu, 8 Feb 2007 19:37:03 +0000
Subject: [PATCH] mini plz fix linker error, i couldnt get it work.

---
 src/Client/World/ObjMgr.cpp     |  3 +--
 src/Client/World/UpdateData.cpp | 30 ++++++++++++++++++------------
 src/Client/World/WorldSession.h |  2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Client/World/ObjMgr.cpp b/src/Client/World/ObjMgr.cpp
index 999b1b9..262d53f 100644
--- a/src/Client/World/ObjMgr.cpp
+++ b/src/Client/World/ObjMgr.cpp
@@ -1,5 +1,4 @@
 #include "common.h"
-#include "Object.h"
 #include "Item.h"
 #include "ObjMgr.h"
 
@@ -25,7 +24,7 @@ Object *ObjMgr::GetObject(uint64 guid)
 {
     for(ObjList::iterator i = _obj.begin(); i!=_obj.end(); i++)
         if((*i)->GetGUID() == guid)
-            return *i;
+            return (*i);
     return NULL;
 }
 
diff --git a/src/Client/World/UpdateData.cpp b/src/Client/World/UpdateData.cpp
index 82d386b..7d001d8 100644
--- a/src/Client/World/UpdateData.cpp
+++ b/src/Client/World/UpdateData.cpp
@@ -1,9 +1,10 @@
 #include "common.h"
 #include "ZCompressor.h"
 #include "WorldSession.h"
-#include "Object.h"
 #include "UpdateData.h"
 #include "UpdateFields.h"
+#include "Object.h"
+#include "ObjMgr.h"
 #include "UpdateMask.h"
 
 
@@ -75,8 +76,12 @@ void WorldSession::_HandleUpdateObjectOpcode(WorldPacket& recvPacket)
 
 		case UPDATETYPE_MOVEMENT:
 			{
-				//this->_MovementUpdate(objtypeid, recvPacket);
-				// TODO: Get objtypeid from objmgr
+                recvPacket >> uguid;
+                Object *obj = objmgr.GetObject(uguid); // WTF is wrong with this?! plz correct!
+                if(obj)
+				    this->_MovementUpdate(obj->GetTypeId(),uguid,recvPacket);
+                else
+                    logerror("Got UpdateObject_Movement for unknown object "I64FMT,uguid);
 			}
 			break;
 
@@ -88,7 +93,7 @@ void WorldSession::_HandleUpdateObjectOpcode(WorldPacket& recvPacket)
 				recvPacket >> objtypeid >> flags;
 				logdebug("Create Object type %u with guid "I64FMT,objtypeid,uguid);
 
-				this->_MovementUpdate(objtypeid, recvPacket);
+				this->_MovementUpdate(objtypeid, uguid, recvPacket);
 
 				// (TODO) and then: Add object to objmgr
 			}
@@ -105,23 +110,24 @@ void WorldSession::_HandleUpdateObjectOpcode(WorldPacket& recvPacket)
 			break;
 
 		default:
+            logerror("Got unk updatetype 0x%X",utype);
 			break;
 		}
 	}
 }
 
-void WorldSession::_MovementUpdate(uint8 objtypeid, WorldPacket& recvPacket)
+void WorldSession::_MovementUpdate(uint8 objtypeid, uint64 uguid, WorldPacket& recvPacket)
 {
 	if(objtypeid==TYPEID_PLAYER)
 	{
-		uint32 flags2, time;
-		uint64 tguid;
+		uint32 flags, flags2, time;
+		uint64 tguid,guid;
 		float nul;
 		float x, y, z, o;
 		float tx, ty, tz, to;
 		float speedWalk, speedRun, speedSwimBack, speedSwim, speedWalkBack, speedTurn;
 
-		recvPacket >> flags2 >> time;
+		recvPacket >> guid >> flags >> flags2 >> time;
 
 		if (flags2 & 0x02000000) // On a transport
 		{
@@ -137,10 +143,10 @@ void WorldSession::_MovementUpdate(uint8 objtypeid, WorldPacket& recvPacket)
 		if(flags2 & 0x2000) // Self update
 		{
 			// What is this data used for?
-			recvPacket << nul;
-			recvPacket << nul;
-			recvPacket << nul;
-			recvPacket << nul;
+			recvPacket >> nul;
+			recvPacket >> nul;
+			recvPacket >> nul;
+			recvPacket >> nul;
 		}
 
 		recvPacket >> speedWalk >> speedRun >> speedSwimBack >> speedSwim >> speedWalkBack >> speedTurn;
diff --git a/src/Client/World/WorldSession.h b/src/Client/World/WorldSession.h
index 764ad4a..6d0b361 100644
--- a/src/Client/World/WorldSession.h
+++ b/src/Client/World/WorldSession.h
@@ -91,7 +91,7 @@ private:
     void _HandleItemQuerySingleResponseOpcode(WorldPacket& recvPacket);
     void _HandleDestroyObjectOpcode(WorldPacket& recvPacket);
     
-	void _MovementUpdate(uint8 objtypeid, WorldPacket& recvPacket); // Helper for _HandleUpdateObjectOpcode
+	void _MovementUpdate(uint8 objtypeid, uint64 guid, WorldPacket& recvPacket); // Helper for _HandleUpdateObjectOpcode
 
     PseuInstance *_instance;
     WorldSocket *_socket;