From e88f67bb3cb78bb34eb79cedf892f937e7f9f75c Mon Sep 17 00:00:00 2001
From: Jan Borsodi <jborsodi@gmail.com>
Date: Mon, 13 Sep 2010 21:21:21 +0200
Subject: [PATCH] Merged public functions for controlling gender, face and hair
 with the event function, no need to have both.

---
 apps/openmw/mwgui/mw_chargen.cpp | 42 +++++---------------------------
 apps/openmw/mwgui/mw_chargen.hpp |  9 -------
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwgui/mw_chargen.cpp b/apps/openmw/mwgui/mw_chargen.cpp
index b0cc4314b..c7cdc6d17 100644
--- a/apps/openmw/mwgui/mw_chargen.cpp
+++ b/apps/openmw/mwgui/mw_chargen.cpp
@@ -70,36 +70,6 @@ int wrap(int index, int max)
 		return index;
 }
 
-void RaceDialog::selectPreviousGender()
-{
-	genderIndex = wrap(genderIndex - 1, 2);
-}
-
-void RaceDialog::selectNextGender()
-{
-	genderIndex = wrap(genderIndex + 1, 2);
-}
-
-void RaceDialog::selectPreviousFace()
-{
-	faceIndex = wrap(faceIndex - 1, faceCount);
-}
-
-void RaceDialog::selectNextFace()
-{
-	faceIndex = wrap(faceIndex + 1, faceCount);
-}
-
-void RaceDialog::selectPreviousHair()
-{
-	hairIndex = wrap(hairIndex - 1, hairCount);
-}
-
-void RaceDialog::selectNextHair()
-{
-	hairIndex = wrap(hairIndex - 1, hairCount);
-}
-
 // widget controls
 
 void RaceDialog::onHeadRotate(MyGUI::VScroll*, size_t _position)
@@ -109,32 +79,32 @@ void RaceDialog::onHeadRotate(MyGUI::VScroll*, size_t _position)
 
 void RaceDialog::onSelectPreviousGender(MyGUI::Widget*)
 {
-	selectPreviousGender();
+	genderIndex = wrap(genderIndex - 1, 2);
 }
 
 void RaceDialog::onSelectNextGender(MyGUI::Widget*)
 {
-	selectNextGender();
+	genderIndex = wrap(genderIndex + 1, 2);
 }
 
 void RaceDialog::onSelectPreviousFace(MyGUI::Widget*)
 {
-	selectPreviousFace();
+	faceIndex = wrap(faceIndex - 1, faceCount);
 }
 
 void RaceDialog::onSelectNextFace(MyGUI::Widget*)
 {
-	selectNextFace();
+	faceIndex = wrap(faceIndex + 1, faceCount);
 }
 
 void RaceDialog::onSelectPreviousHair(MyGUI::Widget*)
 {
-	selectPreviousHair();
+	hairIndex = wrap(hairIndex - 1, hairCount);
 }
 
 void RaceDialog::onSelectNextHair(MyGUI::Widget*)
 {
-	selectNextHair();
+	hairIndex = wrap(hairIndex - 1, hairCount);
 }
 
 void RaceDialog::onSelectRace(MyGUI::List* _sender, size_t _index)
diff --git a/apps/openmw/mwgui/mw_chargen.hpp b/apps/openmw/mwgui/mw_chargen.hpp
index a9d4dd2c9..fa5f83aab 100644
--- a/apps/openmw/mwgui/mw_chargen.hpp
+++ b/apps/openmw/mwgui/mw_chargen.hpp
@@ -29,15 +29,6 @@ namespace MWGui
 	public:
 		RaceDialog();
 
-		void selectPreviousGender();
-		void selectNextGender();
-
-		void selectPreviousFace();
-		void selectNextFace();
-
-		void selectPreviousHair();
-		void selectNextHair();
-
 	protected:
 		void onHeadRotate(MyGUI::VScroll* _sender, size_t _position);