Ease changing default map maxplayers.

Closes ticket 4849.
Warzone2100 · Dec 8, 2018 · 5807d38 · 5807d38
1 parent db81858
commit 5807d38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/configuration.cpp b/src/configuration.cpp
@@ -143,7 +143,7 @@ bool loadConfig()
 	// Set a default map to prevent hosting games without a map.
 	sstrcpy(game.map, DEFAULTSKIRMISHMAP);
 	game.hash.setZero();
-	game.maxPlayers = 4;
+	game.maxPlayers = DEFAULTSKIRMISHMAPMAXPLAYERS;
 
 	game.techLevel = 1;
 
@@ -346,7 +346,7 @@ bool reloadMPConfig()
 		// Set a default map to prevent hosting games without a map.
 		sstrcpy(game.map, DEFAULTSKIRMISHMAP);
 		game.hash.setZero();
-		game.maxPlayers = 4;
+		game.maxPlayers = DEFAULTSKIRMISHMAPMAXPLAYERS;
 
 		ini.setValue("powerLevel", game.power);				// power
 		ini.setValue("base", game.base);				// size of base
@@ -365,7 +365,7 @@ bool reloadMPConfig()
 	// Set a default map to prevent hosting games without a map.
 	sstrcpy(game.map, DEFAULTSKIRMISHMAP);
 	game.hash.setZero();
-	game.maxPlayers = 4;
+	game.maxPlayers = DEFAULTSKIRMISHMAPMAXPLAYERS;
 
 	game.power = ini.value("powerLevel", LEV_MED).toInt();
 	game.base = ini.value("base", CAMP_BASE).toInt();

diff --git a/src/configuration.h b/src/configuration.h
@@ -30,5 +30,6 @@ bool reloadMPConfig();
 
 /// Default map for Skirmish
 static const char DEFAULTSKIRMISHMAP[] = "Sk-Rush";
+static const int DEFAULTSKIRMISHMAPMAXPLAYERS = 4;
 
 #endif // __INCLUDED_SRC_CONFIGURATION_H__
diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -4039,7 +4039,7 @@ bool startMultiOptions(bool bReenter)
 			game.type = SKIRMISH;
 			sstrcpy(game.map, DEFAULTSKIRMISHMAP);
 			game.hash = levGetMapNameHash(game.map);
-			game.maxPlayers = 4;
+			game.maxPlayers = DEFAULTSKIRMISHMAPMAXPLAYERS;
 		}
 
 		ingame.localOptionsReceived = false;