# HG changeset patch
# User nemo
# Date 1311771149 14400
# Node ID b07eb408c5e438859d83d864ed50bb26ce905172
# Parent  3c2d4e46440ff95298133719d33b6934f749d623# Parent  8a7264a094fb187519e13906e5836f94eb6e3d82
unnecessary test removed, also merge

diff -r 3c2d4e46440f -r b07eb408c5e4 .hgtags
--- a/.hgtags	Wed Jul 27 08:51:16 2011 -0400
+++ b/.hgtags	Wed Jul 27 08:52:29 2011 -0400
@@ -11,14 +11,34 @@
 ae71dff40ecc405a55647b0f52f628674c1ebb51 0.9.14.1-release
 ae0c6c35414ddc120c8ae94035f287f03a752e78 Hedgewars-iOS-1.2.3
 19ba506ed86b6306f7cd01b2613069391f4e34e6 0.9.13-release
+19ba506ed86b6306f7cd01b2613069391f4e34e6 0.9.13
+0000000000000000000000000000000000000000 0.9.13
 7d8d62a5566ed84688c596b8f55e83cfd171683e 0.9.12-release
+7d8d62a5566ed84688c596b8f55e83cfd171683e 0.9.12
+0000000000000000000000000000000000000000 0.9.12
 89d0fa6734af24e439755b102080cf6268c50aa6 0.9.11-release
+89d0fa6734af24e439755b102080cf6268c50aa6 0.9.11
+0000000000000000000000000000000000000000 0.9.11
 990f341a2332a7bef0822b313854544228375e36 0.9.10-release
+990f341a2332a7bef0822b313854544228375e36 0.9.10
+0000000000000000000000000000000000000000 0.9.10
 8c3e71880f492c61086c2ca2541b52f82a5957b0 0.9.9.2-release
+8c3e71880f492c61086c2ca2541b52f82a5957b0 0.9.9.2
+0000000000000000000000000000000000000000 0.9.9.2
 040cfeac98127d35f22ac8433b06b09e50d5b28f 0.9.8-release
 44cc464de8f320e8018ed9e9cbb7281fd42d0a00 0.9.7-release
 a32f1eed51a6df2513d471cb849eb110545c50b3 0.9.6-release
 6bc4389344c7d7f41bcbc46f986c1dcf88846189 0.9.5-release
 52c7981594f6bc3a7ed1b297b80cb38082015401 0.9.4-release
+52c7981594f6bc3a7ed1b297b80cb38082015401 0.9.4
+0000000000000000000000000000000000000000 0.9.4
 9b2abea1071f83da8fbda70b0bf6cec0ca481b07 0.9.3-release
+9b2abea1071f83da8fbda70b0bf6cec0ca481b07 0.9.3
+0000000000000000000000000000000000000000 0.9.3
 69f1dc50a1faddf1a52080600a3f4771bedd45c1 0.9.2-release
+69f1dc50a1faddf1a52080600a3f4771bedd45c1 0.9.2
+0000000000000000000000000000000000000000 0.9.2
+fee68e3a303998fdfcc69f74775dc84a36f587fb 0.9.9
+0000000000000000000000000000000000000000 0.9.9
+fee68e3a303998fdfcc69f74775dc84a36f587fb 0.9.9.1
+0000000000000000000000000000000000000000 0.9.9.1
diff -r 3c2d4e46440f -r b07eb408c5e4 QTfrontend/gamecfgwidget.cpp
--- a/QTfrontend/gamecfgwidget.cpp	Wed Jul 27 08:51:16 2011 -0400
+++ b/QTfrontend/gamecfgwidget.cpp	Wed Jul 27 08:52:29 2011 -0400
@@ -49,10 +49,13 @@
 
     QGridLayout *GBoxOptionsLayout = new QGridLayout(GBoxOptions);
 
-    GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Gameplay"), GBoxOptions), 0, 0);
+    QLabel *titleLabel = new QLabel(QLabel::tr("Game Options"), GBoxOptions);
+    titleLabel->setMargin(7);    // TODO: make the text larger/richer!!!!
+    GBoxOptionsLayout->addWidget(titleLabel, 0, 0, 1, 0, Qt::AlignHCenter);
+    GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Style"), GBoxOptions), 1, 0);
 
     Scripts = new QComboBox(GBoxOptions);
-    GBoxOptionsLayout->addWidget(Scripts, 0, 1);
+    GBoxOptionsLayout->addWidget(Scripts, 1, 1);
 
     Scripts->addItem("Normal");
     Scripts->insertSeparator(1);
@@ -91,7 +94,7 @@
     connect(Scripts, SIGNAL(currentIndexChanged(int)), this, SLOT(scriptChanged(int)));
 
     QWidget *SchemeWidget = new QWidget(GBoxOptions);
-    GBoxOptionsLayout->addWidget(SchemeWidget, 1, 0, 1, 2);
+    GBoxOptionsLayout->addWidget(SchemeWidget, 2, 0, 1, 2);
 
     QGridLayout *SchemeWidgetLayout = new QGridLayout(SchemeWidget);
     SchemeWidgetLayout->setMargin(0);
@@ -100,7 +103,7 @@
     SchemeWidgetLayout->addWidget(GameSchemes, 0, 2);
     connect(GameSchemes, SIGNAL(currentIndexChanged(int)), this, SLOT(schemeChanged(int)));
 
-    SchemeWidgetLayout->addWidget(new QLabel(QLabel::tr("Game scheme"), SchemeWidget), 0, 0);
+    SchemeWidgetLayout->addWidget(new QLabel(QLabel::tr("Scheme"), SchemeWidget), 0, 0);
 
     QPixmap pmEdit(":/res/edit.png");
     
@@ -127,8 +130,6 @@
     SchemeWidgetLayout->addWidget(goToWeaponPage, 1, 3);
     connect(goToWeaponPage, SIGNAL(clicked()), this, SLOT(jumpToWeapons()));
 
-    //GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Bind schemes with weapons"), GBoxOptions), 2, 0);
-
     bindEntries = new QCheckBox(SchemeWidget);
     bindEntries->setToolTip(tr("When this option is enabled selecting a game scheme will auto-select a weapon"));
     bindEntries->setChecked(true);
@@ -136,7 +137,6 @@
     bindEntries->setStyleSheet( "QCheckBox::indicator:checked   { image: url(\":/res/lock.png\"); }"
                                 "QCheckBox::indicator:unchecked { image: url(\":/res/unlock.png\");   }" );
     SchemeWidgetLayout->addWidget(bindEntries, 0, 1, 0, 1, Qt::AlignVCenter);
-    //GBoxOptionsLayout->addWidget(bindEntries, 2, 2);
 
     connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(seedChanged(const QString &)));
     connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SLOT(mapChanged(const QString &)));
diff -r 3c2d4e46440f -r b07eb408c5e4 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Wed Jul 27 08:51:16 2011 -0400
+++ b/hedgewars/GSHandlers.inc	Wed Jul 27 08:52:29 2011 -0400
@@ -356,7 +356,7 @@
     else
         Gear^.State := Gear^.State or      gstMoving;
 
-    if (Gear^.nImpactSounds > 0) and (Gear^.ImpactSound <> sndNone) and
+    if (Gear^.nImpactSounds > 0) and 
        ((Gear^.Damage <> 0) or 
           ((Gear^.State and (gstCollision or gstMoving)) = (gstCollision or gstMoving))) and
        ((Gear^.dX.QWordValue > _0_1.QWordValue) or