From d3f8ef2d9c2723c6ab87e90ee7654fc10d3269da Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Wed, 4 Jun 2014 06:20:22 +0200
Subject: [PATCH] Wallz

---
 src/GameWorld.cpp | 21 ++++++++++-----------
 src/GameWorld.h   |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/GameWorld.cpp b/src/GameWorld.cpp
index acf8db1..913e6c1 100755
--- a/src/GameWorld.cpp
+++ b/src/GameWorld.cpp
@@ -269,15 +269,6 @@ void GameWorld::Initialize()
 	}
 #pragma endregion Region for wall debris
 
-#pragma region Wall_Regin
-
- 	for(int i = 10; i < 0; i++)
- 	{
-	EntityID Wall = CreateWall(glm::vec3(i*10.f, -15.f, 0.f), glm::quat());
-	}
-
-#pragma endregion Region for all wall creations
-
 	/*EntityID tank1 = CreateTank(1);
 	{
 		auto transform = GetComponent<Components::Transform>(tank1);
@@ -637,9 +628,9 @@ void GameWorld::CreateGate(EntityID parent, glm::vec3 position, glm::quat orient
 	}
 }
 
-EntityID GameWorld::CreateWall(glm::vec3 pos, glm::quat orientation)
+EntityID GameWorld::CreateWall(EntityID parent, glm::vec3 pos, glm::quat orientation)
 {
-	auto wall = CreateEntity();
+	auto wall = CreateEntity(parent);
 	auto transform = AddComponent<Components::Transform>(wall);
 	transform->Position = pos;
 	transform->Orientation = orientation;
@@ -1109,6 +1100,14 @@ void GameWorld::CreateBase(glm::quat orientation, int playerID)
 
 	CreateGate(base, glm::vec3(273.f, 40.185f, 0.06f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
 
+	CreateWall(base, glm::vec3(273.f, 40.3f, -55.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+	CreateWall(base, glm::vec3(273.f, 40.3f, -45.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+	CreateWall(base, glm::vec3(273.f, 40.3f, -35.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+	CreateWall(base, glm::vec3(273.f, 40.3f, -25.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+	CreateWall(base, glm::vec3(273.f, 40.3f, -15.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+	CreateWall(base, glm::vec3(273.f, 40.3f, 15.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+	CreateWall(base, glm::vec3(273.f, 40.3f, 25.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
+
 	CreateGarage(base, glm::vec3(323.2f, 41.4f, -10.2f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)), playerID);
 }
 EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int playerID)
diff --git a/src/GameWorld.h b/src/GameWorld.h
index 15a4fd9..ef91887 100755
--- a/src/GameWorld.h
+++ b/src/GameWorld.h
@@ -81,7 +81,7 @@ private:
 	void CreateGate(EntityID parent, glm::vec3 position, glm::quat orientation);
 	void AddTankWheelPair(EntityID tankEntity, glm::vec3 position, int axleID, bool steering);
 	EntityID CreateJeep(int playerID);
-	EntityID CreateWall(glm::vec3 pos, glm::quat orientation);
+	EntityID CreateWall(EntityID parent, glm::vec3 pos, glm::quat orientation);
 	EntityID CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int playerID);
 	void CreateTerrain();
 	void CreateBase(glm::quat orientation, int playerID);