hbs now handles salvage.. not fully correctly yet though, need to fix

[hbs.git] / bs / bsconf.cpp

diff --git a/bs/bsconf.cpp b/bs/bsconf.cpp
index 97e3c7ccd4ba1c709d1eda4353e0daf52dc4ff9b..816fd09865f86a8cf362202f9b22441e3056f887 100644 (file)
--- a/bs/bsconf.cpp
+++ b/bs/bsconf.cpp
@@ -85,7 +85,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 +106,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;