Convert room tracking to stack storage for easier serialization.

diff --git a/src/main.c b/src/main.c
index 7478fb47929bd951696b7e0129de2e4d0ae0c2ac..f511ccbe91b383bbe311c636b9636aadf584b164 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -15,8 +15,6 @@ void print_rlog(int logLevel, const char* text, va_list args)
 int main(int argc, char** argv)
 {
 
-       room_positions = (Vector3*)malloc(sizeof(Vector3)*(room_count + 1));
-
 /* TODO: Clean this up and integrate into platform system. */
 #ifdef ENABLE_BARROWGEN
        barrow.max_iterations *= 1;
@@ -43,8 +41,6 @@ int main(int argc, char** argv)
        start_render_loop();
 #endif /* ENABLE_BARROWGEN */
 
-       free(room_positions);
-
        return 0;
 }
 

diff --git a/src/structs.c b/src/structs.c
index fabdb83dde802c1b4c8bfb2f8b43565ef8c9b6df..b2bc9b0a9935ffaf78fc832c31ad1c8989e06863 100644 (file)
--- a/src/structs.c
+++ b/src/structs.c
@@ -82,5 +82,5 @@ float resource_generation_progress = 0.0f;
 int resource_state = 0;
 
 const int room_count = 4;
-Vector3* room_positions = NULL;
+Vector3 room_positions[16];
 

diff --git a/src/structs.h b/src/structs.h
index 6e87c1da2452b4bbb0ab4ef549759c2c2cc0ebad..46d742d33be0fdb6f654247644594a2994259f54 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -95,7 +95,7 @@ extern float resource_generation_progress;
 extern int resource_state;
 
 extern const int room_count;
-extern Vector3* room_positions;
+extern Vector3 room_positions[16];
 
 //int generate_rd(int worker_count, RD_Opts active_opt, FVec2 **grid_buffer, IVec2 pgrid_size);
 void* generate_rd(void* args);