From 4c50cb6b322368a89feef13efa091c765c966e5b Mon Sep 17 00:00:00 2001 From: tom Date: Sun, 22 Nov 2015 19:56:45 -0600 Subject: small changes --- inc/Character.hpp | 2 +- src/Character.cpp | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/inc/Character.hpp b/inc/Character.hpp index 9773762..1a7dcdd 100644 --- a/inc/Character.hpp +++ b/inc/Character.hpp @@ -14,7 +14,7 @@ class Character Character(char nSymbol, int nColor, Location L); void move(Location L){l=L;} void draw(WINDOW * w); - Location action(vector men); + void action(vector men); bool check(Location L, vector men); Location getLocation(){return l;} char getSymbol(){return symbol;} diff --git a/src/Character.cpp b/src/Character.cpp index 0ab594b..5ebc39e 100644 --- a/src/Character.cpp +++ b/src/Character.cpp @@ -13,7 +13,7 @@ void Character::draw(WINDOW * w) mvwaddch(w,l.x,l.y,symbol); } -Location Character::action(vector men) +void Character::action(vector men) { if(order == "wander") { @@ -60,17 +60,10 @@ Location Character::action(vector men) Lo.y = l.y+1; } else - { Lo = l; - } if(check(Lo,men)) - { move(Lo); - return Lo; - } - else - return l; } } -- cgit v1.2.3