thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-13 03:22:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New papersprite sparkle effect

Browse source
This commit is contained in:
TehRealSalt 2019-05-27 00:03:02 -04:00
parent 1e2c7e3461
commit 127935edc2
4 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -266,6 +266,7 @@ typedef enum
k_ringdelay, // 3 tic delay between every ring usage k_ringdelay, // 3 tic delay between every ring usage
k_ringboost, // Ring boost timer k_ringboost, // Ring boost timer
k_ringlock, // Prevent picking up rings while SPB is locked on k_ringlock, // Prevent picking up rings while SPB is locked on
k_sparkleanim, // Angle offset for ring sparkle animation
k_jmp, // In Mario Kart, letting go of the jump button stops the drift k_jmp, // In Mario Kart, letting go of the jump button stops the drift
k_offroad, // In Super Mario Kart, going offroad has lee-way of about 1 second before you start losing speed k_offroad, // In Super Mario Kart, going offroad has lee-way of about 1 second before you start losing speed
k_pogospring, // Pogo spring bounce effect k_pogospring, // Pogo spring bounce effect

1
src/dehacked.c
View file

@ -8418,6 +8418,7 @@ static const char *const KARTSTUFF_LIST[] = {
"RINGDELAY", "RINGDELAY",
"RINGBOOST", "RINGBOOST",
"RINGLOCK", "RINGLOCK",
"SPARKLEANIM",
"JMP", "JMP",
"OFFROAD", "OFFROAD",
"POGOSPRING", "POGOSPRING",

17
src/p_enemy.c
View file

@ -3582,22 +3582,17 @@ void A_AttractChase(mobj_t *actor)
if (actor->extravalue1 >= 21) if (actor->extravalue1 >= 21)
{ {
#if 0
UINT8 i; UINT8 i;
#endif mobj_t *sparkle;
// Base add is 3 tics for 9,9, adds 1 tic for each point closer to the 1,1 end // Base add is 3 tics for 9,9, adds 1 tic for each point closer to the 1,1 end
actor->target->player->kartstuff[k_ringboost] += RINGBOOSTPWR+3; actor->target->player->kartstuff[k_ringboost] += RINGBOOSTPWR+3;
S_StartSound(actor->target, sfx_s1b5); S_StartSound(actor->target, sfx_s1b5);
#if 0 sparkle = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_RINGSPARKS);
// ring sparkle effect P_SetTarget(&sparkle->target, actor->target);
for (i = 0; i < 4; i++) sparkle->angle = FixedAngle(18<<FRACBITS) * actor->target->player->kartstuff[k_sparkleanim];
{ actor->target->player->kartstuff[k_sparkleanim] = (actor->target->player->kartstuff[k_sparkleanim]+1) % 20;
mobj_t *sparkle = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_RINGSPARKS);
P_SetTarget(&sparkle->target, actor->target);
sparkle->extravalue1 = i;
}
#endif
P_KillMobj(actor, actor->target, actor->target); P_KillMobj(actor, actor->target, actor->target);
return; return;

19
src/p_mobj.c
View file

@ -8347,25 +8347,6 @@ void P_MobjThinker(mobj_t *mobj)
} }
K_MatchGenericExtraFlags(mobj, mobj->target); K_MatchGenericExtraFlags(mobj, mobj->target);
mobj->angle = mobj->target->angle;
switch (mobj->extravalue1)
{
case 0:
default:
mobj->angle += ANGLE_90;
break;
case 1:
mobj->angle -= ANGLE_90;
break;
case 2:
mobj->angle += ANGLE_45;
break;
case 3:
mobj->angle -= ANGLE_45;
break;
}
P_TeleportMove(mobj, mobj->target->x + FINECOSINE(mobj->angle >> ANGLETOFINESHIFT), P_TeleportMove(mobj, mobj->target->x + FINECOSINE(mobj->angle >> ANGLETOFINESHIFT),
mobj->target->y + FINESINE(mobj->angle >> ANGLETOFINESHIFT), mobj->target->y + FINESINE(mobj->angle >> ANGLETOFINESHIFT),
mobj->target->z + mobj->target->height); mobj->target->z + mobj->target->height);