From f22b26f80fccfba761b1f9b0b2fe87f39f0731d7 Mon Sep 17 00:00:00 2001 From: af4t Date: Tue, 19 Aug 2014 17:07:27 -0400 Subject: [PATCH] Squashed commit of the following: commit 5d074ea99837e1b0e5bca57f2484f01e623025f8 Author: Michael Cook Date: Thu Jun 5 02:57:56 2014 -0400 Update LS default entry in example config commit e9c4613368029c219637f8a6d1b7846b48dc85cf Merge: 3690f93 dd73b82 Author: KimLS Date: Wed Jun 4 18:32:48 2014 -0700 Merge branch 'master' into water_map_v2 commit 3690f933020cbb24ae12b32a18ad2ca836edcfb0 Author: KimLS Date: Sat May 31 16:32:15 2014 -0700 Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory commit dd73b82ec21faaec0895fc9c9e6647cfcc4d8fec Author: KimLS Date: Tue May 27 16:16:06 2014 -0700 Fix for a problem with global player quests and hasquestsub commit 8a5405060fa732c6199d1307c4c8aca2081ff498 Author: KimLS Date: Fri May 23 17:39:16 2014 -0700 Fix for string.h missing in water map commit 83270d09836506b7fe097e07c0633b30d67b4ecf Author: KimLS Date: Fri May 23 16:10:23 2014 -0700 Merge from master stuff commit fd4343702f7dab3f6553ced17af24276b19f4ffa Merge: 0483e8b 5af47c5 Author: KimLS Date: Fri May 23 16:09:46 2014 -0700 Merge branch 'master' into water_map_v2 commit 0483e8bd1ba99d16ad2e9eb67e865606589fd09a Author: KimLS Date: Fri May 23 16:08:02 2014 -0700 Removed the logging now that the issue is resolved commit 39cbdbd5c2e12f304330fd566779e3020eb511fd Author: KimLS Date: Fri May 23 15:54:26 2014 -0700 Debug logs for map, also can actually turn perl off on zone commit 3a2ccd75210066a165809c91704222fff35ee533 Author: KimLS Date: Wed May 21 17:30:54 2014 -0700 Added loading of v2 regular maps, also #bestz will report water info even if a reg map failed to load. commit 8c9227180449454bc712edbcc50ff23371c80acd Author: KimLS Date: Tue May 20 00:14:26 2014 -0700 Initial v2 water map format. --- zone/perl_client.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index ecb2c4d18..476c47599 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -1263,12 +1263,14 @@ XS(XS_Client_MovePC) THIS->MovePC(zoneID, x, y, z, heading); } else { - if (THIS->IsBot()) - _log(CLIENT__ERROR, "Perl(XS_Client_MovePC) attempted to process a type Bot reference"); - else if (THIS->IsMerc()) + if (THIS->IsMerc()) _log(CLIENT__ERROR, "Perl(XS_Client_MovePC) attempted to process a type Merc reference"); else if (THIS->IsNPC()) _log(CLIENT__ERROR, "Perl(XS_Client_MovePC) attempted to process a type NPC reference"); + #ifdef BOTS + else if (THIS->IsBot()) + _log(CLIENT__ERROR, "Perl(XS_Client_MovePC) attempted to process a type Bot reference"); + #endif else _log(CLIENT__ERROR, "Perl(XS_Client_MovePC) attempted to process an Unknown type reference"); @@ -1307,12 +1309,14 @@ XS(XS_Client_MovePCInstance) THIS->MovePC(zoneID, instanceID, x, y, z, heading); } else { - if (THIS->IsBot()) - _log(CLIENT__ERROR, "Perl(XS_Client_MovePCInstance) attempted to process a type Bot reference"); - else if (THIS->IsMerc()) + if (THIS->IsMerc()) _log(CLIENT__ERROR, "Perl(XS_Client_MovePCInstance) attempted to process a type Merc reference"); else if (THIS->IsNPC()) _log(CLIENT__ERROR, "Perl(XS_Client_MovePCInstance) attempted to process a type NPC reference"); + #ifdef BOTS + else if (THIS->IsBot()) + _log(CLIENT__ERROR, "Perl(XS_Client_MovePCInstance) attempted to process a type Bot reference"); + #endif else _log(CLIENT__ERROR, "Perl(XS_Client_MovePCInstance) attempted to process an Unknown type reference");