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

Merge pull request #3 from EQEmu/master

Browse Source 
sync
This commit is contained in:
josheb
2013-05-06 14:16:46 -07:00
parent 05d7c12d38 90c7fab452
commit 8e49ab9179
216 changed files with 4167 additions and 4149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/tribute.cpp
+3 -3
View File
@@ -167,7 +167,7 @@ void Client::DoTributeUpdate() {
//summon the item for them
const ItemInst* inst = database.CreateItem(item_id, 1);
if(inst == NULL)
if(inst == nullptr)
continue;
PutItemInInventory(TRIBUTE_SLOT_START+r, *inst, false);
@@ -246,7 +246,7 @@ void Client::SendTributeDetails(uint32 client_id, uint32 tribute_id) {
int32 Client::TributeItem(uint32 slot, uint32 quantity) {
const ItemInst*inst = m_inv[slot];
if(inst == NULL)
if(inst == nullptr)
return(0);
//figure out what its worth
@@ -401,7 +401,7 @@ bool ZoneDatabase::LoadTributes() {
uint32 id = atoul(row[r++]);
t.name = row[r++];
t.description = row[r++];
t.unknown = strtoul(row[r++], NULL, 10);
t.unknown = strtoul(row[r++], nullptr, 10);
t.is_guild = atol(row[r++])==0?false:true;
tribute_list[id] = t;