From b97a54b8acd113e99871fdb0f683e27e0912bf42 Mon Sep 17 00:00:00 2001
From: tom <tom@apollo>
Date: Wed, 11 Jan 2017 02:19:07 -0600
Subject: -removed all magic numbers and placed them in a constants header
 -removed unused libraries and redid all header files

---
 src/creature.cpp | 8 ++++----
 src/entity.cpp   | 8 ++++----
 src/list.cpp     | 8 ++++----
 src/resource.cpp | 4 ++--
 src/window.cpp   | 2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/creature.cpp b/src/creature.cpp
index 7e9011a..b81153e 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -10,8 +10,8 @@ Creature::Creature(Window m, int size)
     L.x = rect.x;
     L.y = rect.y;
 
-    health = 500;
-	maxHealth = 1000;
+    health = CREATURE_START_HEALTH;
+	maxHealth = CREATURE_MAX_HEALTH;
     
     hungry = false;
     hasTarget = false;
@@ -61,7 +61,7 @@ void Creature::setTarget()
 
     if(!hasTarget&&!wander){
         wander = true;
-        wTarget = Location(rand()%1200,rand()%800);
+        wTarget = Location(rand()%WINDOW_X,rand()%WINDOW_Y);
     }
 }
 
@@ -69,7 +69,7 @@ void Creature::setTarget()
 void Creature::Action()
 {	
 	if(hasTarget){ 
-        if(Distance(L,target->getLocation())<5){
+        if(Distance(L,target->getLocation())<reach){
             target->eat();
             health+=10; 
         }
diff --git a/src/entity.cpp b/src/entity.cpp
index be3e792..ff6799e 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -3,8 +3,8 @@
 void Entity::Init(Window m)
 {
     renderer = m.getRenderer();
-    rect.y = rand()%640;
-    rect.x = rand()%1080;
+    rect.y = rand()%WINDOW_Y;
+    rect.x = rand()%WINDOW_X;
 }
 
 void Entity::Init(Window m, Location z)
@@ -21,7 +21,7 @@ void Entity::Place()
     else
         SDL_SetRenderDrawColor(renderer,0,255,0,255);
 
-    SDL_RenderDrawRect(renderer, &rect);
+    SDL_RenderFillRect(renderer, &rect);
     
-    SDL_SetRenderDrawColor(renderer,0,0,0,255);
+    SDL_SetRenderDrawColor(renderer,0,0,0,0);
 }
diff --git a/src/list.cpp b/src/list.cpp
index 2fca4f4..b5e05da 100644
--- a/src/list.cpp
+++ b/src/list.cpp
@@ -4,13 +4,13 @@ List::List(Window m)
 {
   int i;
 
-  for(i=0;i<10;i++){
-    Creature X(m,10);
+  for(i=0;i<CREATURES;i++){
+    Creature X(m,CREATURE_SIZE);
     C.push_back(X);
   }
 
-  for(i=0;i<100;i++){
-    Resource Y(m,5);
+  for(i=0;i<RESOURCES;i++){
+    Resource Y(m,RESOURCE_SIZE);
     R.push_back(Y);
   }
 
diff --git a/src/resource.cpp b/src/resource.cpp
index 0c07be3..326c047 100644
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -10,7 +10,7 @@ Resource::Resource(Window m, int size)
     L.x = rect.x;
     L.y = rect.y;
 
-	amount = 100;
+	amount = RESOURCE_AMOUNT;
 }
 
 Resource::Resource(Window m, int size, Location z)
@@ -23,7 +23,7 @@ Resource::Resource(Window m, int size, Location z)
     L.x = rect.x;
     L.y = rect.y;
 
-    amount = 200;
+    amount = RESOURCE_AMOUNT;
 }
 
 void Resource::eat()
diff --git a/src/window.cpp b/src/window.cpp
index fccdef0..f7868a4 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -3,7 +3,7 @@
 Window::Window() 
 {
 	SDL_Init(SDL_INIT_VIDEO);
-	main = SDL_CreateWindow("main",SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED,1080,640,SDL_WINDOW_SHOWN);
+	main = SDL_CreateWindow("main",SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED,WINDOW_X,WINDOW_Y,SDL_WINDOW_SHOWN);
 	renderer = SDL_CreateRenderer(main,-1,SDL_RENDERER_ACCELERATED);
 	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
 }
-- 
cgit v1.2.3