pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed server<->corpse translators to reflect what actually needs to be translated (should not have affected anything in the old configuration)

Browse Source
This commit is contained in:
Uleat 2014-10-19 15:03:11 -04:00
parent 69a124e11f
commit cef2aa64d9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/corpse.cpp
View File

@ -97,7 +97,7 @@ Corpse* Corpse::LoadFromDBData(uint32 in_dbid, uint32 in_charid, char* in_charna
for (unsigned int i=0; i < dbpcs->itemcount; i++) { for (unsigned int i=0; i < dbpcs->itemcount; i++) {
tmp = new ServerLootItem_Struct; tmp = new ServerLootItem_Struct;
memcpy(tmp, &dbpcs->items[i], sizeof(player_lootitem::ServerLootItem_Struct)); memcpy(tmp, &dbpcs->items[i], sizeof(player_lootitem::ServerLootItem_Struct));
tmp->lootslot = CorpseToServerSlot(tmp->lootslot); // temp hack until corpse blobs are removed tmp->equipSlot = CorpseToServerSlot(tmp->equipSlot); // temp hack until corpse blobs are removed
itemlist.push_back(tmp); itemlist.push_back(tmp);
} }
@ -148,7 +148,7 @@ Corpse* Corpse::LoadFromDBData(uint32 in_dbid, uint32 in_charid, char* in_charna
for (unsigned int i=0; i < dbpc->itemcount; i++) { for (unsigned int i=0; i < dbpc->itemcount; i++) {
tmp = new ServerLootItem_Struct; tmp = new ServerLootItem_Struct;
memcpy(tmp, &dbpc->items[i], sizeof(player_lootitem::ServerLootItem_Struct)); memcpy(tmp, &dbpc->items[i], sizeof(player_lootitem::ServerLootItem_Struct));
tmp->lootslot = CorpseToServerSlot(tmp->lootslot); // temp hack until corpse blobs are removed tmp->equipSlot = CorpseToServerSlot(tmp->equipSlot); // temp hack until corpse blobs are removed
itemlist.push_back(tmp); itemlist.push_back(tmp);
} }
@ -602,7 +602,7 @@ bool Corpse::Save() {
end = itemlist.end(); end = itemlist.end();
for(; cur != end; ++cur) { for(; cur != end; ++cur) {
ServerLootItem_Struct* item = *cur; ServerLootItem_Struct* item = *cur;
item->lootslot = ServerToCorpseSlot(item->lootslot); // temp hack until corpse blobs are removed item->equipSlot = ServerToCorpseSlot(item->equipSlot); // temp hack until corpse blobs are removed
memcpy((char*) &dbpc->items[x++], (char*) item, sizeof(player_lootitem::ServerLootItem_Struct)); memcpy((char*) &dbpc->items[x++], (char*) item, sizeof(player_lootitem::ServerLootItem_Struct));
} }
@ -2092,7 +2092,7 @@ void Corpse::LoadPlayerCorpseDecayTime(uint32 dbid){
** **
** (Not all slot designations are valid to all clients..see <client>##_constants.h files for valid slot enumerations) ** (Not all slot designations are valid to all clients..see <client>##_constants.h files for valid slot enumerations)
*/ */
uint16 Corpse::ServerToCorpseSlot(uint16 server_slot) int16 Corpse::ServerToCorpseSlot(int16 server_slot)
{ {
return server_slot; // temporary return return server_slot; // temporary return
@ -2128,7 +2128,7 @@ uint16 Corpse::ServerToCorpseSlot(uint16 server_slot)
*/ */
} }
uint16 Corpse::CorpseToServerSlot(uint16 corpse_slot) int16 Corpse::CorpseToServerSlot(int16 corpse_slot)
{ {
return corpse_slot; // temporary return return corpse_slot; // temporary return

4
zone/corpse.h
View File

@ -112,8 +112,8 @@ public:
inline int GetRezzExp() { return rezzexp; } inline int GetRezzExp() { return rezzexp; }
// these are a temporary work-around until corpse inventory is removed from the database blob // these are a temporary work-around until corpse inventory is removed from the database blob
static uint16 ServerToCorpseSlot(uint16 server_slot); // encode static int16 ServerToCorpseSlot(int16 server_slot); // encode
static uint16 CorpseToServerSlot(uint16 corpse_slot); // decode static int16 CorpseToServerSlot(int16 corpse_slot); // decode
protected: protected:
std::list<uint32> MoveItemToCorpse(Client *client, ItemInst *item, int16 equipslot); std::list<uint32> MoveItemToCorpse(Client *client, ItemInst *item, int16 equipslot);