Some changes..

diff --git a/bs/docs/devel/main.doc b/bs/docs/devel/main.doc
index 8d5204fcd678c373a0856ccc57597a12961b11ba..37f70f7cf7d391cfb1872bb28ecfdcb2d45f4f4f 100644 (file)
--- a/bs/docs/devel/main.doc
+++ b/bs/docs/devel/main.doc
@@ -1,4 +1,4 @@
-/*!\mainpage Testing testing
+/*!\mainpage Harvalen's battlesystem
   \section intro Introduction
   Going to write something nice here.. (maybe ;)
   \section cvs Getting CVS access

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index a57d25e86db06c0a359928fee7b3a70e50729d6b..35de49b849adc58016de508afd2217036f50da2d 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -17,7 +17,51 @@
 
 #include "fleet.h"
 
-Fleet::Fleet(){
+using namespace std;
+
+Fleet::Fleet()
+{
 }
 Fleet::~Fleet(){
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::setName(string sName)
+{
+       m_sName = sName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+string Fleet::Name()
+{
+       return m_sName;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+/** This function first sets the race, then it iterates through the the 
+ * s_Races and checks if it finds the race it returns true, if it reaches
+ * the end without finding it it returns false.
+ */
+bool Fleet::setRace(std::string sRace)
+{
+       m_sRace = sRace;
+  s_Units.begin();
+       for (map<string, vector<int> >::iterator i = s_Races.begin(); i != s_Races.end(); i++)
+       {
+               if (m_sRace == (*i).first)
+                       return true;
+       }
+       return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+string Fleet::Race()
+{
+       return m_sRace;
+}
+
+

diff --git a/bs/fleet.h b/bs/fleet.h
index 3bdd4ce5719042c6e7d6818d0d41ccf151d0dc21..88c78842b92c90452a026d556d25c4f96a56b4c9 100644 (file)
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -20,6 +20,7 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "unittype.h"
 
@@ -29,19 +30,44 @@
   *\todo LOTS (I think ;)
   *@author Michael Andreen
   */
-
 class Fleet 
 {
 public: 
        Fleet();
        ~Fleet();
 
-private:
-       std::string     m_Name;
-       std::string     m_Race;
+       /**Sets the name that represents this fleet. Might be different a name
+        * like foobar or some coordinates like 1:1:1. The name doesn't have to be unique,
+        * since it's up to the rest of the program to handle that part.
+        * \see Name
+        */
+       void   setName(std::string sName);
+       /**Returns the name of this fleet.
+        * \see setName
+        */
+       std::string Name();
+
+       /**The race string decides what type of ships this fleet can have.
+        * The values must be feeded into this class.
+        * \param sRace This is just the name of the race. It's case-sensitive.
+        * \return If the race is available this function returns true, if not false is returned. The race is set in both cases though.
+        * \see Race
+        */
+       bool   setRace(std::string sRace);
+       /**Just returns what race this fleet belongs to.. 
+        * \return The race, represented as a string.
+        * \see setRace
+        */
+       std::string Race();
+
+
+protected:
+       std::string     m_sName;
+       std::string     m_sRace;
        std::map<std::string, std::vector<int> >        m_Fleet;
 
-       static std::map<std::string, UnitType>  m_Units;
+       static std::map<std::string, UnitType>  s_Units;
+       static std::map<std::string, std::vector<int> > s_Races;
 };
 
 #endif

diff --git a/bs/unittype.h b/bs/unittype.h
index 428588b3bd59f976d9e53239f0c0a2e75e180f02..dc34516bb8562a318b655487b602a76a9ea868b4 100644 (file)
--- a/bs/unittype.h
+++ b/bs/unittype.h
@@ -27,6 +27,7 @@
 /**This class contains a unittype, with all it's attributes + the number you got.
  * Maybe this actually should be a struct, since this class doen't have much to do, since i want it to be as generic as possible.  
  * It got some data need need to be taken care of which makes me put it as a class. 
+ * \todo need to add some more constructors.. 
   *@author Michael Andreen <whale@linux.nu>
   *@see Fleet
   */

diff --git a/hbs.kdevses b/hbs.kdevses
index 5ae0a7c03a61958a8c98a5c1ec6c2fb711768da5..d2a040354df82b1799954475604a4b5ce84e5485 100644 (file)
--- a/hbs.kdevses
+++ b/hbs.kdevses
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE KDevPrjSession ><KDevPrjSession>
  <Mainframe MaximizeMode="0" />
- <DocsAndViews NumberOfDocuments="3" >
-  <Doc0 CursorPosLine="13" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/bsdoc.h" >
-   <View0 Top="0" Width="683" Attach="0" Height="354" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+ <DocsAndViews NumberOfDocuments="1" >
+  <Doc0 Type="CDocBrowser" NumberOfViews="1" FileName="file:/home/src/qt-3/doc/html/index.html" >
+   <View Top="0" Width="957" Attach="0" Height="523" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
   </Doc0>
-  <Doc1 CursorPosLine="4" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/battlesum.h" >
-   <View0 Top="0" Width="683" Attach="0" Height="334" Left="0" Focus="1" Type="KWriteView" MinMaxMode="0" />
-  </Doc1>
-  <Doc2 Type="CDocBrowser" NumberOfViews="1" FileName="file:/home/src/qt-3/doc/html/index.html" >
-   <View Top="0" Width="683" Attach="0" Height="334" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
-  </Doc2>
  </DocsAndViews>
 </KDevPrjSession>