From bc3839b805d7d449b73ce6cf7615c34d6a46a59a Mon Sep 17 00:00:00 2001
From: Martin Gerhardy <martin.gerhardy@gmail.com>
Date: Mon, 25 Mar 2019 22:07:29 +0100
Subject: [PATCH] TESTTRAZE: added protocol support for 'owned' counter

---
 src/tests/testtraze/TestTraze.cpp     | 2 +-
 src/tests/testtraze/TrazeProtocol.cpp | 1 +
 src/tests/testtraze/TrazeTypes.h      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tests/testtraze/TestTraze.cpp b/src/tests/testtraze/TestTraze.cpp
index f0fe7485e..4255c242c 100644
--- a/src/tests/testtraze/TestTraze.cpp
+++ b/src/tests/testtraze/TestTraze.cpp
@@ -264,7 +264,7 @@ void TestTraze::doRender() {
 		yOffset += _voxelFontRender.lineHeight();
 		for (const traze::Player& p : _players) {
 			_voxelFontRender.text(glm::ivec3(0, yOffset, 0), p.color, "* %s", p.name.c_str());
-			_voxelFontRender.text(glm::ivec3(_maxLength, yOffset, 0), p.color, "%i", p.frags);
+			_voxelFontRender.text(glm::ivec3(_maxLength, yOffset, 0), p.color, "%i/%i", p.frags, p.owned);
 			yOffset += _voxelFontRender.lineHeight();
 		}
 	}
diff --git a/src/tests/testtraze/TrazeProtocol.cpp b/src/tests/testtraze/TrazeProtocol.cpp
index 4674d8399..734332c6f 100644
--- a/src/tests/testtraze/TrazeProtocol.cpp
+++ b/src/tests/testtraze/TrazeProtocol.cpp
@@ -205,6 +205,7 @@ void Protocol::parsePlayers(const std::string& json) {
 		p.color = materialColors[index];
 		p.id = player["id"].get<int>();
 		p.frags = player["frags"].get<int>();
+		p.owned = player["owned"].get<int>();
 		players.push_back(p);
 		Log::debug("Player %s with id %i", p.name.c_str(), p.id);
 	}
diff --git a/src/tests/testtraze/TrazeTypes.h b/src/tests/testtraze/TrazeTypes.h
index 474863005..daa13ace1 100644
--- a/src/tests/testtraze/TrazeTypes.h
+++ b/src/tests/testtraze/TrazeTypes.h
@@ -38,6 +38,7 @@ struct Player {
 	std::string name;
 	PlayerId id = 0u;
 	uint32_t frags = 0u;
+	uint32_t owned = 0u;
 	uint8_t colorIndex = 0u;
 	glm::vec4 color {0.0f};
 };