X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=blobdiff_plain;f=fishladder_resources.h;fp=fishladder_resources.h;h=030a050645ec1d9066c1aef8acf4eea1a912affe;hp=b486ec6c93d5ea49a40376242db15e69fc2bff8f;hb=7756287016b03ba7eb76b0a57cebe28952a4ce41;hpb=bf818249690c5ae1a1e4634714dd2e722fa35632

diff --git a/fishladder_resources.h b/fishladder_resources.h
index b486ec6..030a050 100644
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -255,24 +255,10 @@ sfx_system audio_system_ui =
 	.name = "UI"
 };
 
-ui_colourset ui_fl_colours = {
-	.main = 0xff807373,
-	.hover = 0xff918484,
-	.active = 0xffad9f9e
-};
-
-ui_colourset ui_fl_colours_inactive = {
-	.main = 0xff655958,
-	.hover = 0xff655958,
-	.active = 0xff655958
-};
-
 static void resource_load_main(void)
 {
 	// Textures // UI
 	vg_tex2d_init( texture_list, vg_list_size( texture_list ) );
-	ui_global_ctx.colours_main = &ui_fl_colours;
-	gui_reset_colours();
 	
 	// Audio
 	sfx_set_init( &audio_tile_mod, NULL );
@@ -712,6 +698,19 @@ struct cmp_level
 	
 	int _unlock, _linked;	// When completed, unlock this level
 	struct cmp_level *unlock, *linked;
+
+   struct world_string
+   {
+      enum placement
+      {
+         k_placement_top,
+         k_placement_bottom
+      }
+      placement;
+
+      const char *str;
+   }
+   strings[2];
 	
 	int serial_id;
 	int is_tutorial;
@@ -987,6 +986,24 @@ static struct cmp_level cmp_levels_computer[] =
 		.title = "3 BIT ADDITION",
 		.map_name = "cmp_add3b",
 		.description = "",
+      .strings = 
+      {
+         {
+            .placement = k_placement_top,
+            //.str ="\t\t\t\t\t\t\t\t\t|      NUMBER A     |       |      NUMBER B     |\n"
+            .str =""
+"\t\t\t\t\t\t\t\t\t\x80\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x82       \x80\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x82\n"
+"\t\t\t\t\t\t\t\t\t\x83 4       2       1 \x84  add  \x83 4       2       1 \x84\n"
+"\t\t\t\t\t\t\t\t\t\x83                   \x84       \x83                   \x84"
+         },
+         {
+            .placement = k_placement_bottom,
+            .str =
+"\t\t\t\x83                           \x84\n"
+"\t\t\t\x83 8       4       2       1 \x84 result a+b\n"
+"\t\t\t\x85\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x86"
+         }
+      },
 
 		._unlock = 25
 	},