movement done

diff --git a/lvl/1.txt b/lvl/1.txt
index dfc622dc321e8151d603c72342571f916f2cd5d1..1173bb1bcf4e822da6c7ece6615112a2c03ccb9c 100644 (file)
--- a/lvl/1.txt
+++ b/lvl/1.txt
@@ -22,6 +22,6 @@
 |           xxx    xxx                    O |\r
 |                                      xxxxx|\r
 |                                xxxxxxxxxxx|\r
 |           xxx    xxx                    O |\r
 |                                      xxxxx|\r
 |                                xxxxxxxxxxx|\r

-|      xxxxx   xxxxxxxxx    xxxxxxxxxxxxxxxx|\r
-|      xxxxx   xxxxxxxxx/\/\xxxxxxxxxxxxxxxx|\r
+|      xxxxxxxxxxxxxxxxx    xxxxxxxxxxxxxxxx|\r
+|      xxxxxxxxxxxxxxxxx/\/\xxxxxxxxxxxxxxxx|\r

 └-------------------------------------------┘
\ No newline at end of file
 └-------------------------------------------┘
\ No newline at end of file

diff --git a/src/main.cpp b/src/main.cpp
index 5b987971f3edb9960d132f063886ade453fd878c..b762f699d97347c47cd8038139eac4ae2ec4a441 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -209,10 +209,6 @@ void print_text(int text_x, int text_y, const char *text, int delay) {
   Sleep(100);\r
 }\r
 \r
   Sleep(100);\r
 }\r
 \r

-enum GameState {\r
-  GS_START, GS_INTRO1, GS_INTRO2\r
-};\r
-\r

 void update_play(bool can_jump = true) {\r
   if (get_dur(update_clock) >= update_time) {\r
     update_clock = clock();\r
 void update_play(bool can_jump = true) {\r
   if (get_dur(update_clock) >= update_time) {\r
     update_clock = clock();\r


@@ -269,10 +265,12 @@ void update_play(bool can_jump = true) {
   }\r
 }\r
 \r
   }\r
 }\r
 \r

-enum GameState game_state = GS_START;\r
-void update_game() {\r
-  switch (game_state) {\r
-  case GS_START:\r
+int lvl = 0;\r
+\r
+void intro() {\r
+  static int progress = 0;\r
+  switch (progress) {\r
+  case 0:\r

     press(VK_DOWN);\r
     press(VK_RIGHT);\r
     press(VK_RIGHT);\r
     press(VK_DOWN);\r
     press(VK_RIGHT);\r
     press(VK_RIGHT);\r


@@ -281,21 +279,29 @@ void update_game() {
 \r
     print_text(4, 2, "Move with left/right.", 30);\r
 \r
 \r
     print_text(4, 2, "Move with left/right.", 30);\r
 \r

-    game_state = GS_INTRO1;\r
+    progress++;\r

     break;\r
     break;\r

-  case GS_INTRO1:\r
+  case 1:\r

     update_play(false);\r
     if (x == 5) {\r
       print_text(4, 4, "Jump with up.", 30);\r
     update_play(false);\r
     if (x == 5) {\r
       print_text(4, 4, "Jump with up.", 30);\r

-      game_state = GS_INTRO2;\r
+      progress++;\r

     }\r
     break;\r
     }\r
     break;\r

-  case GS_INTRO2:\r
+  case 2:\r

     update_play();\r
     break;\r
   }\r
 }\r
 \r
     update_play();\r
     break;\r
   }\r
 }\r
 \r

+void update_game() {\r
+  switch (lvl) {\r
+  case 0:\r
+    intro();\r
+    break;\r
+  }\r
+}\r
+\r

 /*\r
   Todo:\r
   - Restart\r
 /*\r
   Todo:\r
   - Restart\r