Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Temporary revert 6743 commit. I fix this patch across 1-2 days.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2009-12-24 10:20:15 +01:00
parent acdc4ca15b
commit 250a00cc1c
53 changed files with 365 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/ObjectMgr.cpp
View File

@@ -46,7 +46,6 @@
#include "WaypointManager.h"
#include "InstanceData.h" //for condition_instance_data
#include "GossipDef.h"
#include "TimeMgr.h"
INSTANTIATE_SINGLETON_1(ObjectMgr);
@@ -5025,7 +5024,7 @@ void ObjectMgr::LoadNpcTextLocales()
//not very fast function but it is called only once a day, or on starting-up
void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
{
time_t basetime = sGameTime.GetGameTime();
time_t basetime = time(NULL);
sLog.outDebug("Returning mails current time: hour: %d, minute: %d, second: %d ", localtime(&basetime)->tm_hour, localtime(&basetime)->tm_min, localtime(&basetime)->tm_sec);
//delete all old mails without item and without body immediately, if starting server
if (!serverUp)
@@ -8250,9 +8249,7 @@ void ObjectMgr::LoadVendors()
VendorItemData& vList = m_mCacheVendorItemMap[entry];
uint8 vendorslot = vList.GetItemCount();
vList.AddItem(item_id,maxcount,incrtime,ExtendedCost,vendorslot);
vList.AddItem(item_id,maxcount,incrtime,ExtendedCost);
++count;
} while (result->NextRow());
@@ -8523,8 +8520,7 @@ void ObjectMgr::LoadGossipMenuItems()
void ObjectMgr::AddVendorItem( uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb)
{
VendorItemData& vList = m_mCacheVendorItemMap[entry];
uint8 vendorslot = vList.GetItemCount();
vList.AddItem(item,maxcount,incrtime,extendedcost,vendorslot);
vList.AddItem(item,maxcount,incrtime,extendedcost);
if(savetodb) WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')",entry, item, maxcount,incrtime,extendedcost);
}