From aceaba0fb0b3321b237e6ba4e0320cb5802762c1 Mon Sep 17 00:00:00 2001
From: Derision <DerisionEQ@gmail.com>
Date: Sun, 3 Mar 2013 22:12:14 +0000
Subject: [PATCH] Fixed uninitialised mercOwner highlighted by cppcheck.

---
 zone/merc.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/zone/merc.cpp b/zone/merc.cpp
index 3dd9f8e3e..01a4ff1b4 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -5165,12 +5165,9 @@ bool Merc::Unsuspend(bool setMaxStats) {
 	return true;
 }
 
-bool Merc::Dismiss() {
-	Client* mercOwner;
+bool Merc::Dismiss(){
 
-	if(GetMercOwner()) {
-		mercOwner = GetMercOwner();
-	}
+	Client* mercOwner = GetMercOwner();
 
 	if(!mercOwner)
 		return false;