Diff: Entity/Snake/Snake.cpp

Revision:

21:be18f33da757

Parent:

19:bfe410c82b45

--- a/Entity/Snake/Snake.cpp	Thu Apr 25 03:56:09 2019 +0000
+++ b/Entity/Snake/Snake.cpp	Thu Apr 25 05:27:43 2019 +0000
@@ -2,7 +2,8 @@
 #include "math.h"
 #include <complex>
 
-Snake::Snake(float pos_x, float pos_y) {
+Snake::Snake(float pos_x, float pos_y)
+{
     moving = true;
     face = 0;
     hp = 4;
@@ -20,61 +21,53 @@
     velocity = 0;
 }
 
-void Snake::move(float player_x, float player_y) {
+void Snake::move(float player_x, float player_y)
+{
     std::complex<double> pos_diff(player_x - position.x, player_y - position.y); // defining difference in position as a vector
     velocity = velocity_pattern[frame.number]; // Creating slithering effect, changing velocity of movement
-    
+
     // Setting Face
     if (frame.number == 0) {
         if (abs(pos_diff.real()) > abs(pos_diff.imag())) {
             if (pos_diff.real() > 0) {
                 face = 1;
-            }
-            else {
+            } else {
                 face = 3;
             }
-        }
-        else {
+        } else {
             if (pos_diff.imag() > 0) {
                 face = 0;
-            }
-            else {
+            } else {
                 face = 2;
             }
         }
     }
-    
+
     // Movement, Offset and  Update
-    if (face == 0){
+    if (face == 0) {
         position.y += velocity;
-    }
-    else if (face == 1){
+    } else if (face == 1) {
         position.x += velocity;
-    }
-    else if (face == 2){
+    } else if (face == 2) {
         position.y -= velocity;
-    }
-    else if (face == 3){
+    } else if (face == 3) {
         position.x -= velocity;
     }
-    
+
     undo_move_x(matrix_collision_test(position.x, prev_pos.y, 0));
     undo_move_y(matrix_collision_test(prev_pos.x, position.y, 0));
-    
-    if (frame.count < 5) {
-        frame.count++;
-    }
-    else {
+
+    frame.count++;
+    if (frame.count >= 5) {
         frame.count = 0;
-        if (frame.number < frame.max) {
-            frame.number++;
-        }
-        else {
+        frame.number++;
+        if (frame.number >= frame.max) {
             frame.number = 0;
         }
     }
 }
 
-int * Snake::get_frame() {
+int * Snake::get_frame()
+{
     return (int *) sprite_snake[face][frame.number];
 }
\ No newline at end of file