Skip to content

DevilutionX: Controller support #2548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nadenislamarre merged 1 commit into from
Nov 28, 2020
Merged

DevilutionX: Controller support #2548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...ore/batocera-configgen/configgen/configgen/generators/devilutionx/devilutionxGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import Command
from generators.Generator import Generator
import controllersConfig


class DevilutionXGenerator(Generator):

Expand All @@ -10,5 +12,9 @@ def generate(self, system, rom, playersControllers, gameResolution):
"--config-dir", "/userdata/system/config/devilutionx",
"--save-dir", "/userdata/saves/devilutionx"]
if system.isOptSet('showFPS') and system.getOptBoolean('showFPS') == True:
commandArray.append("-f")
return Command.Command(array=commandArray)
commandArray.append("-f")
return Command.Command(
array=commandArray,
env={
'SDL_GAMECONTROLLERCONFIG': controllersConfig.generateSdlGameControllerConfig(playersControllers)
})
3 changes: 1 addition & 2 deletions package/batocera/emulators/devilutionx/devilutionx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
#
################################################################################

# The first commit that allows specifying `--config-dir` (24 Nov 2020)
DEVILUTIONX_VERSION = 9c7d6c96
DEVILUTIONX_VERSION = b10b4381
DEVILUTIONX_SITE = $(call github,diasurgical,devilutionx,$(DEVILUTIONX_VERSION))
DEVILUTIONX_DEPENDENCIES = sdl2 sdl2_mixer sdl2_image sdl2_ttf libsodium

Expand Down