show what the current body type is when changing it

1 files changed, 12 insertions, 5 deletions

diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 89701510..aee1fb30 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -111,18 +111,25 @@ function	script	BarberChangeColor	{
 }
 
 function	script	BarberChangeGender	{
-    mesn("Warning");
+    mesn("Note");
     mes(b(l("Changing your body type will send you back to the character selection screen.")));
     next();
 
     mes(l("Please select the desired body type:"));
     menuint(
-        l("Body type %i", 1), GENDER_HIDDEN,
-        l("Body type %i", 2), GENDER_FEMALE,
-        l("Body type %i", 3), GENDER_MALE);
+        rif(Gender == GENDER_HIDDEN, "► ") + l("Body type %i", 1), GENDER_HIDDEN,
+        rif(Gender == GENDER_FEMALE, "► ") + l("Body type %i", 2), GENDER_FEMALE,
+        rif(Gender == GENDER_MALE, "► ") + l("Body type %i", 3), GENDER_MALE);
 
+    if (@menuret == Gender) {
+        return; // don't kick to char selection when not needed
+    }
+
+    // FIXME: when manaplus supports seamless changing for evol2, use a simple return;
+    closedialog();
+    close2();
     Gender = @menuret;
-    return;
+    close;
 }
 
 // THIS FUNCTION SHOULD BE USED ONLY AT REBIRTH