Diff: Gameengine/Gameengine.cpp

Revision:

46:de3462ad5aef

Parent:

45:bad704c546d4

Child:

48:bd1f31fbfee3

--- a/Gameengine/Gameengine.cpp	Wed Apr 24 13:17:58 2019 +0000
+++ b/Gameengine/Gameengine.cpp	Wed Apr 24 14:24:56 2019 +0000
@@ -110,14 +110,14 @@
     if(_t.read() >= _time) {
         _oxy_state = 0;
     }
-    return _oxy_state;
+    return _oxy_state; // _oxy_state will change FSM value in main.cpp leds()
 }
 
 // turns off led every time life is lost
 int Gameengine::lives_leds()
 {
     _life_state = _lives;
-    return _life_state;
+    return _life_state; _oxy_state; // _life_state will change FSM value in main.cpp leds()
 }
 
 // displays score at end of game
@@ -212,16 +212,7 @@
     _sprites.key_collect(4, _lev.key5.kx[i], _lev.key5.ky[i], lcd, pad);
 }
 
-// reinitialises keys when level complete
-void Gameengine::key_reinit()
-{
-    if(_key_reinit == false) {
-        for(int i = 0; i<5; i++) {
-            _sprites._k.key[i] = false;
-            _key_reinit = true;
-        }
-    }
-}
+
 // places and checks for collision with sinking and solid blocks
 void Gameengine::blocks(N5110 &lcd)
 {
@@ -261,4 +252,15 @@
         return true;
     }
     return false;
+}
+
+// reinitialises keys when level complete
+void Gameengine::key_reinit()
+{
+    if(_key_reinit == false) {
+        for(int i = 0; i<5; i++) {
+            _sprites._k.key[i] = false;
+            _key_reinit = true;
+        }
+    }
 }
\ No newline at end of file