Merge pull request #255 from noudess/master

Update zone.cpp to fix bug in loading merchantlist_temp
This commit is contained in:
Michael Cook (mackal) 2014-09-29 16:57:35 -04:00
commit fdde64dcc3

View File

@ -433,8 +433,8 @@ void Zone::LoadTempMerchantData(){
npcid = ml.npcid; npcid = ml.npcid;
} }
ml.slot = atoul(row[1]); ml.slot = atoul(row[1]);
ml.item = atoul(row[2]); ml.charges = atoul(row[2]);
ml.charges = atoul(row[3]); ml.item = atoul(row[3]);
ml.origslot = ml.slot; ml.origslot = ml.slot;
cur->second.push_back(ml); cur->second.push_back(ml);
} }