mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Remove usage of List from Twitch.cpp

Browse Source
This commit is contained in:
Ted John
2016-09-13 18:27:57 +01:00
parent 97f231d945
commit 5e352a9dfe
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/twitch.cpp
View File

@@ -29,7 +29,7 @@
#error HTTP must be enabled to use the TWITCH functionality.
#endif
#include "../core/List.hpp"
#include <vector>
#include "../core/Math.hpp"
#include "../core/String.hpp"
@@ -119,7 +119,7 @@ namespace Twitch
static void ParseMessages();
static bool ShouldTrackMember(const AudienceMember * member);
static bool ShouldMemberBeGuest(const AudienceMember * member);
static void ManageGuestNames(List<AudienceMember> &members);
static void ManageGuestNames(std::vector<AudienceMember> &members);
static void ParseChatMessage(const char * message);
static void DoChatMessageNews(const char * message);
@@ -328,7 +328,7 @@ namespace Twitch
http_json_response *jsonResponse = _twitchJsonResponse;
if (json_is_array(jsonResponse->root))
{
List<AudienceMember> members;
std::vector<AudienceMember> members;
size_t audienceCount = json_array_size(jsonResponse->root);
for (size_t i = 0; i < audienceCount; i++)
@@ -340,7 +340,7 @@ namespace Twitch
member.ShouldTrack = ShouldTrackMember(&member);
if (ShouldMemberBeGuest(&member))
{
members.Add(member);
members.push_back(member);
}
}
}
@@ -405,7 +405,7 @@ namespace Twitch
return false;
}
static void ManageGuestNames(List<AudienceMember> &members)
static void ManageGuestNames(std::vector<AudienceMember> &members)
{
// Check what followers are already in the park
uint16 spriteIndex;
@@ -462,13 +462,13 @@ namespace Twitch
}
// Rename non-named peeps to followers that aren't currently in the park.
if (members.GetCount() > 0)
if (members.size() > 0)
{
size_t memberIndex = SIZE_MAX;
FOR_ALL_GUESTS(spriteIndex, peep)
{
size_t originalMemberIndex = memberIndex;
for (size_t i = memberIndex + 1; i < members.GetCount(); i++)
for (size_t i = memberIndex + 1; i < members.size(); i++)
{
if (!members[i].Exists)
{