aegea: Fix slot_player_alias being off by one

SpaceManiac · Dec 23, 2024 · f83baee · f83baee
1 parent c1d726b
commit f83baee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/source/aegea/src/aegea.cpp b/source/aegea/src/aegea.cpp
@@ -596,7 +596,13 @@ std::string_view ArchipelagoClient::slot_game_name(int slot)
 
 std::string_view ArchipelagoClient::slot_player_alias(int slot)
 {
-	return room_info_["players"][slot]["alias"].getString();
+	if (slot == 0)
+	{
+		// Slot 0 is Archipelago regardless of team.
+		return "Archipelago";
+	}
+	// For now, assume AP teams feature is not in use and slot N is player N.
+	return room_info_["players"][slot - 1]["alias"].getString();
 }
 
 std::string_view ArchipelagoClient::item_name(int64_t item)

diff --git a/source/loonyland/loonyArchipelago.cpp b/source/loonyland/loonyArchipelago.cpp
@@ -439,11 +439,11 @@ void UpdateArchipelago()
 				std::string text = "Got ";
 				text += ap->item_name(message->item.item);
 				text += " from ";
-				text += ap->slot_player_alias(message->slot);
+				text += ap->slot_player_alias(message->item.player);
 				NewMessage(text.c_str(), MESSAGE_TIME);
 				messageCooldown = MESSAGE_TIME;
 			}
-			else if (message->slot == ap->player_id())
+			else if (message->item.player == ap->player_id())
 			{
 				// Sent [item] to [player].
 				std::string text = "Sent ";