Diff: Enemy/Enemy1.cpp

Revision:

13:c3b550fc2445

Parent:

12:200a1266ceee

Child:

14:d0650d0de063

--- a/Enemy/Enemy1.cpp	Thu May 02 19:59:05 2019 +0000
+++ b/Enemy/Enemy1.cpp	Sat May 04 19:33:08 2019 +0000
@@ -30,23 +30,26 @@
 
 void Enemy1::movement(N5110 &lcd){
     accel = 1;
-
-    if (southCollision(x_enem, y_enem, lcd) == true && westCollision(x_enem, y_enem, lcd) == true){
-        y_enem -= accel;
-    } else if (southCollision(x_enem, y_enem, lcd) == true && eastCollision(x_enem, y_enem, lcd) == true){
-        x_enem -= accel;
-    } else if (northCollision(x_enem, y_enem, lcd) == true && westCollision(x_enem, y_enem, lcd) == true){
-        x_enem += accel;
-    } else if (northCollision(x_enem, y_enem, lcd) == true && eastCollision(x_enem, y_enem, lcd) == true){
-        y_enem += accel;
+    for (int i = 0; i < 60; i++) {
+        if (y_enem == 17 && x_enem < 50){
+            x_enem += accel;
+        }
+        if (y_enem < 24 && x_enem == 50){
+            y_enem += accel;
+        }
+        if (y_enem == 24 && x_enem > 27){
+            x_enem -= accel;
+        }
+        if (y_enem > 17 && x_enem == 27){
+            y_enem -= accel;
+        }
     }
 }
 
-
 bool Enemy1::northCollision(int x, int y, N5110 &lcd){
 
-    for (int i = 0; i < 7; i++) {
-        if (lcd.getPixel(x + i,y + 1) == 1) {
+    for (int i = 1; i < 6; i++) {
+        if (lcd.getPixel(x + i,y - 1) == 1) {
             return true;
         }
     }
@@ -55,7 +58,7 @@
 
 bool Enemy1::southCollision(int x, int y, N5110 &lcd){
 
-    for (int i = 0; i < 7; i++) {
+    for (int i = 1; i < 6; i++) {
         if (lcd.getPixel(x + i,y + 7) == 1) {
             return true;
         }
@@ -65,8 +68,8 @@
 
 bool Enemy1::eastCollision(int x, int y, N5110 &lcd){
 
-    for (int i = 0; i < 7; i++) {
-        if (lcd.getPixel(x + 6,y + i) == 1) {
+    for (int i = 1; i < 6; i++) {
+        if (lcd.getPixel(x + 7,y + i) == 1) {
             return true;
         }
     }
@@ -75,8 +78,8 @@
 
 bool Enemy1::westCollision(int x, int y, N5110 &lcd){
 
-    for (int i = 0; i < 7; i++) {
-        if (lcd.getPixel(x + 1,y + i) == 1) {
+    for (int i = 1; i < 6; i++) {
+        if (lcd.getPixel(x - 1,y + i) == 1) {
             return true;
         }
     }