From 9bebf76c85457b8af23462c1989b1dc97055336c Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 21 Jan 2016 22:10:11 -0600 Subject: [PATCH] set these back to the way they were, so they hopefully don't bug out - may need to add .c_str() somewhere too --- .../library/serverGame/src/shared/object/CreatureObject.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index 91aae655..07ada2df 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -1793,7 +1793,7 @@ void CreatureObject::initializeFirstTimeObject() std::string creature = getTemplateName(); WARNING_STRICT_FATAL(!getDefaultWeapon(), ("Creature %s (%s) has no default " - "weapon", getNetworkId().getValueString().c_str(), creature)); + "weapon", getNetworkId().getValueString().c_str(), getTemplateName())); } const ServerCreatureObjectTemplate * myTemplate = safe_cast(getObjectTemplate()); @@ -3019,9 +3019,7 @@ void CreatureObject::initializeDefaultWeapon() ServerWeaponObjectTemplate const *weaponTemplate = myTemplate->getDefaultWeapon(); if (weaponTemplate == NULL) { - std::string creature = getTemplateName(); - - WARNING(true, ("Creature template %s has no valid default weapon!", creature)); + WARNING(true, ("Creature template %s has no valid default weapon!", getTemplateName())); // try to use the fallback weapon weaponTemplate = dynamic_cast(ObjectTemplateList::fetch(ConfigServerGame::getFallbackDefaultWeapon()));