From 698ef56df96174e824c788c2de71497ea3f55a97 Mon Sep 17 00:00:00 2001 From: Uleat Date: Thu, 24 Mar 2016 19:35:23 -0400 Subject: [PATCH] Few more portability fixes --- zone/bot.cpp | 4 ++-- zone/bot_command.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index 447f38834..93803d978 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -1518,11 +1518,11 @@ bool Bot::IsValidName(std::string& name) { if (name.length() < 4) return false; - if (!IsCharUpper(name[0])) + if (!isupper(name[0])) return false; for (int i = 1; i < name.length(); ++i) { - if (!IsCharLower(name[i]) && name[i] != '_') { + if (!islower(name[i]) && name[i] != '_') { return false; } } diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp index 0c09c6f31..75ca8a6ff 100644 --- a/zone/bot_command.cpp +++ b/zone/bot_command.cpp @@ -990,19 +990,19 @@ private: if (l_size_type < r_size_type) return true; if (l_size_type == BCEnum::SzT_Enlarge && r_size_type == BCEnum::SzT_Enlarge) { - if (EQ_STBASE(l, r, target_type) && GT_SPELLS(l, r, base, 1)) + if (EQ_STBASE(l, r, target_type) && GT_SPELLS_EFFECT_ID(l, r, base, 1)) return true; - if (EQ_STBASE(l, r, target_type) && EQ_SPELLS(l, r, base, 1) && GT_STBASE(l, r, spell_level)) + if (EQ_STBASE(l, r, target_type) && EQ_SPELLS_EFFECT_ID(l, r, base, 1) && GT_STBASE(l, r, spell_level)) return true; - if (EQ_STBASE(l, r, target_type) && EQ_SPELLS(l, r, base, 1) && EQ_STBASE(l, r, spell_level) && LT_STBASE(l, r, caster_class)) + if (EQ_STBASE(l, r, target_type) && EQ_SPELLS_EFFECT_ID(l, r, base, 1) && EQ_STBASE(l, r, spell_level) && LT_STBASE(l, r, caster_class)) return true; } if (l_size_type == BCEnum::SzT_Reduce && r_size_type == BCEnum::SzT_Reduce) { - if (EQ_STBASE(l, r, target_type) && LT_SPELLS(l, r, base, 1)) + if (EQ_STBASE(l, r, target_type) && LT_SPELLS_EFFECT_ID(l, r, base, 1)) return true; - if (EQ_STBASE(l, r, target_type) && EQ_SPELLS(l, r, base, 1) && GT_STBASE(l, r, spell_level)) + if (EQ_STBASE(l, r, target_type) && EQ_SPELLS_EFFECT_ID(l, r, base, 1) && GT_STBASE(l, r, spell_level)) return true; - if (EQ_STBASE(l, r, target_type) && EQ_SPELLS(l, r, base, 1) && EQ_STBASE(l, r, spell_level) && LT_STBASE(l, r, caster_class)) + if (EQ_STBASE(l, r, target_type) && EQ_SPELLS_EFFECT_ID(l, r, base, 1) && EQ_STBASE(l, r, spell_level) && LT_STBASE(l, r, caster_class)) return true; }