Qt4: Gender, not Sex. TOURIST is unconditional.

diff --git a/win/Qt4/qt4inv.cpp b/win/Qt4/qt4inv.cpp
index 9165d58b375a6af0d9b2b768edc3cb9c46e8628d..f753ad0971abc14aa698c1c5414a19951a7b6a7f 100644 (file)
--- a/win/Qt4/qt4inv.cpp
+++ b/win/Qt4/qt4inv.cpp
@@ -73,13 +73,8 @@ void NetHackQtInvUsageWindow::paintEvent(QPaintEvent*)
     drawWorn(painter,uarms,0,1); // Shield
     drawWorn(painter,uarmg,0,2); // Gloves - repeated
     drawWorn(painter,uarmg,2,2); // Gloves - repeated
-#ifdef TOURIST
     drawWorn(painter,uarmf,1,5); // Shoes (feet)
     drawWorn(painter,uarmu,1,4); // Undershirt
-#else
-    drawWorn(painter,0    ,1,5,false);
-    drawWorn(painter,uarmf,1,4); // Shoes (feet)
-#endif
     drawWorn(painter,uleft,0,3); // RingL
     drawWorn(painter,uright,2,3); // RingR
 

diff --git a/win/Qt4/qt4plsel.cpp b/win/Qt4/qt4plsel.cpp
index ea792f8abd065a666dc10fd0819917bb004c6179..99bb15a5bdca2355c49e93f8cf33bee21881501e 100644 (file)
--- a/win/Qt4/qt4plsel.cpp
+++ b/win/Qt4/qt4plsel.cpp
@@ -178,7 +178,7 @@ NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) :
     connect(name, SIGNAL(textChanged(const QString&)),
            this, SLOT(selectName(const QString&)) );
     name->setFocus();
-    QGroupBox* genderbox = new QGroupBox("Sex",this);
+    QGroupBox* genderbox = new QGroupBox("Gender",this);
     QButtonGroup *gendergroup = new QButtonGroup(this);
     QGroupBox* alignbox = new QGroupBox("Alignment",this);
     QButtonGroup *aligngroup = new QButtonGroup(this);