diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 583151cb..974a3d09 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -1747,7 +1747,7 @@ track_players_intersection_tracker() { if(getDvar("g_gametype") == "zgrief" && players[i]._encounters_team != players[j]._encounters_team) { - players[j] scripts/zm/_zm_reimagined_grief::store_damage_info(players[i], "none", "MOD_FALLING"); + players[j] [[level.store_player_damage_info_func]](players[i], "none", "MOD_FALLING"); players[j] dodamage( 1000, (0, 0, 0) ); } @@ -1757,7 +1757,7 @@ track_players_intersection_tracker() { if(getDvar("g_gametype") == "zgrief" && players[i]._encounters_team != players[j]._encounters_team) { - players[i] scripts/zm/_zm_reimagined_grief::store_damage_info(players[j], "none", "MOD_FALLING"); + players[i] [[level.store_player_damage_info_func]](players[j], "none", "MOD_FALLING"); players[i] dodamage( 1000, (0, 0, 0) ); } diff --git a/scripts/zm/_zm_reimagined_grief.gsc b/scripts/zm/_zm_reimagined_grief.gsc index 9a7fa381..54f104e3 100644 --- a/scripts/zm/_zm_reimagined_grief.gsc +++ b/scripts/zm/_zm_reimagined_grief.gsc @@ -170,6 +170,7 @@ set_grief_vars() level.grief_score["B"] = 0; level.game_mode_shellshock_time = 0.5; level.game_mode_griefed_time = 2.5; + level.store_player_damage_info_func = ::store_player_damage_info; flag_wait( "start_zombie_round_logic" ); // needs a wait @@ -645,7 +646,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme self playsound( "zmb_player_hit_ding" ); self thread add_grief_stun_score(eattacker); - self thread store_damage_info(eattacker, sweapon, smeansofdeath); + self thread [[level.store_player_damage_info_func]](eattacker, sweapon, smeansofdeath); } } @@ -669,7 +670,7 @@ add_grief_stun_score(attacker) } } -store_damage_info(attacker, weapon, meansofdeath) +store_player_damage_info(attacker, weapon, meansofdeath) { // show weapon icon for impact damage if(meansofdeath == "MOD_IMPACT") @@ -682,10 +683,10 @@ store_damage_info(attacker, weapon, meansofdeath) self.last_griefed_by.weapon = weapon; self.last_griefed_by.meansofdeath = meansofdeath; - self thread remove_damage_info(); + self thread remove_player_damage_info(); } -remove_damage_info() +remove_player_damage_info() { self notify("new_griefer"); self endon("new_griefer");