# HG changeset patch # User unc0rr # Date 1223909491 0 # Node ID 0eb0b3a955b8fc0fc8272661485dbe2670b278dc # Parent 1102e19780b9e3ad2643ba9f40bf98703dcec0ea - Remove deprecated stuff - Add a preview to each map, so switching is now 100 times faster diff -r 1102e19780b9 -r 0eb0b3a955b8 QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Mon Oct 13 14:44:15 2008 +0000 +++ b/QTfrontend/mapContainer.cpp Mon Oct 13 14:51:31 2008 +0000 @@ -132,12 +132,12 @@ void HWMapContainer::loadMap(int index) { QPixmap mapImage; - if(!mapImage.load(datadir->absolutePath() + "/Maps/" + chooseMap->currentText() + "/map.png")) { + if(!mapImage.load(datadir->absolutePath() + "/Maps/" + chooseMap->currentText() + "/preview.png")) { changeImage(); chooseMap->setCurrentIndex(0); return; } - imageButt->setIcon(mapImage.scaled(256, 128)); + imageButt->setIcon(mapImage); QFile mapCfgFile(datadir->absolutePath() + "/Maps/" + chooseMap->currentText() + "/map.cfg"); if (mapCfgFile.open(QFile::ReadOnly)) { QTextStream input(&mapCfgFile); diff -r 1102e19780b9 -r 0eb0b3a955b8 QTfrontend/selectWeapon.cpp --- a/QTfrontend/selectWeapon.cpp Mon Oct 13 14:44:15 2008 +0000 +++ b/QTfrontend/selectWeapon.cpp Mon Oct 13 14:51:31 2008 +0000 @@ -145,11 +145,6 @@ return it==weaponItems.end() ? 9 : it->second->getItemsNum(); } -QString SelWeaponWidget::getWeaponsString() const -{ - return currentState; -} - QString SelWeaponWidget::getWeaponsString(const QString& name) const { return wconf->value(name).toString(); diff -r 1102e19780b9 -r 0eb0b3a955b8 QTfrontend/selectWeapon.h --- a/QTfrontend/selectWeapon.h Mon Oct 13 14:44:15 2008 +0000 +++ b/QTfrontend/selectWeapon.h Mon Oct 13 14:51:31 2008 +0000 @@ -47,7 +47,6 @@ public: SelWeaponWidget(int numItems, QWidget* parent=0); - QString getWeaponsString() const; // deprecated? QString getWeaponsString(const QString& name) const; QStringList getWeaponNames() const; diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Bamboo/preview.png Binary file share/hedgewars/Data/Maps/Bamboo/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/BambooPlinko/preview.png Binary file share/hedgewars/Data/Maps/BambooPlinko/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Bath/preview.png Binary file share/hedgewars/Data/Maps/Bath/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Castle/preview.png Binary file share/hedgewars/Data/Maps/Castle/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/EarthRise/preview.png Binary file share/hedgewars/Data/Maps/EarthRise/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Hedgelove/preview.png Binary file share/hedgewars/Data/Maps/Hedgelove/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Hedgewars/preview.png Binary file share/hedgewars/Data/Maps/Hedgewars/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Hydrant/preview.png Binary file share/hedgewars/Data/Maps/Hydrant/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Lonely_Island/preview.png Binary file share/hedgewars/Data/Maps/Lonely_Island/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/PirateFlag/preview.png Binary file share/hedgewars/Data/Maps/PirateFlag/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Plane/preview.png Binary file share/hedgewars/Data/Maps/Plane/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/Sheep/preview.png Binary file share/hedgewars/Data/Maps/Sheep/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/cheese/preview.png Binary file share/hedgewars/Data/Maps/cheese/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/mushrooms/preview.png Binary file share/hedgewars/Data/Maps/mushrooms/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/test/preview.png Binary file share/hedgewars/Data/Maps/test/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/test2/preview.png Binary file share/hedgewars/Data/Maps/test2/preview.png has changed diff -r 1102e19780b9 -r 0eb0b3a955b8 share/hedgewars/Data/Maps/test3/preview.png Binary file share/hedgewars/Data/Maps/test3/preview.png has changed