From f889e025cc403ceb6f6276d66fdc367f544a0e82 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Sun, 31 Jan 2016 23:39:10 -0500
Subject: do not force logout after sex change remove sex change roundtrip only
 unequip on gender incompatibility

---
 src/map/pc.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/map')

diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 389f6b5..cb115c3 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -3487,33 +3487,28 @@ int pc_setparam(dumb_ptr<map_session_data> sd, SP type, int val)
             }
             break;
         case SP::SEX:
-            int operation;
             switch (val)
             {
             case 0:
                 sd->sex = sd->status.sex = SEX::FEMALE;
-                operation = 5;
                 break;
             case 1:
                 sd->sex = sd->status.sex = SEX::MALE;
-                operation = 6;
                 break;
             default:
                 sd->sex = sd->status.sex = SEX::NEUTRAL;
-                operation = 7;
                 break;
             }
             for (IOff0 j : IOff0::iter())
             {
                 if (sd->status.inventory[j].nameid
-                    && bool(sd->status.inventory[j].equip))
+                    && bool(sd->status.inventory[j].equip)
+                    && !pc_isequip(sd, j))
                     pc_unequipitem(sd, j, CalcStatus::LATER);
             }
             pc_calcstatus(sd, 0);
             chrif_save(sd);
-            sd->login_id1++;
             clif_fixpcpos(sd);
-            chrif_char_ask_name(AccountId(), sd->status_key.name, operation, HumanTimeDiff());
             break;
         case SP::WEIGHT:
             sd->weight = val;
-- 
cgit v1.2.3-70-g09d2