X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsdoc.cpp;h=5bf5f46863c6c28ec325cabca60f5b99703449e5;hp=47688a7bfd06e20b37cf312b818fcc8e676a973c;hb=5940cfda3be2c7b4ecbd64c814948b29139177c0;hpb=7a187d329c61f264cbafc28654c6b8bb1e3b87a1

diff --git a/bs/bsdoc.cpp b/bs/bsdoc.cpp
index 47688a7..5bf5f46 100644
--- a/bs/bsdoc.cpp
+++ b/bs/bsdoc.cpp
@@ -17,6 +17,8 @@
 
 #include "bsdoc.h"
 
+#include "planet.h"
+
 using namespace std;
 
 BSDoc::BSDoc()
@@ -39,12 +41,14 @@ bool BSDoc::save()
 
 bool BSDoc::saveAs(const QString &filename)
 {
+	QString test = filename;
   return true;
 }
 
 bool BSDoc::load(const QString &filename)
 {
-  emit documentChanged();
+  QString test = filename;
+	emit documentChanged();
   return true;
 }
 
@@ -58,10 +62,11 @@ bool BSDoc::isModified() const
 
 int BSDoc::newBattle(QString name)
 {
-	m_Battles[name]["Friendly"]["Home Planet"].setRace("Planet");
-	m_Battles[name]["Friendly"]["Home Fleet"];
+	m_Battles[name]["Friendly"]["Home Planet"] = new Planet();;
+	m_Battles[name]["Friendly"]["Home Fleet"] = new Fleet();
 	m_Battles[name]["Hostile"];
 
+	//Planet* pl = dynamic_cast<Planet*>(m_Battles[name]["Friendly"]["Home Planet"]);
 	modified = true;
 	emit documentChanged();
 	return 0;
@@ -70,24 +75,24 @@ int BSDoc::newBattle(QString name)
 /////////////////////////////////////////////////////////////////////////
 //
 
-const std::map<QString, std::map<QString, std::map<QString, Fleet> > >& BSDoc::battles() const
+const BattleList& BSDoc::battles() const
 {
 	return m_Battles;
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-Fleet BSDoc::specificFleet(QString battle, QString group, QString fleet) const
+const Fleet* BSDoc::specificFleet(QString battle, QString group, QString fleet) const
 {
-	for (map<QString, map<QString, map<QString, Fleet> > >::const_iterator i = m_Battles.begin(); i != m_Battles.end(); ++i)
+	for (BattleList::const_iterator i = m_Battles.begin(); i != m_Battles.end(); ++i)
 	{
 		if (i->first == battle)
 		{
-			for (map<QString, map<QString, Fleet> >::const_iterator j = i->second.begin(); j != i->second.end(); j++)
+			for (map<QString, map<QString, Fleet*> >::const_iterator j = i->second.begin(); j != i->second.end(); j++)
 			{
 				if (j->first == group)
 				{
-					for (map<QString, Fleet>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
+					for (map<QString, Fleet*>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
 					{
 						if (k->first == fleet)
 						{
@@ -98,7 +103,7 @@ Fleet BSDoc::specificFleet(QString battle, QString group, QString fleet) const
 			}
 		}
 	}
-	return Fleet();
+	return '\0';
 }