X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fplanet.cpp;h=a5541cbebaee4b89dd68d5f79d9de96d6d94838a;hb=ac13ca5453360c59eaa0b8ad4242ea0837825bc1;hp=9c421ccc4b9b71abe7e58af0d96e7caed2a87f28;hpb=3ae63f013b2ac281d17acec43bc054a132861d35;p=hbs.git

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 9c421cc..a5541cb 100644
--- 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)
 {
 }