mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Eggmark fixes
- Update eggmanblame on K_EggmanTransfer
- Currently blames the bumper, but could blame the source's eggmanblame if we wanted to change that
- Use K_FlipFromObject for correct reverse gravity placement
This commit is contained in:
parent
3e494a342c
commit
54137ad468
1 changed files with 3 additions and 1 deletions
|
|
@ -8408,7 +8408,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
||||||
//player->flashing = 0;
|
//player->flashing = 0;
|
||||||
eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION);
|
eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION);
|
||||||
eggsexplode->height = 2 * player->mo->height;
|
eggsexplode->height = 2 * player->mo->height;
|
||||||
eggsexplode->color = player->mo->color;
|
K_FlipFromObject(eggsexplode, player->mo);
|
||||||
|
|
||||||
if (player->eggmanblame >= 0
|
if (player->eggmanblame >= 0
|
||||||
&& player->eggmanblame < MAXPLAYERS
|
&& player->eggmanblame < MAXPLAYERS
|
||||||
|
|
@ -12304,6 +12304,7 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
|
||||||
K_AddHitLag(victim->mo, 2, true);
|
K_AddHitLag(victim->mo, 2, true);
|
||||||
K_DropItems(victim);
|
K_DropItems(victim);
|
||||||
victim->eggmanexplode = 6*TICRATE;
|
victim->eggmanexplode = 6*TICRATE;
|
||||||
|
victim->eggmanblame = (source - players);
|
||||||
K_StopRoulette(&victim->itemRoulette);
|
K_StopRoulette(&victim->itemRoulette);
|
||||||
|
|
||||||
if (P_IsDisplayPlayer(victim) && !demo.freecam)
|
if (P_IsDisplayPlayer(victim) && !demo.freecam)
|
||||||
|
|
@ -12311,6 +12312,7 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
|
||||||
|
|
||||||
K_AddHitLag(source->mo, 2, true);
|
K_AddHitLag(source->mo, 2, true);
|
||||||
source->eggmanexplode = 0;
|
source->eggmanexplode = 0;
|
||||||
|
source->eggmanblame = -1;
|
||||||
K_StopRoulette(&source->itemRoulette);
|
K_StopRoulette(&source->itemRoulette);
|
||||||
source->eggmanTransferDelay = 10;
|
source->eggmanTransferDelay = 10;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue