# HG changeset patch # User Wuzzy # Date 1509471053 -3600 # Node ID de3cbbb09915b372b42eb716e6b2b6f374430100 # Parent 28e8f1d76b06cffb6a8bd9d6f46e326f8d6219f8 Fix host not re-sending ammo scheme after editing an existing ammo scheme This caused clients to start with an incompatible ammo loadout. diff -r 28e8f1d76b06 -r de3cbbb09915 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Tue Oct 31 17:07:56 2017 +0100 +++ b/QTfrontend/hwform.cpp Tue Oct 31 18:30:53 2017 +0100 @@ -339,6 +339,8 @@ this, SLOT(AddWeapons(QString, QString))); connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsEdited(QString, QString, QString)), this, SLOT(EditWeapons(QString, QString, QString))); + connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsEdited(QString, QString, QString)), + ui.pageNetGame->pGameCFG, SLOT(resendAmmoData())); connect(ui.pageMain->BtnNetLocal, SIGNAL(clicked()), this, SLOT(GoToNet())); connect(ui.pageMain->BtnNetOfficial, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer())); diff -r 28e8f1d76b06 -r de3cbbb09915 QTfrontend/ui/widget/gamecfgwidget.cpp --- a/QTfrontend/ui/widget/gamecfgwidget.cpp Tue Oct 31 17:07:56 2017 +0100 +++ b/QTfrontend/ui/widget/gamecfgwidget.cpp Tue Oct 31 18:30:53 2017 +0100 @@ -695,6 +695,11 @@ schemeChanged(GameSchemes->currentIndex()); } +void GameCFGWidget::resendAmmoData() +{ + ammoChanged(WeaponsName->currentIndex()); +} + void GameCFGWidget::onDrawnMapChanged(const QByteArray & data) { emit paramChanged("DRAWNMAP", QStringList(qCompress(data, 9).toBase64())); diff -r 28e8f1d76b06 -r de3cbbb09915 QTfrontend/ui/widget/gamecfgwidget.h --- a/QTfrontend/ui/widget/gamecfgwidget.h Tue Oct 31 17:07:56 2017 +0100 +++ b/QTfrontend/ui/widget/gamecfgwidget.h Tue Oct 31 18:30:53 2017 +0100 @@ -55,6 +55,7 @@ void setParam(const QString & param, const QStringList & value); void fullNetConfig(); void resendSchemeData(); + void resendAmmoData(); void setMaster(bool master); void setTabbed(bool tabbed);