movement done

[npengine] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 13778d5895f0585b34a66ba7d7e5d5088d11050a..5b987971f3edb9960d132f063886ade453fd878c 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,19 +16,20 @@ const int WIDTH = 43, HEIGHT = 25;
 int x = 0, y = 0;\r
 bool right = true;\r
 \r
 int x = 0, y = 0;\r
 bool right = true;\r
 \r

+clock_t update_clock = clock();\r
+double update_time = 40;\r
+\r

 bool keys[4] = { false, false, false, false };\r
 bool keys_old[4] = { false, false, false, false };\r
 \r
 int jumping = 0;\r
 \r
 clock_t jump_clock = clock();\r
 bool keys[4] = { false, false, false, false };\r
 bool keys_old[4] = { false, false, false, false };\r
 \r
 int jumping = 0;\r
 \r
 clock_t jump_clock = clock();\r

-double jump_time1 = 0.01;\r
-double jump_time2 = 0.05;\r
+double jump_time1 = 50;\r
+double jump_time2 = 100;\r

 int jump_height = 3;\r
 \r
 int jump_height = 3;\r
 \r

-DWORD wait_time = 50;\r
-\r
-\r
+DWORD wait_time = 10;\r

 \r
 void press_down(WORD vk) {\r
   INPUT ip;\r
 \r
 void press_down(WORD vk) {\r
   INPUT ip;\r


@@ -212,29 +213,25 @@ enum GameState {
   GS_START, GS_INTRO1, GS_INTRO2\r
 };\r
 \r
   GS_START, GS_INTRO1, GS_INTRO2\r
 };\r
 \r

-clock_t update_clock = clock();\r
-double update_time = 30;\r
-\r

 void update_play(bool can_jump = true) {\r
 void update_play(bool can_jump = true) {\r

-  if (get_dur(update_clock) >= update_time)\r
+  if (get_dur(update_clock) >= update_time) {\r

     update_clock = clock();\r
     update_clock = clock();\r

-  else\r
-    return;\r
+\r
+    if (keys[0] &&\r
+        x > 0 &&\r
+        get_block(x - 1, y) != 'x')\r
+      move(-1, 0);\r
+    if (keys[1] &&\r
+        x < WIDTH - 1 &&\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
 \r
   // bool left = false;\r
   // bool right = false;\r
   // bool up = false;\r
   // bool down = false;\r
 \r

-  if (keys[0] &&\r
-      x > 0 &&\r
-      get_block(x - 1, y) != 'x')\r
-    move(-1, 0);\r
-  if (keys[1] &&\r
-      x < WIDTH - 1 &&\r
-      get_block(x + 1, y) != 'x')\r
-    move(+1, 0);\r
-  // else \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


@@ -369,7 +366,7 @@ int main(int argc, char **argv) {
     keys_old[2] = keys[2];\r
     keys_old[3] = keys[3];\r
 \r
     keys_old[2] = keys[2];\r
     keys_old[3] = keys[3];\r
 \r

-    WaitForSingleObject( pi.hProcess, 10);\r
+    WaitForSingleObject( pi.hProcess, wait_time);\r

 \r
     SetWindowPos(hwnd, HWND_TOPMOST, 100, 100, 750, 750, SWP_SHOWWINDOW);\r
   }\r
 \r
     SetWindowPos(hwnd, HWND_TOPMOST, 100, 100, 750, 750, SWP_SHOWWINDOW);\r
   }\r