puzzle selection scene

3 files changed, 14 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index e7275dc..1a4fff2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,12 +25,24 @@ int main(void) {
         printf("Failed to create a collection scene\n");
         return 1;
     }
+<<<<<<< HEAD
 
+||||||| parent of cc0a4ad (puzzle selection scene)
+
+    DeleteSceneFromStack();
+    return 0;
+
+=======
+// 
+    // DeleteSceneFromStack();
+    // return 0;
+// 
+>>>>>>> cc0a4ad (puzzle selection scene)
     // if (!AddScene(CreatePuzzleScene(puzzle))) {
         // printf("Failed to create a puzzle menu\n");
         // return 1;
     // }
-    
+  
     SetConfigFlags(FLAG_WINDOW_RESIZABLE);
     InitWindow(800, 600, "Programming game");
     LoadResources();
diff --git a/src/puzzles/puzzle.h b/src/puzzles/puzzle.h
index bc43662..e8180e1 100644
--- a/src/puzzles/puzzle.h
+++ b/src/puzzles/puzzle.h
@@ -39,7 +39,6 @@ enum PUZZLE_TEST_RESULT {
     RESULT_COMPTIME_NO_ENTRY,
     RESULT_COMPTIME_ERR,
     RESULT_RUNTIME_ERR,
-    // TODO: add async evaluation to prevent `while (true)` situation
     RESULT_TIMEOUT,
     RESULT_INIT_ERROR,
 };
diff --git a/src/resources/resources.h b/src/resources/resources.h
index 0837317..1669d07 100644
--- a/src/resources/resources.h
+++ b/src/resources/resources.h
@@ -24,7 +24,7 @@ static const Color COLORSCHEME_BROWN = { 103, 9, 22, 255 };
 static const Color COLORSCHEME_RED = { 207, 4, 44, 255 };
 /// #F0781C as RGBA
 static const Color COLORSCHEME_ORANGE = { 240, 120, 28, 255 };
-/// #f7bc53 as RGBA
+/// #F7BC53 as RGBA
 static const Color COLORSCHEME_YELLOW = { 247, 188, 83, 255 };
 /// #E9E1B9 as RGBA
 static const Color COLORSCHEME_WHITE = { 233, 225, 185, 255 };