fix(menus): Render

Author: skuzzis

src/menus/Menu.cpp

@@ -85,16 +85,19 @@ void Menu::ProcessOptions()
     }
 }
 
-std::string Menu::GeneratedItems(int page)
+std::string Menu::GeneratedItems(int playerid, int page)
 {
-    return this->generatedPages[page - 1];
+    return this->generatedPages[playerid][page - 1];
 }
 
-void Menu::RegeneratePage(int page, int selected)
+void Menu::RegeneratePage(int playerid, int page, int selected)
 {
-    while (this->generatedPages.size() < page)
+    if (this->generatedPages.find(playerid) == this->generatedPages.end())
+        this->generatedPages.insert({playerid, {}});
+
+    while (this->generatedPages[playerid].size() < page)
     {
-        this->generatedPages.push_back("");
+        this->generatedPages[playerid].push_back("");
     }
 
     std::string stringPage = string_format("<div><font color=\"#%s\">&nbsp;&nbsp;&nbsp;%s</font></div><br/>", this->color.c_str(), this->title.c_str());
@@ -103,7 +106,7 @@ void Menu::RegeneratePage(int page, int selected)
 
     stringPage += string_format("<font class='fontSize-s'>%s</font>", replace(replace(g_translations->FetchTranslation("core.menu.footer"), "{PAGE}", std::to_string(page)), "{MAXPAGES}", std::to_string(processedOptions.size())).c_str());
 
-    this->generatedPages[page - 1] = stringPage;
+    this->generatedPages[playerid][page - 1] = stringPage;
 }
 
 bool Menu::IsTemporary()

src/menus/Menu.h

@@ -15,16 +15,16 @@ class Menu
     std::vector<std::vector<std::pair<std::string, std::string>>> processedOptions;
     bool temporary;
 
-    std::vector<std::string> generatedPages;
+    std::map<int, std::vector<std::string>> generatedPages;
 
 public:
     Menu(std::string id, std::string title, std::string color, std::vector<std::pair<std::string, std::string>> options, bool tmp);
     ~Menu();
 
     std::string GetID();
     void ProcessOptions();
-    std::string GeneratedItems(int page);
-    void RegeneratePage(int page, int selected);
+    std::string GeneratedItems(int playerid, int page);
+    void RegeneratePage(int playerid, int page, int selected);
 
     std::string GetCommandFromOption(int page, int selected);
     size_t GetItemsOnPage(int page);

src/player/Player.cpp

@@ -345,7 +345,7 @@ void Player::SetButtons(uint64_t new_buttons)
 {
     /*
     DEBUG: Button Presses
-    
+
     for(uint64_t i = 0; i < 64; i++) {
         if((new_buttons & (1ULL << i)) != 0) {
             PRINTF("%s: %d\n", key_buttons[i].c_str(), i);
@@ -383,7 +383,7 @@ void Player::SetPage(int pg)
 {
     this->page = pg;
     this->selected = 0;
-    this->menu->RegeneratePage(this->page, this->selected);
+    this->menu->RegeneratePage(this->GetSlot().Get(), this->page, this->selected);
 }
 int Player::GetSelection() { return this->selected; }
 void Player::MoveSelection()
@@ -396,7 +396,7 @@ void Player::MoveSelection()
     if (itemsPerPage == this->selected)
         this->selected = 0;
 
-    this->menu->RegeneratePage(this->page, this->selected);
+    this->menu->RegeneratePage(this->GetSlot().Get(), this->page, this->selected);
 }
 
 void Player::ShowMenu(std::string menuid)
@@ -412,7 +412,7 @@ void Player::ShowMenu(std::string menuid)
     this->page = 1;
     this->selected = 0;
 
-    this->menu->RegeneratePage(this->page, this->selected);
+    this->menu->RegeneratePage(this->GetSlot().Get(), this->page, this->selected);
     this->RenderMenu();
 }
 
@@ -427,7 +427,7 @@ void Player::RenderMenu()
     IGameEvent *pEvent = g_gameEventManager->CreateEvent("show_survival_respawn_status", true);
     if (pEvent)
     {
-        pEvent->SetString("loc_token", this->menu->GeneratedItems(this->page).c_str());
+        pEvent->SetString("loc_token", this->menu->GeneratedItems(this->GetSlot().Get(), this->page).c_str());
         pEvent->SetUint64("duration", 10);
         pEvent->SetInt("userid", this->GetController()->GetEntityIndex().Get() - 1);