Merge branch 'master' into shared_mem

This commit is contained in:
KimLS 2013-02-23 22:43:24 -08:00
commit d42ff6ce19

View File

@ -11325,7 +11325,14 @@ void command_camerashake(Client *c, const Seperator *sep)
void command_disarmtrap(Client *c, const Seperator *sep) void command_disarmtrap(Client *c, const Seperator *sep)
{ {
Mob * target = c->GetTarget(); Mob *target = c->GetTarget();
if(!target)
{
c->Message(13, "You must have a target.");
return;
}
if(target->IsNPC()) if(target->IsNPC())
{ {
if(c->HasSkill(DISARM_TRAPS)) if(c->HasSkill(DISARM_TRAPS))
@ -11345,6 +11352,12 @@ void command_disarmtrap(Client *c, const Seperator *sep)
void command_sensetrap(Client *c, const Seperator *sep) void command_sensetrap(Client *c, const Seperator *sep)
{ {
Mob * target = c->GetTarget(); Mob * target = c->GetTarget();
if(!target)
{
c->Message(13, "You must have a target.");
return;
}
if(target->IsNPC()) if(target->IsNPC())
{ {
if(c->HasSkill(SENSE_TRAPS)) if(c->HasSkill(SENSE_TRAPS))
@ -11364,6 +11377,12 @@ void command_sensetrap(Client *c, const Seperator *sep)
void command_picklock(Client *c, const Seperator *sep) void command_picklock(Client *c, const Seperator *sep)
{ {
Mob * target = c->GetTarget(); Mob * target = c->GetTarget();
if(!target)
{
c->Message(13, "You must have a target.");
return;
}
if(target->IsNPC()) if(target->IsNPC())
{ {
if(c->HasSkill(PICK_LOCK)) if(c->HasSkill(PICK_LOCK))