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

[9870] Add script id to all remaining SCRIPT_COMMAND_* error message outputs.

Browse source 
Note that script id can be id from different DB tables. It will however make it easier to find the source of any error.
More code cleanup and style corrections.

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-05-11 11:45:50 +02:00
parent d02313d94c
commit 3790084fb1
2 changed files with 132 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

262
src/game/Map.cpp
View file

@ -2778,7 +2778,7 @@ void Map::ScriptsProcess()
Object* source = NULL; Object* source = NULL;
if(step.sourceGUID) if (step.sourceGUID)
{ {
switch(GUID_HIPART(step.sourceGUID)) switch(GUID_HIPART(step.sourceGUID))
{ {
@ -2814,11 +2814,12 @@ void Map::ScriptsProcess()
} }
} }
if(source && !source->IsInWorld()) source = NULL; if (source && !source->IsInWorld())
source = NULL;
Object* target = NULL; Object* target = NULL;
if(step.targetGUID) if (step.targetGUID)
{ {
switch(GUID_HIPART(step.targetGUID)) switch(GUID_HIPART(step.targetGUID))
{ {
@ -2846,21 +2847,22 @@ void Map::ScriptsProcess()
} }
} }
if(target && !target->IsInWorld()) target = NULL; if (target && !target->IsInWorld())
target = NULL;
switch (step.script->command) switch(step.script->command)
{ {
case SCRIPT_COMMAND_TALK: case SCRIPT_COMMAND_TALK:
{ {
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_TALK call for NULL creature."); sLog.outError("SCRIPT_COMMAND_TALK (script id %u) call for NULL creature.", step.script->id);
break; break;
} }
if(source->GetTypeId()!=TYPEID_UNIT) if (source->GetTypeId()!=TYPEID_UNIT)
{ {
sLog.outError("SCRIPT_COMMAND_TALK call for non-creature (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_TALK (script id %u) call for non-creature (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
@ -2873,12 +2875,12 @@ void Map::ScriptsProcess()
((Creature *)source)->Say(step.script->dataint, LANG_UNIVERSAL, unit_target); ((Creature *)source)->Say(step.script->dataint, LANG_UNIVERSAL, unit_target);
break; break;
case 1: // Whisper case 1: // Whisper
if(!unit_target) if (!unit_target)
{ {
sLog.outError("SCRIPT_COMMAND_TALK attempt to whisper (%u) NULL, skipping.",step.script->datalong); sLog.outError("SCRIPT_COMMAND_TALK (script id %u) attempt to whisper (%u) NULL, skipping.", step.script->id, step.script->datalong);
break; break;
} }
((Creature *)source)->Whisper(step.script->dataint,unit_target); ((Creature *)source)->Whisper(step.script->dataint, unit_target);
break; break;
case 2: // Yell case 2: // Yell
((Creature *)source)->Yell(step.script->dataint, LANG_UNIVERSAL, unit_target); ((Creature *)source)->Yell(step.script->dataint, LANG_UNIVERSAL, unit_target);
@ -2891,95 +2893,95 @@ void Map::ScriptsProcess()
} }
break; break;
} }
case SCRIPT_COMMAND_EMOTE: case SCRIPT_COMMAND_EMOTE:
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_EMOTE call for NULL creature."); sLog.outError("SCRIPT_COMMAND_EMOTE (script id %u) call for NULL creature.", step.script->id);
break; break;
} }
if(source->GetTypeId()!=TYPEID_UNIT) if (source->GetTypeId()!=TYPEID_UNIT)
{ {
sLog.outError("SCRIPT_COMMAND_EMOTE call for non-creature (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_EMOTE (script id %u) call for non-creature (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
((Creature *)source)->HandleEmote(step.script->datalong); ((Creature *)source)->HandleEmote(step.script->datalong);
break; break;
case SCRIPT_COMMAND_FIELD_SET: case SCRIPT_COMMAND_FIELD_SET:
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_FIELD_SET call for NULL object."); sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id %u) call for NULL object.", step.script->id);
break; break;
} }
if(step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount())
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount())
{ {
sLog.outError("SCRIPT_COMMAND_FIELD_SET call for wrong field %u (max count: %u) in object (TypeId: %u).", sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id %u) call for wrong field %u (max count: %u) in object (TypeId: %u).",
step.script->datalong,source->GetValuesCount(),source->GetTypeId()); step.script->id, step.script->datalong, source->GetValuesCount(), source->GetTypeId());
break; break;
} }
source->SetUInt32Value(step.script->datalong, step.script->datalong2); source->SetUInt32Value(step.script->datalong, step.script->datalong2);
break; break;
case SCRIPT_COMMAND_MOVE_TO: case SCRIPT_COMMAND_MOVE_TO:
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_MOVE_TO call for NULL creature."); sLog.outError("SCRIPT_COMMAND_MOVE_TO (script id %u) call for NULL creature.", step.script->id);
break; break;
} }
if(source->GetTypeId()!=TYPEID_UNIT) if (source->GetTypeId() != TYPEID_UNIT)
{ {
sLog.outError("SCRIPT_COMMAND_MOVE_TO call for non-creature (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_MOVE_TO (script id %u) call for non-creature (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
((Unit*)source)->MonsterMoveWithSpeed(step.script->x, step.script->y, step.script->z, step.script->datalong2 ); ((Unit*)source)->MonsterMoveWithSpeed(step.script->x, step.script->y, step.script->z, step.script->datalong2 );
break; break;
case SCRIPT_COMMAND_FLAG_SET: case SCRIPT_COMMAND_FLAG_SET:
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_FLAG_SET call for NULL object."); sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id %u) call for NULL object.", step.script->id);
break; break;
} }
if(step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount()) if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount())
{ {
sLog.outError("SCRIPT_COMMAND_FLAG_SET call for wrong field %u (max count: %u) in object (TypeId: %u).", sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id %u) call for wrong field %u (max count: %u) in object (TypeId: %u).",
step.script->datalong,source->GetValuesCount(),source->GetTypeId()); step.script->id, step.script->datalong, source->GetValuesCount(), source->GetTypeId());
break; break;
} }
source->SetFlag(step.script->datalong, step.script->datalong2); source->SetFlag(step.script->datalong, step.script->datalong2);
break; break;
case SCRIPT_COMMAND_FLAG_REMOVE: case SCRIPT_COMMAND_FLAG_REMOVE:
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE call for NULL object."); sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE (script id %u) call for NULL object.", step.script->id);
break; break;
} }
if(step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount()) if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount())
{ {
sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE call for wrong field %u (max count: %u) in object (TypeId: %u).", sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE (script id %u) call for wrong field %u (max count: %u) in object (TypeId: %u).",
step.script->datalong,source->GetValuesCount(),source->GetTypeId()); step.script->id, step.script->datalong, source->GetValuesCount(), source->GetTypeId());
break; break;
} }
source->RemoveFlag(step.script->datalong, step.script->datalong2); source->RemoveFlag(step.script->datalong, step.script->datalong2);
break; break;
case SCRIPT_COMMAND_TELEPORT_TO: case SCRIPT_COMMAND_TELEPORT_TO:
{ {
// accept player in any one from target/source arg // accept player in any one from target/source arg
if (!target && !source) if (!target && !source)
{ {
sLog.outError("SCRIPT_COMMAND_TELEPORT_TO call for NULL object."); sLog.outError("SCRIPT_COMMAND_TELEPORT_TO (script id %u) call for NULL object.", step.script->id);
break; break;
} }
// must be only Player // must be only Player
if((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER)) if ((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER))
{ {
sLog.outError("SCRIPT_COMMAND_TELEPORT_TO call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0); sLog.outError("SCRIPT_COMMAND_TELEPORT_TO (script id %u) call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", step.script->id, source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0);
break; break;
} }
@ -2988,20 +2990,19 @@ void Map::ScriptsProcess()
pSource->TeleportTo(step.script->datalong, step.script->x, step.script->y, step.script->z, step.script->o); pSource->TeleportTo(step.script->datalong, step.script->x, step.script->y, step.script->z, step.script->o);
break; break;
} }
case SCRIPT_COMMAND_KILL_CREDIT: case SCRIPT_COMMAND_KILL_CREDIT:
{ {
// accept player in any one from target/source arg // accept player in any one from target/source arg
if (!target && !source) if (!target && !source)
{ {
sLog.outError("SCRIPT_COMMAND_KILL_CREDIT call for NULL object."); sLog.outError("SCRIPT_COMMAND_KILL_CREDIT (script id %u) call for NULL object.", step.script->id);
break; break;
} }
// must be only Player // must be only Player
if((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER)) if ((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER))
{ {
sLog.outError("SCRIPT_COMMAND_KILL_CREDIT call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0); sLog.outError("SCRIPT_COMMAND_KILL_CREDIT (script id %u) call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", step.script->id, source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0);
break; break;
} }
@ -3018,26 +3019,25 @@ void Map::ScriptsProcess()
break; break;
} }
case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE: case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE:
{ {
if(!step.script->datalong) // creature not specified if (!step.script->datalong) // creature not specified
{ {
sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE call for NULL creature."); sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE (script id %u) call for NULL creature.", step.script->id);
break; break;
} }
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE call for NULL world object."); sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE (script id %u) call for NULL world object.", step.script->id);
break; break;
} }
WorldObject* summoner = dynamic_cast<WorldObject*>(source); WorldObject* summoner = dynamic_cast<WorldObject*>(source);
if(!summoner) if (!summoner)
{ {
sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE call for non-WorldObject (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE (script id %u) call for non-WorldObject (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
@ -3046,35 +3046,34 @@ void Map::ScriptsProcess()
float z = step.script->z; float z = step.script->z;
float o = step.script->o; float o = step.script->o;
Creature* pCreature = summoner->SummonCreature(step.script->datalong, x, y, z, o,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,step.script->datalong2); Creature* pCreature = summoner->SummonCreature(step.script->datalong, x, y, z, o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, step.script->datalong2);
if (!pCreature) if (!pCreature)
{ {
sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON failed for creature (entry: %u).",step.script->datalong); sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON (script id %u) failed for creature (entry: %u).", step.script->id, step.script->datalong);
break; break;
} }
break; break;
} }
case SCRIPT_COMMAND_RESPAWN_GAMEOBJECT: case SCRIPT_COMMAND_RESPAWN_GAMEOBJECT:
{ {
if(!step.script->datalong) // gameobject not specified if (!step.script->datalong) // gameobject not specified
{ {
sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT call for NULL gameobject."); sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT (script id %u) call for NULL gameobject.", step.script->id);
break; break;
} }
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT call for NULL world object."); sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT (script id %u) call for NULL world object.", step.script->id);
break; break;
} }
WorldObject* summoner = dynamic_cast<WorldObject*>(source); WorldObject* summoner = dynamic_cast<WorldObject*>(source);
if(!summoner) if (!summoner)
{ {
sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT call for non-WorldObject (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT (script id %u) call for non-WorldObject (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
@ -3082,25 +3081,25 @@ void Map::ScriptsProcess()
int32 time_to_despawn = step.script->datalong2<5 ? 5 : (int32)step.script->datalong2; int32 time_to_despawn = step.script->datalong2<5 ? 5 : (int32)step.script->datalong2;
MaNGOS::GameObjectWithDbGUIDCheck go_check(*summoner,step.script->datalong); MaNGOS::GameObjectWithDbGUIDCheck go_check(*summoner,step.script->datalong);
MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(summoner, go,go_check); MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(summoner, go, go_check);
Cell::VisitGridObjects(summoner, checker, GetVisibilityDistance()); Cell::VisitGridObjects(summoner, checker, GetVisibilityDistance());
if ( !go ) if (!go)
{ {
sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT failed for gameobject(guid: %u).", step.script->datalong); sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT (script id %u) failed for gameobject(guid: %u).", step.script->id, step.script->datalong);
break; break;
} }
if( go->GetGoType()==GAMEOBJECT_TYPE_FISHINGNODE || if (go->GetGoType()==GAMEOBJECT_TYPE_FISHINGNODE ||
go->GetGoType()==GAMEOBJECT_TYPE_DOOR || go->GetGoType()==GAMEOBJECT_TYPE_DOOR ||
go->GetGoType()==GAMEOBJECT_TYPE_BUTTON || go->GetGoType()==GAMEOBJECT_TYPE_BUTTON ||
go->GetGoType()==GAMEOBJECT_TYPE_TRAP ) go->GetGoType()==GAMEOBJECT_TYPE_TRAP)
{ {
sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT can not be used with gameobject of type %u (guid: %u).", uint32(go->GetGoType()), step.script->datalong); sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT (script id %u) can not be used with gameobject of type %u (guid: %u).", step.script->id, uint32(go->GetGoType()), step.script->datalong);
break; break;
} }
if( go->isSpawned() ) if (go->isSpawned())
break; //gameobject already spawned break; //gameobject already spawned
go->SetLootState(GO_READY); go->SetLootState(GO_READY);
@ -3111,21 +3110,21 @@ void Map::ScriptsProcess()
} }
case SCRIPT_COMMAND_OPEN_DOOR: case SCRIPT_COMMAND_OPEN_DOOR:
{ {
if(!step.script->datalong) // door not specified if (!step.script->datalong) // door not specified
{ {
sLog.outError("SCRIPT_COMMAND_OPEN_DOOR call for NULL door."); sLog.outError("SCRIPT_COMMAND_OPEN_DOOR (script id %u) call for NULL door.", step.script->id);
break; break;
} }
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_OPEN_DOOR call for NULL unit."); sLog.outError("SCRIPT_COMMAND_OPEN_DOOR (script id %u) call for NULL unit.", step.script->id);
break; break;
} }
if(!source->isType(TYPEMASK_UNIT)) // must be any Unit (creature or player) if (!source->isType(TYPEMASK_UNIT)) // must be any Unit (creature or player)
{ {
sLog.outError("SCRIPT_COMMAND_OPEN_DOOR call for non-unit (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_OPEN_DOOR (script id %u) call for non-unit (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
@ -3134,18 +3133,19 @@ void Map::ScriptsProcess()
GameObject *door = NULL; GameObject *door = NULL;
int32 time_to_close = step.script->datalong2 < 15 ? 15 : (int32)step.script->datalong2; int32 time_to_close = step.script->datalong2 < 15 ? 15 : (int32)step.script->datalong2;
MaNGOS::GameObjectWithDbGUIDCheck go_check(*caster,step.script->datalong); MaNGOS::GameObjectWithDbGUIDCheck go_check(*caster, step.script->datalong);
MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(caster,door,go_check); MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(caster, door, go_check);
Cell::VisitGridObjects(caster, checker, GetVisibilityDistance()); Cell::VisitGridObjects(caster, checker, GetVisibilityDistance());
if (!door) if (!door)
{ {
sLog.outError("SCRIPT_COMMAND_OPEN_DOOR failed for gameobject(guid: %u).", step.script->datalong); sLog.outError("SCRIPT_COMMAND_OPEN_DOOR (script id %u) failed for gameobject(guid: %u).", step.script->id, step.script->datalong);
break; break;
} }
if (door->GetGoType() != GAMEOBJECT_TYPE_DOOR) if (door->GetGoType() != GAMEOBJECT_TYPE_DOOR)
{ {
sLog.outError("SCRIPT_COMMAND_OPEN_DOOR failed for non-door(GoType: %u).", door->GetGoType()); sLog.outError("SCRIPT_COMMAND_OPEN_DOOR (script id %u) failed for non-door(GoType: %u).", step.script->id, door->GetGoType());
break; break;
} }
@ -3154,27 +3154,28 @@ void Map::ScriptsProcess()
door->UseDoorOrButton(time_to_close); door->UseDoorOrButton(time_to_close);
if(target && target->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)target)->GetGoType()==GAMEOBJECT_TYPE_BUTTON) if (target && target->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)target)->GetGoType()==GAMEOBJECT_TYPE_BUTTON)
((GameObject*)target)->UseDoorOrButton(time_to_close); ((GameObject*)target)->UseDoorOrButton(time_to_close);
break; break;
} }
case SCRIPT_COMMAND_CLOSE_DOOR: case SCRIPT_COMMAND_CLOSE_DOOR:
{ {
if(!step.script->datalong) // guid for door not specified if (!step.script->datalong) // guid for door not specified
{ {
sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR call for NULL door."); sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR (script id %u) call for NULL door.", step.script->id);
break; break;
} }
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR call for NULL unit."); sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR (script id %u) call for NULL unit.", step.script->id);
break; break;
} }
if(!source->isType(TYPEMASK_UNIT)) // must be any Unit (creature or player) if (!source->isType(TYPEMASK_UNIT)) // must be any Unit (creature or player)
{ {
sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR call for non-unit (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR (script id %u) call for non-unit (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
@ -3183,27 +3184,27 @@ void Map::ScriptsProcess()
GameObject *door = NULL; GameObject *door = NULL;
int32 time_to_open = step.script->datalong2 < 15 ? 15 : (int32)step.script->datalong2; int32 time_to_open = step.script->datalong2 < 15 ? 15 : (int32)step.script->datalong2;
MaNGOS::GameObjectWithDbGUIDCheck go_check(*caster,step.script->datalong); MaNGOS::GameObjectWithDbGUIDCheck go_check(*caster, step.script->datalong);
MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(caster,door,go_check); MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(caster, door, go_check);
Cell::VisitGridObjects(caster, checker, GetVisibilityDistance()); Cell::VisitGridObjects(caster, checker, GetVisibilityDistance());
if ( !door ) if (!door)
{ {
sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR failed for gameobject(guid: %u).", step.script->datalong); sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR (script id %u) failed for gameobject(guid: %u).", step.script->id, step.script->datalong);
break; break;
} }
if ( door->GetGoType() != GAMEOBJECT_TYPE_DOOR ) if (door->GetGoType() != GAMEOBJECT_TYPE_DOOR)
{ {
sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR failed for non-door(GoType: %u).", door->GetGoType()); sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR (script id %u) failed for non-door(GoType: %u).", step.script->id, door->GetGoType());
break; break;
} }
if( door->GetGoState() == GO_STATE_READY ) if (door->GetGoState() == GO_STATE_READY)
break; //door already closed break; //door already closed
door->UseDoorOrButton(time_to_open); door->UseDoorOrButton(time_to_open);
if(target && target->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)target)->GetGoType()==GAMEOBJECT_TYPE_BUTTON) if (target && target->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)target)->GetGoType()==GAMEOBJECT_TYPE_BUTTON)
((GameObject*)target)->UseDoorOrButton(time_to_open); ((GameObject*)target)->UseDoorOrButton(time_to_open);
break; break;
@ -3266,25 +3267,25 @@ void Map::ScriptsProcess()
} }
case SCRIPT_COMMAND_ACTIVATE_OBJECT: case SCRIPT_COMMAND_ACTIVATE_OBJECT:
{ {
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT must have source caster."); sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT must have source caster.");
break; break;
} }
if(!source->isType(TYPEMASK_UNIT)) if (!source->isType(TYPEMASK_UNIT))
{ {
sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT source caster isn't unit (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT source caster isn't unit (TypeId: %u), skipping.",source->GetTypeId());
break; break;
} }
if(!target) if (!target)
{ {
sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT call for NULL gameobject."); sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT call for NULL gameobject.");
break; break;
} }
if(target->GetTypeId()!=TYPEID_GAMEOBJECT) if (target->GetTypeId()!=TYPEID_GAMEOBJECT)
{ {
sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT call for non-gameobject (TypeId: %u), skipping.",target->GetTypeId()); sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT call for non-gameobject (TypeId: %u), skipping.",target->GetTypeId());
break; break;
@ -3297,46 +3298,44 @@ void Map::ScriptsProcess()
go->Use(caster); go->Use(caster);
break; break;
} }
case SCRIPT_COMMAND_REMOVE_AURA: case SCRIPT_COMMAND_REMOVE_AURA:
{ {
Object* cmdTarget = step.script->datalong2 ? source : target; Object* cmdTarget = step.script->datalong2 ? source : target;
if(!cmdTarget) if (!cmdTarget)
{ {
sLog.outError("SCRIPT_COMMAND_REMOVE_AURA call for NULL %s.",step.script->datalong2 ? "source" : "target"); sLog.outError("SCRIPT_COMMAND_REMOVE_AURA (script id %u) call for NULL %s.", step.script->id, step.script->datalong2 ? "source" : "target");
break; break;
} }
if(!cmdTarget->isType(TYPEMASK_UNIT)) if (!cmdTarget->isType(TYPEMASK_UNIT))
{ {
sLog.outError("SCRIPT_COMMAND_REMOVE_AURA %s isn't unit (TypeId: %u), skipping.",step.script->datalong2 ? "source" : "target",cmdTarget->GetTypeId()); sLog.outError("SCRIPT_COMMAND_REMOVE_AURA (script id %u) %s isn't unit (TypeId: %u), skipping.", step.script->id, step.script->datalong2 ? "source" : "target",cmdTarget->GetTypeId());
break; break;
} }
((Unit*)cmdTarget)->RemoveAurasDueToSpell(step.script->datalong); ((Unit*)cmdTarget)->RemoveAurasDueToSpell(step.script->datalong);
break; break;
} }
case SCRIPT_COMMAND_CAST_SPELL: case SCRIPT_COMMAND_CAST_SPELL:
{ {
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_CAST_SPELL must have source caster."); sLog.outError("SCRIPT_COMMAND_CAST_SPELL (script id %u) must have source caster.", step.script->id);
break; break;
} }
Object* cmdTarget = step.script->datalong2 & 0x01 ? source : target; Object* cmdTarget = step.script->datalong2 & 0x01 ? source : target;
if(!cmdTarget) if (!cmdTarget)
{ {
sLog.outError("SCRIPT_COMMAND_CAST_SPELL call for NULL %s.",step.script->datalong2 & 0x01 ? "source" : "target"); sLog.outError("SCRIPT_COMMAND_CAST_SPELL (script id %u) call for NULL %s.", step.script->id, step.script->datalong2 & 0x01 ? "source" : "target");
break; break;
} }
if(!cmdTarget->isType(TYPEMASK_UNIT)) if (!cmdTarget->isType(TYPEMASK_UNIT))
{ {
sLog.outError("SCRIPT_COMMAND_CAST_SPELL %s isn't unit (TypeId: %u), skipping.",step.script->datalong2 & 0x01 ? "source" : "target",cmdTarget->GetTypeId()); sLog.outError("SCRIPT_COMMAND_CAST_SPELL (script id %u) %s isn't unit (TypeId: %u), skipping.", step.script->id, step.script->datalong2 & 0x01 ? "source" : "target",cmdTarget->GetTypeId());
break; break;
} }
@ -3344,15 +3343,15 @@ void Map::ScriptsProcess()
Object* cmdSource = step.script->datalong2 & 0x02 ? target : source; Object* cmdSource = step.script->datalong2 & 0x02 ? target : source;
if(!cmdSource) if (!cmdSource)
{ {
sLog.outError("SCRIPT_COMMAND_CAST_SPELL call for NULL %s.",step.script->datalong2 & 0x02 ? "target" : "source"); sLog.outError("SCRIPT_COMMAND_CAST_SPELL (script id %u) call for NULL %s.", step.script->id, step.script->datalong2 & 0x02 ? "target" : "source");
break; break;
} }
if(!cmdSource->isType(TYPEMASK_UNIT)) if (!cmdSource->isType(TYPEMASK_UNIT))
{ {
sLog.outError("SCRIPT_COMMAND_CAST_SPELL %s isn't unit (TypeId: %u), skipping.",step.script->datalong2 & 0x02 ? "target" : "source", cmdSource->GetTypeId()); sLog.outError("SCRIPT_COMMAND_CAST_SPELL (script id %u) %s isn't unit (TypeId: %u), skipping.", step.script->id, step.script->datalong2 & 0x02 ? "target" : "source", cmdSource->GetTypeId());
break; break;
} }
@ -3363,35 +3362,36 @@ void Map::ScriptsProcess()
break; break;
} }
case SCRIPT_COMMAND_PLAY_SOUND: case SCRIPT_COMMAND_PLAY_SOUND:
{ {
if(!source) if (!source)
{ {
sLog.outError("SCRIPT_COMMAND_PLAY_SOUND call for NULL creature."); sLog.outError("SCRIPT_COMMAND_PLAY_SOUND (script id %u) call for NULL creature.", step.script->id);
break; break;
} }
WorldObject* pSource = dynamic_cast<WorldObject*>(source); WorldObject* pSource = dynamic_cast<WorldObject*>(source);
if(!pSource)
if (!pSource)
{ {
sLog.outError("SCRIPT_COMMAND_PLAY_SOUND call for non-world object (TypeId: %u), skipping.",source->GetTypeId()); sLog.outError("SCRIPT_COMMAND_PLAY_SOUND (script id %u) call for non-world object (TypeId: %u), skipping.", step.script->id, source->GetTypeId());
break; break;
} }
// bitmask: 0/1=anyone/target, 0/2=with distance dependent // bitmask: 0/1=anyone/target, 0/2=with distance dependent
Player* pTarget = NULL; Player* pTarget = NULL;
if(step.script->datalong2 & 1)
if (step.script->datalong2 & 1)
{ {
if(!target) if (!target)
{ {
sLog.outError("SCRIPT_COMMAND_PLAY_SOUND in targeted mode call for NULL target."); sLog.outError("SCRIPT_COMMAND_PLAY_SOUND (script id %u) in targeted mode call for NULL target.", step.script->id);
break; break;
} }
if(target->GetTypeId()!=TYPEID_PLAYER) if (target->GetTypeId() != TYPEID_PLAYER)
{ {
sLog.outError("SCRIPT_COMMAND_PLAY_SOUND in targeted mode call for non-player (TypeId: %u), skipping.",target->GetTypeId()); sLog.outError("SCRIPT_COMMAND_PLAY_SOUND (script id %u) in targeted mode call for non-player (TypeId: %u), skipping.", step.script->id, target->GetTypeId());
break; break;
} }
@ -3399,24 +3399,25 @@ void Map::ScriptsProcess()
} }
// bitmask: 0/1=anyone/target, 0/2=with distance dependent // bitmask: 0/1=anyone/target, 0/2=with distance dependent
if(step.script->datalong2 & 2) if (step.script->datalong2 & 2)
pSource->PlayDistanceSound(step.script->datalong,pTarget); pSource->PlayDistanceSound(step.script->datalong, pTarget);
else else
pSource->PlayDirectSound(step.script->datalong,pTarget); pSource->PlayDirectSound(step.script->datalong, pTarget);
break; break;
} }
case SCRIPT_COMMAND_CREATE_ITEM: case SCRIPT_COMMAND_CREATE_ITEM:
{ {
if (!target && !source) if (!target && !source)
{ {
sLog.outError("SCRIPT_COMMAND_CREATE_ITEM call for NULL object."); sLog.outError("SCRIPT_COMMAND_CREATE_ITEM (script id %u) call for NULL object.", step.script->id);
break; break;
} }
// only Player // only Player
if ((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER)) if ((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER))
{ {
sLog.outError("SCRIPT_COMMAND_CREATE_ITEM call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0); sLog.outError("SCRIPT_COMMAND_CREATE_ITEM (script id %u) call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", step.script->id, source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0);
break; break;
} }
@ -3431,14 +3432,14 @@ void Map::ScriptsProcess()
{ {
if (!target && !source) if (!target && !source)
{ {
sLog.outError("SCRIPT_COMMAND_DESPAWN_SELF call for NULL object."); sLog.outError("SCRIPT_COMMAND_DESPAWN_SELF (script id %u) call for NULL object.", step.script->id);
break; break;
} }
// only creature // only creature
if ((!target || target->GetTypeId() != TYPEID_UNIT) && (!source || source->GetTypeId() != TYPEID_UNIT)) if ((!target || target->GetTypeId() != TYPEID_UNIT) && (!source || source->GetTypeId() != TYPEID_UNIT))
{ {
sLog.outError("SCRIPT_COMMAND_DESPAWN_SELF call for non-creature (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0); sLog.outError("SCRIPT_COMMAND_DESPAWN_SELF (script id %u) call for non-creature (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", step.script->id, source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0);
break; break;
} }
@ -3449,7 +3450,7 @@ void Map::ScriptsProcess()
break; break;
} }
default: default:
sLog.outError("Unknown script command %u called.",step.script->command); sLog.outError("Unknown SCRIPT_COMMAND_ %u called for script id %u.",step.script->command, step.script->id);
break; break;
} }
@ -3458,7 +3459,6 @@ void Map::ScriptsProcess()
iter = m_scriptSchedule.begin(); iter = m_scriptSchedule.begin();
} }
return;
} }
Creature* Map::GetCreature(ObjectGuid guid) Creature* Map::GetCreature(ObjectGuid guid)

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 "9869" #define REVISION_NR "9870"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__