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

---
 inc/constants.hpp | 19 +++++++++++++++++++
 inc/creature.hpp  | 12 ++++++++----
 inc/entity.hpp    |  2 +-
 inc/event.hpp     |  2 +-
 inc/list.hpp      |  3 +++
 inc/timer.hpp     |  2 +-
 inc/window.hpp    | 12 +-----------
 7 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 inc/constants.hpp

(limited to 'inc')

diff --git a/inc/constants.hpp b/inc/constants.hpp
new file mode 100644
index 0000000..2a5b8fb
--- /dev/null
+++ b/inc/constants.hpp
@@ -0,0 +1,19 @@
+#ifndef constants_h
+#define constants_h
+
+const int CREATURES             = 10;
+const int RESOURCES             = 100;
+const int WINDOW_X              = 1080;
+const int WINDOW_Y              = 640;
+
+const int CREATURE_START_HEALTH = 500;
+const int CREATURE_MAX_HEALTH   = 1000;
+const int CREATURE_BEST_SENSE   = 100;
+const int CREATURE_SPEED        = 1;
+const int CREATURE_REACH        = 5;
+const int CREATURE_SIZE         = 10;
+
+const int RESOURCE_SIZE         = 5;
+const int RESOURCE_AMOUNT       = 100;
+
+#endif
diff --git a/inc/creature.hpp b/inc/creature.hpp
index bc23652..8515bc0 100644
--- a/inc/creature.hpp
+++ b/inc/creature.hpp
@@ -1,9 +1,12 @@
 #ifndef creature_h
 #define creature_h
 
-#include "entity.hpp"
-#include "resource.hpp"
+#include <SDL2/SDL.h>
+#include <list>
+
 #include "location.hpp"
+#include "entity.hpp"
+#include "constants.hpp"
 
 class Creature: public Entity
 {
@@ -27,11 +30,12 @@ class Creature: public Entity
     bool wander;
     Location wTarget;
     int health; 
+    int reach = CREATURE_REACH;
     int maxHealth;
     bool hungry; 
-    int speed = 1;
+    int speed = CREATURE_SPEED;
     bool able;     
-    int bestSense = 100;
+    int bestSense = CREATURE_BEST_SENSE;
     
     list<Entity*> N;
     Entity *target; 
diff --git a/inc/entity.hpp b/inc/entity.hpp
index 62c14d4..d02f689 100644
--- a/inc/entity.hpp
+++ b/inc/entity.hpp
@@ -19,7 +19,7 @@ class Entity
         virtual int getAmount(void){}; 
 
 	protected:
-		int type = 0;
+		int type;
         SDL_Rect rect;
         Location L;
 		SDL_Renderer* renderer;
diff --git a/inc/event.hpp b/inc/event.hpp
index e9025f0..c1d528e 100644
--- a/inc/event.hpp
+++ b/inc/event.hpp
@@ -1,7 +1,7 @@
 #ifndef event_h
 #define event_h
 
-#include "window.hpp"
+#include <SDL2/SDL.h>
 
 class Event
 {
diff --git a/inc/list.hpp b/inc/list.hpp
index 3ad8477..8cf409b 100644
--- a/inc/list.hpp
+++ b/inc/list.hpp
@@ -1,10 +1,13 @@
 #ifndef list_h
 #define list_h
 
+#include <list>
+
 #include "creature.hpp"
 #include "resource.hpp"
 #include "window.hpp"
 #include "location.hpp"
+#include "constants.hpp"
 
 class List
 {
diff --git a/inc/timer.hpp b/inc/timer.hpp
index 1213311..c8f43ff 100644
--- a/inc/timer.hpp
+++ b/inc/timer.hpp
@@ -1,7 +1,7 @@
 #ifndef timer_h
 #define timer_h
 
-#include "window.hpp"
+#include <SDL2/SDL.h>
 
 class Timer
 {
diff --git a/inc/window.hpp b/inc/window.hpp
index 49bdb09..1a1a5a7 100644
--- a/inc/window.hpp
+++ b/inc/window.hpp
@@ -1,20 +1,10 @@
 #ifndef window_h
 #define window_h
 
-//Theres alot here that are probs not used, needs cleaning
 #include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
-#include <string>
-#include <cmath>
-#include <stdlib.h>
-#include <time.h>
-#include <iostream>
-#include <vector>
-#include <chrono>
-#include <random>
-#include <list>
 #include <algorithm>
 
+#include "constants.hpp"
 
 using namespace std;
 
-- 
cgit v1.2.3