diff --git a/src/buttons.c b/src/buttons.c index c72f6fb1..5499fa46 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -953,10 +953,13 @@ void Button_Settings(void) {"Merge movement:",1,&(selected_config.Mouse_merge_movement),0,100,4,NULL}, {"Double click speed:",2,&(selected_config.Double_click_speed),1,1999,4,NULL}, {"Double key speed:",2,&(selected_config.Double_key_speed),1,1999,4,NULL}, - {"Mouse speed (fullscreen)",0,NULL,0,0,0,NULL}, - {" horizontally:",1,&(selected_config.Mouse_sensitivity_index_x),1,4,0,Lookup_MouseSpeed}, - {" vertically:",1,&(selected_config.Mouse_sensitivity_index_y),1,4,0,Lookup_MouseSpeed}, + //{"Mouse speed (fullscreen)",0,NULL,0,0,0,NULL}, + //{" horizontally:",1,&(selected_config.Mouse_sensitivity_index_x),1,4,0,Lookup_MouseSpeed}, + //{" vertically:",1,&(selected_config.Mouse_sensitivity_index_y),1,4,0,Lookup_MouseSpeed}, {"Key to swap buttons:",2,&(selected_config.Swap_buttons),0,0,0,Lookup_SwapButtons}, + {"",0,NULL,0,0,0,NULL}, + {"",0,NULL,0,0,0,NULL}, + {"",0,NULL,0,0,0,NULL}, {" --- Editing ---",0,NULL,0,0,0,NULL}, {"Adjust brush pick:",1,&(selected_config.Adjust_brush_pick),0,1,0,Lookup_YesNo}, diff --git a/src/helpfile.h b/src/helpfile.h index 576113e6..6ed351bc 100644 --- a/src/helpfile.h +++ b/src/helpfile.h @@ -454,20 +454,20 @@ static const T_Help_table helptable_credits[] = HELP_TEXT ("") //HELP_TEXT ("0----5----0----5----0----5----0----5----0--X") HELP_TEXT (" anibiqme blumunkee BDCIron ") - HELP_TEXT (" Ced DawnBringer El Topo ") - HELP_TEXT (" falenblood fanickbux fano ") - HELP_TEXT (" fogbot121 Frost Grimmy ") - HELP_TEXT (" Gürkan Sengün Hatch HoraK-FDF ") - HELP_TEXT (" iLKke Iw2evk Jamon ") - HELP_TEXT (" keito kusma Lord Graga ") - HELP_TEXT (" Lorenzo Gatti MagerValp maymunbeyin ") - HELP_TEXT (" mind MooZ Pasi Kallinen ") - HELP_TEXT (" the Peach petter PheeL ") - HELP_TEXT (" Ravey1138 richienyhus sm4tik ") - HELP_TEXT (" spratek Surt tape.yrm ") - HELP_TEXT (" TeeEmCee tempest Timo Kurrpa ") - HELP_TEXT (" titus^Rab Tobé yakumo2975 ") - HELP_TEXT (" 00ai99") + HELP_TEXT (" Ced DarkDefende DawnBringer ") + HELP_TEXT (" El Topo falenblood fanickbux ") + HELP_TEXT (" fano fogbot121 Frost ") + HELP_TEXT (" Grimmy Gürkan Sengün Hatch ") + HELP_TEXT (" HoraK-FDF iLKke Iw2evk ") + HELP_TEXT (" jackfrost128 Jamon keito ") + HELP_TEXT (" kusma Lord Graga Lorenzo Gatti ") + HELP_TEXT (" MagerValp maymunbeyin mind ") + HELP_TEXT (" MooZ Pasi Kallinen the Peach ") + HELP_TEXT (" petter PheeL Ravey1138 ") + HELP_TEXT (" richienyhus sm4tik spratek ") + HELP_TEXT (" Surt tape.yrm TeeEmCee ") + HELP_TEXT (" tempest Timo Kurrpa titus^Rab ") + HELP_TEXT (" Tobé yakumo2975 00ai99") HELP_TEXT ("") HELP_TEXT (" ... posted the annoying bug reports.") HELP_TEXT ("") diff --git a/src/input.c b/src/input.c index 45b54b6f..d9e5273d 100644 --- a/src/input.c +++ b/src/input.c @@ -85,12 +85,6 @@ word Input_new_mouse_Y; byte Input_new_mouse_K; byte Button_inverter=0; // State of the key that swaps mouse buttons. -byte Mouse_mode = 0; ///< Mouse mode = 0:normal, 1:emulated with custom sensitivity. -short Mouse_virtual_x_position; -short Mouse_virtual_y_position; -short Mouse_virtual_width; -short Mouse_virtual_height; - // Joystick/pad configurations for the various console ports. // See the #else for the documentation of fields. // TODO: Make these user-settable somehow. @@ -306,30 +300,8 @@ void Handle_window_exit(__attribute__((unused)) SDL_QuitEvent event) int Handle_mouse_move(SDL_MouseMotionEvent event) { - if (Mouse_mode == 0) - { - Input_new_mouse_X = event.x/Pixel_width; - Input_new_mouse_Y = event.y/Pixel_height; - } - else - { - Mouse_virtual_x_position += event.xrel * 12 / Config.Mouse_sensitivity_index_x; - // Clip - if (Mouse_virtual_x_position > Mouse_virtual_width) - Mouse_virtual_x_position = Mouse_virtual_width; - else if (Mouse_virtual_x_position < 0) - Mouse_virtual_x_position = 0; - - Mouse_virtual_y_position += event.yrel * 12 / Config.Mouse_sensitivity_index_y; - // Clip - if (Mouse_virtual_y_position > Mouse_virtual_height) - Mouse_virtual_y_position = Mouse_virtual_height; - else if (Mouse_virtual_y_position < 0) - Mouse_virtual_y_position = 0; - - Input_new_mouse_X = Mouse_virtual_x_position / 12 / Pixel_width; - Input_new_mouse_Y = Mouse_virtual_y_position / 12 / Pixel_height; - } + Input_new_mouse_X = event.x/Pixel_width; + Input_new_mouse_Y = event.y/Pixel_height; return Move_cursor_with_constraints(); } @@ -1050,32 +1022,13 @@ int Get_input(int sleep_time) void Adjust_mouse_sensitivity(word fullscreen) { - if (fullscreen == 0) - { - Mouse_mode = 0; - return; - } - Mouse_mode = 1; - Mouse_virtual_x_position = 12*Mouse_X*Pixel_width; - Mouse_virtual_y_position = 12*Mouse_Y*Pixel_height; - Mouse_virtual_width = 12*(Screen_width-1)*Pixel_width; - Mouse_virtual_height = 12*(Screen_height-1)*Pixel_height; + // Deprecated + (void)fullscreen; } void Set_mouse_position(void) { - if (Mouse_mode == 0) - { - SDL_WarpMouse( - Mouse_X*Pixel_width, - Mouse_Y*Pixel_height - ); - } - else - { - Mouse_virtual_x_position = 12*Mouse_X*Pixel_width; - Mouse_virtual_y_position = 12*Mouse_Y*Pixel_height; - } + SDL_WarpMouse(Mouse_X*Pixel_width, Mouse_Y*Pixel_height); } int Color_cycling(__attribute__((unused)) void* useless)