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

[11973] Various Cleanups

Browse source 
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
stfx 2012-04-22 19:41:24 +02:00 • committed by Schmoozerd
parent c243c42c3c
commit f3f3349661
50 changed files with 153 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/game/Level2.cpp
View file

@ -1739,7 +1739,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(char* args)
{
pCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
pCreature->GetMotionMaster()->Initialize();
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
{
pCreature->SetDeathState(JUST_DIED);
pCreature->Respawn();
@ -1925,7 +1925,7 @@ bool ChatHandler::HandleNpcMoveCommand(char* args)
}
pCreature->GetMap()->CreatureRelocation(pCreature,x, y, z,o);
pCreature->GetMotionMaster()->Initialize();
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
{
pCreature->SetDeathState(JUST_DIED);
pCreature->Respawn();
@ -2019,7 +2019,7 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(char* args)
{
pCreature->SetDefaultMovementType(move_type);
pCreature->GetMotionMaster()->Initialize();
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
{
pCreature->SetDeathState(JUST_DIED);
pCreature->Respawn();
@ -2128,7 +2128,7 @@ bool ChatHandler::HandleNpcSpawnDistCommand(char* args)
pCreature->SetRespawnRadius((float)option);
pCreature->SetDefaultMovementType(mtype);
pCreature->GetMotionMaster()->Initialize();
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
if (pCreature->isAlive()) // dead creature will reset movement generator at respawn
{
pCreature->SetDeathState(JUST_DIED);
pCreature->Respawn();
@ -2221,10 +2221,11 @@ bool ChatHandler::HandleNpcUnFollowCommand(char* /*args*/)
bool ChatHandler::HandleNpcTameCommand(char* /*args*/)
{
Creature *creatureTarget = getSelectedCreature ();
if (!creatureTarget || creatureTarget->IsPet ())
if (!creatureTarget || creatureTarget->IsPet())
{
PSendSysMessage (LANG_SELECT_CREATURE);
SetSentErrorMessage (true);
PSendSysMessage(LANG_SELECT_CREATURE);
SetSentErrorMessage(true);
return false;
}
@ -2987,7 +2988,7 @@ bool ChatHandler::HandleWpAddCommand(char* args)
{
target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
target->GetMotionMaster()->Initialize();
if (target->isAlive()) // dead creature will reset movement generator at respawn
if (target->isAlive()) // dead creature will reset movement generator at respawn
{
target->SetDeathState(JUST_DIED);
target->Respawn();
@ -3207,7 +3208,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
if (npcCreature)
{
npcCreature->GetMotionMaster()->Initialize();
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
{
npcCreature->SetDeathState(JUST_DIED);
npcCreature->Respawn();
@ -3287,7 +3288,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
delete result2;
}
npcCreature->GetMotionMaster()->Initialize();
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
{
npcCreature->SetDeathState(JUST_DIED);
npcCreature->Respawn();
@ -3351,7 +3352,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
if (npcCreature)
{
npcCreature->GetMotionMaster()->Initialize();
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
{
npcCreature->SetDeathState(JUST_DIED);
npcCreature->Respawn();
@ -3385,7 +3386,7 @@ bool ChatHandler::HandleWpModifyCommand(char* args)
{
npcCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
npcCreature->GetMotionMaster()->Initialize();
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn
{
npcCreature->SetDeathState(JUST_DIED);
npcCreature->Respawn();