forgot a few things...

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 97be5aaf867286b7e24d8d178dac634eb9667396..f134f7bb1fa51b7c2d2f8e29d5d5dd6a16bafc7d 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -218,7 +218,13 @@ void Fleet::addToThis(std::vector<Fleet*> fleets, int tick = 0)
 
 //////////////////////////////////////////////////////////////////////////
 //
-void distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
+void Fleet::distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+std::vector<Fleet*> Fleet::calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0)
 {
 }
 

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 9c421ccc4b9b71abe7e58af0d96e7caed2a87f28..a5541cbebaee4b89dd68d5f79d9de96d6d94838a 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -86,7 +86,7 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
        {
                //See who's in the battle at the current tick
                vector<Fleet*> friends = calculateSide(friendly, 6, tick);
-               vector<Fleet*> hostiles = calcualteSide(hostile, 3, tick);
+               vector<Fleet*> hostiles = calculateSide(hostile, 3, tick);
 
                // No idea to calculate anything if noone is there.. ;)
                if (hostiles.size() == 0)
@@ -98,16 +98,16 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
                Fleet allHostiles;
                allHostiles.addToThis(hostiles);
 
-               calculateOneTick(&allFriends, &allHostiles);
+               calcOneTick(&allFriends, &allHostiles);
 
                allFriends.distributeLossesGains(friends, tick);
-               allHostile.distributeLossesGains(friends, tick);
+               allHostiles.distributeLossesGains(friends, tick);
        }
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void calcOneTick(Planet* friendly, Fleet* Hostile)
+void Planet::calcOneTick(Planet* friendly, Fleet* Hostile)
 {
 }