From 8f33fc6192655ab7a4453a54616c911b19a8ded3 Mon Sep 17 00:00:00 2001 From: wushin Date: Sun, 31 Jan 2016 21:27:30 -0600 Subject: Don't override char gender sd->sex is fluid, only trust sd->status.sex to be static --- src/char/char.cpp | 1 - src/login/login.cpp | 1 - src/map/pc.cpp | 6 ------ 3 files changed, 8 deletions(-) (limited to 'src') diff --git a/src/char/char.cpp b/src/char/char.cpp index bc759d0..5effd32 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -1689,7 +1689,6 @@ void parse_frommap(Session *ms) Packet_Payload<0x2afd> payload_fd; // not file descriptor payload_fd.account_id = account_id; payload_fd.login_id2 = afi.login_id2; - cd->sex = afi.sex; payload_fd.packet_client_version = afi.packet_client_version; FPRINTF(stderr, "From queue index %zd: recalling packet version %d\n"_fmt, diff --git a/src/login/login.cpp b/src/login/login.cpp index 4ab0773..a1c6650 100644 --- a/src/login/login.cpp +++ b/src/login/login.cpp @@ -879,7 +879,6 @@ void parse_fromchar(Session *s) if (auth_fifo[i].account_id == acc && auth_fifo[i].login_id1 == fixed.login_id1 && auth_fifo[i].login_id2 == fixed.login_id2 && // relate to the versions higher than 18 - auth_fifo[i].sex == fixed.sex && auth_fifo[i].ip == fixed.ip && !auth_fifo[i].delflag) { diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 59fbba6..389f6b5 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -657,12 +657,6 @@ int pc_authok(AccountId id, int login_id2, sd->status_key = *st_key; sd->status = *st_data; - if (sd->status.sex != sd->sex) - { - clif_authfail_fd(sd->sess, 0); - return 1; - } - MAP_LOG_STATS(sd, "LOGIN"_fmt); MAP_LOG_XP(sd, "LOGIN"_fmt); MAP_LOG_MAGIC(sd, "LOGIN"_fmt); -- cgit v1.2.3-60-g2f50