pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ConfigFileUpdate

Browse Source
This commit is contained in:
phredi
2016-05-24 20:47:52 -05:00
parent 109de62916 12905a3771
commit a628dee2b7
76 changed files with 1887 additions and 1720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/worlddb.cpp
+1 -1
View File
@@ -245,7 +245,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
/* Load Inventory */
// If we ensure that the material data is updated appropriately, we can do away with inventory loads
if (GetInventory(accountID, cse->Name, &inv)) {
const Item_Struct* item = nullptr;
const EQEmu::Item_Struct* item = nullptr;
const ItemInst* inst = nullptr;
int16 invslot = 0;