Remove unsupportable config settings

7 files changed, 8 insertions, 30 deletions

diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 96945a4..a04e402 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -2212,7 +2212,6 @@ Battle_Config init_battle_config()
         battle_config.skill_min_damage = 0;
         battle_config.natural_healhp_interval = 6000;
         battle_config.natural_healsp_interval = 8000;
-        battle_config.natural_heal_skill_interval = 10000;
         battle_config.natural_heal_weight_rate = 50;
         battle_config.itemheal_regeneration_factor = 1;
         battle_config.arrow_decrement = 1;
@@ -2240,8 +2239,6 @@ Battle_Config init_battle_config()
         battle_config.player_attack_direction_change = 1;
         battle_config.monster_attack_direction_change = 1;
         battle_config.display_delay_skill_fail = 1;
-        battle_config.dead_branch_active = 0;
-        battle_config.show_steal_in_same_party = 0;
         battle_config.hide_GM_session = 0;
         battle_config.invite_request_check = 1;
         battle_config.disp_experience = 0;
@@ -2338,7 +2335,6 @@ bool battle_config_read(ZString cfgName)
             BATTLE_CONFIG_VAR(skill_min_damage),
             BATTLE_CONFIG_VAR(natural_healhp_interval),
             BATTLE_CONFIG_VAR(natural_healsp_interval),
-            BATTLE_CONFIG_VAR(natural_heal_skill_interval),
             BATTLE_CONFIG_VAR(natural_heal_weight_rate),
             BATTLE_CONFIG_VAR(itemheal_regeneration_factor),
             BATTLE_CONFIG_VAR(arrow_decrement),
@@ -2366,8 +2362,6 @@ bool battle_config_read(ZString cfgName)
             BATTLE_CONFIG_VAR(player_attack_direction_change),
             BATTLE_CONFIG_VAR(monster_attack_direction_change),
             BATTLE_CONFIG_VAR(display_delay_skill_fail),
-            BATTLE_CONFIG_VAR(dead_branch_active),
-            BATTLE_CONFIG_VAR(show_steal_in_same_party),
             BATTLE_CONFIG_VAR(hide_GM_session),
             BATTLE_CONFIG_VAR(invite_request_check),
             BATTLE_CONFIG_VAR(disp_experience),
@@ -2452,8 +2446,6 @@ void battle_config_check()
             battle_config.natural_healhp_interval = NATURAL_HEAL_INTERVAL.count();
         if (battle_config.natural_healsp_interval < NATURAL_HEAL_INTERVAL.count())
             battle_config.natural_healsp_interval = NATURAL_HEAL_INTERVAL.count();
-        if (battle_config.natural_heal_skill_interval < NATURAL_HEAL_INTERVAL.count())
-            battle_config.natural_heal_skill_interval = NATURAL_HEAL_INTERVAL.count();
         if (battle_config.natural_heal_weight_rate < 50)
             battle_config.natural_heal_weight_rate = 50;
         if (battle_config.natural_heal_weight_rate > 101)
diff --git a/src/map/battle.hpp b/src/map/battle.hpp
index 7733391..53782fa 100644
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -141,7 +141,6 @@ extern struct Battle_Config
     int skill_min_damage;
     int natural_healhp_interval;
     int natural_healsp_interval;
-    int natural_heal_skill_interval;
     int natural_heal_weight_rate;
     int arrow_decrement;
     int max_aspd;
@@ -166,8 +165,6 @@ extern struct Battle_Config
     int player_attack_direction_change;
     int monster_attack_direction_change;
     int display_delay_skill_fail;
-    int dead_branch_active;
-    int show_steal_in_same_party;
 
     int prevent_logout;
 
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index 9a36a60..7d64098 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -320,8 +320,6 @@ int chrif_sendmapack(Session *, Packet_Fixed<0x2afb> fixed)
         exit(1);
     }
 
-    wisp_server_name = fixed.whisper_name;
-
     chrif_state = 2;
 
     return 0;
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 5329eff..1c6f403 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -3936,7 +3936,7 @@ RecvResult clif_parse_Wis(Session *s, dumb_ptr<map_session_data> sd)
         if (dstsd->sess == s)
         {
             ZString mes = "You cannot page yourself."_s;
-            clif_wis_message(s, wisp_server_name, mes);
+            clif_wis_message(s, WISP_SERVER_NAME, mes);
         }
         else
         {
@@ -5529,7 +5529,6 @@ unknown_packet:
                 PRINTF("\nclif_parse: session #%d, packet 0x%x, lenght %zu\n"_fmt,
                         s, packet_id, packet_avail(s));
             {
-                ZString packet_txt = "save/packet.txt"_s;
                 if (sd && sd->state.auth)
                 {
                     PRINTF("Unknown packet: Account ID %d, character ID %d, player name %s.\n"_fmt,
@@ -5541,35 +5540,27 @@ unknown_packet:
                 else
                     PRINTF("Unknown packet (unknown)\n"_fmt);
 
-                io::AppendFile fp(packet_txt);
-                if (!fp.is_open())
-                {
-                    PRINTF("clif.c: cant write [%s] !!! data is lost !!!\n"_fmt,
-                            packet_txt);
-                    return;
-                }
-                else
                 {
                     timestamp_seconds_buffer now;
                     stamp_time(now);
                     if (sd && sd->state.auth)
                     {
-                        FPRINTF(fp,
+                        FPRINTF(stderr,
                                 "%s\nPlayer with account ID %d (character ID %d, player name %s) sent wrong packet:\n"_fmt,
                                 now,
                                 sd->status_key.account_id,
                                 sd->status_key.char_id, sd->status_key.name);
                     }
                     else if (sd)    // not authentified! (refused by char-server or disconnect before to be authentified)
-                        FPRINTF(fp,
+                        FPRINTF(stderr,
                                 "%s\nUnauthenticated player with account ID %d sent wrong packet:\n"_fmt,
                                 now, sd->bl_id);
                     else
-                        FPRINTF(fp,
+                        FPRINTF(stderr,
                                 "%s\nUnknown connection sent wrong packet:\n"_fmt,
                                 now);
 
-                    packet_dump(fp, s);
+                    packet_dump(s);
                 }
             }
         }
diff --git a/src/map/map.cpp b/src/map/map.cpp
index e2c38a7..e5705aa 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -112,7 +112,7 @@ int save_settings = 0xFFFF;
 
 AString motd_txt = "conf/motd.txt"_s;
 
-CharName wisp_server_name = stringish<CharName>("Server"_s);   // can be modified in char-server configuration file
+const CharName WISP_SERVER_NAME = stringish<CharName>("Server"_s);
 
 map_local undefined_gat = [](){ map_local rv {}; rv.name_ = stringish<MapName>("undefined.gat"_s); return rv; }();
 
diff --git a/src/map/map.hpp b/src/map/map.hpp
index fc48126..ac16fe9 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -535,7 +535,7 @@ extern int save_settings;
 
 extern AString motd_txt;
 
-extern CharName wisp_server_name;
+extern const CharName WISP_SERVER_NAME;
 
 // 鯖全体情報
 void map_setusers(int);
diff --git a/src/map/tmw.cpp b/src/map/tmw.cpp
index 04906b6..4f29fab 100644
--- a/src/map/tmw.cpp
+++ b/src/map/tmw.cpp
@@ -161,7 +161,7 @@ bool tmw_CheckChatLameness(dumb_ptr<map_session_data>, XString message)
 // Sends a whisper to all GMs
 void tmw_GmHackMsg(ZString line)
 {
-    intif_wis_message_to_gm(wisp_server_name,
+    intif_wis_message_to_gm(WISP_SERVER_NAME,
             GmLevel::from(static_cast<uint32_t>(battle_config.hack_info_GM_level)),
             line);
 }