summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/Character.hpp2
-rw-r--r--inc/Frame.hpp14
-rw-r--r--inc/Screen.hpp4
3 files changed, 10 insertions, 10 deletions
diff --git a/inc/Character.hpp b/inc/Character.hpp
index 607e8ea..3111154 100644
--- a/inc/Character.hpp
+++ b/inc/Character.hpp
@@ -12,7 +12,7 @@ class Character
{
public:
Character(char nSymbol, int nColor, Location L);
- void move(Location L){l.x=L.x;l.y=L.y;}
+ void move(Location L){l=L;}
void draw(WINDOW * w);
Location action(vector <Location> occupied);
bool check(Location L, vector <Location> occupied);
diff --git a/inc/Frame.hpp b/inc/Frame.hpp
index cc87090..4e4b57f 100644
--- a/inc/Frame.hpp
+++ b/inc/Frame.hpp
@@ -16,13 +16,13 @@ class Frame
Frame(string location, int nRow, int nCol); // main window with seeded map
Frame(Frame &super, int rows, int cols, int nRow, int nCol); // viewport
~Frame();
- WINDOW * getWin();
- WINDOW * getSuper();
- bool getHasSuper();
- int getHeight();
- int getWidth();
- int getRow();
- int getCol();
+ WINDOW * getWin(){return w;}
+ WINDOW * getSuper(){return super;}
+ bool getHasSuper(){return hasSuper;}
+ int getHeight(){return height;}
+ int getWidth(){return width;}
+ int getRow(){return row;}
+ int getCol(){return col;}
void fillWindow();
void refresh();
void move(int nRow, int nCol);
diff --git a/inc/Screen.hpp b/inc/Screen.hpp
index 505f4e2..2108b97 100644
--- a/inc/Screen.hpp
+++ b/inc/Screen.hpp
@@ -12,8 +12,8 @@ class Screen
Screen();
~Screen();
void ping(string msg);
- int getHeight();
- int getWidth();
+ int getHeight(){return height;}
+ int getWidth(){return width;}
private:
int height, width;
};