pre double

diff --git a/src/main.cpp b/src/main.cpp
index 6c48dd91d35388000799fdd8c0a9d7867c9d964e..18294f44a70ffcda10de3135608d1e3579ea4c98 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,14 +1,11 @@
-#define DIRECTINPUT_VERSION 0x0800\r
-#include <dinput.h>\r

 #include <fstream>\r
 #include <stdio.h>\r
 #include <string>\r
 #include <time.h>\r
 #include <windows.h>\r
 #include <fstream>\r
 #include <stdio.h>\r
 #include <string>\r
 #include <time.h>\r
 #include <windows.h>\r

+#include <Richedit.h>\r

 \r
 #pragma comment(lib, "user32.lib")\r
 \r
 #pragma comment(lib, "user32.lib")\r

-#pragma comment(lib, "dinput8.lib")\r
-#pragma comment(lib, "dxguid.lib")\r

 \r
 #define CONSOLE\r
 \r
 \r
 #define CONSOLE\r
 \r


@@ -18,119 +15,95 @@
 #pragma comment(linker, "/subsystem:windows")\r
 #endif\r
 \r
 #pragma comment(linker, "/subsystem:windows")\r
 #endif\r
 \r

-HWND hwnd = NULL;\r
+using namespace std;\r

 \r
 \r

-STARTUPINFOA si;\r
-PROCESS_INFORMATION pi;\r

 \r
 const int WIDTH = 56, HEIGHT = 29;\r
 \r
 const int WIDTH = 56, HEIGHT = 29;\r

-int x = 0, y = 0;\r
-int spawn_x, spawn_y;\r
-bool right = true;\r
-\r
-clock_t update_clock = clock();\r
-double update_time = 40;\r
-\r
-BYTE dikeys[256];\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 = 50;\r
-double jump_time2 = 100;\r
-int jump_height = 3;\r
-\r
-DWORD wait_time = 10;\r
-\r
-int text_speed = 2;\r

 \r
 std::string map;\r
 \r
 \r
 std::string map;\r
 \r

-void press_down(WORD vk) {\r
-  INPUT ip;\r
+clock_t game_clock;\r
+double dt;\r

 \r
 \r

-  ip.type = INPUT_KEYBOARD;\r
-  ip.ki.wScan = 0;\r
-  ip.ki.time = 0;\r
-  ip.ki.dwExtraInfo = 0;\r
+// Edit\r

 \r
 \r

-  ip.ki.wVk = vk;\r
-  ip.ki.dwFlags = 0;\r
-  SendInput(1, &ip, sizeof(INPUT));\r
-}\r
-\r
-void press_up(WORD vk) {\r
-  INPUT ip;\r
-  ip.type = INPUT_KEYBOARD;\r
-  ip.ki.wScan = 0;\r
-  ip.ki.time = 0;\r
-  ip.ki.dwExtraInfo = 0;\r
+HWND hwnd_notepad = NULL;\r
+HWND hwnd_edit = NULL;\r

 \r
 \r

-  ip.ki.wVk = vk;\r
-  ip.ki.dwFlags = KEYEVENTF_KEYUP;\r
-  SendInput(1, &ip, sizeof(INPUT));\r
+string get_text() {\r
+  int len = SendMessageA(hwnd_edit, WM_GETTEXTLENGTH, 0, 0);\r
+  char *buffer = new char[len + 1];\r
+  int read = SendMessageA(hwnd_edit, WM_GETTEXT, len + 1, (LPARAM)buffer);\r
+  if (read != len)\r
+    puts("???");\r
+  buffer[read] = 0;\r
+  string result(buffer);\r
+  delete[] buffer;\r
+  return result;\r

 }\r
 \r
 }\r
 \r

-void press(WORD vk) {\r
-  press_down(vk);\r
-  press_up(vk);\r
+void select_all() {\r
+  SendMessage(hwnd_edit, EM_SETSEL, 0, get_text().size());\r

 }\r
 \r
 }\r
 \r

-void key_down(char c) {\r
-  INPUT ip;\r
-  ip.type = INPUT_KEYBOARD;\r
-  ip.ki.time = 0;\r
-  ip.ki.dwExtraInfo = 0;\r
+void select_length(int from, int length) {\r
+  SendMessage(hwnd_edit, EM_SETSEL, from, from + length);\r
+}\r

 \r
 \r

-  ip.ki.dwFlags = KEYEVENTF_UNICODE;\r
-  ip.ki.wVk = 0;\r
-  ip.ki.wScan = c;\r
-  SendInput(1, &ip, sizeof(INPUT));\r
+void select_from_to(int from, int to) {\r
+  SendMessage(hwnd_edit, EM_SETSEL, from, to);\r

 }\r
 \r
 }\r
 \r

-void key_up(char c) {\r
-  INPUT ip;\r
-  ip.type = INPUT_KEYBOARD;\r
-  ip.ki.time = 0;\r
-  ip.ki.dwExtraInfo = 0;\r
+void replace(string str) {\r
+  SendMessage(hwnd_edit, EM_REPLACESEL, FALSE, (LPARAM)str.c_str());\r
+}\r

 \r
 \r

-  ip.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP;\r
-  SendInput(1, &ip, sizeof(INPUT));\r
+int get_pos(int x, int y) {\r
+  return (y + 1) * (WIDTH + 4) + x + 1;\r

 }\r
 \r
 }\r
 \r

-void key(char c) {\r
-  key_down(c);\r
-  key_up(c);\r
+char get_block(int x, int y) {\r
+  return map[get_pos(x, y)];\r

 }\r
 \r
 }\r
 \r

-LPDIRECTINPUT8 di;\r
-LPDIRECTINPUTDEVICE8 keyboard;\r
+// Player\r
+struct Player {\r
+  int x, y;\r

 \r
 \r

-HRESULT initializedirectinput8() {\r
-  HRESULT hr;\r
-  // Create a DirectInput device\r
-  if (FAILED(hr = DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION,\r
-                                     IID_IDirectInput8, (VOID **)&di, NULL))) {\r
-    return hr;\r
+  void clear() {\r
+    int pos = get_pos(x, y);\r
+    select_length(pos, 1);\r
+    replace({ map[pos], 0 });\r
+  }\r
+  \r
+  void draw() {\r
+    int pos = get_pos(x, y);\r
+    select_length(pos, 1);\r
+    replace({ 'Q', 0 });\r

   }\r
   }\r

-  return 0;\r
-}\r

 \r
 \r

-void createdikeyboard() {\r
-  di->CreateDevice(GUID_SysKeyboard, &keyboard, NULL);\r
-  keyboard->SetDataFormat(&c_dfDIKeyboard);\r
-  keyboard->SetCooperativeLevel(NULL, DISCL_FOREGROUND | DISCL_EXCLUSIVE);\r
-  keyboard->Acquire();\r
-}\r
+  void move_to(int x, int y) {\r
+    clear();\r
+    this->x = x;\r
+    this->y = y;\r
+    draw();\r
+  }\r

 \r
 \r

-void destroydikeyboard() {\r
-  keyboard->Unacquire();\r
-  keyboard->Release();\r
-}\r
+  void move(int dx, int dy) {\r
+    move_to(x + dx, y + dy);\r
+  }\r
+\r
+  bool collision(int xdir, int ydir) {\r
+    int newx = x + xdir;\r
+    int newy = y + ydir;\r
+    if (newx < 0 || newx >= WIDTH || newy < 0 || newy >= HEIGHT)\r
+      return true;\r
+    return get_block(newx, newy) == 'X';\r
+  }\r
+};\r
+Player player { 0, 0 };\r

 \r
 \r

-#define keydown(name, key) (name[key] & 0x80)\r
+// Lvl\r

 \r
 std::string read_map(int lvl) {\r
   std::ifstream ifs("lvl/" + std::to_string(lvl) + ".txt",\r
 \r
 std::string read_map(int lvl) {\r
   std::ifstream ifs("lvl/" + std::to_string(lvl) + ".txt",\r


@@ -149,179 +122,54 @@ std::string read_map(int lvl) {
   return result;\r
 }\r
 \r
   return result;\r
 }\r
 \r

-char get_block(int x, int y) {\r
-  char result = map[(y + 1) * (WIDTH + 4) + x + 1];\r
-  return result;\r
-}\r
-\r
-double get_dur(clock_t then) {\r
-  double result = (double)(clock() - then) / CLOCKS_PER_SEC;\r
-  return result * 1000;\r
-}\r
-\r
-void draw() {\r
-  press(VK_BACK);\r
-  key(right ? '>' : '<');\r
-}\r
-\r
-void erase() {\r
-  press(VK_BACK);\r
-  key(get_block(x, y));\r
-}\r
-\r
-void move(int dx, int dy) {\r
-  erase();\r
-\r
-  for (int i = 0; i < dx; i++) {\r
-    right = true;\r
-    press(VK_RIGHT);\r
-  }\r
-  for (int i = 0; i > dx; i--) {\r
-    right = false;\r
-    press(VK_LEFT);\r
-  }\r
-  for (int i = 0; i < dy; i++) {\r
-    press(VK_DOWN);\r
-  }\r
-  for (int i = 0; i > dy; i--) {\r
-    press(VK_UP);\r
-  }\r
-\r
-  draw();\r
-\r
-  x += dx;\r
-  y += dy;\r
-\r
-  printf("%d %d\n", x, y);\r
+void redraw() {\r
+  select_all();\r
+  replace(map);\r

 }\r
 \r
 }\r
 \r

-void move_to(int _x, int _y) { move(_x - x, _y - y); }\r
-\r
-void print_text(int text_x, int text_y, const char *text, int delay,\r
-                bool move = true) {\r
-  if (move) {\r
-    for (int i = x; i < text_x; i++)\r
-      press(VK_RIGHT);\r
-    for (int i = x; i > text_x; i--)\r
-      press(VK_LEFT);\r
-    for (int i = y; i < text_y; i++)\r
-      press(VK_DOWN);\r
-    for (int i = y; i > text_y; i--)\r
-      press(VK_UP);\r
-  }\r
-\r
-  int len = strlen(text);\r
-  for (int i = 0; i < len; i++) {\r
-    if (text[i] == '\r')\r
-      continue;\r
-    press(VK_DELETE);\r
-    key(text[i]);\r
-    if (move) {\r
-      map[(text_y + 1) * (WIDTH + 4) + text_x + 1 + i] = text[i];\r
+void load_level(int lvl) {\r
+  map = read_map(lvl);\r
+  redraw();\r
+  for (int x = 0; x < WIDTH; x++) {\r
+    for (int y = 0; y < HEIGHT; y++) {\r
+      if (map[get_pos(x, y)] == 'S')\r
+        player.move_to(x, y);\r

     }\r
     }\r

-    Sleep(delay);\r

   }\r
   }\r

-  if (move) {\r
-    for (int i = text_x + len; i < x; i++)\r
-      press(VK_RIGHT);\r
-    for (int i = text_x + len; i > x; i--)\r
-      press(VK_LEFT);\r
-    for (int i = text_y; i < y; i++)\r
-      press(VK_DOWN);\r
-    for (int i = text_y; i > y; i--)\r
-      press(VK_UP);\r
-  }\r
-\r
-  draw();\r
-\r
-  Sleep(100);\r

 }\r
 \r
 }\r
 \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
+// Notepad\r

 \r
 \r

-    if (keys[0] && x > x_min && get_block(x - 1, y) != 'X')\r
-      move(-1, 0);\r
-    if (keys[1] && x < x_max && get_block(x + 1, y) != 'X')\r
-      move(+1, 0);\r
-  }\r
+STARTUPINFOA si;\r
+PROCESS_INFORMATION pi;\r

 \r
 \r

-  if (keys[2] && !keys_old[2] && jumping == 0 && can_jump) {\r
-    jumping = 1;\r
-    move(0, -1);\r
-    jump_clock = clock();\r
-  }\r
-  if (jumping != 0) {\r
-    if (jumping < jump_height && get_dur(jump_clock) > jump_time1) {\r
-      if (get_block(x, y - 1) != 'X') {\r
-        move(0, -1);\r
-        jumping++;\r
-        jump_clock = clock();\r
-      } else {\r
-        jumping = jump_height;\r
-      }\r
-    } else if (jumping == jump_height && get_dur(jump_clock) > jump_time2) {\r
-      jumping = 0;\r
-    }\r
+BOOL CALLBACK ew_cb(HWND hwnd, LPARAM lp) {\r
+  DWORD pid;\r
+  DWORD tid = GetWindowThreadProcessId(hwnd, &pid);\r
+  if (pi.dwProcessId == pid && pi.dwThreadId == tid) {\r
+    hwnd_notepad = hwnd;\r
+    return false;\r

   }\r
   }\r

-  if (!jumping && get_block(x, y + 1) != 'X' && y < HEIGHT - 1)\r
-    move(0, +1);\r
-\r
-  char b = get_block(x, y);\r
-  if (b == '/' || b == '\\' || b == '<' || b == '>')\r
-    move_to(spawn_x, spawn_y);\r
+  return true;\r

 }\r
 }\r

-\r
-void redraw() {\r
-  press_down(VK_CONTROL);\r
-  press('A');\r
-  press_up(VK_CONTROL);\r
-  Sleep(100);\r
-  press(VK_DELETE);\r
-  Sleep(100);\r
-  int _x = x, _y = y;\r
-  print_text(0, 0, map.c_str(), 1, false);\r
-  for (int i = 0; i < 100; i++)\r
-    press(VK_UP);\r
-  for (int i = 0; i < 100; i++)\r
-    press(VK_LEFT);\r
-  x = y = 0;\r
-  press(VK_DOWN);\r
-  press(VK_RIGHT);\r
-  press(VK_RIGHT);\r
-  move_to(_x, _y);\r
-}\r
-\r
-int lvl = 0;\r
-\r
-void setup() {\r
-  x = y = 0;\r
-  press(VK_DOWN);\r
-  press(VK_RIGHT);\r
-  press(VK_RIGHT);\r
-\r
-  for (int i = 0; i < WIDTH; i++)\r
-    for (int j = 0; j < HEIGHT; j++)\r
-      if (get_block(i, j) == 'S') {\r
-        spawn_x = i;\r
-        spawn_y = j;\r
-      }\r
-      \r
-  move_to(spawn_x, spawn_y);\r
+BOOL CALLBACK ecw_cb(HWND child, LPARAM in) {\r
+  char buffer[1024 + 1];\r
+  int len = GetClassNameA(child, buffer, 1024);\r
+  buffer[len] = 0;\r
+  if (strcmp(buffer, "Edit") == 0) {\r
+    hwnd_edit = child;\r
+    return false;\r
+  }\r
+  return true;\r

 }\r
 \r
 }\r
 \r

-void load_level(int l, bool terminate = true) {\r
-  lvl = l;\r
-  map = read_map(lvl);\r
-  if (terminate)\r
-    TerminateProcess(pi.hProcess, 0);\r
-\r
-  char cmd[100];\r
-  sprintf(cmd, "notepad.exe lvl/%d.txt", lvl);\r
+void start_notepad() {\r
+  ZeroMemory(&si, sizeof(si));\r
+  si.cb = sizeof(si);\r
+  ZeroMemory(&pi, sizeof(pi));\r

 \r
   if (!CreateProcessA(NULL,  // No module name (use command line)\r
 \r
   if (!CreateProcessA(NULL,  // No module name (use command line)\r

-                      cmd,   // Command line\r
+                      "notepad.exe",   // Command line\r

                       NULL,  // Process handle not inheritable\r
                       NULL,  // Thread handle not inheritable\r
                       FALSE, // Set handle inheritance to FALSE\r
                       NULL,  // Process handle not inheritable\r
                       NULL,  // Thread handle not inheritable\r
                       FALSE, // Set handle inheritance to FALSE\r


@@ -332,223 +180,97 @@ void load_level(int l, bool terminate = true) {
                       &pi)   // Pointer to PROCESS_INFORMATION structure\r
   ) {\r
     printf("CreateProcess failed (%d).\n", GetLastError());\r
                       &pi)   // Pointer to PROCESS_INFORMATION structure\r
   ) {\r
     printf("CreateProcess failed (%d).\n", GetLastError());\r

-    return;\r

   }\r
   }\r

-\r

   Sleep(100);\r
   Sleep(100);\r

-\r
-  char title[100];\r
-  sprintf(title, "%d.txt - Editor", lvl);\r
-  hwnd = FindWindowA(NULL, title);\r
-\r
-  SetWindowPos(hwnd, HWND_TOP, 100, 100, 965, 905, SWP_SHOWWINDOW);\r
-  SetFocus(hwnd);\r
-\r
-  for (int i = 0; i < 10; i++) {\r
-    press_down(VK_CONTROL);\r
-    press(VK_OEM_PLUS);\r
-    press_up(VK_CONTROL);\r
-  }\r
-\r
-  setup();\r
+  EnumWindows(ew_cb, 0);\r
+  EnumChildWindows(hwnd_notepad, ecw_cb, 0);\r
+  SendMessage(hwnd_edit, EM_SETREADONLY, TRUE, NULL);\r

 }\r
 }\r

-\r
-void intro() {\r
-  static int progress = 0;\r
-  switch (progress) {\r
-  case 0:\r
-    print_text(4, 2, "Move with left/right.", text_speed);\r
-\r
-    progress++;\r
-    break;\r
-  case 1:\r
-    update_play(false);\r
-    if (x == 17) {\r
-      print_text(4, 4, "Jump with up.", text_speed);\r
-      print_text(4, 6, "Stand on x.", text_speed);\r
-      progress++;\r
-    }\r
-    break;\r
-  case 2:\r
-    update_play();\r
-    if (x == 22) {\r
-      print_text(4, 8, "Collect ? for ???.", text_speed);\r
-      progress++;\r
-    }\r
-    break;\r
-  case 3:\r
-    update_play(true, 0, 33);\r
-    if (get_block(x, y) == '?') {\r
-      print_text(4, 10, "Avoid /\\.", text_speed);\r
-      progress++;\r
-    }\r
-    break;\r
-  case 4:\r
-    update_play();\r
-    if (x == 39) {\r
-      print_text(4, 14, "Finish lvl by reaching O.", text_speed);\r
-      progress++;\r
-    }\r
-    break;\r
-  case 5:\r
-    update_play();\r
-    if (get_block(x, y) == 'O') {\r
-      load_level(1);\r
-    }\r
-    break;\r
-  }\r
+void close_notepad() {\r
+  TerminateProcess(pi.hProcess, 0);\r
+  CloseHandle(pi.hProcess);\r
+  CloseHandle(pi.hThread);\r

 }\r
 \r
 }\r
 \r

-void lvl1() {\r
-  static int progress = 0;\r
-  switch (progress) {\r
-  case 0:\r
-    print_text(4, 2, "Also avoid > and <.", text_speed);\r
-    progress++;\r
-    break;\r
-  case 1:\r
-    update_play();\r
-    break;\r
+// Keys\r
+\r
+enum class Key {\r
+  Left,\r
+  Right,\r
+  Jump,\r
+  Exit,\r
+  Redraw,\r
+  COUNT\r
+};\r
+\r
+bool key_state[(uint64_t)Key::COUNT];\r
+bool key_state_old[(uint64_t)Key::COUNT];\r
+\r
+int key_get_vk(Key key) {\r
+  switch (key) {\r
+    case Key::Left: return 'A';\r
+    case Key::Right: return 'D';\r
+    case Key::Jump: return VK_SPACE;\r
+    case Key::Exit: return VK_ESCAPE;\r
+    case Key::Redraw: return 'R';\r
+    default: return 0;\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r

-void update_game() {\r
-  switch (lvl) {\r
-  case 0:\r
-    intro();\r
-    break;\r
-  case 1:\r
-    lvl1();\r
-    break;\r
+void update_key_state() {\r
+  for (int i = 0; i < (int)Key::COUNT; i++) {\r
+    key_state[i] = GetAsyncKeyState(key_get_vk((Key)i));\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r

-void enter_keys(std::string input, int delay) {\r
-  for (int i = 0; i < input.size(); i++) {\r
-    if (input[i] == 't') {\r
-      press(VK_TAB);\r
-      Sleep(delay);\r
-    }\r
-    else if (input[i] == 's') {\r
-      press(VK_SPACE);\r
-      Sleep(delay);\r
-    }\r
-    else if (input[i] == '~') {\r
-      press_down(VK_LSHIFT);\r
-      enter_keys(input.substr(i+1, 1), delay);\r
-      press_up(VK_LSHIFT);\r
-      i++;\r
-    }\r
-    else {\r
-      int n = 0;\r
-      int len = 0;\r
-      while (input[i+len] >= '0' && input[i+len] <= '9') {\r
-        n *= 10;\r
-        n += input[i+len] - '0';\r
-        len++;\r
-      }\r
-      for (int j = 0; j < n; j++) {\r
-        if (input[i+len] == '~') {\r
-          enter_keys(input.substr(i+len, 2), delay);\r
-        }\r
-        else {\r
-          enter_keys(input.substr(i+len, 1), delay);\r
-        }          \r
-      }\r
-      if (input[i+len] == '~')\r
-        i++;\r
-      i += len;\r
-    }\r
+void update_key_state_old() {\r
+  for (int i = 0; i < (int)Key::COUNT; i++) {\r
+    key_state_old[i] = key_state[i];\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r

-void toggle_key_repeat() {\r
-  WinExec("c:\\windows\\system32\\control.exe /name Microsoft.EaseOfAccessCenter /page pageKeyboardEasierToUse", SW_NORMAL);\r
-  Sleep(500);\r
-\r
-  enter_keys("6ts9ts7~ts13ts5~tss6ts", 10);\r
-\r
-  Sleep(100);\r
+bool key_pressed(Key key) {\r
+  return key_state[(int)key] && !key_state_old[(int)key];\r
+}\r

 \r
 \r

-  press_down(VK_CONTROL);\r
-  press('W');\r
-  press_up(VK_CONTROL);\r
+bool key_down(Key key) {\r
+  return key_state[(int)key];\r
+}\r

 \r
 \r

-  Sleep(1000);\r
+bool key_up(Key key) {\r
+  return !key_state[(int)key];\r

 }\r
 \r
 }\r
 \r

-/*\r
-  Todo:\r
-  - Msg Box Intro\r
-  - Multi Jump\r
-  - more blocks/lvls\r
-  - Set Accessibility \r
-  - Lua?\r
-  - Scrolling?\r
-*/\r

 #ifdef CONSOLE\r
 int main(int argc, char **argv) {\r
 #else\r
 int WinMain(HINSTANCE a0, HINSTANCE a1, LPSTR a2, int a3) {\r
 #endif\r
 #ifdef CONSOLE\r
 int main(int argc, char **argv) {\r
 #else\r
 int WinMain(HINSTANCE a0, HINSTANCE a1, LPSTR a2, int a3) {\r
 #endif\r

-  toggle_key_repeat();\r
-  // Dies zu programmieren mit der reduzierten Inputrate.\r
-  // Ist nicht angenehm. Ich werde es ändern.......\r
-\r
-  // printf("%c", get_block(6, 23));\r
-  // printf("%c", get_block(6, 24));\r
-\r
-  ZeroMemory(&si, sizeof(si));\r
-  si.cb = sizeof(si);\r
-  ZeroMemory(&pi, sizeof(pi));\r
-\r
-  // MessageBoxA(NULL, "Guten Tag.", "Spiel Name???", MB_OK);\r
-\r
-  HRESULT hr;\r
-  initializedirectinput8();\r
-  createdikeyboard();\r
-\r
-  load_level(0, false);\r
-\r
-  MSG Msg;\r
+  start_notepad();\r
+  if (hwnd_notepad == NULL || hwnd_edit == NULL) {\r
+    puts("error");\r
+    return 1;\r
+  }\r
+  load_level(0);\r

   while (true) {\r
   while (true) {\r

-    hr = keyboard->GetDeviceState(256, dikeys);\r
-    if (keydown(dikeys, DIK_ESCAPE)) {\r
-      TerminateProcess(pi.hProcess, 0);\r
-      // MessageBoxA(NULL, "beendet...", "Schönes Wochenende.", MB_OK);\r
+    dt = ((double)clock() - game_clock) / CLOCKS_PER_SEC * 1000;\r
+    game_clock = clock();\r
+    update_key_state();\r
+\r
+    if (key_pressed(Key::Exit))\r

       break;\r
       break;\r

-    }\r
-    if (keydown(dikeys, DIK_R)) {\r
+    if (key_pressed(Key::Redraw))\r

       redraw();\r
       redraw();\r

-    }\r
-    keys[0] = keydown(dikeys, DIK_LEFTARROW);\r
-    keys[1] = keydown(dikeys, DIK_RIGHTARROW);\r
-    keys[2] = keydown(dikeys, DIK_UPARROW);\r
-\r
-    if (keys[0] && !keys_old[0])\r
-      press(VK_RIGHT);\r
-    if (keys[1] && !keys_old[1])\r
-      press(VK_LEFT);\r
-    if (keys[2] && !keys_old[2])\r
-      press(VK_DOWN);\r
-\r
-    update_game();\r
-\r
-    keys_old[0] = keys[0];\r
-    keys_old[1] = keys[1];\r
-    keys_old[2] = keys[2];\r
-    keys_old[3] = keys[3];\r
-\r
-    WaitForSingleObject(pi.hProcess, wait_time);\r
+    if (key_down(Key::Left) && !player.collision(-1, 0))\r
+      player.move(-1, 0);\r
+    if (key_down(Key::Right) && !player.collision(1, 0))\r
+      player.move(+1, 0);\r
+    if (key_pressed(Key::Jump) && player.collision(0, 1))\r
+      player.move(0, -1);\r
+\r
+    update_key_state_old();\r

   }\r
   }\r

-\r
-  toggle_key_repeat();\r
-\r
-  destroydikeyboard();\r
-\r
-  // Close process and thread handles.\r
-  CloseHandle(pi.hProcess);\r
-  CloseHandle(pi.hThread);\r
+  close_notepad();\r

 \r
   return 0;\r
 }
\ No newline at end of file
 \r
   return 0;\r
 }
\ No newline at end of file