From 86bf68cc1f2cc81589acc2c35c4875a1230b0267 Mon Sep 17 00:00:00 2001
From: tom <tom@ground-control>
Date: Sat, 21 Nov 2015 15:06:26 -0600
Subject: didnt get everything

---
 inc/Character.hpp | 12 +++++-------
 inc/Frame.hpp     |  3 ---
 inc/Location.hpp  |  1 +
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'inc')

diff --git a/inc/Character.hpp b/inc/Character.hpp
index 1f948f2..607e8ea 100644
--- a/inc/Character.hpp
+++ b/inc/Character.hpp
@@ -11,15 +11,13 @@ using namespace std;
 class Character
 {
     public:
-        Character(char nSymbol, int nColor,int nRow, int nCol);
-        void move(Location L);
+        Character(char nSymbol, int nColor, Location L);
+        void move(Location L){l.x=L.x;l.y=L.y;}
         void draw(WINDOW * w);
-        bool action(vector <Location> occupied);
-        bool check(Location L, vector <Location> occupied);
-        int getRow();
-        int getCol();
+        Location action(vector <Location> occupied);
+        bool check(Location L, vector <Location> occupied);        
         Location getLocation(){return l;}
-        char getSymbol();
+        char getSymbol(){return symbol;}
 
     private:
         string order = "wander";
diff --git a/inc/Frame.hpp b/inc/Frame.hpp
index 89242ff..cc87090 100644
--- a/inc/Frame.hpp
+++ b/inc/Frame.hpp
@@ -26,9 +26,6 @@ class Frame
         void fillWindow();
         void refresh();
         void move(int nRow, int nCol);
-        //void add(Character &c);
-        //void add(Character &c, int nRow, int nCol);
-        void erase(Character &c);
         void center(Character &ch);
 
     private:
diff --git a/inc/Location.hpp b/inc/Location.hpp
index 458e77e..5c6f1ea 100644
--- a/inc/Location.hpp
+++ b/inc/Location.hpp
@@ -4,6 +4,7 @@
 class Location
 {
     public:
+        Location(){x=0;y=0;}
         int x;
         int y;
 };
-- 
cgit v1.2.3