diff --git a/src/basic.h b/src/basic.h index f74c11a..f79886d 100644 --- a/src/basic.h +++ b/src/basic.h @@ -167,7 +167,7 @@ enum _playerstateflags { #define PSFM_alife (PSF_used + PSF_alife + PSF_playing) #define PS_IS_dead(__ps) (((__ps) & (PSFM_alife)) == (PSFM_used)) #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_used(__ps) (((__ps) & (PSFM_used)) != 0) diff --git a/src/player.c b/src/player.c index a3b373e..5ee7a3f 100644 --- a/src/player.c +++ b/src/player.c @@ -101,6 +101,7 @@ void player_check_powerup (int p_nr) { _player *p = &bman.players[p_nr]; + int fx = p->pos.x >> 8; int fy = p->pos.y >> 8; int _x = p->pos.x & 255; @@ -108,6 +109,9 @@ player_check_powerup (int p_nr) int ft, i; + if (PS_IS_netplayer (p->state)) + return; + /* Get the right field position */ if (_x > 128) fx = fx + 1;