X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsconf.cpp;h=478b8d456bb64621effb19fe78ae09fbd235bb91;hb=2fd4fff0f5eef1d64527b202924f16f2242691dc;hp=1ee7da5ca02c4f65ca7d02aa24a6c3d51fd8710b;hpb=dc90594097a886eee49e9bfe45da6d4f9765179a;p=hbs.git

diff --git a/bs/bsconf.cpp b/bs/bsconf.cpp
index 1ee7da5..478b8d4 100644
--- a/bs/bsconf.cpp
+++ b/bs/bsconf.cpp
@@ -62,7 +62,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 +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,13 @@ 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].setTotalResources(metal.toInt() + crystal.toInt() + eonium.toInt());
 				t1 >> temp;
 				units[race].setFuel(temp.toInt());
 				t1 >> temp;