Allow the player to become one of the factions in the big map

Andrettin · Aug 21, 2016 · 60f11a7 · 60f11a7
1 parent bd7b686
commit 60f11a7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -108,6 +108,9 @@ GameResults GameResult;                      /// Outcome of the game
 
 std::string GameName;
 std::string FullGameName;
+//Wyrmgus start
+std::string PlayerFaction;
+//Wyrmgus end
 
 unsigned long GameCycle;             /// Game simulation cycle counter
 unsigned long FastForwardCycle;      /// Cycle to fastforward to in a replay

diff --git a/src/include/stratagus.h b/src/include/stratagus.h
@@ -188,6 +188,9 @@ extern const char NameLine[];
 
 extern std::string StratagusLibPath;        /// Location of stratagus data
 extern std::string MenuRace;
+//Wyrmgus start
+extern std::string PlayerFaction;
+//Wyrmgus end
 
 extern unsigned long GameCycle;             /// Game simulation cycle counter
 extern unsigned long FastForwardCycle;      /// Game Replay Fast Forward Counter

diff --git a/src/map/script_map.cpp b/src/map/script_map.cpp
@@ -590,6 +590,15 @@ void ApplyMapTemplate(std::string map_template_ident, int template_start_x, int
 		}
 	}
 
+	if (!PlayerFaction.empty()) {
+		CFaction *player_faction = PlayerRaces.GetFaction(-1, PlayerFaction);
+
+		if (player_faction) {
+			ThisPlayer->SetCivilization(player_faction->Civilization);
+			ThisPlayer->SetFaction(player_faction->Name);
+		}
+	}
+
 	for (size_t i = 0; i < map_template->Subtemplates.size(); ++i) {
 		Vec2i random_pos(0, 0);
 		Vec2i min_pos(0, 0);

diff --git a/src/tolua/game.pkg b/src/tolua/game.pkg
@@ -38,6 +38,10 @@ extern tolua_property__s int GameSpeed;
 extern bool GameObserve;
 extern bool GameEstablishing;
 
+//Wyrmgus start
+extern std::string PlayerFaction;
+//Wyrmgus end
+
 extern unsigned long GameCycle;
 extern unsigned long FastForwardCycle;
 //Wyrmgus start