Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
krazynez committed Jan 3, 2025
2 parents c69b2a9 + dca52f8 commit dc91c52
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions contrib/SETTINGS.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ always, qaflags, on

# Luxor doesn't like Inferno Cache
ULUS10201, infernocache, off

# Enable Extra RAM on GTA LCS and VCS
ULUS10041 ULUS10160 ULES00151 ULES00502, highmem, on
2 changes: 1 addition & 1 deletion extras/menus/arkMenu/src/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ u32 Controller::get_buttons() {
}

bool Controller::any(){
return (newpad!=0);
return ((newpad&0xFFFF)!=0);
}

bool Controller::accept(){
Expand Down

0 comments on commit dc91c52

Please sign in to comment.