pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-17 01:22:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved OP_LootItem slot translation to external handlers in client patch files

Browse Source
This commit is contained in:
Uleat 2014-10-03 15:05:20 -04:00
parent bb2bed7b00
commit 3a270dd96a
7 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
-------------------------------------------------------
== 10/03/2014 ==
Uleat: Fixed Ti(6.2) OP_AugmentInfo translation that I broke (does not currently need and I mis-read a process)
Uleat: Moved client patch OP_LootItem slot translation to external handlers
== 10/02/2014 ==
Uleat: First round of Ti/6.2 translators added - needed for re-enumeration

6
common/patches/client62.cpp
View File

@ -446,7 +446,7 @@ namespace Client62
OUT(lootee);
OUT(looter);
eq->slot_id = emu->slot_id;
eq->slot_id = ServerToClient62CorpseSlot(emu->slot_id);
OUT(auto_loot);
FINISH_ENCODE();
@ -1105,7 +1105,7 @@ namespace Client62
IN(lootee);
IN(looter);
emu->slot_id = eq->slot_id;
emu->slot_id = Client62ToServerCorpseSlot(eq->slot_id);
IN(auto_loot);
FINISH_DIRECT_DECODE();
@ -1317,6 +1317,7 @@ namespace Client62
static inline int16 ServerToClient62CorpseSlot(uint32 ServerCorpse)
{
//int16 Client62Corpse;
return ServerCorpse;
}
static inline uint32 Client62ToServerSlot(int16 Client62Slot)
@ -1331,6 +1332,7 @@ namespace Client62
static inline uint32 Client62ToServerCorpseSlot(int16 Client62Corpse)
{
//uint32 ServerCorpse;
return Client62Corpse;
}
}
// end namespace Client62

6
common/patches/rof.cpp
View File

@ -1423,7 +1423,7 @@ namespace RoF
OUT(lootee);
OUT(looter);
eq->slot_id = emu->slot_id + 1;
eq->slot_id = ServerToRoFCorpseSlot(emu->slot_id);
OUT(auto_loot);
FINISH_ENCODE();
@ -4405,7 +4405,7 @@ namespace RoF
IN(lootee);
IN(looter);
emu->slot_id = eq->slot_id - 1;
emu->slot_id = RoFToServerCorpseSlot(eq->slot_id);
IN(auto_loot);
FINISH_DIRECT_DECODE();
@ -5406,6 +5406,7 @@ namespace RoF
static inline uint32 ServerToRoFCorpseSlot(uint32 ServerCorpse)
{
//uint32 RoFCorpse;
return (ServerCorpse + 1);
}
static inline uint32 RoFToServerSlot(structs::ItemSlotStruct RoFSlot)
@ -5546,6 +5547,7 @@ namespace RoF
static inline uint32 RoFToServerCorpseSlot(uint32 RoFCorpse)
{
//uint32 ServerCorpse;
return (RoFCorpse - 1);
}
}
// end namespace RoF

6
common/patches/sod.cpp
View File

@ -984,7 +984,7 @@ namespace SoD
OUT(lootee);
OUT(looter);
eq->slot_id = emu->slot_id + 1;
eq->slot_id = ServerToSoDCorpseSlot(emu->slot_id);
OUT(auto_loot);
FINISH_ENCODE();
@ -2956,7 +2956,7 @@ namespace SoD
IN(lootee);
IN(looter);
emu->slot_id = eq->slot_id - 1;
emu->slot_id = SoDToServerCorpseSlot(eq->slot_id);
IN(auto_loot);
FINISH_DIRECT_DECODE();
@ -3599,6 +3599,7 @@ namespace SoD
static inline uint32 ServerToSoDCorpseSlot(uint32 ServerCorpse)
{
//uint32 SoDCorpse;
return (ServerCorpse + 1);
}
static inline uint32 SoDToServerSlot(uint32 SoDSlot)
@ -3623,6 +3624,7 @@ namespace SoD
static inline uint32 SoDToServerCorpseSlot(uint32 SoDCorpse)
{
//uint32 ServerCorpse;
return (SoDCorpse - 1);
}
}
// end namespace SoD

6
common/patches/sof.cpp
View File

@ -783,7 +783,7 @@ namespace SoF
OUT(lootee);
OUT(looter);
eq->slot_id = emu->slot_id + 1;
eq->slot_id = ServerToSoFCorpseSlot(emu->slot_id);
OUT(auto_loot);
FINISH_ENCODE();
@ -2294,7 +2294,7 @@ namespace SoF
IN(lootee);
IN(looter);
emu->slot_id = eq->slot_id - 1;
emu->slot_id = SoFToServerCorpseSlot(eq->slot_id);
IN(auto_loot);
FINISH_DIRECT_DECODE();
@ -2920,6 +2920,7 @@ namespace SoF
static inline uint32 ServerToSoFCorpseSlot(uint32 ServerCorpse)
{
//uint32 SoFCorpse;
return (ServerCorpse + 1);
}
static inline uint32 SoFToServerSlot(uint32 SoFSlot)
@ -2945,6 +2946,7 @@ namespace SoF
static inline uint32 SoFToServerCorpseSlot(uint32 SoFCorpse)
{
//uint32 ServerCorpse;
return (SoFCorpse - 1);
}
}
// end namespace SoF

6
common/patches/titanium.cpp
View File

@ -654,7 +654,7 @@ namespace Titanium
OUT(lootee);
OUT(looter);
eq->slot_id = emu->slot_id;
eq->slot_id = ServerToTitaniumCorpseSlot(emu->slot_id);
OUT(auto_loot);
FINISH_ENCODE();
@ -1517,7 +1517,7 @@ namespace Titanium
IN(lootee);
IN(looter);
emu->slot_id = eq->slot_id;
emu->slot_id = TitaniumToServerCorpseSlot(eq->slot_id);
IN(auto_loot);
FINISH_DIRECT_DECODE();
@ -1745,6 +1745,7 @@ namespace Titanium
static inline int16 ServerToTitaniumCorpseSlot(uint32 ServerCorpse)
{
//int16 TitaniumCorpse;
return ServerCorpse;
}
static inline uint32 TitaniumToServerSlot(int16 TitaniumSlot)
@ -1759,6 +1760,7 @@ namespace Titanium
static inline uint32 TitaniumToServerCorpseSlot(int16 TitaniumCorpse)
{
//uint32 ServerCorpse;
return TitaniumCorpse;
}
}
// end namespace Titanium

6
common/patches/underfoot.cpp
View File

@ -1234,7 +1234,7 @@ namespace Underfoot
OUT(lootee);
OUT(looter);
eq->slot_id = emu->slot_id + 1;
eq->slot_id = ServerToUnderFootCorpseSlot(emu->slot_id);
OUT(auto_loot);
FINISH_ENCODE();
@ -3294,7 +3294,7 @@ namespace Underfoot
IN(lootee);
IN(looter);
emu->slot_id = eq->slot_id - 1;
emu->slot_id = UnderfootToServerCorpseSlot(eq->slot_id);
IN(auto_loot);
FINISH_DIRECT_DECODE();
@ -4021,6 +4021,7 @@ namespace Underfoot
static inline uint32 ServerToUnderFootCorpseSlot(uint32 ServerCorpse)
{
//uint32 UnderfootCorpse;
return (ServerCorpse + 1);
}
static inline uint32 UnderfootToServerSlot(uint32 UnderfootSlot)
@ -4046,6 +4047,7 @@ namespace Underfoot
static inline uint32 UnderfootToServerCorpseSlot(uint32 UnderfootCorpse)
{
//uint32 ServerCorpse;
return (UnderfootCorpse - 1);
}
}
// end namespace Underfoot