Fix gszHero

Source/mainmenu.cpp

@@ -3,7 +3,7 @@
 #include "../types.h"
 
 static float mainmenu_cpp_init_value = INFINITY;
-char chr_name_str[16];
+char gszHero[16];
 
 /* data */
 
@@ -44,7 +44,7 @@ int __stdcall mainmenu_select_hero_dialog(
 		        pfile_delete_save,
 		        pfile_ui_set_class_stats,
 		        &a5,
-		        chr_name_str,
+		        gszHero,
 		        &gnDifficulty))
 			TermMsg("Unable to display SelHeroSing");
 
@@ -60,7 +60,7 @@ int __stdcall mainmenu_select_hero_dialog(
 	               pfile_ui_set_class_stats,
 	               &a5,
 	               &a6,
-	               chr_name_str)) {
+	               gszHero)) {
 		TermMsg("Can't load multiplayer dialog");
 	}
 	if (a5 == 4) {
@@ -76,7 +76,7 @@ int __stdcall mainmenu_select_hero_dialog(
 			*multi = a6;
 	}
 	if (cname && clen)
-		SStrCopy(cname, chr_name_str, clen);
+		SStrCopy(cname, gszHero, clen);
 
 	return 1;
 }

Source/mainmenu.h

@@ -2,7 +2,7 @@
 #ifndef __MAINMENU_H__
 #define __MAINMENU_H__
 
-extern char chr_name_str[16];
+extern char gszHero[16];
 
 void __cdecl mainmenu_cpp_init();
 void __cdecl mainmenu_refresh_music();

Source/pfile.cpp

@@ -150,7 +150,7 @@ BOOL __fastcall pfile_create_player_description(char *dst, unsigned int len)
 	myplr = 0;
 	pfile_read_player_from_save();
 	game_2_ui_player(plr, &uihero, gbValidSaveFile);
-	UiSetupPlayerInfo(chr_name_str, &uihero, GAME_ID);
+	UiSetupPlayerInfo(gszHero, &uihero, GAME_ID);
 
 	if (dst != NULL && len) {
 		if (UiCreatePlayerDescription(&uihero, GAME_ID, desc) == 0)
@@ -184,10 +184,10 @@ BOOL __fastcall pfile_create_save_file(const char *name_1, const char *name_2)
 
 	SStrCopy(hero_names[save_num], name_2, PLR_NAME_LEN);
 	SStrCopy(plr[i]._pName, name_2, PLR_NAME_LEN);
-	if (!_strcmpi(chr_name_str, name_1))
-		SStrCopy(chr_name_str, name_2, sizeof(chr_name_str));
+	if (!_strcmpi(gszHero, name_1))
+		SStrCopy(gszHero, name_2, sizeof(gszHero));
 	game_2_ui_player(plr, &uihero, gbValidSaveFile);
-	UiSetupPlayerInfo(chr_name_str, &uihero, GAME_ID);
+	UiSetupPlayerInfo(gszHero, &uihero, GAME_ID);
 	pfile_write_hero();
 	return TRUE;
 }
@@ -485,7 +485,7 @@ void __cdecl pfile_read_player_from_save()
 	unsigned int save_num;
 	PkPlayerStruct pkplr;
 
-	save_num = pfile_get_save_num_from_name(chr_name_str);
+	save_num = pfile_get_save_num_from_name(gszHero);
 	archive = pfile_open_save_archive(NULL, save_num);
 	if (archive == NULL)
 		TermMsg("Unable to open archive");