From ea606ef80dc958a09234d6131462cf21b6e200f6 Mon Sep 17 00:00:00 2001
From: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon, 22 Apr 2013 23:14:00 -0700
Subject: [PATCH] Turn DeleteCharacterPacket handling into a method.

---
 world/client.cpp | 28 ++++++++++++++++++----------
 world/client.h   |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/world/client.cpp b/world/client.cpp
index 7039b8145..b275640e0 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -893,6 +893,19 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
 	return true;
 }
 
+bool Client::HandleDeleteCharacterPacket(const EQApplicationPacket *app) {
+
+	uint32 char_acct_id = database.GetAccountIDByChar((char*)app->pBuffer);
+	if(char_acct_id == GetAccountID())
+	{
+		clog(WORLD__CLIENT,"Delete character: %s",app->pBuffer);
+		database.DeleteCharacter((char *)app->pBuffer);
+		SendCharInfo();
+	}
+
+	return true;
+}
+
 bool Client::HandlePacket(const EQApplicationPacket *app) {
 	const WorldConfig *Config=WorldConfig::get();
 	EmuOpcode opcode = app->GetOpcode();
@@ -955,18 +968,13 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
 		{
 			return HandleEnterWorldPacket(app);
 		}
-		case OP_LoginComplete:{
+		case OP_LoginComplete:
+		{
 			return true;
 		}
-		case OP_DeleteCharacter: {
-			uint32 char_acct_id = database.GetAccountIDByChar((char*)app->pBuffer);
-			if(char_acct_id == GetAccountID())
-			{
-				clog(WORLD__CLIENT,"Delete character: %s",app->pBuffer);
-				database.DeleteCharacter((char *)app->pBuffer);
-				SendCharInfo();
-			}
-			break;
+		case OP_DeleteCharacter: 
+		{
+			return HandleDeleteCharacterPacket(app);
 		}
 		case OP_ApproveWorld:
 		{
diff --git a/world/client.h b/world/client.h
index 207f48e25..bdef569f1 100644
--- a/world/client.h
+++ b/world/client.h
@@ -105,6 +105,7 @@ private:
 	bool HandleCharacterCreateRequestPacket(const EQApplicationPacket *app);
 	bool HandleCharacterCreatePacket(const EQApplicationPacket *app);
 	bool HandleEnterWorldPacket(const EQApplicationPacket *app);
+	bool HandleDeleteCharacterPacket(const EQApplicationPacket *app);
 
 	EQStreamInterface* const eqs;
 };