Diff: Player/Player.cpp

Revision:

1:bd92ef8d00ac

Parent:

0:df4347043adf

diff -r df4347043adf -r bd92ef8d00ac Player/Player.cpp
--- a/Player/Player.cpp	Thu May 04 11:25:43 2017 +0000
+++ b/Player/Player.cpp	Thu May 04 14:08:31 2017 +0000
@@ -28,9 +28,10 @@
 {
   
     const char map[48][85] = _background.draw(N5110 &lcd);
-    Vector2D monsterPos = get_pos();
+    //Vector2D monsterPos = get_pos();
     if(A_PRESSED==1){
-        if(map[_y][_x+5]==1){
+        if(//map[_y][_x+5]==1
+        ){
             _x==_x;
             _y==_y;
             }
@@ -40,7 +41,8 @@
             }
     }
     else if (B_PRESSED==1){
-        if(map[_y+5][_x]==1){
+        if(//map[_y+5][_x]==1
+        ){
               _x==_x;
               _y==_y;
             }
@@ -49,11 +51,13 @@
             }
         }
     else if (d == N) { 
-        if(map[_y+3][_x]==1){
+        if(//map[_y+3][_x]==1
+        ){
               _x==_x;
               _y==_y;
         }
-        else if (map[_y+3][_x+2]==1){
+        else if (//map[_y+3][_x+2]==1
+        ){
              _x==_x;
             _y==_y;
         }      
@@ -64,11 +68,13 @@
         }
     } 
     else if (d == S) {
-        if(map[_y-1][_x]==1){
+        if(//map[_y-1][_x]==1
+        ){
              _x==_x;
              _y==_y;
         }
-        else if(map[_y-1][_x+2]==1){
+        else if(//map[_y-1][_x+2]==1
+        ){
               _x==_x;
               _y==_y; 
         }
@@ -78,11 +84,13 @@
          ;
         }   
     }else if (d == W) {
-        if(map[_y][_x-1]==1){
+        if(//map[_y][_x-1]==1
+        ){
               _x==_x;
               _y==_y;;    
         }
-        else if(map[_y+2][_x-1]==1){
+        else if(//map[_y+2][_x-1]==1
+        ){
               _x==_x;
               _y==_y;
         }    
@@ -92,11 +100,13 @@
            
         }  
     }else if (d == E) {
-        if(map[_y][_x+3]==1){
+        if(//map[_y][_x+3]==1
+        ){
               _x==_x;
               _y==_y;
         }
-        else if(map[_y+2][_x+3]==1){
+        else if(//map[_y+2][_x+3]==1
+        ){
               _x==_x;
               _y==_y;
         }