diff --git a/common/main/multi.h b/common/main/multi.h index e64661b8f..462f6d006 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -483,11 +483,6 @@ void multi_prep_level_objects(const d_vclip_array &Vclip); void multi_prep_level_player(); void multi_leave_game(void); void multi_process_bigdata(playernum_t pnum, const uint8_t *buf, uint_fast32_t len); -} -#endif -void multi_do_death(int objnum); -#ifdef dsx -namespace dsx { void multi_make_ghost_player(playernum_t); void multi_make_player_ghost(playernum_t); } diff --git a/similar/main/gameseq.cpp b/similar/main/gameseq.cpp index e761bd20c..57a4338ee 100644 --- a/similar/main/gameseq.cpp +++ b/similar/main/gameseq.cpp @@ -1769,7 +1769,6 @@ window_event_result DoPlayerDead() auto &plr = get_local_player(); if ( Game_mode&GM_MULTI ) { - multi_do_death(plr.objnum); } else { //Note link to above else! diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 6a64ec359..caba44a76 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -1630,18 +1630,6 @@ window_event_result multi_message_input_sub(int key) return window_event_result::ignored; } -void multi_do_death(int) -{ - auto &Objects = LevelUniqueObjectState.Objects; - auto &vmobjptr = Objects.vmptr; - // Do any miscellaneous stuff for a new network player after death - if (!(Game_mode & GM_MULTI_COOP)) - { - auto &player_info = get_local_plrobj().ctype.player_info; - player_info.powerup_flags |= (PLAYER_FLAGS_RED_KEY | PLAYER_FLAGS_BLUE_KEY | PLAYER_FLAGS_GOLD_KEY); - } -} - namespace dsx { namespace {