a-game

commit 5777b526116d9eb8a349e82423d5230453dd9da0
parent eb3fd8f207af2b4fcad6b1e019f4b0d1d069110f
Author: amin <dev@aminmesbah.com>
Date:   Sun,  2 Jun 2019 01:26:54 +0000

Use test rooms

FossilOrigin-Name: e111552335e6c6f9742952fe29d0402017644dee6fab5d9c81e002a7ae42d953
Diffstat:
M
src/game.c
 | 
47
++++++++++++++++++++++++++++-------------------

1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/game.c b/src/game.c
@@ -61,8 +61,6 @@ internal void game_init(struct GameMemory *game_memory, v2u framebuffer)
         },
     };
 
-    //world_room_set(game_state->world, collision_test_zone, &game_state->world_allocator);
-    //world_room_set(game_state->world, knytt_hanging_fly_village, &game_state->world_allocator);
 
     i32 s = -3;
     i32 f = 3;
@@ -70,23 +68,34 @@ internal void game_init(struct GameMemory *game_memory, v2u framebuffer)
     {
         for (i32 y = s; y <= f; y++)
         {
-            struct Room r = {
-                .index = {x, y},
-                .tiles = {
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 1, 0,  0, 1, 0, 1, 0,  0, 1, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 1, 0,  0, 1, 0, 1, 0,  0, 1, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
-                },
-            };
-            world_room_set(game_state->world, r, &game_state->world_allocator);
+            if (math_v2i_eq((v2i) {x, y}, collision_test_zone.index))
+            {
+                world_room_set(game_state->world, collision_test_zone, &game_state->world_allocator);
+            }
+            else if (math_v2i_eq((v2i) {x, y}, knytt_hanging_fly_village.index))
+            {
+                world_room_set(game_state->world, knytt_hanging_fly_village, &game_state->world_allocator);
+            }
+            else
+            {
+                struct Room r = {
+                    .index = {x, y},
+                    .tiles = {
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 1, 0,  0, 1, 0, 1, 0,  0, 1, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 1, 0,  0, 1, 0, 1, 0,  0, 1, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0, 0,
+                    },
+                };
+                world_room_set(game_state->world, r, &game_state->world_allocator);
+            }
         }
     }