From 169b9161b9c99a2b8b129617b8d1cd928e1f2356 Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Mon, 17 Feb 2014 17:34:02 -0500
Subject: [PATCH] Performance: Changed RampageArray to be a vector of IDs

---
 zone/MobAI.cpp | 41 ++++++++++++++++++-----------------------
 zone/mob.h     |  2 +-
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/zone/MobAI.cpp b/zone/MobAI.cpp
index 8c6a40e58..b7f719b27 100644
--- a/zone/MobAI.cpp
+++ b/zone/MobAI.cpp
@@ -1997,59 +1997,54 @@ bool Mob::Flurry(ExtraAttackOptions *opts)
 
 bool Mob::AddRampage(Mob *mob)
 {
-	if(!mob)
+	if (!mob)
 		return false;
 
 	if (!GetSpecialAbility(SPECATK_RAMPAGE))
 		return false;
 
-	for (int i = 0; i < RampageArray.size(); i++)
-	{
-		// if name is already on the list dont add it again
-		if (strcasecmp(mob->GetName(), RampageArray[i].c_str()) == 0)
+	for (int i = 0; i < RampageArray.size(); i++) {
+		// if Entity ID is already on the list don't add it again
+		if (mob->GetID() == RampageArray[i])
 			return false;
 	}
-	std::string r_name = mob->GetName();
-	RampageArray.push_back(r_name);
+	RampageArray.push_back(mob->GetID());
 	return true;
 }
 
-void Mob::ClearRampage(){
+void Mob::ClearRampage()
+{
 	RampageArray.clear();
 }
 
 bool Mob::Rampage(ExtraAttackOptions *opts)
 {
 	int index_hit = 0;
-	if (!IsPet()) {
+	if (!IsPet())
 		entity_list.MessageClose_StringID(this, true, 200, MT_NPCRampage, NPC_RAMPAGE, GetCleanName());
-	} else {
+	else
 		entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, NPC_RAMPAGE, GetCleanName());
-	}
 
 	int rampage_targets = GetSpecialAbilityParam(SPECATK_RAMPAGE, 1);
 	rampage_targets = rampage_targets > 0 ? rampage_targets : RuleI(Combat, MaxRampageTargets);
-	for (int i = 0; i < RampageArray.size(); i++)
-	{
-		if(index_hit >= rampage_targets)
+	for (int i = 0; i < RampageArray.size(); i++) {
+		if (index_hit >= rampage_targets)
 			break;
 		// range is important
-		Mob *m_target = entity_list.GetMob(RampageArray[i].c_str());
-		if(m_target)
-		{
-			if(m_target == GetTarget())
+		Mob *m_target = entity_list.GetMob(RampageArray[i]);
+		if (m_target) {
+			if (m_target == GetTarget())
 				continue;
-			if (CombatRange(m_target))
-			{
+			if (CombatRange(m_target)) {
 				Attack(m_target, 13, false, false, false, opts);
 				index_hit++;
 			}
 		}
 	}
-	
-	if(index_hit < rampage_targets) {
+
+	if (index_hit < rampage_targets)
 		Attack(GetTarget(), 13, false, false, false, opts);
-	}
+
 	return true;
 }
 
diff --git a/zone/mob.h b/zone/mob.h
index a5d594123..9220844e2 100644
--- a/zone/mob.h
+++ b/zone/mob.h
@@ -880,7 +880,7 @@ protected:
 	bool IsFullHP;
 	bool moved;
 
-	std::vector<std::string> RampageArray;
+	std::vector<uint16> RampageArray;
 	std::map<std::string, std::string> m_EntityVariables;
 
 	int16 SkillDmgTaken_Mod[HIGHEST_SKILL+2];