summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorSage King <sagekingssk@gmail.com>2022-08-07 18:39:07 -0600
committerSage King <sagekingssk@gmail.com>2022-08-09 16:26:53 -0600
commit66276ac61ba3ae3a8b5f840cdb8616ee9bd5dc83 (patch)
tree6f2b2f094a55ca162ca61551a377e8b7afbb9c86 /Source
parent978b6a8724c38c03e2eb07c6ac5c4f3c146e9d09 (diff)
Added type to SyncIndentifierComparison enum in SyncIdentifier.h in an
attempt to fix a failed call to operator<< in SendResponse()
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/NetPlayServer.cpp3
-rw-r--r--Source/Core/Core/NetPlayServer.h6
-rw-r--r--Source/Core/Core/SyncIdentifier.h2
3 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 0d59486423..981e980d17 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -2049,7 +2049,8 @@ void NetPlayServer::AssignNewUserAPad(const Client& player)
{
for (PlayerId& mapping : m_pad_map)
{
- if (mapping == Unmapped)
+ // 0 means unmapped
+ if (mapping == 0)
{
mapping = player.pid;
break;
diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h
index 0b54f30ba2..13a05ee070 100644
--- a/Source/Core/Core/NetPlayServer.h
+++ b/Source/Core/Core/NetPlayServer.h
@@ -103,12 +103,6 @@ private:
AllExcept
};
- enum MappedState
- {
- Unmapped,
- Mapped
- };
-
struct AsyncQueueEntry
{
sf::Packet packet;
diff --git a/Source/Core/Core/SyncIdentifier.h b/Source/Core/Core/SyncIdentifier.h
index a144eb58e1..5e984476f9 100644
--- a/Source/Core/Core/SyncIdentifier.h
+++ b/Source/Core/Core/SyncIdentifier.h
@@ -36,7 +36,7 @@ struct SyncIdentifier
// The order of entries in this enum matters, as the lowest value is
// treated as the "best" available option.
-enum class SyncIdentifierComparison
+enum class SyncIdentifierComparison : u8
{
SameGame,
DifferentHash,