All pastes #1796760 Raw Edit

clueless

public text v1 · immutable
#1796760 ·published 2010-02-15 00:07 UTC
rendered paste body
Index: src/server/psserverchar.cpp===================================================================--- src/server/psserverchar.cpp	(revision 5556)+++ src/server/psserverchar.cpp	(working copy)@@ -414,7 +414,7 @@             invType = CONTAINER_INVENTORY_EQUIPMENT;          Notify5(LOG_EXCHANGES, "  Inv item %s, slot %d, weight %1.1f, stack count %u\n",item->GetName(), slot, item->GetWeight(), item->GetStackCount() );-        msgsize += strlen(item->GetName()) + 1 + 3*sizeof(uint32_t) * 3 + sizeof(float) * 2 + strlen(item->GetImageName()) + 1 + sizeof(uint8_t);+        msgsize += strlen(item->GetName()) + 1 + sizeof(uint32_t) * 5 + sizeof(float) * 2 + strlen(item->GetImageName()) + 1 + sizeof(uint8_t);     }          psMoney m = chardata->Money();@@ -422,8 +422,6 @@     if (exchange)         m += -exchange->GetOfferedMoney(client);     msgsize += strlen(m.ToString()) + 1;--	msgsize += sizeof(uint32); // apply version size          // actually create the message     outgoing = new psGUIInventoryMessage(toClientNumber,@@ -452,7 +450,7 @@                           slot,                           (exchanging && invitem->exchangeOfferSlot != PSCHARACTER_SLOT_NONE) ? item->GetStackCount() - invitem->exchangeStackCount : item->GetStackCount(),                           item->GetWeight(),-                          item->GetTotalStackSize(), //TODO: CHANGE psGUIInventoryMessage to use float for this!!!+                          item->GetTotalStackSize(),                           item->GetImageName(),                           item->GetPurifyStatus(),                           CacheManager::GetSingleton().GetMsgStrings());Index: src/common/net/messages.cpp===================================================================--- src/common/net/messages.cpp	(revision 5556)+++ src/common/net/messages.cpp	(working copy)@@ -2184,7 +2184,7 @@                 item.slot          = message->GetUInt32();                 item.stackcount    = message->GetUInt32();                 item.weight        = message->GetFloat();-                item.size          = message->GetUInt32();+                item.size          = message->GetFloat();                 item.iconImage     = message->GetStr();                 item.purifyStatus  = message->GetUInt8();                 items.Push(item);@@ -2240,7 +2240,7 @@                                      int slotID,                                      int stackcount,                                      float weight,-                                     uint32 size,+                                     float size,                                      const char* icon,                                      int purifyStatus,                                       csStringSet* msgstrings )Index: src/common/net/messages.h===================================================================--- src/common/net/messages.h	(revision 5556)+++ src/common/net/messages.h	(working copy)@@ -45,7 +45,7 @@  // This holds the version number of the network code, remember to increase // this each time you do an update which breaks compatibility-#define PS_NETVERSION   0x00B7+#define PS_NETVERSION   0x00B8 // Remember to bump the version in pscssetup.h, as well.  @@ -1664,7 +1664,7 @@                     int slot,                     int stackcount,                     float weight,-                    uint32 size,+                    float size,                     const char* icon,                     int purifyStatus,                     csStringSet* msgstrings );@@ -1685,7 +1685,7 @@         csString materialName;         int slot;         float weight;-        uint32 size;+        float size;         int stackcount;         csString iconImage;         int container;