[PlaneShift-svn] SF.net SVN: planeshift:[4607] trunk/src/server/entitymanager.cpp

[<ko...@us...>]

Revision: 4607
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4607&view=rev
Author:   kougaro
Date:     2009-10-02 14:00:08 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
Some cleanups to the code adding and remove relation between entities

Modified Paths:
--------------
    trunk/src/server/entitymanager.cpp

Modified: trunk/src/server/entitymanager.cpp
===================================================================
--- trunk/src/server/entitymanager.cpp	2009-10-02 10:25:41 UTC (rev 4606)
+++ trunk/src/server/entitymanager.cpp	2009-10-02 14:00:08 UTC (rev 4607)
@@ -1125,10 +1125,10 @@
     rider->UpdateProxList(true);
 
     float movMod = mountChar->GetRaceInfo()->GetSpeedModifier();
-    if(movMod != 1.0)
+    if( movMod != rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier())
     {
         psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::MULTIPLIER,
-                     csVector3(movMod), movMod);
+                            csVector3(movMod), movMod);
         modMsg.SendMessage();
     }
 
@@ -1142,17 +1142,17 @@
     psSectorInfo *sectorinfo;
     InstanceID instance;
 
+    float movMod = rider->GetMount()->GetRaceInfo()->GetSpeedModifier();
+
     rider->GetCharacterData()->GetLocationInWorld(instance, sectorinfo,pos.x,pos.y,pos.z,yrot);
     rider->GetMount()->SetLocationInWorld(instance, sectorinfo,pos.x,pos.y,pos.z,yrot);
-    CreateNPC(rider->GetMount(), instance, pos, FindSector(sectorinfo->name), yrot);
+    CreateNPC(rider->GetMount());
     rider->SetMount(NULL);
-    rider->UpdateProxList(true);
 
-    float movMod = 1/(rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier());
-    if(movMod != 1.0)
+    if( movMod != rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier())
     {
-        psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::MULTIPLIER,
-                     csVector3(movMod), movMod);
+        psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::NONE,
+                            csVector3(0), 0);
         modMsg.SendMessage();
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.