From 701ca06a6570efb868188ef9c56b5c46a049ee8a Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Fri, 30 May 2014 01:03:59 +0200
Subject: [PATCH] Crosshair

---
 assets              | 2 +-
 src/GUI/PlayerHUD.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/assets b/assets
index bc811a1..fe035e7 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit bc811a1b392782213d0823e418bc1d773e1a9641
+Subproject commit fe035e74bd086cfa924003349711f31133337812
diff --git a/src/GUI/PlayerHUD.h b/src/GUI/PlayerHUD.h
index 648230a..b094d4c 100644
--- a/src/GUI/PlayerHUD.h
+++ b/src/GUI/PlayerHUD.h
@@ -16,6 +16,13 @@ namespace GUI
 			, m_PlayerID(playerID)
 		{
 			m_HealthOverlay = new HealthOverlay(this, "HealthOverlay", m_World, m_PlayerID);
+			m_Crosshair = new TextureFrame(this, "Crosshair");
+			m_Crosshair->Width = 45;
+			m_Crosshair->Height = 45;
+			m_Crosshair->X = this->Width / 2.f - m_Crosshair->Width / 2.f;
+			m_Crosshair->Y = this->Height / 2.f - m_Crosshair->Height / 2.f;
+			m_Crosshair->SetTexture("Textures/GUI/crosshair.png");
+			m_Crosshair->SetColor(glm::vec4(1.f, 1.f, 1.f, 0.75f));
 		}
 
 	protected:
@@ -23,6 +30,7 @@ namespace GUI
 		int m_PlayerID;
 
 		HealthOverlay* m_HealthOverlay;
+		TextureFrame* m_Crosshair;
 	};
 
 }