X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder_resources.h;h=d5a9a6eaa566b86008a0ab82f171e39564988315;hb=b5886bcf2a79ad14e586d69ee9fd01f87bac9c95;hp=ef9dcd1fe89f8179bad737a9aa08c70ca6009dd5;hpb=c09e6742a336ca5a64e5ef0ab564370d1040547b;p=fishladder.git

diff --git a/fishladder_resources.h b/fishladder_resources.h
index ef9dcd1..d5a9a6e 100644
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -656,6 +656,8 @@ struct cmp_level
 	int serial_id;
 	int is_tutorial;
 
+	v2i world_pos;
+
 	#ifdef VG_STEAM
 	SteamLeaderboard_t steam_leaderboard;
 	#endif
@@ -909,24 +911,37 @@ static struct cmp_level cmp_levels_grad[] =
 
 #define NUM_CAMPAIGN_LEVELS (vg_list_size( cmp_levels_tutorials ) + vg_list_size( cmp_levels_basic ) + vg_list_size( cmp_levels_grad ))
 
-static struct serializable_set 
+static struct career_level_pack 
 {
 	struct cmp_level *pack;
 	int count;
+
+	v3f primary_colour;
+	v2i origin;
+	v2i dims;
 } 
-career_serializable[] =
+career_packs[] =
 {
 	{
 		.pack = cmp_levels_tutorials,
-		.count = vg_list_size( cmp_levels_tutorials )
+		.count = vg_list_size( cmp_levels_tutorials ),
+		.primary_colour = { 0.204f, 0.345f, 0.553f },
+		.origin = { -5, 0 },
+		.dims = { 1, 4 }
 	},
 	{
 		.pack = cmp_levels_basic,
-		.count = vg_list_size( cmp_levels_basic )
+		.count = vg_list_size( cmp_levels_basic ),
+		.primary_colour = { 0.304f, 0.245f, 0.553f },
+		.origin = { -3, 0 },
+		.dims = { 3, 6 }
 	},
 	{
 		.pack = cmp_levels_grad,
-		.count = vg_list_size( cmp_levels_grad )
+		.count = vg_list_size( cmp_levels_grad ),
+		.primary_colour = { 0.553f, 0.345f, 0.204f },
+		.origin = { -5, 7 },
+		.dims = { 4, 1 }
 	}
 };
 
@@ -936,18 +951,18 @@ static void career_local_data_init(void)
 	struct cmp_level *level_ptrs[ NUM_CAMPAIGN_LEVELS ];
 	
 	// COllect pointers
-	for( int i = 0; i < vg_list_size( career_serializable ); i ++ )
+	for( int i = 0; i < vg_list_size( career_packs ); i ++ )
 	{
-		struct serializable_set *set = &career_serializable[i];
+		struct career_level_pack *set = &career_packs[i];
 		
 		for( int j = 0; j < set->count; j ++ )
 			level_ptrs[ set->pack[j].serial_id ] = &set->pack[j];
 	}
 	
 	// Apply
-	for( int i = 0; i < vg_list_size( career_serializable ); i ++ )
+	for( int i = 0; i < vg_list_size( career_packs ); i ++ )
 	{
-		struct serializable_set *set = &career_serializable[i];
+		struct career_level_pack *set = &career_packs[i];
 		
 		for( int j = 0; j < set->count; j ++ )
 		{
@@ -957,36 +972,3 @@ static void career_local_data_init(void)
 		}
 	}
 }
-
-static struct button_grid
-{
-	v3f primary_colour;
-	v2i origin;
-	v2i dims;
-	struct cmp_level *levels;
-	int count;
-}
-button_grids[] = 
-{
-	{
-		.primary_colour = { 0.204f, 0.345f, 0.553f },
-		.origin = { -5, 0 },
-		.dims = { 1, 4 },
-		.levels = cmp_levels_tutorials,
-		.count = vg_list_size( cmp_levels_tutorials )
-	},
-	{
-		.primary_colour = { 0.304f, 0.245f, 0.553f },
-		.origin = { -3, 0 },
-		.dims = { 3, 6 },
-		.levels = cmp_levels_basic,
-		.count = vg_list_size( cmp_levels_basic )
-	},
-	{
-		.primary_colour = { 0.553f, 0.345f, 0.204f },
-		.origin = { -5, 7 },
-		.dims = { 4, 1 },
-		.levels = cmp_levels_grad,
-		.count = vg_list_size( cmp_levels_grad )
-	}
-};