Skip to content

Commit

Permalink
cleanup: Change variable name for clarity.
Browse files Browse the repository at this point in the history
  • Loading branch information
littleguy77 committed Jan 14, 2013
1 parent e912269 commit ce18401
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/paulscode/android/mupen64plusae/persistent/UserPrefs.java
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,13 @@ else if( isFpsEnabled )
isPlugged4 = inputMap4.isEnabled();

// Determine whether controller deconfliction is needed
int numPlayers = 0;
numPlayers += inputMap1.isEnabled() ? 1 : 0;
numPlayers += inputMap2.isEnabled() ? 1 : 0;
numPlayers += inputMap3.isEnabled() ? 1 : 0;
numPlayers += inputMap4.isEnabled() ? 1 : 0;
int numControllers = 0;
numControllers += inputMap1.isEnabled() ? 1 : 0;
numControllers += inputMap2.isEnabled() ? 1 : 0;
numControllers += inputMap3.isEnabled() ? 1 : 0;
numControllers += inputMap4.isEnabled() ? 1 : 0;
boolean isControllerShared = prefsData.getBoolean( "inputShareController", false );
playerMap.setEnabled( numPlayers > 1 && !isControllerShared );
playerMap.setEnabled( numControllers > 1 && !isControllerShared );

// Determine the key codes that should not be mapped to controls
boolean volKeysMappable = prefsData.getBoolean( "inputVolumeMappable", false );
Expand Down

0 comments on commit ce18401

Please sign in to comment.