Hows about....
Code:
--- c:\temp\1\zone\client_process.cpp 2006-10-19 13:03:34.593750000 -0500
+++ c:\temp\2\zone\client_process.cpp 2006-10-15 23:11:28.000000000 -0500
@@ -431,7 +431,7 @@
{
if (!CombatRange(shield_target))
{
- entity_list.MessageClose(this,false,100,0,"%s ceases shielding %s.",GetCleanName(),shield_target->GetCleanName());
+ entity_list.MessageClose(this,false,100,0,"%s ceases shielding %s.",GetName(),shield_target->GetName());
for (int y = 0; y < 2; y++)
{
if (shield_target->shielder[y].shielder_id == GetID())
--- c:\temp\1\zone\MobAI.cpp 2006-10-18 22:10:57.328125000 -0500
+++ c:\temp\2\zone\MobAI.cpp 2006-10-15 17:21:50.000000000 -0500
@@ -1116,7 +1116,7 @@
// start the timer. need to call IsEnraged frequently since we dont have callback timers :-/
SpecAttackTimers[SPECATK_ENRAGE]->Start();
bEnraged = true;
- entity_list.MessageClose(this, true, 600, 13, "%s has become ENRAGED.", GetCleanName());
+ entity_list.MessageClose(this, true, 600, 13, "%s has become ENRAGED.", GetName());
}
bool Mob::IsEnraged()
@@ -1124,7 +1124,7 @@
// check the timer and set to false if time is up
if (bEnraged && SpecAttackTimers[SPECATK_ENRAGE] && SpecAttackTimers[SPECATK_ENRAGE]->Check())
{
- entity_list.MessageClose(this, true, 600, 13, "%s is no longer enraged.", GetCleanName());
+ entity_list.MessageClose(this, true, 600, 13, "%s is no longer enraged.", GetName());
safe_delete(SpecAttackTimers[SPECATK_ENRAGE]);
SpecAttackTimers[SPECATK_ENRAGE] = new Timer(360000);
SpecAttackTimers[SPECATK_ENRAGE]->Start();
@@ -1164,7 +1164,7 @@
bool Mob::Rampage()
{
- entity_list.MessageClose(this, true, 600, 13, "%s goes on a RAMPAGE!", GetCleanName());
+ entity_list.MessageClose(this, true, 600, 13, "%s goes on a RAMPAGE!", GetName());
for (int i = 0; i < MAX_RAMPAGE_TARGETS; i++)
{
// range is important
--- c:\temp\1\zone\attack.cpp 2006-10-18 22:10:57.812500000 -0500
+++ c:\temp\2\zone\attack.cpp 2006-10-15 17:21:16.000000000 -0500
@@ -1273,7 +1273,7 @@
if (!IsAttackAllowed(other)) {
if (this->GetOwnerID())
- entity_list.MessageClose(this, 1, 200, 10, "%s says, 'That is not a legal target master.'", this->GetCleanName());
+ entity_list.MessageClose(this, 1, 200, 10, "%s says, 'That is not a legal target master.'", this->GetName());
if(other)
RemoveFromHateList(other);
mlog(COMBAT__ATTACKS, "I am not allowed to attack %s", other->GetName());
@@ -2227,7 +2227,7 @@
if ((spell_id != SPELL_UNKNOWN || (attack_skill>200 && attack_skill<250)) && damage>0) {
//special crap for spell damage, looks hackish to me
char val1[20]={0};
- owner->Message_StringID(4,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1));
+ owner->Message_StringID(4,OTHER_HIT_NONMELEE,GetName(),ConvertArray(damage,val1));
} else {
if(damage > 0) {
if(spell_id != SPELL_UNKNOWN)
@@ -2250,7 +2250,7 @@
if ((spell_id != SPELL_UNKNOWN || (attack_skill>200 && attack_skill<250)) && damage>0) {
//special crap for spell damage, looks hackish to me
char val1[20]={0};
- attacker->Message_StringID(4,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1));
+ attacker->Message_StringID(4,OTHER_HIT_NONMELEE,GetName(),ConvertArray(damage,val1));
} else {
if(damage > 0) {
if(spell_id != SPELL_UNKNOWN)
--- c:\temp\1\zone\client_packet.cpp 2006-10-18 22:10:57.921875000 -0500
+++ c:\temp\2\zone\client_packet.cpp 2006-10-15 23:11:28.000000000 -0500
@@ -4580,12 +4580,12 @@
break;
}
case PET_TAUNT: {
- Message(0,"%s says, 'Now taunting foes, Master!",mypet->GetCleanName());
+ Message(0,"%s says, 'Now taunting foes, Master!",mypet->GetName());
mypet->CastToNPC()->SetTaunting(true);
break;
}
case PET_NOTAUNT: {
- Message(0,"%s says, 'No longer taunting foes, Master!",mypet->GetCleanName());
+ Message(0,"%s says, 'No longer taunting foes, Master!",mypet->GetName());
mypet->CastToNPC()->SetTaunting(false);
break;
}
--- c:\temp\1\zone\mob.cpp 2006-10-18 22:36:37.203125000 -0500
+++ c:\temp\2\zone\mob.cpp 2006-10-15 23:11:28.000000000 -0500
@@ -1763,7 +1763,7 @@
{
if (target->IsClient())
target->CastToClient()->Message(15,"You have been summoned!");
- entity_list.MessageClose(this, true, 500, 10, "%s says,'You will not evade me, %s!' ", GetCleanName(), GetHateTop()->GetName() );
+ entity_list.MessageClose(this, true, 500, 10, "%s says,'You will not evade me, %s!' ", GetName(), GetHateTop()->GetName() );
// RangerDown - GMMove doesn't seem to be working well with players, so use MovePC for them, GMMove for NPC's
if (target->IsClient())