LOC FILES: Always load when playing back demo

Reported as broken by !Nico on Discord
Previous forced to always load by MVD stats code,
  which was fixed by QW-Group@84cb09d
But didn't load .locs during demoplayback by default
  (this seems over 17 years old)
Now always load during demoplayback, and get rid of
  the workaround in mvd stats code

match_tools.c

@@ -59,8 +59,6 @@ cvar_t match_name_on = {"match_name_on", "on"};
 cvar_t match_name_nick = {"match_name_nick", ""};			
 cvar_t match_name_spec = {"match_name_spec", "(SPEC)"};		
 
-int loc_loaded = 0;
-
 char *CL_DemoDirectory(void);
 
 static char *MT_CleanString(char *string, qbool allow_spaces_and_slashes) {
@@ -754,7 +752,6 @@ void MT_NewMap(void)
 {
 	MT_CancelMatch();
 	MT_ClearClientState();
-	loc_loaded=0;
 }
 
 void MT_Disconnect(void)

mvd_utils.c

@@ -200,7 +200,6 @@ static int fixed_ordering = 0;
 
 extern cvar_t tp_name_none, tp_weapon_order;
 char mvd_info_best_weapon[20];
-extern int loc_loaded;
 
 extern qbool TP_LoadLocFile(char* path, qbool quiet);
 extern char* TP_LocationName(vec3_t location);
@@ -1045,7 +1044,6 @@ char* MVD_BestAmmo(int i) {
 	}
 }
 
-
 void MVD_Info(void) {
 	char str[1024];
 	char mvd_info_final_string[1024], mvd_info_powerups[20], mvd_info_header_string[1024];
@@ -1059,12 +1057,6 @@ void MVD_Info(void) {
 
 	z = 1;
 
-	if (loc_loaded == 0) {
-		char* mapname = TP_MapName();
-		TP_LoadLocFile(mapname, true);
-		loc_loaded = 1;
-	}
-
 	if (!mvd_info.value)
 		return;
 

teamplay_locfiles.c

@@ -552,7 +552,9 @@ void TP_LocFiles_NewMap(void)
 
 	if (strcmp(mapname, last_map)) {	// map name has changed
 		TP_ClearLocs();					// clear loc file
-		if (tp_loadlocs.integer && cl.deathmatch && !cls.demoplayback) {
+
+		// always load when playing back demos (teaminfo might be enabled etc)
+		if ((tp_loadlocs.integer && cl.deathmatch) || cls.demoplayback) {
 			if (!TP_LoadLocFile(va("%s.loc", mapname), true)) {
 				if ((groupname = TP_GetMapGroupName(mapname, &system)) && !system) {
 					TP_LoadLocFile(va("%s.loc", groupname), true);