CnCNet support

code/gamedirs.cpp

@@ -33,6 +33,11 @@ static char const * const DefaultSearchFolders = "INI,MIX,Maps";
 
 static char const * const ConfigName = "OPENTS.INI";
 
+/*
+ * The folder saved games are kept in, under whichever directory the player's own files go.
+ */
+static char const * const SavedGamesFolder = "Saved Games";
+
 /*
  * The folders the configuration itself is looked for in, relative to the data directory.
  */
@@ -314,6 +319,22 @@ std::string User_File_Write_Name(char const * filename)
 }
 
 
+/// <summary>
+/// Names a saved game inside the folder they are kept in. The folder is not one of the
+/// searched ones and is created here, so a launcher can browse it before the first save is
+/// written.
+/// </summary>
+/// <returns>The name to open, delete or scan for.</returns>
+std::string Saved_Game_Name(char const * filename)
+{
+	std::string const folder = UserDirectory + SavedGamesFolder;
+
+	CreateDirectory(folder.c_str(), NULL);
+
+	return(folder + '\\' + filename);
+}
+
+
 static void Scan_Folder(char const * prefix, char const * pattern, std::vector<std::string> & names)
 {
 	std::string const search = std::string(prefix) + pattern;

code/gamedirs.h

@@ -37,5 +37,11 @@ char const * Game_Directory_Error(void);
  */
 std::string User_File_Write_Name(char const * filename);
 
+/*
+ * Where the player's saved games are. They are never searched for: the folder is named
+ * outright wherever a saved game is opened, listed or removed.
+ */
+std::string Saved_Game_Name(char const * filename);
+
 std::vector<std::string> Parse_Search_Folders(char const * list);
 std::vector<std::string> Search_Files(char const * pattern);

code/house.cpp

@@ -311,6 +311,7 @@ HouseClass::HouseClass(HouseTypeClass const * type) :
 	BuildingsLost(0),
 	WhoLastHurtMe(HOUSE_NONE),
 	Center(0,0,0),
+	SpawnWaypoint(-1),
 	Radius(0),
 	LATime(0),
 	LAEnemy(HOUSE_NONE),
@@ -6491,6 +6492,7 @@ void HouseClass::Serialize(SaveStreamClass & stream)
 	stream.Serialize(EnemyAirForcePrediction);
 	stream.Serialize(EnemyInfantryForcePrediction);
 	stream.Serialize(PowerSurplus);
+	stream.Serialize(SpawnWaypoint);
 }
 
 

code/house.h

@@ -83,8 +83,6 @@ class ObjectTypeClass;
 class SaveStreamClass;
 template<class T> class DynamicVectorClass;
 
-#define HOUSE_NAME_MAX	20
-
 
 /****************************************************************************
 **	Certain aspects of the house "country" are initially set by the scenario
@@ -565,6 +563,7 @@ class HouseClass : public AbstractClass
 		**	the base.
 		*/
 		Coord Center;			// Center of the base.
+		int SpawnWaypoint;		// starting waypoint this house was placed at; -1 = never placed
 		int Radius;				// Average building distance from center (leptons).
 		struct {
 			int AirDefense;

code/house.hh

@@ -14,6 +14,8 @@
 #pragma once
 
 
+#define HOUSE_NAME_MAX	20
+
 /**********************************************************************
 **	The houses that can be played are listed here. Each has their own
 **	personality and strengths.

code/init.cpp

@@ -154,6 +154,7 @@
 #include "scheme.h"
 #include "script.h"
 #include "session.h"
+#include "spawner.h"
 #include "side.h"
 #include "skirmish.h"
 #include "smudtype.h"
@@ -413,18 +414,20 @@ int Init_Game(int , char * [])
 	/*
 	**	Play the startup animation.
 	*/
-	if (Special.IsFromInstall == true) {
-		DebugString("Playing first time intro sequence.\n");
-		Play_Movie("EVA.VQA", THEME_NONE, false);
-	}
+	if (!Spawner_Is_Requested()) {
+		if (Special.IsFromInstall == true) {
+			DebugString("Playing first time intro sequence.\n");
+			Play_Movie("EVA.VQA", THEME_NONE, false);
+		}
 
-	DebugString("Playing startup movies.\n");
-	Play_Movie("WWLOGO.VQA", THEME_NONE);
-	if (!Get_New_Menu()->MixFile) {
-		if (CCFileClass("FS_TITLE.VQA").Is_Available() == true) {
-			Play_Movie("FS_TITLE.VQA", THEME_NONE, false);
-		} else {
-			Play_Movie("STARTUP.VQA", THEME_NONE, false);
+		DebugString("Playing startup movies.\n");
+		Play_Movie("WWLOGO.VQA", THEME_NONE);
+		if (!Get_New_Menu()->MixFile) {
+			if (CCFileClass("FS_TITLE.VQA").Is_Available() == true) {
+				Play_Movie("FS_TITLE.VQA", THEME_NONE, false);
+			} else {
+				Play_Movie("STARTUP.VQA", THEME_NONE, false);
+			}
 		}
 	}
 
@@ -648,6 +651,21 @@ void Init_Campaigns(void)
 }
 
 
+/// <summary>
+/// Reads the countries and the sides they belong to from the rules, so a house's side is
+/// known before anything asks for it.
+/// </summary>
+void Prepare_Side_Roster(void)
+{
+	Rule->Do_HouseTypes(*RuleINI);
+	Rule->Do_Sides(*RuleINI);
+
+	for (int index = 0; index < HouseTypes.Count(); index++) {
+		HouseTypes[index]->Read_INI(*RuleINI);
+	}
+}
+
+
 /// <summary>
 /// Can this campaign be played with the addons that are enabled?
 /// A base game campaign is offered only when no addon is running, and an addon's own
@@ -1072,6 +1090,18 @@ bool Select_Game(bool )
 			}
 		}
 
+		/*
+		 * A launch replaces the menu once. An ended match or a refusal answers false, so the
+		 * process exits and the client sees it go.
+		 */
+		if (Spawner_Is_Requested()) {
+			if (!Spawner_Prepare(gameloaded)) {
+				return(false);
+			}
+			process = false;
+			Theme.Stop(true);
+		}
+
 		while (process) {
 
 			/*
@@ -1118,33 +1148,6 @@ bool Select_Game(bool )
 						break;
 					}
 
-					switch (Options.Difficulty) {
-						case 0:
-							Scen->CDifficulty = DIFF_HARD;
-							Scen->Difficulty = DIFF_EASY;
-							break;
-
-						case 1:
-							Scen->CDifficulty = DIFF_HARD;
-							Scen->Difficulty = DIFF_NORMAL;
-							break;
-
-						case 2:
-							Scen->CDifficulty = DIFF_NORMAL;
-							Scen->Difficulty = DIFF_NORMAL;
-							break;
-
-						case 3:
-							Scen->CDifficulty = DIFF_EASY;
-							Scen->Difficulty = DIFF_NORMAL;
-							break;
-
-						case 4:
-							Scen->CDifficulty = DIFF_EASY;
-							Scen->Difficulty = DIFF_HARD;
-							break;
-					}
-
 					Theme.Stop(true);
 
 					int timeout = (TickCount + 5 * TIMER_SECOND);
@@ -1387,8 +1390,14 @@ bool Select_Game(bool )
 			Session.PlayerIsGDI = stricmp(HouseTypes[Session.Players[0]->Player.House]->Name(), "GDI") == 0;
 		}
 
-		if (Session.Type != GAME_NORMAL || Debug_ForceScenario || Session.Play) {
-			if (!Start_Scenario(Scen->ScenarioName, true, CAMPAIGN_NONE)) {
+		// The menu sets the difficulty pair on every path but a client launch, which chose it.
+		if (!Spawner_Is_Active()) {
+			Session.CampaignDifficulty = (DiffType)Options.Difficulty;
+			Session.CampaignCDifficulty = (DiffType)(DIFF_COUNT - 1 - Options.Difficulty);
+		}
+
+		if (Session.Type != GAME_NORMAL || Debug_ForceScenario || Session.Play || Spawner_Is_Active()) {
+			if (!Start_Scenario(Scen->ScenarioName, true, Spawner_Is_Active() ? Scen->Campaign : CAMPAIGN_NONE)) {
 				if (Debug_Map) {
 					return(false);
 				} else {
@@ -1405,6 +1414,13 @@ bool Select_Game(bool )
 			}
 		}
 
+		// The mission read clears these, so a launch file's carried-over flags are set after it.
+		if (Spawner_Is_Active() && Session.Type == GAME_NORMAL) {
+			for (int index = 0; index < ARRAY_SIZE(Environment.Globals); index++) {
+				Scen->Set_Global_To(index, Environment.Globals[index]);
+			}
+		}
+
 		/*
 		**	Save initialization values if we're recording this game.
 		*/
@@ -1656,6 +1672,12 @@ bool Parse_Command_Line(int argc, char * argv[])
 			continue;
 		}
 
+		// A client asking the game to launch what SPAWN.INI describes.
+		if (stricmp(string, "-SPAWN") == 0) {
+			Spawner_Request();
+			continue;
+		}
+
 		if (memcmp(string, "-TIME=", 6) == 0) {
 			sscanf(&string[6], "%d", &TournamentTime);
 		}
@@ -1831,7 +1853,11 @@ void Init_Random(void)
 	**	a recording; the random number generator is initialized by loading
 	**	the game.
 	*/
-	if (Session.LoadGame || Session.Play) {
+	if (Session.LoadGame) {
+		return;
+	}
+
+	if (Session.Play) {
 		Scen->RandomNumber = Seed;
 		NonCriticalRandomNumber = Seed;
 		DebugString("Seed is %08x\n", Seed);

code/init.h

@@ -42,6 +42,8 @@ void Title_Screen_Restore(bool force=false);
 
 void Init_Campaigns(void);
 
+void Prepare_Side_Roster(void);
+
 void Delete_All_Objects(void);
 
 void Init_Theater(TheaterType theater);

code/language/language.rc

@@ -1426,11 +1426,13 @@ STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "Resume Mission",IDC_RESUME_MISSION,"Button",
-                    BS_OWNERDRAW,120,48,99,14
+                    BS_OWNERDRAW,120,59,99,14
     CONTROL         "Game Controls",IDC_GAME_CONTROLS,"Button",BS_OWNERDRAW,
-                    120,12,99,14
+                    120,8,99,14
+    CONTROL         "Save Game",IDC_SAVE_GAME,"Button",BS_OWNERDRAW,
+                    120,25,99,14
     CONTROL         "Abort Mission",IDC_ABORT_MISSION,"Button",BS_OWNERDRAW,
-                    120,30,99,14
+                    120,42,99,14
     CONTROL         "Slider1",IDC_GAME_SPEED_SLIDER,"msctls_trackbar32",
                     TBS_BOTH | TBS_NOTICKS,95,115,148,13
     LTEXT           "Game Speed",-1,39,115,58,13,SS_CENTERIMAGE | NOT