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

[<wel...@us...>]

Revision: 7128
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7128&view=rev
Author:   weltall2
Date:     2011-04-04 17:08:28 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
fixed a crash which appeared without touching files. who is using telepathy with gcc here?

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

Modified: trunk/src/server/workmanager.cpp
===================================================================
--- trunk/src/server/workmanager.cpp	2011-04-04 07:32:33 UTC (rev 7127)
+++ trunk/src/server/workmanager.cpp	2011-04-04 17:08:28 UTC (rev 7128)
@@ -2591,13 +2591,13 @@
         Error3("Bad container slot %i when trying to add item instance #%u.", PSCHARACTER_SLOT_NONE, newItem->GetUID());
         return NULL;
     }
-    workItem->Save(true);
+    containerItem->Save(true);
 
     // Zero out x,y,z location because it is in container
     float xpos,ypos,zpos,yrot;
     psSectorInfo* sectorinfo;
     InstanceID instance;
-    workItem->GetLocationInWorld(instance, &sectorinfo, xpos, ypos, zpos, yrot );
+    containerItem->GetLocationInWorld(instance, &sectorinfo, xpos, ypos, zpos, yrot );
     newItem->SetLocationInWorld(instance,sectorinfo, 0.00, 0.00, 0.00, 0.00 );
 
     newItem->SetLoaded();  // Item is fully created


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