Add a utility function to get a CSmPlayer from a CUser. Rename deprec…

…ated classes and variables.
maniaplanet · Nov 15, 2017 · 9f76f95 · 9f76f95
1 parent 1ae3eef
commit 9f76f95
Showing 1 changed file with 33 additions and 7 deletions.
diff --git a/Common/Scripts/Libs/Nadeo/ShootMania/SM3.Script.txt b/Common/Scripts/Libs/Nadeo/ShootMania/SM3.Script.txt
@@ -2,7 +2,7 @@
  *	Utilility functions for ShootMania
  */
 
-#Const Version		"2017-01-31"
+#Const Version		"2017-10-17"
 #Const ScriptName	"Libs/Nadeo/ShootMania/SM2.Script.txt"
 
 // ---------------------------------- //
@@ -58,7 +58,7 @@ Text GetScriptName() {
  *	@param	_ClanNum			The clan in which the player will be spawned
  *	@param	_Landmark			The landmark where the player will be spawned
  */
-Void Spawn(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn) {
+Void Spawn(CSmPlayer _Player, Integer _ClanNum, CMapSpawn _Spawn) {
 	This.SpawnPlayer(_Player, _ClanNum, -1, _Spawn, -1);
 	if(_Player.Score != Null) Ladder::AddPlayer(_Player.Score);
 }
@@ -71,7 +71,7 @@ Void Spawn(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn) {
  *	@param	_Landmark			The landmark where the player will be spawned
  *	@param	_ActivationDate		When the player will be spawned
  */
-Void Spawn(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn, Integer _ActivationDate) {
+Void Spawn(CSmPlayer _Player, Integer _ClanNum, CMapSpawn _Spawn, Integer _ActivationDate) {
 	This.SpawnPlayer(_Player, _ClanNum, -1, _Spawn, _ActivationDate);
 	if(_Player.Score != Null) Ladder::AddPlayer(_Player.Score);
 }
@@ -85,7 +85,7 @@ Void Spawn(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn, Intege
  *	@param	_Landmark			The landmark where the player will be spawned
  *	@param	_ActivationDate		When the player will be spawned
  */
-Void Spawn(CSmPlayer _Player, Integer _ClanNum, Integer _Armor, CSmMapPlayerSpawn _Spawn, Integer _ActivationDate) {
+Void Spawn(CSmPlayer _Player, Integer _ClanNum, Integer _Armor, CMapSpawn _Spawn, Integer _ActivationDate) {
 	This.SpawnPlayer(_Player, _ClanNum, _Armor, _Spawn, _ActivationDate);
 	if(_Player.Score != Null) Ladder::AddPlayer(_Player.Score);
 }
@@ -97,7 +97,7 @@ Void Spawn(CSmPlayer _Player, Integer _ClanNum, Integer _Armor, CSmMapPlayerSpaw
  *	@param	_ClanNum			The clan in which the player will be spawned
  *	@param	_Landmark			The landmark where the player will be spawned
  */
-Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn) {
+Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, CMapSpawn _Spawn) {
 	This.SpawnPlayer(_Player, _ClanNum, -1, _Spawn, -1);
 }
 
@@ -109,7 +109,7 @@ Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn
  *	@param	_Landmark			The landmark where the player will be spawned
  *	@param	_ActivationDate		When the player will be spawned
  */
-Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn, Integer _ActivationDate) {
+Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, CMapSpawn _Spawn, Integer _ActivationDate) {
 	This.SpawnPlayer(_Player, _ClanNum, -1, _Spawn, _ActivationDate);
 }
 
@@ -122,7 +122,7 @@ Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, CSmMapPlayerSpawn _Spawn
  *	@param	_Landmark			The landmark where the player will be spawned
  *	@param	_ActivationDate		When the player will be spawned
  */
-Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, Integer _Armor, CSmMapPlayerSpawn _Spawn, Integer _ActivationDate) {
+Void SpawnNoLadder(CSmPlayer _Player, Integer _ClanNum, Integer _Armor, CMapSpawn _Spawn, Integer _ActivationDate) {
 	This.SpawnPlayer(_Player, _ClanNum, _Armor, _Spawn, _ActivationDate);
 }
 
@@ -223,6 +223,32 @@ CSmPlayer GetPlayer(Text _Login) {
 	return Null;
 }
 
+// ---------------------------------- //
+/** Get a player from its User
+ *
+ *	@param	_User											The source User
+ *
+ *	@return														The player if found
+ *																		Null otherwise
+ */
+CSmPlayer GetPlayer(CUser _User) {
+	if (_User == Null) return Null;
+
+	declare LibSM3_PlayerId for _User = NullId;
+	if (LibSM3_PlayerId != NullId && AllPlayers.existskey(LibSM3_PlayerId)) {
+		return AllPlayers[LibSM3_PlayerId];
+	}
+
+	foreach (Player in AllPlayers) {
+		if (Player.User == _User) {
+			LibSM3_PlayerId = Player.Id;
+			return Player;
+		}
+	}
+
+	return Null;
+}
+
 // ---------------------------------- //
 /**	Get a user from its login
  *