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

Merged with master and fixed compile error

Browse source
This commit is contained in:
tomrus88 2009-03-21 20:06:51 +03:00
commit 1c04b528f8
3 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/game/CharacterHandler.cpp
View file

@ -1209,22 +1209,21 @@ void WorldSession::HandleRemoveGlyph( WorldPacket & recv_data )
uint32 slot; uint32 slot;
recv_data >> slot; recv_data >> slot;
if(slot < MAX_GLYPH_SLOT_INDEX) if(slot >= MAX_GLYPH_SLOT_INDEX)
{ {
if(uint32 glyph = _player->GetGlyph(slot)) sLog.outDebug("Client sent wrong glyph slot number in opcode CMSG_REMOVE_GLYPH %u", slot);
{
if(GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
{
_player->RemoveAurasDueToSpell(gp->SpellId);
_player->SetGlyph(slot, 0);
_player->SendTalentsInfoData(false);
}
}
return; return;
} }
sLog.outDebug("Client sent wrong glyph slot number in opcode CMSG_REMOVE_GLYPH %u", slot); if(uint32 glyph = _player->GetGlyph(slot))
{
if(GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
{
_player->RemoveAurasDueToSpell(gp->SpellId);
_player->SetGlyph(slot, 0);
_player->SendTalentsInfoData(false);
}
}
} }
void WorldSession::HandleCharCustomize(WorldPacket& recv_data) void WorldSession::HandleCharCustomize(WorldPacket& recv_data)

6
src/game/Level2.cpp
View file

@ -663,9 +663,6 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
map->Remove(obj,false); map->Remove(obj,false);
obj->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), obj->GetOrientation()); obj->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), obj->GetOrientation());
obj->SetFloatValue(GAMEOBJECT_POS_X, chr->GetPositionX());
obj->SetFloatValue(GAMEOBJECT_POS_Y, chr->GetPositionY());
obj->SetFloatValue(GAMEOBJECT_POS_Z, chr->GetPositionZ());
map->Add(obj); map->Add(obj);
} }
@ -689,9 +686,6 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
map->Remove(obj,false); map->Remove(obj,false);
obj->Relocate(x, y, z, obj->GetOrientation()); obj->Relocate(x, y, z, obj->GetOrientation());
obj->SetFloatValue(GAMEOBJECT_POS_X, x);
obj->SetFloatValue(GAMEOBJECT_POS_Y, y);
obj->SetFloatValue(GAMEOBJECT_POS_Z, z);
map->Add(obj); map->Add(obj);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7507" #define REVISION_NR "7508"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__