Working on level 2

5 files changed, 20 insertions, 7 deletions

diff --git a/src/game.c b/src/game.c
index 594646d..c1c5616 100644
--- a/src/game.c
+++ b/src/game.c
@@ -33,7 +33,7 @@ void initGame(Game * game) {
 
 	// Levels.
 	initLevels(&game->levels);
-	startLevel(game, &game->levels, 0);
+	startLevel(game, &game->levels, 1);
 }
 
 void closeGame(Game * game) {
diff --git a/src/levels.c b/src/levels.c
index 3e79e2c..dec7d8f 100644
--- a/src/levels.c
+++ b/src/levels.c
@@ -6,6 +6,7 @@
 
 const LevelInfo levelInfoList[LEVELS_COUNT] = {
     (LevelInfo){initLevel1, closelevel1, updateLevel1},
+    (LevelInfo){initLevel2, closelevel2, updateLevel2},
     (LevelInfo){initTestLevel, closeTestLevel, updateTestLevel}
 };
 
diff --git a/src/levels.h b/src/levels.h
index 07544d0..b739d56 100644
--- a/src/levels.h
+++ b/src/levels.h
@@ -5,7 +5,7 @@
 #ifndef LEVELS_H
 #define LEVELS_H
 
-#define LEVELS_COUNT 2
+#define LEVELS_COUNT 3
 
 #define NO_LEVEL -1
 
diff --git a/src/levels/level2.c b/src/levels/level2.c
index 4e5dded..74e58c3 100644
--- a/src/levels/level2.c
+++ b/src/levels/level2.c
@@ -2,24 +2,35 @@
 #include "game.h"
 #include "world.h"
 #include "entity.h"
+#include "entitiesInclude.h"
 
 void initLevel2(Game * game, Levels * levels) {
     int i;
 
-	WorldEntry entries[11] = {
+	WorldEntry entries[] = {
 		(WorldEntry){ENTITY_ANTIFA, (Vector3){0.0, 0.0, 0.0}, QuaternionIdentity()}
 	};
 
-	for (i = 1; i < 11; ++i) {
-		entries[i] = (WorldEntry){ENTITY_SOLDATO, (Vector3){0.0, i * 10.0, i * 10.0 + 200.0}, QuaternionIdentity()};
-	}
-
     addEntriesToWorld(
 		&game->world,
 		game,
 		entries,
 		sizeof(entries) / sizeof(WorldEntry)
 	);
+
+    Vector3 groups[] = {
+        (Vector3){0.0, 0.0, 1000.0},
+        (Vector3){0.0, 0.0, -1000.0},
+        (Vector3){1000.0, 0.0, 0.0},
+        (Vector3){-1000.0, 0.0, 0.0},
+        (Vector3){0.0, 1000.0, 0.0},
+        (Vector3){0.0, -1000.0, 0.0}
+    };
+
+   for (i = 0; i < sizeof(groups) / sizeof(Vector3); ++i) {
+       Vector3 spacing = (Vector3){0.0, 10.0, 10.0};
+       addSoldatoGroupToWorld(game, 7, groups[i], spacing);
+    }
 }
 
 void closelevel2(Levels * levels) {
diff --git a/src/levelsInclude.h b/src/levelsInclude.h
index 24c0027..f467dca 100644
--- a/src/levelsInclude.h
+++ b/src/levelsInclude.h
@@ -1,4 +1,5 @@
 #include "levels/testLevel.h"
 #include "levels/level1.h"
+#include "levels/level2.h"
 
 // As you can tell I fucking hate your stupid fat ass