remove deprecated icons_STAR.bni and all the references https://github.com/HarpyWar/pvpgn/issues/55

conf/bnetd.conf.in

@@ -178,7 +178,6 @@ allow_d2cs_setname = true
 # the "filedir" directory specified above.
 iconfile = "icons.bni"
 war3_iconfile = "icons-WAR3.bni"
-star_iconfile = "icons_STAR.bni"
 
 #                                                                            #
 ##############################################################################

conf/bnetd.conf.win32

@@ -156,7 +156,6 @@ allow_d2cs_setname = true
 # the "filedir" directory specified above.
 iconfile = "icons.bni"
 war3_iconfile = "icons-WAR3.bni"
-star_iconfile = "icons_STAR.bni"
 
 #                                                                            #
 ##############################################################################

conf/supportfile.conf.in

@@ -1,15 +1,13 @@
 # this file contains the names of all files that need to be installed in the filedir
-# (but that aren't any longer part of the pvpgn package)
 # some lines are commented out, cause they weren't installed by default in older versions
 
 IX86ver1.mpq
 ver-ix86-1.mpq
-#PMACver1.mpq
-#XMACver1.mpq
+PMACver1.mpq
+XMACver1.mpq
 bnserver-D2DV.ini
-#bnserver-D2XP.ini
+bnserver-D2XP.ini
 bnserver-WAR3.ini
 bnserver.ini
 icons-WAR3.bni
 icons.bni
-icons_STAR.bni

src/bnetd/file.cpp

@@ -200,6 +200,9 @@ namespace pvpgn
 				eventlog(eventlog_level_error, __FUNCTION__, "got NULL rawname");
 				return -1;
 			}
+			// ignore request for icons_STAR.bni (deprecated https://github.com/HarpyWar/pvpgn/issues/55)
+			if (strcmp(rawname, BNETD_STAR_ICON_FILE) == 0)
+				return -1;
 
 			if (!(rpacket = packet_create(packet_class_file)))
 			{

src/bnetd/luainterface.cpp

@@ -211,7 +211,6 @@ namespace pvpgn
 				config.update("allow_d2cs_setname", prefs_allow_d2cs_setname());
 				config.update("iconfile", prefs_get_iconfile());
 				config.update("war3_iconfile", prefs_get_war3_iconfile());
-				config.update("star_iconfile", prefs_get_star_iconfile());
 				config.update("tosfile", prefs_get_tosfile());
 				config.update("allowed_clients", prefs_get_allowed_clients());
 				config.update("skip_versioncheck", prefs_get_skip_versioncheck());

src/bnetd/prefs.cpp

@@ -84,7 +84,6 @@ namespace pvpgn
 			unsigned int report_diablo_games;
 			char const * iconfile;
 			char const * war3_iconfile;
-			char const * star_iconfile;
 			char const * tosfile;
 			char const * mpqfile;
 			char const * trackaddrs;
@@ -357,10 +356,6 @@ namespace pvpgn
 		static const char *conf_get_war3_iconfile(void);
 		static int conf_setdef_war3_iconfile(void);
 
-		static int conf_set_star_iconfile(const char *valstr);
-		static const char *conf_get_star_iconfile(void);
-		static int conf_setdef_star_iconfile(void);
-
 		static int conf_set_tosfile(const char *valstr);
 		static const char *conf_get_tosfile(void);
 		static int conf_setdef_tosfile(void);
@@ -777,7 +772,6 @@ namespace pvpgn
 			{ "report_diablo_games", conf_set_report_diablo_games, conf_get_report_diablo_games, conf_setdef_report_diablo_games },
 			{ "iconfile", conf_set_iconfile, conf_get_iconfile, conf_setdef_iconfile },
 			{ "war3_iconfile", conf_set_war3_iconfile, conf_get_war3_iconfile, conf_setdef_war3_iconfile },
-			{ "star_iconfile", conf_set_star_iconfile, conf_get_star_iconfile, conf_setdef_star_iconfile },
 			{ "tosfile", conf_set_tosfile, conf_get_tosfile, conf_setdef_tosfile },
 			{ "mpqfile", conf_set_mpqfile, conf_get_mpqfile, conf_setdef_mpqfile },
 			{ "trackaddrs", conf_set_trackaddrs, conf_get_trackaddrs, conf_setdef_trackaddrs },
@@ -1814,27 +1808,6 @@ namespace pvpgn
 		}
 
 
-		extern char const * prefs_get_star_iconfile(void)
-		{
-			return prefs_runtime_config.star_iconfile;
-		}
-
-		static int conf_set_star_iconfile(const char *valstr)
-		{
-			return conf_set_str(&prefs_runtime_config.star_iconfile, valstr, NULL);
-		}
-
-		static int conf_setdef_star_iconfile(void)
-		{
-			return conf_set_str(&prefs_runtime_config.star_iconfile, NULL, BNETD_STAR_ICON_FILE);
-		}
-
-		static const char* conf_get_star_iconfile(void)
-		{
-			return prefs_runtime_config.star_iconfile;
-		}
-
-
 		extern char const * prefs_get_tosfile(void)
 		{
 			return prefs_runtime_config.tosfile;

src/bnetd/prefs.h

@@ -79,7 +79,6 @@ namespace pvpgn
 		extern char const * prefs_get_pidfile(void);
 		extern char const * prefs_get_iconfile(void);
 		extern char const * prefs_get_war3_iconfile(void);
-		extern char const * prefs_get_star_iconfile(void);
 		extern char const * prefs_get_tosfile(void);
 		extern char const * prefs_get_mpqauthfile(void);
 		extern char const * prefs_get_mpqfile(void);