# HG changeset patch # User nemo # Date 1419981545 18000 # Node ID 5f34d3341fc17d531b6393b5fda0bcba35614849 # Parent 2cfa650836218a0d02713458465f8905397968bf revert 9b789de8e5df on branch based on feedback from zorg - seems to be breaking gameplay diff -r 2cfa65083621 -r 5f34d3341fc1 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Tue Dec 30 19:07:57 2014 +0300 +++ b/QTfrontend/hwform.cpp Tue Dec 30 18:19:05 2014 -0500 @@ -1832,7 +1832,7 @@ if (hwnet) { NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet); - connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), netAmmo, SLOT(setNetSchemeConfig(QStringList))); + connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &))); ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo); diff -r 2cfa65083621 -r 5f34d3341fc1 QTfrontend/model/ammoSchemeModel.cpp --- a/QTfrontend/model/ammoSchemeModel.cpp Tue Dec 30 19:07:57 2014 +0300 +++ b/QTfrontend/model/ammoSchemeModel.cpp Tue Dec 30 18:19:05 2014 -0500 @@ -845,7 +845,7 @@ return netScheme[index.column()]; } -void NetAmmoSchemeModel::setNetSchemeConfig(QStringList cfg) +void NetAmmoSchemeModel::setNetSchemeConfig(QStringList & cfg) { if(cfg.size() != netScheme.size()) { diff -r 2cfa65083621 -r 5f34d3341fc1 QTfrontend/model/ammoSchemeModel.h --- a/QTfrontend/model/ammoSchemeModel.h Tue Dec 30 19:07:57 2014 +0300 +++ b/QTfrontend/model/ammoSchemeModel.h Tue Dec 30 18:19:05 2014 -0500 @@ -70,7 +70,7 @@ QVariant data(const QModelIndex &index, int role) const; public slots: - void setNetSchemeConfig(QStringList cfg); + void setNetSchemeConfig(QStringList & cfg); private: QList netScheme; diff -r 2cfa65083621 -r 5f34d3341fc1 QTfrontend/net/newnetclient.h --- a/QTfrontend/net/newnetclient.h Tue Dec 30 19:07:57 2014 +0300 +++ b/QTfrontend/net/newnetclient.h Tue Dec 30 18:19:05 2014 -0500 @@ -111,7 +111,7 @@ void roomNameUpdated(const QString & name); void askForRoomPassword(); - void netSchemeConfig(QStringList); + void netSchemeConfig(QStringList &); void paramChanged(const QString & param, const QStringList & value); void configAsked();