diff --git a/src/k_kart.c b/src/k_kart.c index c91242d1..e5c2fe32 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -951,7 +951,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd) return; } - if (cv_kartdebugitem.value != 0) + if (cv_kartdebugitem.value != 0 && !modeattacking) { K_KartGetItemResult(player, cv_kartdebugitem.value); player->kartstuff[k_itemamount] = cv_kartdebugamount.value; @@ -1405,7 +1405,7 @@ void K_RespawnChecker(player_t *player) { player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE; player->mo->destscale = 6*(mapheaderinfo[gamemap-1]->mobj_scale)/8; - if (cv_kartdebugshrink.value && !player->bot) + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->destscale = 6*player->mo->destscale/8; } @@ -1915,7 +1915,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, boolean trapitem P_SetPlayerMobjState(player->mo, S_KART_SPIN); player->kartstuff[k_instashield] = 15; - if (cv_kartdebughuddrop.value) + if (cv_kartdebughuddrop.value && !modeattacking) K_DropItems(player); else K_DropHnextList(player); @@ -1998,7 +1998,7 @@ void K_SquishPlayer(player_t *player, mobj_t *source) P_PlayRinglossSound(player->mo); player->kartstuff[k_instashield] = 15; - if (cv_kartdebughuddrop.value) + if (cv_kartdebughuddrop.value && !modeattacking) K_DropItems(player); else K_DropHnextList(player); @@ -2099,10 +2099,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b } player->kartstuff[k_instashield] = 15; - //if (cv_kartdebughuddrop.value) - K_DropItems(player); - /*else - K_DropHnextList(player);*/ + K_DropItems(player); + return; } @@ -2173,7 +2171,7 @@ void K_StealBumper(player_t *player, player_t *victim, boolean force) victim->kartstuff[k_comebacktimer] = comebacktime;*/ victim->kartstuff[k_instashield] = 15; - if (cv_kartdebughuddrop.value) + if (cv_kartdebughuddrop.value && !modeattacking) K_DropItems(victim); else K_DropHnextList(victim); @@ -4086,7 +4084,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->kartstuff[k_invincibilitytimer] == 0) player->mo->color = player->skincolor; player->mo->destscale = mapheaderinfo[gamemap-1]->mobj_scale; - if (cv_kartdebugshrink.value && !player->bot) + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->destscale = 6*player->mo->destscale/8; P_RestoreMusic(player); } @@ -5040,7 +5038,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) K_PlayPowerGloatSound(player->mo); player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE; player->mo->destscale = 3*(mapheaderinfo[gamemap-1]->mobj_scale)/2; - if (cv_kartdebugshrink.value && !player->bot) + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->destscale = 6*player->mo->destscale/8; player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds P_RestoreMusic(player); @@ -5286,7 +5284,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (leveltime < starttime+10) { player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale) + (player->kartstuff[k_boostcharge]*131); - if (cv_kartdebugshrink.value && !player->bot) + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->destscale = 6*player->mo->destscale/8; } @@ -7893,6 +7891,9 @@ void K_drawKartHUD(void) K_drawLapStartAnim(); } + if (modeattacking) // everything after here is MP and debug only + return; + if (G_BattleGametype() && !splitscreen && (stplyr->kartstuff[k_yougotem] % 2)) // * YOU GOT EM * V_DrawScaledPatch(BASEVIDWIDTH/2 - (SHORT(kp_yougotem->width)/2), 32, V_HUDTRANS, kp_yougotem); diff --git a/src/p_inter.c b/src/p_inter.c index 781442e2..b52dd2c3 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3254,7 +3254,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // Start shrinking! player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE; player->mo->destscale = 6*(mapheaderinfo[gamemap-1]->mobj_scale)/8; - if (cv_kartdebugshrink.value && !player->bot) + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->destscale = 6*player->mo->destscale/8; // Wipeout diff --git a/src/p_mobj.c b/src/p_mobj.c index a7b1f701..8bf9de3b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10930,7 +10930,7 @@ void P_SpawnPlayer(INT32 playernum) p->awayviewtics = 0; // set the scale to the mobj's destscale so settings get correctly set. if we don't, they sometimes don't. - if (cv_kartdebugshrink.value && !p->bot) + if (cv_kartdebugshrink.value && !modeattacking && !p->bot) mobj->destscale = 6*mobj->destscale/8; P_SetScale(mobj, mobj->destscale); P_FlashPal(p, 0, 0); // Resets