Server: Win7: Use int8 (short) datatype for player role

Author: provigz

InternetGamesServer/Match.hpp

@@ -26,7 +26,7 @@ class Match
 	}
 	virtual ~Match() = default;
 
-	virtual size_t GetRequiredPlayerCount() const { return 2; }
+	virtual int8_t GetRequiredPlayerCount() const { return 2; }
 	inline REFGUID GetGUID() const { return m_guid; }
 
 protected:

InternetGamesServer/Win7/BackgammonMatch.cpp

@@ -3,14 +3,16 @@
 #include "PlayerSocket.hpp"
 #include "../Util.hpp"
 
-#define BackgammonInvertRole(role) (role == 0 ? 1 : 0)
-#define BackgammonIsStoneIdxPlayer0(stoneIdx) (stoneIdx < BackgammonPlayerStones)
-#define BackgammonIsStoneIdxPlayer1(stoneIdx) (stoneIdx >= BackgammonPlayerStones && stoneIdx < BackgammonPlayerStones * 2)
-
 static const std::uniform_int_distribution<> s_dieDistribution(1, 6);
 
 namespace Win7 {
 
+#define BackgammonBarX 24
+
+#define BackgammonInvertRole(role) (role == 0 ? 1 : 0)
+#define BackgammonIsStoneIdxPlayer0(stoneIdx) (stoneIdx < BackgammonPlayerStones)
+#define BackgammonIsStoneIdxPlayer1(stoneIdx) (stoneIdx >= BackgammonPlayerStones && stoneIdx < BackgammonPlayerStones * 2)
+
 BackgammonMatch::BackgammonMatch(PlayerSocket& player) :
 	Match(player),
 	m_playerPoints(),
@@ -56,7 +58,6 @@ BackgammonMatch::ClearGameState()
 	m_playersBorneOff = {};
 	m_initialRollStarted = false;
 	m_doubleRequested = false;
-	m_doubleRequested = false;
 	m_doubleCubeValue = 1;
 	m_doubleCubeOwner = -1;
 	m_resignPointsOffered = 0;
@@ -65,7 +66,7 @@ BackgammonMatch::ClearGameState()
 }
 
 void
-BackgammonMatch::AddGamePoints(int role, uint8_t points)
+BackgammonMatch::AddGamePoints(int8_t role, uint8_t points)
 {
 	assert(points > 0);
 	if ((m_playerPoints[role] += points) >= BackgammonMatchPoints)

InternetGamesServer/Win7/BackgammonMatch.hpp

@@ -9,8 +9,6 @@ namespace Win7 {
 #define BackgammonMatchPoints 5
 #define BackgammonPlayerStones 15
 
-#define BackgammonBarX 24
-
 class BackgammonMatch final : public Match
 {
 public:
@@ -26,7 +24,7 @@ class BackgammonMatch final : public Match
 private:
 	void ClearGameState();
 
-	void AddGamePoints(int role, uint8_t points);
+	void AddGamePoints(int8_t role, uint8_t points);
 
 private:
 	std::array<uint8_t, 2> m_playerPoints;
@@ -41,7 +39,7 @@ class BackgammonMatch final : public Match
 	bool m_initialRollStarted;
 	bool m_doubleRequested;
 	uint8_t m_doubleCubeValue;
-	int m_doubleCubeOwner;
+	int8_t m_doubleCubeOwner;
 	uint8_t m_resignPointsOffered;
 
 	enum class GameState
@@ -51,7 +49,7 @@ class BackgammonMatch final : public Match
 		START_NEXT_REQUESTED_ONCE
 	};
 	GameState m_gameState;
-	int m_startNextGameRequestedOnceBy;
+	int8_t m_startNextGameRequestedOnceBy;
 
 private:
 	BackgammonMatch(const BackgammonMatch&) = delete;

InternetGamesServer/Win7/CheckersMatch.cpp

@@ -3,10 +3,10 @@
 #include "PlayerSocket.hpp"
 #include "../Util.hpp"
 
-#define CheckersInvertRole(role) (role == 0 ? 1 : 0)
-
 namespace Win7 {
 
+#define CheckersInvertRole(role) (role == 0 ? 1 : 0)
+
 CheckersMatch::CheckersMatch(PlayerSocket& player) :
 	Match(player),
 	m_playerCheckersLeft({ 12, 12 }),

InternetGamesServer/Win7/CheckersMatch.hpp

@@ -23,7 +23,7 @@ class CheckersMatch final : public Match
 private:
 	std::array<int8_t, 2> m_playerCheckersLeft;
 
-	int m_drawOfferedBy;
+	int8_t m_drawOfferedBy;
 
 private:
 	CheckersMatch(const CheckersMatch&) = delete;

InternetGamesServer/Win7/Match.cpp

@@ -151,7 +151,7 @@ Match::Update()
 				const int playerCount = static_cast<int>(m_players.size());
 				const std::vector<int> roles = GenerateUniqueRandomNums(0, playerCount - 1);
 				for (int i = 0; i < playerCount; i++)
-					const_cast<int&>(m_players[i]->m_role) = roles[i];
+					const_cast<int8_t&>(m_players[i]->m_role) = static_cast<int8_t>(roles[i]);
 
 				for (PlayerSocket* p : m_players)
 					p->OnGameStart();

InternetGamesServer/Win7/PlayerSocket.hpp

@@ -61,7 +61,7 @@ class PlayerSocket final : public ::PlayerSocket
 
 public:
 	// Variables, set by the match
-	const int m_role;
+	const int8_t m_role;
 
 private:
 	PlayerSocket(const PlayerSocket&) = delete;

InternetGamesServer/Win7/SpadesMatch.cpp

@@ -120,7 +120,7 @@ SpadesMatch::ProcessEvent(const tinyxml2::XMLElement& elEvent, const PlayerSocke
 				{
 					const bool bidDoubleNil = bid == BID_DOUBLE_NIL;
 					if (m_playerBids[caller.m_role] != (bidDoubleNil ? BID_HAND_START : BID_SHOWN_CARDS))
-						return {};
+						throw std::runtime_error("SpadesMatch::ProcessEvent(): \"Move\": Player is not in a proper start bid state!");
 
 					bool moreBidsToSend = m_nextBidPlayer != m_handDealer ||
 						std::all_of(m_playerBids.begin(), m_playerBids.end(), [](int bid) { return bid <= BID_SHOWN_CARDS; });

InternetGamesServer/Win7/SpadesMatch.hpp

@@ -16,7 +16,7 @@ class SpadesMatch final : public Match
 	SpadesMatch(PlayerSocket& player);
 
 	Game GetGame() const override { return Game::SPADES; }
-	size_t GetRequiredPlayerCount() const override { return 4; }
+	int8_t GetRequiredPlayerCount() const override { return 4; }
 
 	std::vector<std::string> ConstructGameStartMessagesXML(const PlayerSocket& caller) const override;
 
@@ -52,15 +52,15 @@ class SpadesMatch final : public Match
 	std::array<int16_t, 2> m_teamPoints;
 	std::array<int16_t, 2> m_teamBags;
 
-	int m_handDealer;
-	int m_nextBidPlayer;
+	int8_t m_handDealer;
+	int8_t m_nextBidPlayer;
 	std::array<int8_t, 4> m_playerBids;
 	std::array<CardArray, 4> m_playerCards;
-	int m_playerTurn;
-	int m_playerTrickTurn;
+	int8_t m_playerTurn;
+	int8_t m_playerTrickTurn;
 	std::array<int16_t, 4> m_playerTricksTaken;
 
-	CardTrick<Card, ZPA_UNSET_CARD> m_currentTrick;
+	CardTrick<Card, int8_t, ZPA_UNSET_CARD> m_currentTrick;
 
 private:
 	SpadesMatch(const SpadesMatch&) = delete;

InternetGamesServer/WinCommon/SpadesUtil.hpp

@@ -23,7 +23,7 @@ enum class CardSuit
 	SPADES = 3
 };
 
-template<typename C, C UnsetVal>
+template<typename C, typename P, C UnsetVal>
 class CardTrick final
 {
 	using IsCardValidFunc = bool (*)(C);
@@ -50,7 +50,7 @@ class CardTrick final
 		m_leadCard = UnsetVal;
 		m_playerCards = { UnsetVal, UnsetVal, UnsetVal, UnsetVal };
 	}
-	void Set(int player, C card)
+	void Set(P player, C card)
 	{
 		assert(!IsFinished());
 
@@ -84,7 +84,7 @@ class CardTrick final
 		}
 		return false;
 	}
-	int16_t GetWinner() const
+	P GetWinner() const
 	{
 		const bool hasSpades = std::any_of(m_playerCards.begin(), m_playerCards.end(),
 			[this](C card) {
@@ -93,8 +93,8 @@ class CardTrick final
 		const CardSuit targetSuit = hasSpades ? CardSuit::SPADES : m_getCardSuitFunc(m_leadCard);
 
 		uint8_t maxRank = 0;
-		int16_t maxRankPlayer = -1;
-		for (int16_t i = 0; i < SpadesNumPlayers; ++i)
+		P maxRankPlayer = -1;
+		for (P i = 0; i < SpadesNumPlayers; ++i)
 		{
 			const C card = m_playerCards[i];
 			if (m_getCardSuitFunc(card) == targetSuit)