mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/Player.cpp
	src/game/Spell.cpp
This commit is contained in:
tomrus88 2008-11-08 16:52:28 +03:00
commit 7974d1cb94
67 changed files with 939 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/GameObject.cpp
View file

@ -62,7 +62,7 @@ GameObject::~GameObject()
{
if(m_uint32Values) // field array can be not exist if GameOBject not loaded
{
// crash possable at access to deleted GO in Unit::m_gameobj
// crash possible at access to deleted GO in Unit::m_gameobj
uint64 owner_guid = GetOwnerGUID();
if(owner_guid)
{
@ -70,7 +70,7 @@ GameObject::~GameObject()
if(owner)
owner->RemoveGameObject(this,false);
else if(!IS_PLAYER_GUID(owner_guid))
sLog.outError("Delete GameObject (GUID: %u Entry: %u ) that have references in not found creature %u GO list. Crash possable later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid));
sLog.outError("Delete GameObject (GUID: %u Entry: %u ) that have references in not found creature %u GO list. Crash possible later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid));
}
}
}
@ -220,7 +220,7 @@ void GameObject::Update(uint32 /*p_time*/)
((Player*)caster)->SendMessageToSet(&data,true);
}
m_lootState = GO_READY; // can be succesfully open with some chance
m_lootState = GO_READY; // can be successfully open with some chance
}
return;
}
@ -297,7 +297,7 @@ void GameObject::Update(uint32 /*p_time*/)
float radius = goInfo->trap.radius;
if(!radius)
{
if(goInfo->trap.cooldown != 3) // cast in other case (at some triggring/linked go/etc explicit call)
if(goInfo->trap.cooldown != 3) // cast in other case (at some triggering/linked go/etc explicit call)
return;
else
{
@ -496,7 +496,7 @@ void GameObject::getFishLoot(Loot *fishloot)
void GameObject::SaveToDB()
{
// this should only be used when the gameobject has already been loaded
// perferably after adding to map, because mapid may not be valid otherwise
// preferably after adding to map, because mapid may not be valid otherwise
GameObjectData const *data = objmgr.GetGOData(m_DBTableGuid);
if(!data)
{