[PlaneShift-svn] SF.net SVN: planeshift:[8637] trunk/src/client

[<ma...@us...>]

Revision: 8637
          http://planeshift.svn.sourceforge.net/planeshift/?rev=8637&view=rev
Author:   magodra
Date:     2013-03-10 23:26:43 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
- Fixed display of HP/Mana/PSta/MSta in Pet Stats and Skill window.

Modified Paths:
--------------
    trunk/src/client/gui/pawspetstatwindow.cpp
    trunk/src/client/psclientdr.cpp

Modified: trunk/src/client/gui/pawspetstatwindow.cpp
===================================================================
--- trunk/src/client/gui/pawspetstatwindow.cpp	2013-03-10 21:46:04 UTC (rev 8636)
+++ trunk/src/client/gui/pawspetstatwindow.cpp	2013-03-10 23:26:43 UTC (rev 8637)
@@ -29,6 +29,7 @@
 #include "net/clientmsghandler.h"
 #include "util/strutil.h"
 #include "util/psxmlparser.h"
+#include "util/log.h"
 
 // PAWS INCLUDES
 #include "pawsskillwindow.h"
@@ -551,19 +552,20 @@
         // Set control Subscriptions
         targetID.Clear();
         targetID.Append(actor->GetEID().Unbox());
-        signal.Format("fVitalValue0:%s", targetID.GetData());
+
+        signal.Format("fVitalValue%d:%s", VITAL_HITPOINTS, targetID.GetData());
         PawsManager::GetSingleton().Subscribe(signal, hpBar);
         PawsManager::GetSingleton().Subscribe(signal, hpCurrent);
 
-        signal.Format("fVitalValue1:%s", targetID.GetData());
+        signal.Format("fVitalValue%d:%s", VITAL_MANA, targetID.GetData());
         PawsManager::GetSingleton().Subscribe(signal, manaBar);
         PawsManager::GetSingleton().Subscribe(signal, manaCurrent);
 
-        signal.Format("fVitalValue2:%s", targetID.GetData());
+        signal.Format("fVitalValue%d:%s", VITAL_PYSSTAMINA, targetID.GetData());
         PawsManager::GetSingleton().Subscribe(signal, pysStaminaBar);
         PawsManager::GetSingleton().Subscribe(signal, pysStaminaCurrent);
 
-        signal.Format("fVitalValue3:%s", targetID.GetData());
+        signal.Format("fVitalValue%d:%s", VITAL_MENSTAMINA, targetID.GetData());
         PawsManager::GetSingleton().Subscribe(signal, menStaminaBar);
         PawsManager::GetSingleton().Subscribe(signal, menStaminaCurrent);
     }

Modified: trunk/src/client/psclientdr.cpp
===================================================================
--- trunk/src/client/psclientdr.cpp	2013-03-10 21:46:04 UTC (rev 8636)
+++ trunk/src/client/psclientdr.cpp	2013-03-10 23:26:43 UTC (rev 8637)
@@ -287,7 +287,8 @@
     }        
     else 
     {   // Publish Vitals data using EntityID
-        csString ID((size_t) gemObject->GetEID().Unbox());
+        csString ID;
+        ID.Append(gemObject->GetEID().Unbox());
         gemObject->GetVitalMgr()->HandleDRData(statdrmsg, ID.GetData() );
     }
 

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