From 615b1bc6080a3418b18fd4ab93b4212470709731 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Fri, 22 Feb 2008 19:58:29 +0000
Subject: Handling gender with an enum everywhere.

(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)

Conflicts:

	src/net/beinghandler.cpp
	src/net/charserverhandler.cpp
	src/player.cpp
	src/player.h
---
 src/main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index d99c1985..83686749 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,9 @@
 
 #include <libxml/parser.h>
 
+#ifdef WIN32
+#include <SDL_syswm.h>
+#endif
 #ifndef WIN32
 #include <cerrno>
 #include <sys/stat.h>
@@ -83,10 +86,6 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
-#ifdef WIN32
-#include <SDL_syswm.h>
-#endif
-
 namespace {
     Window *setupWindow = 0;
 
@@ -874,7 +873,8 @@ int main(int argc, char *argv[])
                 case CHAR_SELECT_STATE:
                     logger->log("State: CHAR_SELECT");
                     currentDialog = new CharSelectDialog(network, &charInfo,
-                                                         1 - loginData.sex);
+                            (loginData.sex == 0) ?
+                            GENDER_FEMALE : GENDER_MALE);
 
                     if (((CharSelectDialog*) currentDialog)->
                             selectByName(options.playername))
-- 
cgit v1.2.3-70-g09d2