mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-format fucked up the .ini file

Browse Source
This commit is contained in:
kalaposfos13 2024-10-12 17:41:23 +02:00
parent 98200221f5
commit 22e4ab866b
2 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sdl_window.cpp
View File

@ -261,6 +261,8 @@ void WindowSDL::parseInputConfig(const std::string& filename) {
std::cerr << "Invalid line format: " << line << std::endl; std::cerr << "Invalid line format: " << line << std::endl;
continue; 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 controller_input = line.substr(0, equal_pos);
std::string kbm_input = line.substr(equal_pos + 1); std::string kbm_input = line.substr(equal_pos + 1);

108
user/keyboardInputConfig.ini
View File

@ -1,64 +1,72 @@
#SPDX - FileCopyrightText : Copyright 2024 shadPS4 Emulator Project #SPDX - FileCopyrightText : Copyright 2024 shadPS4 Emulator Project
#SPDX - License - Identifier : GPL - 2.0 - or -later #SPDX - License - Identifier : GPL - 2.0 - or -later
#controller button mappings #Controller button mappings
#taken keys: #Taken keys:
#f11 : fullscreen #F11 : fullscreen
#f10 : fps counter #F10 : FPS counter
#f9 : toggle mouse capture #F9 : toggle mouse capture
#f8 : reparse keyboard input(this) #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 #Use another item(healing), change status in inventory
triangle = f triangle = f;
#dodge, back in inv
circle = space
#interact, select item in inv
cross = e
#use quick item, remove item in inv
square = r
#emergency extra bullets #Dodge, back in inventory
up = w, circle = space;
lalt
#change quick item
down = s,
lalt
#change weapon in left hand
left = a,
lalt
#change weapon in right hand
right = d,
lalt
#menu #Interact, select item in inventory
options = escape cross = e;
#gestures
touchpad = g
#transform #Use quick item, remove item in inventory
l1 = rightbutton, square = r;
lshift
#shoot
r1 = leftbutton
#light attack
l2 = rightbutton
#heavy attack
r2 = leftbutton,
lshift
#does nothing #Emergency extra bullets
l3 = x up = w, lalt;
#center cam, lock on
r3 = q
#axis mappings #Change quick item
#move down = s, lalt;
axis_left_x_minus = a axis_left_x_plus = d axis_left_y_minus =
w axis_left_y_plus = s #Change weapon in left hand
#og cam input 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_minus = j
#axis_right_x_plus = l #axis_right_x_plus = l
#axis_right_y_minus = i #axis_right_y_minus = i