diff --git a/src/d_clisrv.c b/src/d_clisrv.c index a5a0b1ab..036ed0e0 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2393,7 +2393,7 @@ static void CL_RemovePlayer(INT32 playernum, INT32 reason) } } } - + #ifdef HAVE_BLUA LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting #endif diff --git a/src/d_clisrv.h b/src/d_clisrv.h index c067a3ad..f49eeffc 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -449,10 +449,10 @@ typedef enum KR_KICK = 1, //Kicked by server KR_PINGLIMIT = 2, //Broke Ping Limit KR_SYNCH = 3, //Synch Failure - KR_TIMEOUT = 4, //Connection Timeout + KR_TIMEOUT = 4, //Connection Timeout KR_BAN = 5, //Banned by server KR_LEAVE = 6, //Quit the game - + } kickreason_t; extern boolean server; diff --git a/src/dehacked.c b/src/dehacked.c index da7240c8..dd75fce4 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7417,7 +7417,7 @@ struct { {"V_CHARCOLORSHIFT",V_CHARCOLORSHIFT}, {"V_ALPHASHIFT",V_ALPHASHIFT}, - + //Kick Reasons {"KR_KICK",KR_KICK}, {"KR_PINGLIMIT",KR_PINGLIMIT}, diff --git a/src/p_floor.c b/src/p_floor.c index 8af2ee7b..40ce9acc 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -1966,7 +1966,7 @@ void T_ThwompSector(levelspecthink_t *thwomp) continue; mo = (mobj_t *)th; - if (mo->type == MT_PLAYER && mo->health && mo->player && !mo->player->spectator + if (mo->type == MT_PLAYER && mo->health && mo->player && !mo->player->spectator && mo->z <= thwomp->sector->ceilingheight && P_AproxDistance(thwompx - mo->x, thwompy - mo->y) <= 96*FRACUNIT) {