X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=4d70027d34911d1aaf5fedc93763d21077fb50e1;hb=12a8eb6ca28aa97f422e7cf9317f01eb0dfc9a11;hp=a189082a82c5cf01a8d7fc5390bd4fa0c0bd7b4d;hpb=85a0523ca92c9c77a009233fe7f04109d8f8a9d7;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index a189082a..4d70027d 100644 --- a/src/events.c +++ b/src/events.c @@ -465,9 +465,11 @@ void HandleWindowEvent(WindowEvent *event) int new_xpercent = (100 * new_window_width / video.width); int new_ypercent = (100 * new_window_height / video.height); +#if 0 printf("::: RESIZED from %d, %d to %d, %d\n", video.window_width, video.window_height, new_window_width, new_window_height); +#endif setup.window_scaling_percent = video.window_scaling_percent = MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)), @@ -476,11 +478,15 @@ void HandleWindowEvent(WindowEvent *event) video.window_width = new_window_width; video.window_height = new_window_height; +#if 0 printf("::: setup.window_scaling_percent set to %d\n", setup.window_scaling_percent); +#endif if (game_status == GAME_MODE_SETUP) RedrawSetupScreenAfterFullscreenToggle(); + + SetWindowTitle(); } #else // prevent slightly wrong scaling factor due to rounding differences @@ -533,10 +539,12 @@ void HandleFingerEvent(FingerEvent *event) static Key button_key = KSYM_UNDEFINED; static float motion_x1, motion_y1; static float button_x1, button_y1; - static SDL_FingerID motion_id = 0; - static SDL_FingerID button_id = 0; - int trigger_distance_percent = 1; // percent of touchpad width/height - float trigger_distance = (float)trigger_distance_percent / 100; + static SDL_FingerID motion_id = -1; + static SDL_FingerID button_id = -1; + int move_trigger_distance_percent = 2; // percent of touchpad width/height + int drop_trigger_distance_percent = 5; // percent of touchpad width/height + float move_trigger_distance = (float)move_trigger_distance_percent / 100; + float drop_trigger_distance = (float)drop_trigger_distance_percent / 100; float event_x = event->x; float event_y = event->y; @@ -556,7 +564,13 @@ void HandleFingerEvent(FingerEvent *event) if (game_status != GAME_MODE_PLAYING) return; - if (1) +#if 1 + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) +#else + boolean use_virtual_button_control = FALSE; + + if (use_virtual_button_control) +#endif { int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : KEY_PRESSED); @@ -570,12 +584,14 @@ void HandleFingerEvent(FingerEvent *event) event->x < 5.0 / 6.0 ? setup.input[0].key.left : setup.input[0].key.right) : KSYM_UNDEFINED); +#if 0 char *key_name = (key == setup.input[0].key.snap ? "SNAP" : key == setup.input[0].key.drop ? "DROP" : key == setup.input[0].key.up ? "UP" : key == setup.input[0].key.down ? "DOWN" : key == setup.input[0].key.left ? "LEFT" : key == setup.input[0].key.right ? "RIGHT" : "(unknown)"); +#endif char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" : "KEY_PRESSED"); #else @@ -706,6 +722,8 @@ void HandleFingerEvent(FingerEvent *event) return; } + // use touch direction control + if (event->type == EVENT_FINGERPRESS) { if (event_x > 1.0 / 3.0) @@ -742,7 +760,7 @@ void HandleFingerEvent(FingerEvent *event) { if (event->fingerId == motion_id) { - motion_id = 0; + motion_id = -1; if (motion_key_x != KSYM_UNDEFINED) HandleKey(motion_key_x, KEY_RELEASED); @@ -756,7 +774,7 @@ void HandleFingerEvent(FingerEvent *event) } else if (event->fingerId == button_id) { - button_id = 0; + button_id = -1; if (button_key != KSYM_UNDEFINED) HandleKey(button_key, KEY_RELEASED); @@ -779,16 +797,16 @@ void HandleFingerEvent(FingerEvent *event) event_y > motion_y1 ? setup.input[0].key.down : KSYM_UNDEFINED); - if (distance_x < trigger_distance / 2 || + if (distance_x < move_trigger_distance / 2 || distance_x < distance_y) new_motion_key_x = KSYM_UNDEFINED; - if (distance_y < trigger_distance / 2 || + if (distance_y < move_trigger_distance / 2 || distance_y < distance_x) new_motion_key_y = KSYM_UNDEFINED; - if (distance_x > trigger_distance || - distance_y > trigger_distance) + if (distance_x > move_trigger_distance || + distance_y > move_trigger_distance) { if (new_motion_key_x != motion_key_x) { @@ -820,8 +838,8 @@ void HandleFingerEvent(FingerEvent *event) float distance_x = ABS(event_x - button_x1); float distance_y = ABS(event_y - button_y1); - if (distance_x < trigger_distance / 2 && - distance_y > trigger_distance) + if (distance_x < drop_trigger_distance / 2 && + distance_y > drop_trigger_distance) { if (button_key == setup.input[0].key.snap) HandleKey(button_key, KEY_RELEASED); @@ -1144,8 +1162,10 @@ void HandleButton(int mx, int my, int button, int button_nr) case GAME_MODE_PLAYING: #ifdef DEBUG - if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my)) - DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); + if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my)) + DumpTile(LEVELX((mx - SX) / TILESIZE_VAR), + LEVELY((my - SY) / TILESIZE_VAR)); + // DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); #endif break; @@ -1235,6 +1255,20 @@ static void HandleKeysSpecial(Key key) { DumpTape(&tape); } + else if (is_string_suffix(cheat_input, ":fix-tape") || + is_string_suffix(cheat_input, ":ft")) + { + /* fix single-player tapes that contain player input for more than one + player (due to a bug in 3.3.1.2 and earlier versions), which results + in playing levels with more than one player in multi-player mode, + even though the tape was originally recorded in single-player mode */ + + /* remove player input actions for all players but the first one */ + for (i = 1; i < MAX_PLAYERS; i++) + tape.player_participates[i] = FALSE; + + tape.changed = TRUE; + } else if (is_string_suffix(cheat_input, ":save-native-level") || is_string_suffix(cheat_input, ":snl")) { @@ -1693,6 +1727,7 @@ void HandleKey(Key key, int key_status) } break; +#if 0 case KSYM_s: if (!global.fps_slowdown) { @@ -1712,7 +1747,9 @@ void HandleKey(Key key, int key_status) printf("fps slowdown disabled\n"); } break; +#endif +#if 0 case KSYM_f: ScrollStepSize = TILEX / 8; printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); @@ -1732,6 +1769,7 @@ void HandleKey(Key key, int key_status) ScrollStepSize = TILEX; printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); break; +#endif case KSYM_v: printf("::: currently using game engine version %d\n",