speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Bug #825 - fixes control menus for different players

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5506 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 60bfa4f314dff4b0582939176273da1e59934c85
Former-commit-id: 896fc5594c8e1291173312c851d95f914e8a2d89
This commit is contained in:
mungewell 2013-06-11 05:41:00 +00:00
parent acfdeda347
commit 98c736bba6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
View file

@ -610,15 +610,6 @@ ControlMenuInit(void *prevMenu, void *prefHdle, unsigned index, tGearChangeMode
{ {
int i; int i;
/* Don't recreate screen if already done */
if (ScrHandle) {
if (PrevScrHandle != prevMenu)
// Need to re-create screen as parent has changed
GfuiScreenRelease(ScrHandle);
else
return ScrHandle;
}
ReloadValues = 1; ReloadValues = 1;
PrevScrHandle = prevMenu; PrevScrHandle = prevMenu;
PrefHdle = prefHdle; PrefHdle = prefHdle;
@ -630,6 +621,15 @@ ControlMenuInit(void *prevMenu, void *prefHdle, unsigned index, tGearChangeMode
/* Set specified gear changing mode for current player */ /* Set specified gear changing mode for current player */
GearChangeMode = gearChangeMode; GearChangeMode = gearChangeMode;
/* Don't recreate screen if already done */
if (ScrHandle) {
if (PrevScrHandle != prevMenu)
// Need to re-create screen as parent has changed
GfuiScreenRelease(ScrHandle);
else
return ScrHandle;
}
/* Initialize joysticks array */ /* Initialize joysticks array */
for (int jsInd = 0; jsInd < GFCTRL_JOY_NUMBER; jsInd++) for (int jsInd = 0; jsInd < GFCTRL_JOY_NUMBER; jsInd++)
Joystick[jsInd] = 0; Joystick[jsInd] = 0;