some cleanup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1303 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 7 insertions, 9 deletions

diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index 6eb9602cec..0eae9fd877 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -75,7 +75,7 @@ CBannerLoaderWii::GetBanner(u32* _pBannerImage)
 {

 	if (!IsValid())

 	{

-		return(false);

+		return false;

 	}

 

 	SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;

@@ -93,7 +93,7 @@ CBannerLoaderWii::GetBanner(u32* _pBannerImage)
 	}

 

 

-	return(true);

+	return true;

 }

 

 std::string 

@@ -126,15 +126,15 @@ CBannerLoaderWii::GetName(std::string& _rName, int language)
 		return true;

 	}

 

-	_rName = m_Name;

-	return(true);

+	return true;

 }

 

 

 bool

 CBannerLoaderWii::GetCompany(std::string& _rCompany)

 {

-	return(false);

+    _rCompany = "N/A";

+    return true;

 }

 

 

@@ -150,7 +150,7 @@ CBannerLoaderWii::GetDescription(std::string& _rDescription)
 		return true;

 	}

 

-	return(false);

+	return false;

 }

 

 

@@ -197,7 +197,7 @@ CBannerLoaderWii::decode5A3(u16 val)
 		a = 0xFF;

 	}

 

-	return((a << 24) | (r << 16) | (g << 8) | b);

+	return ((a << 24) | (r << 16) | (g << 8) | b);

 }

 

 

diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.h b/Source/Core/DiscIO/Src/BannerLoaderWii.h
index d0f253bcfe..48efa2b875 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.h
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.h
@@ -66,8 +66,6 @@ class CBannerLoaderWii
 		int lut4to8[16];

 		int lut5to8[32];

 

-		std::string m_Name;

-

 		u8* m_pBannerFile;

 

 		bool m_IsValid;