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

Merge 2f772e5e91 into 670c5e2e1a

Browse Source
This commit is contained in:
vsab
2014-05-10 18:30:52 +00:00
parent 670c5e2e1a 2f772e5e91
commit 85816e971e
15 changed files with 271 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/worlddb.cpp
+19 -6
View File
@@ -197,14 +197,27 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct*
cs->cs_colors[char_num][material].color = color;
// the weapons are kept elsewhere
if ((material==MaterialPrimary) || (material==MaterialSecondary))
if ((material == MaterialPrimary) || (material == MaterialSecondary))
{
if(strlen(item->GetItem()->IDFile) > 2) {
uint32 idfile=atoi(&item->GetItem()->IDFile[2]);
if (material==MaterialPrimary)
cs->primary[char_num]=idfile;
if (strlen(item->GetItem()->IDFile) > 2)
{
uint32 idfile = 0;
if (RuleB(Inventory,UseAugOrnamentations) && item->HasOrnamentation())
{
ItemInst* ornament = item->GetOrnamentation();
if (strlen(ornament->GetItem()->IDFile) > 2)
{
idfile = atoi(&ornament->GetItem()->IDFile[2]);
}
}
else
cs->secondary[char_num]=idfile;
{
idfile = atoi(&item->GetItem()->IDFile[2]);
}
if (material == MaterialPrimary)
cs->primary[char_num] = idfile;
else
cs->secondary[char_num] = idfile;
}
}
}