some changes..

[hbs.git] / bs / bsconf.cpp

diff --git a/bs/bsconf.cpp b/bs/bsconf.cpp
index 1ee7da5ca02c4f65ca7d02aa24a6c3d51fd8710b..ea32b7e68314cff5e39762f7f7871326ba7ea818 100644 (file)
--- a/bs/bsconf.cpp
+++ b/bs/bsconf.cpp
@@ -32,9 +32,10 @@ using namespace std;
 BSConf::BSConf()
 {
        QSettings settings;
+       //settings.insertSearchPath(QSettings::Unix);
 
-       m_sRaceFilename = settings.readEntry("/hbs/RaceFilename", "/usr/share/hbs/race.conf");
-       m_sStatsFilename = settings.readEntry("/hbs/StatsFilename", "/usr/share/hbs/stats.conf");
+       m_sRaceFilename = settings.readEntry("/hbs/ConfFiles/RaceFilename", "/usr/share/hbs/race.conf");
+       m_sStatsFilename = settings.readEntry("/hbs/ConfFiles/StatsFilename", "/usr/share/hbs/stats.conf");
        
        loadRace();
        loadStats();
@@ -62,7 +63,7 @@ bool BSConf::save()
 //
 bool BSConf::loadStats()
 {
-       std::map<std::string, UnitType> units;
+       UnitList units;
        QFile f(m_sStatsFilename);
 
        if ( f.open(IO_ReadOnly) )
@@ -85,7 +86,7 @@ bool BSConf::loadStats()
                                t1 >> temp;
                                units[race].setRace(temp.toInt());
                                t1 >> temp;
-                               units[race].setClass((const char*) temp);
+                               units[race].setUnitClass((const char*) temp);
                                t1 >> temp;
                                units[race].addTarget((const char*) temp);
                                t1 >> temp;
@@ -106,8 +107,16 @@ bool BSConf::loadStats()
                                units[race].setArmor(temp.toInt());
                                t1 >> temp;
                                units[race].setEMP(temp.toInt());
-                               t1 >> temp;
-                               units[race].setTotalResources(temp.toInt());
+                               QString metal;
+                               QString crystal;
+                               QString eonium;
+                               t1 >> metal;
+                               t1 >> crystal;
+                               t1 >> eonium;
+                               units[race].setResources(tr("metal").latin1(), metal.toInt());
+                               units[race].setResources(tr("crystal").latin1(), crystal.toInt());
+                               units[race].setResources(tr("eonium").latin1(), eonium.toInt());
+                               //units[race].setTotalResources(metal.toInt() + crystal.toInt() + eonium.toInt());
                                t1 >> temp;
                                units[race].setFuel(temp.toInt());
                                t1 >> temp;