# HG changeset patch # User unc0rr # Date 1158352705 0 # Node ID c0355acf07c8057c24e20e7926780154e2daf3b3 # Parent 52a3c431db8a5ad41bb08171d81a66f4c45c1f51 Don't save demos in 'bin' dir diff -r 52a3c431db8a -r c0355acf07c8 QTfrontend/game.cpp --- a/QTfrontend/game.cpp Fri Sep 15 15:45:30 2006 +0000 +++ b/QTfrontend/game.cpp Fri Sep 15 20:38:25 2006 +0000 @@ -73,7 +73,7 @@ void HWGame::ClientDisconnect() { - SaveDemo("demo.hwd_1"); + SaveDemo(cfgdir->absolutePath() + "/Demos/demo.hwd_1"); IPCSocket->deleteLater(); IPCSocket = 0; deleteLater(); @@ -97,7 +97,7 @@ LocalCFG(teams[i]); SendIPC(QString("ecolor %1").arg(65535 << i * 8)); for (int t = 0; t < hdNum[teams[i]]; t++) - SendIPC(QString("eadd hh%1 0").arg(t)); + SendIPC(QString("eadd hh%1 1").arg(t)); } } diff -r 52a3c431db8a -r c0355acf07c8 QTfrontend/main.cpp --- a/QTfrontend/main.cpp Fri Sep 15 15:45:30 2006 +0000 +++ b/QTfrontend/main.cpp Fri Sep 15 20:38:25 2006 +0000 @@ -44,6 +44,21 @@ QDir * cfgdir; QDir * datadir; +bool checkForDir(const QString & dir) +{ + QDir tmpdir; + if (!tmpdir.exists(dir)) + if (!tmpdir.mkdir(dir)) + { + QMessageBox::critical(0, + QObject::tr("Error"), + QObject::tr("Cannot create directory %1").arg(dir), + QObject::tr("OK")); + return false; + } + return true; +} + int main(int argc, char *argv[]) { QApplication app(argc, argv); @@ -65,15 +80,9 @@ cfgdir = new QDir(); cfgdir->setPath(cfgdir->homePath()); - if (!cfgdir->exists(".hedgewars")) + if (checkForDir(cfgdir->absolutePath() + "/.hedgewars")) { - if (!cfgdir->mkdir(".hedgewars")) - { - QMessageBox::critical(0, - QObject::tr("Error"), - QObject::tr("Cannot create directory %1").arg("/.hedgewars"), - QObject::tr("Quit")); - } + checkForDir(cfgdir->absolutePath() + "/.hedgewars/Demos"); } cfgdir->cd(".hedgewars"); diff -r 52a3c431db8a -r c0355acf07c8 QTfrontend/main.cpp.in --- a/QTfrontend/main.cpp.in Fri Sep 15 15:45:30 2006 +0000 +++ b/QTfrontend/main.cpp.in Fri Sep 15 20:38:25 2006 +0000 @@ -44,6 +44,21 @@ QDir * cfgdir; QDir * datadir; +bool checkForDir(const QString & dir) +{ + QDir tmpdir; + if (!tmpdir.exists(dir)) + if (!tmpdir.mkdir(dir)) + { + QMessageBox::critical(0, + QObject::tr("Error"), + QObject::tr("Cannot create directory %1").arg(dir), + QObject::tr("OK")); + return false; + } + return true; +} + int main(int argc, char *argv[]) { QApplication app(argc, argv); @@ -60,20 +75,14 @@ QDir mydir("${HEDGEWARS_BINDIR}"); mydir.cd("bin"); - + bindir = new QDir(mydir); cfgdir = new QDir(); cfgdir->setPath(cfgdir->homePath()); - if (!cfgdir->exists(".hedgewars")) + if (checkForDir(cfgdir->absolutePath() + "/.hedgewars")) { - if (!cfgdir->mkdir(".hedgewars")) - { - QMessageBox::critical(0, - QObject::tr("Error"), - QObject::tr("Cannot create directory %1").arg("/.hedgewars"), - QObject::tr("Quit")); - } + checkForDir(cfgdir->absolutePath() + "/.hedgewars/Demos"); } cfgdir->cd(".hedgewars");