player control init: fallback to existing control sets if selected control set not found

src/control/C4PlayerControl.cpp

@@ -465,12 +465,12 @@ bool C4PlayerControlAssignmentSets::ResolveRefs(C4PlayerControlDefs *pDefs)
 	}
 
 C4PlayerControlAssignmentSet *C4PlayerControlAssignmentSets::GetSetByName(const char *szName)
-	{
+{
 	for (AssignmentSetList::iterator i = Sets.begin(); i != Sets.end(); ++i)
-		if (SEqual((*i).GetName(), szName))
+		if (WildcardMatch(szName, (*i).GetName()))
 			return &*i;
 	return NULL;
-	}
+}
 
 
 /* C4PlayerControlFile */

src/game/landscape/C4Weather.cpp

@@ -293,7 +293,7 @@ void C4Weather::CompileFunc(StdCompiler *pComp)
 	pComp->Value(mkNamingAdapt(VolcanoLevel,     "VolcanoLevel",          0));
 	pComp->Value(mkNamingAdapt(EarthquakeLevel,  "EarthquakeLevel",       0));
 	pComp->Value(mkNamingAdapt(LightningLevel,   "LightningLevel",        0));
-	pComp->Value(mkNamingAdapt(NoGamma,          "NoGamma",               true));
+	pComp->Value(mkNamingAdapt(NoGamma,          "NoGamma",               0));
 	uint32_t dwGammaDefaults[C4MaxGammaRamps*3];
 	for (int32_t i=0; i<C4MaxGammaRamps; ++i)
 		{

src/game/player/C4Player.cpp

@@ -1639,24 +1639,24 @@ void C4Player::ScrollView(int32_t iX, int32_t iY, int32_t ViewWdt, int32_t ViewH
 	}
 
 void C4Player::InitControl()
-	{
+{
 	// Check local control
 	LocalControl = false;
 	if (AtClient == ::Control.ClientID())
 		if (!GetInfo() || GetInfo()->GetType() == C4PT_User)
 			LocalControl=true;
-  // Set control
-  ControlSet=C4P_Control_None;
+	// Set control
+	ControlSet=C4P_Control_None;
 	// Preferred control
-  int32_t iControl = PrefControl;
+	int32_t iControl = PrefControl;
 	// gamepad control safety
 	if (Inside<int32_t>(iControl, C4P_Control_GamePad1, C4P_Control_GamePadMax) && !Config.General.GamepadEnabled)
-		{
+	{
 		iControl = C4P_Control_Keyboard1;
-		}
+	}
 	// Choose next while control taken
 	if (::Players.ControlTaken(iControl))
-		{
+	{
 		// Preferred control taken, search for available keyboard control
 		for (iControl=C4P_Control_Keyboard1; iControl<=C4P_Control_Keyboard2; iControl++)
 			if (!::Players.ControlTaken(iControl)) // Available control found
@@ -1664,15 +1664,15 @@ void C4Player::InitControl()
 		// No available control found
 		if (iControl>C4P_Control_Keyboard2)
 			iControl=C4P_Control_None;
-		}
+	}
 	// Set control
 	ControlSet=iControl;
 	// init gamepad
 	if (pGamepad) { delete pGamepad; pGamepad=NULL; }
 	if (Inside<int32_t>(ControlSet, C4P_Control_GamePad1, C4P_Control_GamePadMax))
-		{
+	{
 		pGamepad = new C4GamePadOpener(ControlSet - C4P_Control_GamePad1);
-		}
+	}
 	// Mouse
 	if (PrefMouse && !::Control.isReplay())
 		if (!Game.C4S.Head.DisableMouse)
@@ -1686,8 +1686,26 @@ void C4Player::InitControl()
 	// init control callbacks
 	StdStrBuf sKeysetName;
 	sKeysetName.Format("Keyboard%d%s", ControlSet, PrefControlStyle ? "" : "Classic");
-	Control.RegisterKeyset(Number, Game.PlayerControlAssignmentSets.GetSetByName(sKeysetName.getData()));
+	C4PlayerControlAssignmentSet *keyset = Game.PlayerControlAssignmentSets.GetSetByName(sKeysetName.getData());
+	if (!keyset)
+	{
+		// the correct keyset could not be found. fallback to something useful...
+		if (!PrefControlStyle)
+		{
+			keyset = Game.PlayerControlAssignmentSets.GetSetByName("Keyboard*Classic");
+		}
+		if (!keyset)
+		{
+			keyset = Game.PlayerControlAssignmentSets.GetSetByName("Keyboard*");
+		}
+		if (!keyset)
+		{
+			// now we're really desperate...
+			keyset = Game.PlayerControlAssignmentSets.GetSetByName("*");
+		}
 	}
+	Control.RegisterKeyset(Number, keyset);
+}
 
 int igOffX, igOffY;
 

src/platform/StdFile.h

@@ -81,7 +81,7 @@ void MakeTempFilename(char *szFileName);
 void MakeTempFilename(class StdStrBuf *sFileName);
 bool WildcardListMatch(const char *szWildcardList, const char *szString); // match string in list like *.png|*.bmp
 bool IsWildcardString(const char *szString); // does szString contain wildcard characters?
-bool WildcardMatch(const char *szFName1, const char *szFName2);
+bool WildcardMatch(const char *szWildcard, const char *szString);
 bool TruncatePath(char *szPath);
 // szBuffer has to be of at least _MAX_PATH length.
 bool GetParentPath(const char *szFilename, char *szBuffer);