Merge branch 'master' of https://gitea.sustancia.synology.me/JailDoctor/thepool

source/m_catslife.cpp

@@ -1,6 +1,6 @@
 #include "m_catslife.h"
 #include "jgame.h"
-#include "jinput.h"
+#include "controller.h"
 #include "jdraw.h"
 #include "jaudio.h"
 #include "actor.h"
@@ -22,7 +22,7 @@ namespace modules
 
         bool loop()
         {
-            if (input::keyPressed(SDL_SCANCODE_SPACE)) {
+            if (controller::pressed(KEY_JUMP) || controller::pressed(KEY_PICK)) {
                 return false;
             }