Merge pull request #31 from CrystalPointA4/feature/loadingscreen

Feature/loadingscreen (reverted from commit 316d6c9e14)
2016-06-22 03:09:28 +02:00
parent 9a31e09bff
commit 92460b8ca4
25 changed files with 180 additions and 194 deletions
@@ -120,8 +120,13 @@ void ControllerHandler::commandControllerData(std::vector<std::string> data) {

            c->joystick.x = std::stoi(data[2])/2000.0f;
            c->joystick.y = std::stoi(data[3])/2000.0f;
-            c->joystickButton = !(data[4] == "0");

+            c->lastButton = c->button;
+            c->lastJoystickButton = c->joystickButton;
+            c->lastMagetSwitch = c->magnetSwitch;
+
+            c->joystickButton = !(data[4] == "0");
+            c->button = !(data[8] == "0");
            c->magnetSwitch = !(data[9] == "0");
        }
    }