From c7c9f145cad920c7c94558f9791a7c67827be599 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 5 Apr 2023 21:06:05 -0700 Subject: [PATCH] Really get rid of XD_POWERLEVEL --- src/d_netcmd.c | 18 ------------------ src/d_netcmd.h | 23 +++++++++++------------ 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 2dbf96b62..d366888b6 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -80,7 +80,6 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum); static void Got_WeaponPref(UINT8 **cp, INT32 playernum); -static void Got_PowerLevel(UINT8 **cp, INT32 playernum); static void Got_PartyInvite(UINT8 **cp, INT32 playernum); static void Got_AcceptPartyInvite(UINT8 **cp, INT32 playernum); static void Got_CancelPartyInvite(UINT8 **cp, INT32 playernum); @@ -1805,23 +1804,6 @@ static void Got_WeaponPref(UINT8 **cp,INT32 playernum) demo_extradata[playernum] |= DXD_WEAPONPREF; } -// Currently unused, PWR is sent in XD_ADDPLAYER -static void Got_PowerLevel(UINT8 **cp,INT32 playernum) -{ - int i; - - for(i = 0; i < MAXPLAYERS; i++) - { - UINT16 race = (UINT16)READUINT16(*cp); - UINT16 battle = (UINT16)READUINT16(*cp); - - clientpowerlevels[i][PWRLV_RACE] = min(PWRLVRECORD_MAX, race); - clientpowerlevels[i][PWRLV_BATTLE] = min(PWRLVRECORD_MAX, battle); - - CONS_Debug(DBG_GAMELOGIC, "set player %d to power %d\n", i, race); - } -} - static void Got_PartyInvite(UINT8 **cp,INT32 playernum) { UINT8 invitee; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index d4d5fee85..31f430ed2 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -169,18 +169,17 @@ typedef enum XD_MODIFYVOTE, // 24 XD_PICKVOTE, // 25 XD_REMOVEPLAYER,// 26 - XD_POWERLEVEL, // 27 [No longer used, might be repurposed - PWR is in XD_ADDPLAYER now] - XD_PARTYINVITE, // 28 - XD_ACCEPTPARTYINVITE, // 29 - XD_LEAVEPARTY, // 30 - XD_CANCELPARTYINVITE, // 31 - XD_CHEAT, // 32 - XD_ADDBOT, // 33 - XD_DISCORD, // 34 - XD_PLAYSOUND, // 35 - XD_SCHEDULETASK, // 36 - XD_SCHEDULECLEAR, // 37 - XD_AUTOMATE, // 38 + XD_PARTYINVITE, // 27 + XD_ACCEPTPARTYINVITE, // 28 + XD_LEAVEPARTY, // 29 + XD_CANCELPARTYINVITE, // 30 + XD_CHEAT, // 31 + XD_ADDBOT, // 32 + XD_DISCORD, // 33 + XD_PLAYSOUND, // 34 + XD_SCHEDULETASK, // 35 + XD_SCHEDULECLEAR, // 36 + XD_AUTOMATE, // 37 MAXNETXCMD } netxcmd_t;