swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

set these back to the way they were, so they hopefully don't bug out - may need to add .c_str() somewhere too

Browse Source
This commit is contained in:
DarthArgus
2016-01-21 22:10:11 -06:00
parent ba9f47f9db
commit 9bebf76c85
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
+2 -4
View File
@@ -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<const ServerCreatureObjectTemplate *>(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<ServerWeaponObjectTemplate const *>(ObjectTemplateList::fetch(ConfigServerGame::getFallbackDefaultWeapon()));