use player's inventory slot directly in interface

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 92d1c943705c8f9ecf83b74856aa0e193e75d756..9a6e927407b212f24063817bda98e2ce1e1b718d 100644 (file)
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -42,7 +42,6 @@ private:
        ClientController &client_ctrl;
 
        glm::ivec3 fwd, rev;
-       int slot;
        int num_slots;
 
        bool locked;

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 8563f7ded08409344be3957f7620640268ca7e3f..263245cd79bfe61ccdeb57e710bc1f5951c67fd0 100644 (file)
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -511,7 +511,6 @@ Interface::Interface(
 , client_ctrl(cc)
 , fwd(0)
 , rev(0)
-, slot(0)
 , num_slots(10)
 , locked(false) {
 
@@ -711,7 +710,7 @@ void Interface::UpdateMovement() {
 }
 
 void Interface::InvAbs(int s) {
-       slot = s % num_slots;
+       int slot = s % num_slots;
        while (slot < 0) {
                slot += num_slots;
        }
@@ -719,7 +718,7 @@ void Interface::InvAbs(int s) {
 }
 
 void Interface::InvRel(int delta) {
-       InvAbs(slot + delta);
+       InvAbs(player_ctrl.GetPlayer().GetInventorySlot() + delta);
 }