TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Disable powerup capping for cooperative game mode as it potentially deletes weapons carried over from another level

Browse source
This commit is contained in:
zico 2013-12-14 02:53:45 +01:00
parent c4f14f1044
commit ec516b5675
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/multi.h
View file

@ -62,7 +62,7 @@ extern int multi_protocol; // set and determinate used protocol
#define MULTI_PROTO_UDP 1 // UDP protocol
// What version of the multiplayer protocol is this? Increment each time something drastic changes in Multiplayer without the version number changes. Can be reset to 0 each time the version of the game changes
#define MULTI_PROTO_VERSION 9
#define MULTI_PROTO_VERSION 10
// PROTOCOL VARIABLES AND DEFINES - END
// limits for Packets (i.e. positional updates) per sec

14
similar/main/multi.cpp
View file

@ -2696,7 +2696,7 @@ void multi_powcap_cap_objects()
char type;
int index;
if (!(Game_mode & GM_NETWORK))
if (!(Game_mode & GM_NETWORK) || (Game_mode & GM_MULTI_COOP))
return;
if (!game_mode_hoard())
@ -2809,7 +2809,7 @@ static void multi_powcap_adjust_cap_for_player(int pnum)
int index;
if (!(Game_mode & GM_NETWORK))
if (!(Game_mode & GM_NETWORK) || (Game_mode & GM_MULTI_COOP))
return;
for (index=0;index<MAX_PRIMARY_WEAPONS;index++)
@ -2858,7 +2858,7 @@ void multi_powcap_adjust_remote_cap(int pnum)
int index;
if (!(Game_mode & GM_NETWORK))
if (!(Game_mode & GM_NETWORK) || (Game_mode & GM_MULTI_COOP))
return;
for (index=0;index<MAX_PRIMARY_WEAPONS;index++)
@ -3359,7 +3359,7 @@ void multi_prep_level(void)
multi_delete_extra_objects(); // Removes monsters from level
}
if (Game_mode & GM_NETWORK)
if ((Game_mode & GM_NETWORK) && !(Game_mode & GM_MULTI_COOP))
{
multi_powcap_adjust_cap_for_player(Player_num);
multi_send_powcap_update();
@ -4078,6 +4078,9 @@ static void multi_do_drop_blob (const ubyte *buf)
void multi_send_powcap_update ()
{
if (!(Game_mode & GM_NETWORK) || (Game_mode & GM_MULTI_COOP))
return;
multibuf[0]=MULTI_POWCAP_UPDATE;
for (unsigned i=0;i<MAX_POWERUP_TYPES;i++)
multibuf[i+1]=MaxPowerupsAllowed[i];
@ -4087,6 +4090,9 @@ void multi_send_powcap_update ()
static void multi_do_powcap_update (const ubyte *buf)
{
if (!(Game_mode & GM_NETWORK) || (Game_mode & GM_MULTI_COOP))
return;
for (unsigned i=0;i<MAX_POWERUP_TYPES;i++)
if (buf[i+1]>MaxPowerupsAllowed[i])
MaxPowerupsAllowed[i]=buf[i+1];