Skip to content
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.

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

Explicitly define gamepad type for console platforms #7660

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CMake/platforms/ps4.cmake
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ set(UBSAN OFF)
SET(DISABLE_LTO ON)
set(NONET ON)
set(NOEXIT ON)
set(DEVILUTIONX_GAMEPAD_TYPE PlayStation)
set(BUILD_ASSETS_MPQ ON)

# Packbrew SDK provides SDL_image, but FindSDL2_image() fails to
1 change: 1 addition & 0 deletions CMake/platforms/switch.cmake
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ set(DEVILUTIONX_SYSTEM_SDL_IMAGE OFF)
set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
set(DISABLE_ZERO_TIER ON)
set(PREFILL_PLAYER_NAME ON)
set(DEVILUTIONX_GAMEPAD_TYPE Nintendo)
set(NOEXIT ON)

set(JOY_BUTTON_DPAD_LEFT 16)
1 change: 1 addition & 0 deletions CMake/platforms/uwp_lib.cmake
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ set(UBSAN OFF)
set(BUILD_ASSETS_MPQ OFF)
set(BUILD_TESTING OFF)
set(DISCORD_INTEGRATION OFF)
set(DEVILUTIONX_GAMEPAD_TYPE Xbox)

# setting all libs to be built statically and from source
set(DEVILUTIONX_SYSTEM_SDL2 OFF)
1 change: 1 addition & 0 deletions CMake/platforms/vita.cmake
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
set(BUILD_TESTING OFF)
set(DISABLE_ZERO_TIER ON)
set(PREFILL_PLAYER_NAME ON)
set(DEVILUTIONX_GAMEPAD_TYPE PlayStation)
set(NOEXIT ON)

list(APPEND DEVILUTIONX_PLATFORM_SUBDIRECTORIES platform/vita)

Unchanged files with check annotations Beta

* This approximates that diagonal movement on a square grid should have a cost
* of sqrt(2). That's approximately 1.5, so they multiply all step costs by 2,
* except diagonal steps which are times 3
*/

Check warning on line 173 in Source/engine/path.cpp

GitHub Actions / build

'return': conversion from 'size_t' to 'int', possible loss of data
int GetDistance(Point startPosition, Point destinationPosition)
{
if (startPosition.x == destinationPosition.x || startPosition.y == destinationPosition.y)