general refractoring

4 files changed, 17 insertions, 22 deletions

diff --git a/src/creature.cpp b/src/creature.cpp
index dc5a307..bd731d2 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -16,7 +16,6 @@ Creature::Creature(Window M, SDL_Rect R, Dna D)
     gender          = rand() % 2;
     age             = 0;
     pregnancyTime   = 0;
-    able            = true;
     pregnancyReady  = false;
     pregnate        = false;
     hasTarget       = false;
@@ -88,7 +87,7 @@ void Creature::checkTarget()
     for(std::vector <Entity*>::iterator it = N.begin(); it!=N.end(); it++)
         if( target == *it )
             return;
-    
+
     hasTarget = false;
 }
 
@@ -112,17 +111,17 @@ void Creature::Action()
             hasTarget = false;
         }
         else
-            Move(target->getRect());    
+            moveTowards(target->getRect());    
     }
     else if(wander){
         if(Distance(rect,wTarget) < mine.reach)
             wander = false;
         else
-            Move(wTarget);
+            moveTowards(wTarget);
     }
 }
 
-void Creature::Move(SDL_Rect R)
+void Creature::moveTowards(SDL_Rect R)
 {
     if( rect.x == R.x ){
         if( rect.y < R.y )
diff --git a/src/list.cpp b/src/list.cpp
index 68a71c9..afe51a3 100644
--- a/src/list.cpp
+++ b/src/list.cpp
@@ -17,7 +17,6 @@ List::List(Window m)
     Resource Y(main,Rect);
     R.push_back(Y);
   }
-
 }
 
 void List::Remove()
@@ -44,9 +43,9 @@ void List::Behavior()
         
         if(it->getPregnancyReady()){
             Dna D  = it->getChildDNA();
-            SDL_Rect Rect = it->getRect();
-            Rect.h = Rect.w = D.sizeMax / 5; 
-            Creature X(main,Rect,D);
+            SDL_Rect rect = it->getRect();
+            rect.h = rect.w = D.sizeMax / 5; 
+            Creature X(main,rect,D);
             C.push_back(X);
             it->hadPregnancy();
         }
@@ -58,9 +57,9 @@ void List::Behavior()
 
 void List::Place()
 { 
-    SDL_Rect Rect = {0,0,RESOURCE_SIZE_START,RESOURCE_SIZE_START};
+    SDL_Rect rect = {0,0,RESOURCE_SIZE_START,RESOURCE_SIZE_START};
     while(R.size() < MINIMUM_RESOURCES){
-        Resource Y(main,Rect);
+        Resource Y(main,rect);
         R.push_back(Y);
     }
 
@@ -76,13 +75,13 @@ std::vector<Entity*> List::getNear(Creature nC)
     std::vector<Entity*> N;
 
     for(std::list<Resource>::iterator it = R.begin(); it!=R.end(); it++)
-        if( nC.getBestSense() > Distance(nC.getRect(),it->getRect()) )
+        if(nC.getBestSense() > Distance(nC.getRect(),it->getRect()))
             N.push_back(&(*it));
         
     for(std::list<Creature>::iterator it = C.begin(); it!=C.end(); it++)
-        if( &nC == &(*it))
+        if(&nC == &(*it))
             continue;
-        else if( nC.getBestSense() > Distance(nC.getRect(),it->getRect()) )
+        else if(nC.getBestSense() > Distance(nC.getRect(),it->getRect()))
             N.push_back(&(*it));
 
     return N;
diff --git a/src/main.cpp b/src/main.cpp
index 82f0067..5170bf3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,12 +11,9 @@ int main()
     int speed = 60;

     bool pause = false;

 

-	while(e.gRun())

-	{

+	while(e.gRun()){

         fps.Start();

-

-		while(e.Poll())

-		{

+		while(e.Poll()){

 			if(e.gEventType() == SDL_QUIT)

 				e.off();

 			else if(e.gEventType() == SDL_KEYDOWN)

diff --git a/src/resource.cpp b/src/resource.cpp
index 2f2181f..ee9100a 100644
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -1,9 +1,8 @@
 #include "resource.hpp"
 
-Resource::Resource(Window m, SDL_Rect R)
+Resource::Resource(Window M, SDL_Rect R)
 {	
-    renderer    = m.getRenderer();
-    type        = RESOURCE_TYPE;
+    renderer    = M.getRenderer();
     rect        = R;
     
     if(rect.x == 0 && rect.y == 0){
@@ -11,6 +10,7 @@ Resource::Resource(Window m, SDL_Rect R)
         rect.y  = rand()%WINDOW_Y;
     }
 
+    type        = RESOURCE_TYPE;
 	amount      = RESOURCE_AMOUNT_START;
     growAmount  = RESOURCE_GROW;
 }