diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-02-22 19:58:29 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 17:28:29 +0100 |
| commit | 615b1bc6080a3418b18fd4ab93b4212470709731 (patch) | |
| tree | a82805bc56042899bd19620d667d890baefd7413 /src/main.cpp | |
| parent | 12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51 (diff) | |
| download | Mana-615b1bc6080a3418b18fd4ab93b4212470709731.tar.gz Mana-615b1bc6080a3418b18fd4ab93b4212470709731.tar.bz2 Mana-615b1bc6080a3418b18fd4ab93b4212470709731.tar.xz Mana-615b1bc6080a3418b18fd4ab93b4212470709731.zip | |
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
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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)) |