From 5781821ab341185c4b5ab598a46cce062da42e7b Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Tue, 7 Oct 2014 10:12:00 -0700
Subject: [PATCH] RemoveMember converted to QueryDatabase

---
 zone/raids.cpp | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/zone/raids.cpp b/zone/raids.cpp
index 84b6bba12..d9dd20e96 100644
--- a/zone/raids.cpp
+++ b/zone/raids.cpp
@@ -100,32 +100,26 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo
 	safe_delete(pack);
 }
 
-void Raid::RemoveMember(const char *c)
+void Raid::RemoveMember(const char *characterName)
 {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char* query = 0;
-	MYSQL_RES *result;
-	if (database.RunQuery(query,MakeAnyLenString(&query, "DELETE FROM raid_members where name='%s'", c ),errbuf,&result)){
-		mysql_free_result(result);
-	}
+	std::string query = StringFormat("DELETE FROM raid_members where name='%s'", characterName);
+	auto results = database.QueryDatabase(query);
 
-	Client *m = entity_list.GetClientByName(c);
-	safe_delete_array(query);
+	Client *client = entity_list.GetClientByName(characterName);
 	disbandCheck = true;
-	SendRaidRemoveAll(c);
-	SendRaidDisband(m);
+	SendRaidRemoveAll(characterName);
+	SendRaidDisband(client);
 	LearnMembers();
 	VerifyRaid();
 
-	if(m){
-		m->SetRaidGrouped(false);
-	}
+	if(client)
+		client->SetRaidGrouped(false);
 
 	ServerPacket *pack = new ServerPacket(ServerOP_RaidRemove, sizeof(ServerRaidGeneralAction_Struct));
 	ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 	rga->rid = GetID();
 	rga->instance_id = zone->GetInstanceID();
-	strn0cpy(rga->playername, c, 64);
+	strn0cpy(rga->playername, characterName, 64);
 	rga->zoneid = zone->GetZoneID();
 	worldserver.SendPacket(pack);
 	safe_delete(pack);