movement done

[npengine] / src / main.cpp

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

-void update_play(bool can_jump = true) {\r
+void update_play(bool can_jump = true, int x_min = 0, int x_max = WIDTH - 1) {\r

   if (get_dur(update_clock) >= update_time) {\r
     update_clock = clock();\r
 \r
     if (keys[0] &&\r
   if (get_dur(update_clock) >= update_time) {\r
     update_clock = clock();\r
 \r
     if (keys[0] &&\r

-        x > 0 &&\r
+        x > x_min &&\r

         get_block(x - 1, y) != 'x')\r
       move(-1, 0);\r
     if (keys[1] &&\r
         get_block(x - 1, y) != 'x')\r
       move(-1, 0);\r
     if (keys[1] &&\r

-        x < WIDTH - 1 &&\r
+        x < x_max &&\r

         get_block(x + 1, y) != 'x')\r
       move(+1, 0);\r
   }\r
 \r
         get_block(x + 1, y) != 'x')\r
       move(+1, 0);\r
   }\r
 \r

-  // bool left = false;\r
-  // bool right = false;\r
-  // bool up = false;\r
-  // bool down = false;\r
-\r

   if (keys[2] && !keys_old[2] && jumping == 0 && can_jump) {\r
     jumping = 1;\r
     move(0, -1);\r
   if (keys[2] && !keys_old[2] && jumping == 0 && can_jump) {\r
     jumping = 1;\r
     move(0, -1);\r


@@ -249,20 +244,6 @@ void update_play(bool can_jump = true) {
   }\r
   if (!jumping && get_block(x, y + 1) != 'x' && y < HEIGHT - 1)\r
       move(0, +1);\r
   }\r
   if (!jumping && get_block(x, y + 1) != 'x' && y < HEIGHT - 1)\r
       move(0, +1);\r

-\r
-  char block = get_block(x, y);\r
-  switch (block) {\r
-  case '/':\r
-  case '\\':\r
-    move_to(0, 24);\r
-    break;\r
-  case '?':\r
-    puts("?");\r
-    break;\r
-  case 'O':\r
-    puts("O");\r
-    break;\r
-  }\r

 }\r
 \r
 int lvl = 0;\r
 }\r
 \r
 int lvl = 0;\r


@@ -285,10 +266,25 @@ void intro() {
     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

+      print_text(4, 6, "Stand on x.", 30);\r

       progress++;\r
     }\r
     break;\r
   case 2:\r
       progress++;\r
     }\r
     break;\r
   case 2:\r

+    update_play();\r
+    if (x == 8) {\r
+      print_text(4, 8, "Collect ? for ???.", 30);\r
+      progress++;\r
+    }\r
+    break;\r
+  case 3:\r
+    update_play(true, 0, 22);\r
+    if (get_block(x, y) == '?') {\r
+      print_text(4, 10, "Avoid /\\.", 30);\r
+      progress++;\r
+    }\r
+    break;\r
+  case 4:\r

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