improved code for default keyboard

White Dragon · White Dragon · commit 691299b6eb41 · 2018-07-05T23:01:59.000+02:00
diff --git a/engine/sdl/control.c b/engine/sdl/control.c
@@ -855,7 +855,7 @@ void control_update(s_playercontrols ** playercontrols, int numplayers)
 
 		k = 0;
 
-		for(i=0;i<JOY_MAX_INPUTS;i++)
+		for(i = 0; i < JOY_MAX_INPUTS; i++)
 		{
 			t = pcontrols->settings[i];
 			if(t >= SDLK_FIRST && t < SDLK_LAST){
@@ -864,8 +864,10 @@ void control_update(s_playercontrols ** playercontrols, int numplayers)
 		}
 
         //White Dragon: Set input from default keys overriding previous keys
-        if (player <= 0) {
-            for(i=0;i<JOY_MAX_INPUTS;i++)
+        //Default keys are available just if no configured keys are pressed!
+        if (player <= 0 && !k)
+        {
+            for(i = 0; i < JOY_MAX_INPUTS; i++)
             {
                 t = default_control.settings[i];
                 if(t >= SDLK_FIRST && t < SDLK_LAST){
@@ -876,7 +878,7 @@ void control_update(s_playercontrols ** playercontrols, int numplayers)
 
 		if(usejoy)
 		{
-			for(i=0; i<JOY_MAX_INPUTS; i++)
+			for(i = 0; i < JOY_MAX_INPUTS; i++)
 			{
 				t = pcontrols->settings[i];
 				if(t >= JOY_LIST_FIRST && t <= JOY_LIST_LAST)

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ void control_update(s_playercontrols ** playercontrols, int numplayers)`
`855`	`855`
`856`	`856`	`k = 0;`
`857`	`857`
`858`		`- for(i=0;i<JOY_MAX_INPUTS;i++)`
	`858`	`+ for(i = 0; i < JOY_MAX_INPUTS; i++)`
`859`	`859`	`{`
`860`	`860`	`t = pcontrols->settings[i];`
`861`	`861`	`if(t >= SDLK_FIRST && t < SDLK_LAST){`
`@@ -864,8 +864,10 @@ void control_update(s_playercontrols ** playercontrols, int numplayers)`
`864`	`864`	`}`
`865`	`865`
`866`	`866`	`//White Dragon: Set input from default keys overriding previous keys`
`867`		`- if (player <= 0) {`
`868`		`- for(i=0;i<JOY_MAX_INPUTS;i++)`
	`867`	`+ //Default keys are available just if no configured keys are pressed!`
	`868`	`+ if (player <= 0 && !k)`
	`869`	`+ {`
	`870`	`+ for(i = 0; i < JOY_MAX_INPUTS; i++)`
`869`	`871`	`{`
`870`	`872`	`t = default_control.settings[i];`
`871`	`873`	`if(t >= SDLK_FIRST && t < SDLK_LAST){`
`@@ -876,7 +878,7 @@ void control_update(s_playercontrols ** playercontrols, int numplayers)`
`876`	`878`
`877`	`879`	`if(usejoy)`
`878`	`880`	`{`
`879`		`- for(i=0; i<JOY_MAX_INPUTS; i++)`
	`881`	`+ for(i = 0; i < JOY_MAX_INPUTS; i++)`
`880`	`882`	`{`
`881`	`883`	`t = pcontrols->settings[i];`
`882`	`884`	`if(t >= JOY_LIST_FIRST && t <= JOY_LIST_LAST)`