diff --git a/src/info.c b/src/info.c index d3bad37b5..a8133ddb3 100644 --- a/src/info.c +++ b/src/info.c @@ -2168,7 +2168,7 @@ state_t states[NUMSTATES] = {SPR_BAIL, FF_FULLBRIGHT|FF_ANIMATE|0, 8, {NULL}, 8, 1, S_BAIB}, // S_BAIL {SPR_BAIB, FF_FULLBRIGHT|FF_ANIMATE|0, 10, {NULL}, 9, 1, S_NULL}, // S_BAIB {SPR_BAIC, FF_FULLBRIGHT|FF_ANIMATE|0, 11, {NULL}, 10, 1, S_NULL}, // S_BAIC - {SPR_TECH, FF_FULLBRIGHT|FF_ANIMATE|0, -1, {NULL}, 41, 1, S_NULL}, // S_BAILCHARGE + {SPR_TECH, 0, -1, {NULL}, 41, 1, S_NULL}, // S_BAILCHARGE {SPR_AMPB, FF_FULLBRIGHT|FF_PAPERSPRITE|0, -1, {NULL}, 0, 0, S_NULL}, // S_AMPRING {SPR_AMPC, FF_FULLBRIGHT|FF_ANIMATE|0, -1, {NULL}, 4, 2, S_NULL}, // S_AMPBODY diff --git a/src/k_kart.c b/src/k_kart.c index 85d74c0cb..d133b71db 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -13971,6 +13971,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) { mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAILCHARGE); P_SetTarget(&bail->target, player->mo); + bail->renderflags |= RF_FULLBRIGHT; // set fullbright here, were gonna animate frames in the thinker and it saves us from setting FF_FULLBRIGHT every frame } } else diff --git a/src/objects/bail.c b/src/objects/bail.c index cd8e2c686..c1c3a0d93 100644 --- a/src/objects/bail.c +++ b/src/objects/bail.c @@ -62,7 +62,6 @@ void Obj_BailChargeThink (mobj_t *aura) aura->flags |= MF_NOCLIPTHING; // aura->color = mo->color; - aura->anim_duration = 999; // This prevents FF_ANIMATE from working, we're gonna animate manually ourselves here aura->frame = ((player->bailcharge-1)/2); // By syncing the frame with the charge timer here fixed_t baseScale = 13*mo->scale/10;