🐛 Fix loading chosen hero

Source/mainmenu.cpp

@@ -103,6 +103,8 @@ bool mainmenu_select_hero_dialog(GameData *gameData)
 		return false;
 	}
 
+	pfile_read_player_from_save(gszHero, myplr);
+
 	return true;
 }
 

Source/multi.cpp

@@ -10,6 +10,7 @@
 #include "DiabloUI/diabloui.h"
 #include "diablo.h"
 #include "dthread.h"
+#include "mainmenu.h"
 #include "nthread.h"
 #include "options.h"
 #include "pfile.h"
@@ -827,7 +828,7 @@ bool multi_init_multi(GameData *gameData)
 	myplr = playerId;
 	gbIsMultiplayer = true;
 
-	pfile_read_player_from_save();
+	pfile_read_player_from_save(gszHero, myplr);
 
 	return true;
 }

Source/pfile.cpp

@@ -385,13 +385,13 @@ bool pfile_delete_save(_uiheroinfo *hero_info)
 	return true;
 }
 
-void pfile_read_player_from_save()
+void pfile_read_player_from_save(char name[16], int playerId)
 {
 	HANDLE archive;
 	DWORD save_num;
 	PkPlayerStruct pkplr;
 
-	save_num = pfile_get_save_num_from_name(gszHero);
+	save_num = pfile_get_save_num_from_name(name);
 	archive = pfile_open_save_archive(save_num);
 	if (archive == nullptr)
 		app_fatal("Unable to open archive");
@@ -404,11 +404,11 @@ void pfile_read_player_from_save()
 
 	pfile_SFileCloseArchive(&archive);
 
-	UnPackPlayer(&pkplr, myplr, false);
+	UnPackPlayer(&pkplr, playerId, false);
 
-	LoadHeroItems(&plr[myplr]);
-	RemoveEmptyInventory(myplr);
-	CalcPlrInv(myplr, false);
+	LoadHeroItems(&plr[playerId]);
+	RemoveEmptyInventory(playerId);
+	CalcPlrInv(playerId, false);
 }
 
 bool LevelFileExists()

Source/pfile.h

@@ -35,7 +35,7 @@ void pfile_ui_set_class_stats(unsigned int player_class_nr, _uidefaultstats *cla
 bool pfile_ui_save_create(_uiheroinfo *heroinfo);
 bool pfile_get_file_name(uint8_t lvl, char *dst);
 bool pfile_delete_save(_uiheroinfo *hero_info);
-void pfile_read_player_from_save();
+void pfile_read_player_from_save(char name[16], int playerId);
 bool LevelFileExists();
 void GetTempLevelNames(char *szTemp);
 void GetPermLevelNames(char *szPerm);