From 70424edcd807ba2c614e1e13bf8d300c8da5ced2 Mon Sep 17 00:00:00 2001
From: Xerxes <5236639+xerxes-at@users.noreply.github.com>
Date: Fri, 3 Apr 2020 17:17:30 +0200
Subject: [PATCH] Rewrite how give_personality_characters and
 give_team_characters are called.

I got rid of all includes and are using a level variable that always points to the correct method. Each game modes init method for each map does set this to whatever the current combination of map and gamemode needs. This way we can use one gsc file for all maps without the need to edit anything.
---
 MapRestartWorkaround/main.gsc | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/MapRestartWorkaround/main.gsc b/MapRestartWorkaround/main.gsc
index dca50fa..5f39828 100644
--- a/MapRestartWorkaround/main.gsc
+++ b/MapRestartWorkaround/main.gsc
@@ -1,14 +1,5 @@
 #include maps\mp\_utility;
 #include common_scripts\utility;
-//these map specific includes are all required for give_team_characters(), and give_personality_characters to work
-#include maps\mp\zm_alcatraz_grief_cellblock;
-#include maps\mp\zm_prison;
-#include maps\mp\zm_highrise;
-#include maps\mp\zm_transit;
-#include maps\mp\zm_buried;
-#include maps\mp\zm_tomb;
-#include maps\mp\zm_nuked;
-#include maps\mp\zombies\_zm_utility;
 
 init()
 {
@@ -17,17 +8,10 @@ init()
     for(;;)
     {
         level waittill("connected", player);
-        if ( level.scr_zm_ui_gametype_group == "zencounter" || level.scr_zm_ui_gametype_group == "zsurvival" )
-        {
-       		player thread give_team_characters(); //the real cause of the invisible player glitch these 2 functions aren't always called on map_restart so call them here
-       	}
-       	else 
-      	{
-      	 	player thread give_personality_characters(); //this has to commented out when loading nuketown
-		//unfortunately nuketown is the only map without this function therefore it can't find it and the server will throw an error
-		//the only way to fix this would be to copy both give_team_characters() and give_personality_characters() into this file and account for all maps
-		//this would make the fix more cumbersome which is why I haven't done it
-      	}	
+		player thread [[level.givecustomcharacters]]();
+		//The real cause of the invisible player glitch is that this function isn't always called on map_restart so call it here.
+		//This will just call the method the map uses for give_personality_characters or give_team_characters without all the includes and it workes on NukeTown as well.
+		//We don't need to check the game mode since each game mode's init function does set level.givecustomcharacters with an pointer to the correct method.
     }
 }