fix(player): Buttons

swiftly-solution · Oct 16, 2024 · e0d1c13 · e0d1c13
1 parent a047834
commit e0d1c13
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/entrypoint.cpp b/src/entrypoint.cpp
@@ -468,7 +468,7 @@ void Swiftly::Hook_GameFrame(bool simulating, bool bFirstTick, bool bLastTick)
                 continue;
 
             auto buttonStates = pawn->m_pMovementServices()->m_nButtons().m_pButtonStates();
-            player->SetButtons(buttonStates[0], buttonStates[1]);
+            player->SetButtons(buttonStates[0]);
 
             if (player->HasMenuShown())
                 player->RenderMenu();

diff --git a/src/player/player/Player.cpp b/src/player/player/Player.cpp
@@ -347,15 +347,16 @@ const std::vector<std::string> key_buttons = {
 
 void OnClientKeyStateChange(int playerid, std::string key, bool pressed);
 
-void Player::SetButtons(uint64_t new_buttons, uint64_t changed_buttons)
+void Player::SetButtons(uint64_t new_buttons)
 {
-    if(changed_buttons > 0) {
+    if(buttons != new_buttons) {
         for(uint16_t i = 0; i < 64; i++) {
-            if((new_buttons & (1ULL << i)) != 0 && (changed_buttons & (1ULL << i)) != 0)
+            if((buttons & (1ULL << i)) != 0 && (new_buttons & (1ULL << i)) == 0)
                 OnClientKeyStateChange(this->slot, key_buttons[i], true);
-            else if((new_buttons & (1ULL << i)) == 0 && (changed_buttons & (1ULL << i)) != 0)
+            else if((buttons & (1ULL << i)) == 0 && (new_buttons & (1ULL << i)) != 0)
                 OnClientKeyStateChange(this->slot, key_buttons[i], false);
         }
+        buttons = new_buttons;
     }
 }
 

diff --git a/src/player/player/Player.h b/src/player/player/Player.h
@@ -69,7 +69,7 @@ class Player
     void SwitchTeam(int team);
     void ChangeTeam(int team);
 
-    void SetButtons(uint64_t new_buttons, uint64_t changed_buttons);
+    void SetButtons(uint64_t new_buttons);
 
     std::string tag = "";
     std::string tagcolor = "{default}";
@@ -131,6 +131,7 @@ class Player
     Menu* menu = nullptr;
     int page = 0;
     int selected = 0;
+    uint64_t buttons = 0;
 
     std::map<std::string, std::any> internalVars;