diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp index c88461d65..acc042af0 100644 --- a/src/sdl_window.cpp +++ b/src/sdl_window.cpp @@ -261,6 +261,8 @@ void WindowSDL::parseInputConfig(const std::string& filename) { std::cerr << "Invalid line format: " << line << std::endl; continue; } + // strip the ; that we put there so that the braindead clang-format is happy + line = line.substr(0, line.length() - 1); std::string controller_input = line.substr(0, equal_pos); std::string kbm_input = line.substr(equal_pos + 1); diff --git a/user/keyboardInputConfig.ini b/user/keyboardInputConfig.ini index 096f3a3f0..8f9f47b82 100644 --- a/user/keyboardInputConfig.ini +++ b/user/keyboardInputConfig.ini @@ -1,64 +1,72 @@ #SPDX - FileCopyrightText : Copyright 2024 shadPS4 Emulator Project #SPDX - License - Identifier : GPL - 2.0 - or -later -#controller button mappings +#Controller button mappings -#taken keys: -#f11 : fullscreen -#f10 : fps counter -#f9 : toggle mouse capture -#f8 : reparse keyboard input(this) +#Taken keys: +#F11 : fullscreen +#F10 : FPS counter +#F9 : toggle mouse capture +#F8 : reparse keyboard input(this) -#this is a mapping for bloodborne inspired by other souls titles on pc +#This is a mapping for Bloodborne, inspired by other Souls titles on PC. -#use another item(healing), change status in inventory -triangle = f -#dodge, back in inv - circle = space -#interact, select item in inv - cross = e -#use quick item, remove item in inv - square = r +#Use another item(healing), change status in inventory +triangle = f; -#emergency extra bullets - up = w, - lalt -#change quick item - down = s, - lalt -#change weapon in left hand - left = a, - lalt -#change weapon in right hand - right = d, - lalt +#Dodge, back in inventory +circle = space; -#menu - options = escape -#gestures - touchpad = g +#Interact, select item in inventory +cross = e; -#transform - l1 = rightbutton, - lshift -#shoot - r1 = leftbutton -#light attack - l2 = rightbutton -#heavy attack - r2 = leftbutton, - lshift +#Use quick item, remove item in inventory +square = r; -#does nothing - l3 = x -#center cam, lock on - r3 = q +#Emergency extra bullets +up = w, lalt; -#axis mappings -#move - axis_left_x_minus = a axis_left_x_plus = d axis_left_y_minus = - w axis_left_y_plus = s -#og cam input +#Change quick item +down = s, lalt; + +#Change weapon in left hand +left = a, lalt; + +#Change weapon in right hand +right = d, lalt; + +#Menu +options = escape; + +#Gestures +touchpad = g; + +#Transform +l1 = rightbutton, lshift; + +#Shoot +r1 = leftbutton; + +#Light attack +l2 = rightbutton; + +#Heavy attack +r2 = leftbutton, lshift; + +#Does nothing +l3 = x; + +#Center cam, lock on +r3 = q; + +#Axis mappings +#Move +axis_left_x_minus = a; +axis_left_x_plus = d; +axis_left_y_minus = w; +axis_left_y_plus = s; + +#Original camera input(disabled in current config) #axis_right_x_minus = j #axis_right_x_plus = l #axis_right_y_minus = i