PS_IS_NETPLAYER was not working right

origin
stpohle 23 years ago
parent 463b4edb23
commit 3c004aa9e4

@ -167,7 +167,7 @@ enum _playerstateflags {
#define PSFM_alife (PSF_used + PSF_alife + PSF_playing) #define PSFM_alife (PSF_used + PSF_alife + PSF_playing)
#define PS_IS_dead(__ps) (((__ps) & (PSFM_alife)) == (PSFM_used)) #define PS_IS_dead(__ps) (((__ps) & (PSFM_alife)) == (PSFM_used))
#define PS_IS_alife(__ps) (((__ps) & (PSFM_alife)) == (PSFM_alife)) #define PS_IS_alife(__ps) (((__ps) & (PSFM_alife)) == (PSFM_alife))
#define PS_IS_netplayer(__ps) (((__ps) & (PSFM_used + PSF_net)) != 0) #define PS_IS_netplayer(__ps) (((__ps) & (PSF_net)) != 0)
#define PS_IS_playing(__ps) (((__ps) & (PSFM_used)) == (PSFM_used)) #define PS_IS_playing(__ps) (((__ps) & (PSFM_used)) == (PSFM_used))
#define PS_IS_used(__ps) (((__ps) & (PSFM_used)) != 0) #define PS_IS_used(__ps) (((__ps) & (PSFM_used)) != 0)

@ -101,6 +101,7 @@ void
player_check_powerup (int p_nr) player_check_powerup (int p_nr)
{ {
_player *p = &bman.players[p_nr]; _player *p = &bman.players[p_nr];
int fx = p->pos.x >> 8; int fx = p->pos.x >> 8;
int fy = p->pos.y >> 8; int fy = p->pos.y >> 8;
int _x = p->pos.x & 255; int _x = p->pos.x & 255;
@ -108,6 +109,9 @@ player_check_powerup (int p_nr)
int ft, int ft,
i; i;
if (PS_IS_netplayer (p->state))
return;
/* Get the right field position */ /* Get the right field position */
if (_x > 128) if (_x > 128)
fx = fx + 1; fx = fx + 1;

Loading…
Cancel
Save