some changes

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 85304bb2bfcb6e642826764749ca1bad9a2ea4be..4fc5be57a4fe8376e0552550832f856274fb3905 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -1,9 +1,9 @@
 /***************************************************************************
-                          fleet.cpp  -  description
-                             -------------------
-    begin                : Tue Jan 22 2002
-    copyright            : (C) 2002 by Michael Andreen
-    email                : whale@linux.nu
+  fleet.cpp  -  description
+  -------------------
+begin                : Tue Jan 22 2002
+copyright            : (C) 2002 by Michael Andreen
+email                : whale@linux.nu
  ***************************************************************************/
 
 /***************************************************************************
@@ -118,29 +118,29 @@ void Fleet::setUnits(UnitList& units)
 {
        s_Units = units;
 
-       
-/*
-       for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); i++)
-       {
-               cerr << s_Units[(*i).first].Name() << "\t\t"
-                       << s_Units[(*i).first].race() <<"\t"
-                       << s_Units[(*i).first].unitClass() << "\t"
-                       << s_Units[(*i).first].target(0) << "\t"
-                       << s_Units[(*i).first].target(1) << "\t"
-                       << s_Units[(*i).first].target(2) << "\t"
-                       << s_Units[(*i).first].initiative() << "\t"
-                       << s_Units[(*i).first].agility() << "\t"
-                       << s_Units[(*i).first].weaponSpeed() << "\t"
-                       << s_Units[(*i).first].guns() << "\t"
-                       << s_Units[(*i).first].power() << "\t"
-                       << s_Units[(*i).first].armor() << "\t"
-                       << s_Units[(*i).first].EMP() << "\t"
-                       << s_Units[(*i).first].totRes() << "\t"
-                       << s_Units[(*i).first].fuel() << "\t"
-                       << s_Units[(*i).first].ETA() << "\t"
-                       << s_Units[(*i).first].type() << endl;
-       }
-*/     
+
+       /*
+          for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); i++)
+          {
+          cerr << s_Units[(*i).first].Name() << "\t\t"
+          << s_Units[(*i).first].race() <<"\t"
+          << s_Units[(*i).first].unitClass() << "\t"
+          << s_Units[(*i).first].target(0) << "\t"
+          << s_Units[(*i).first].target(1) << "\t"
+          << s_Units[(*i).first].target(2) << "\t"
+          << s_Units[(*i).first].initiative() << "\t"
+          << s_Units[(*i).first].agility() << "\t"
+          << s_Units[(*i).first].weaponSpeed() << "\t"
+          << s_Units[(*i).first].guns() << "\t"
+          << s_Units[(*i).first].power() << "\t"
+          << s_Units[(*i).first].armor() << "\t"
+          << s_Units[(*i).first].EMP() << "\t"
+          << s_Units[(*i).first].totRes() << "\t"
+          << s_Units[(*i).first].fuel() << "\t"
+          << s_Units[(*i).first].ETA() << "\t"
+          << s_Units[(*i).first].type() << endl;
+          }
+        */     
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -272,13 +272,13 @@ void Fleet::setBlockedFleet(std::string unittype, int number, int tick = 0)
 }
 
 //////////////////////////////////////////////////////////////////////////
-//FIXME
+//
 void Fleet::addToThis(std::vector<Fleet*> fleets, int tick = 0)
 {
        for (UnitList::iterator i = s_Units.begin();  i != s_Units.end(); ++i)
        {
                if (m_Fleet[i->first].size() == 0)
-                               m_Fleet[i->first].push_back(0);
+                       m_Fleet[i->first].push_back(0);
 
                for (vector<Fleet*>::iterator j = fleets.begin(); j != fleets.end(); ++j)
                {
@@ -301,17 +301,17 @@ void Fleet::distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
 
                if (m_Fleet[unittype].size() < 1)
                        continue;
-               if (m_Fleet[unittype][0] == 0)
+               if (m_Fleet[unittype][0] == 0)
                        continue;
 
-                
+
                int totallost = fleet(unittype,1) - fleet(unittype, 0);
 
 
                cerr << "Distributing type: " << unittype << " with a total loss of " << totallost << " units" << endl;
 
                cerr << "Total number of units before: " << fleet(unittype, 0)  << " and after : " << fleet(unittype, 1) << endl;
-               
+
                for (vector<Fleet*>::iterator j = fleets.begin(); j != fleets.end(); ++j)
                {
                        int fl1 = (*j)->fleet(unittype, tick - 1);
@@ -376,7 +376,7 @@ void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, in
 
        float guns = s_Units[unittype].guns() * number;
 
-       
+
        if (guns == 0)
                return;
 
@@ -386,15 +386,14 @@ void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, in
        for (int count = 0; count < 3; ++count)//vector<string>::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i)
        {
                string ta = s_Units[unittype].target(count);
-       cerr << "Shooting at target class: " << ta << endl;
+               cerr << "Shooting at target class: " << ta << endl;
                while (gunsleft > 0)
                {
-       
+
                        map<string, int*> targets;
 
                        for (UnitList::iterator j = s_Units.begin(); j != s_Units.end(); ++j)
                        {
-
                                if (m_Fleet[j->first].size() == 0)
                                        continue;
 
@@ -407,10 +406,9 @@ void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, in
                                if (m_Fleet[j->first][1] > 0  && ( ta == j->second.unitClass() || ta == "All"))
                                {
 
-                               //      cerr << "Looking at target: " << j->first << endl;
+                                       //      cerr << "Looking at target: " << j->first << endl;
                                        targets[j->first] = &m_Fleet[j->first][1];
                                }
-
                        }
 
                        if (targets.size() == 0)
@@ -450,13 +448,13 @@ void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, in
                                                m_Armor[j->first] = s_Units[j->first].armor();
                                                (*j->second)--;
                                                hitunits[j->first]++;
-                                               
+
                                                //There is a chance that we're hitting a blocked ship.
                                                if (m_BlockedFleet[j->first].size() >= 1)
                                                {
                                                        int test = rand() % m_BlockedFleet[j->first][0];
                                                        if (test == 1
-                                                               && m_BlockedFleet[j->first][0] > 0)
+                                                                       && m_BlockedFleet[j->first][0] > 0)
                                                        {
                                                                if (m_BlockedFleet[j->first].size() == 1)
                                                                        m_BlockedFleet[j->first].push_back(m_BlockedFleet[j->first][0] - 1);
@@ -492,10 +490,10 @@ void Fleet::takeEMP(std::string unittype, int number)
        for (int count = 0; count < 3; ++count)//vector<string>::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i)
        {
                string ta = s_Units[unittype].target(count);
-       cerr << "Shooting at target class: " << ta << endl;
+               cerr << "Shooting at target class: " << ta << endl;
                while (gunsleft > 0)
                {
-       
+
                        map<string, int*> targets;
 
                        for (UnitList::iterator j = s_Units.begin(); j != s_Units.end(); ++j)
@@ -517,7 +515,7 @@ void Fleet::takeEMP(std::string unittype, int number)
                                if (m_Fleet[j->first][1] > 0  && ( ta == j->second.unitClass() || ta == "All"))
                                {
 
-                               //      cerr << "Looking at target: " << j->first << endl;
+                                       //      cerr << "Looking at target: " << j->first << endl;
                                        targets[j->first] = &m_Fleet[j->first][1];
                                }
 
@@ -692,17 +690,17 @@ void Fleet::distributeCappedRoids(std::vector<Fleet*> fleets, int tick = 0)
 
                if (m_Resources[res].size() < 2)
                        continue;
-               if (m_Resources[res][1] == 0)
+               if (m_Resources[res][1] == 0)
                        continue;
 
-                
+
                int totcapped = resource(res,1) - resource(res, 0);
 
 
                cerr << "Distributing type: " << res << " with a total gain of " << totcapped << " roids" << endl;
 
                cerr << "Total number of roids before: " << resource(res, 0)  << " and after : " << resource(res, 1) << endl;
-               
+
                for (vector<Fleet*>::iterator j = fleets.begin(); j != fleets.end(); ++j)
                {
                        unsigned fl1 = (*j)->score(tick - 1);
@@ -782,7 +780,7 @@ void Fleet::calculateSalvage()
 {
        for (FleetList::iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i)
        {
-               
+
                map<string, int> res = s_Units[i->first].resources();
 
                if (i->second.size() > 0)

diff --git a/hbs.kdevses b/hbs.kdevses
index c5d9ecce371532bea17b55aa58712f6600e8b5c6..1d74bb19fdd058fa65812a373647926bd7606280 100644 (file)
--- a/hbs.kdevses
+++ b/hbs.kdevses
@@ -2,6 +2,10 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
  <Mainframe MaximizeMode="0" />
- <DocsAndViews NumberOfDocuments="0" />
+ <DocsAndViews NumberOfDocuments="1" >
+  <Doc0 CursorPosLine="781" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/coding/hbs/bs/fleet.cpp" >
+   <View0 Top="0" Width="770" Attach="1" Height="375" Left="0" Focus="1" Type="KWriteView" MinMaxMode="0" />
+  </Doc0>
+ </DocsAndViews>
  <LastCompileConfig>(Default)</LastCompileConfig>
 </KDevPrjSession>