stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-19 16:01:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dust devil support

Browse source
This commit is contained in:
ZipperQR 2020-04-22 00:59:12 +03:00
parent 536fb1ef2a
commit 64edd91dbd
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_player.h
View file

@ -239,7 +239,8 @@ typedef enum
CR_MACESPIN, CR_MACESPIN,
CR_MINECART, CR_MINECART,
CR_ROLLOUT, CR_ROLLOUT,
CR_PTERABYTE CR_PTERABYTE,
CR_DUSTDEVIL
} carrytype_t; // pw_carry } carrytype_t; // pw_carry
// Player powers. (don't edit this comment) // Player powers. (don't edit this comment)

1
src/dehacked.c
View file

@ -9468,6 +9468,7 @@ struct {
{"CR_MINECART",CR_MINECART}, {"CR_MINECART",CR_MINECART},
{"CR_ROLLOUT",CR_ROLLOUT}, {"CR_ROLLOUT",CR_ROLLOUT},
{"CR_PTERABYTE",CR_PTERABYTE}, {"CR_PTERABYTE",CR_PTERABYTE},
{"CR_DUSTDEVIL",CR_DUSTDEVIL},
// Ring weapons (ringweapons_t) // Ring weapons (ringweapons_t)
// Useful for A_GiveWeapon // Useful for A_GiveWeapon

5
src/p_enemy.c
View file

@ -13311,8 +13311,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
P_ResetPlayer(player); P_ResetPlayer(player);
A_PlayActiveSound(dustdevil); A_PlayActiveSound(dustdevil);
} }
player->powers[pw_carry] = CR_DUSTDEVIL;
player->powers[pw_nocontrol] = 2; player->powers[pw_nocontrol] = 2;
player->drawangle += ANG20; P_SetTarget(&thing->tracer, dustdevil);
P_SetPlayerMobjState(thing, S_PLAY_PAIN); P_SetPlayerMobjState(thing, S_PLAY_PAIN);
if (dist > dragamount) if (dist > dragamount)
@ -13332,7 +13333,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
P_ResetPlayer(player); P_ResetPlayer(player);
thing->z = dustdevil->z + dustdevil->height; thing->z = dustdevil->z + dustdevil->height;
thrust = 20 * FRACUNIT; thrust = 20 * FRACUNIT;
player->powers[pw_carry] = CR_NONE;
player->powers[pw_nocontrol] = 0; player->powers[pw_nocontrol] = 0;
P_SetTarget(&thing->tracer, NULL);
S_StartSound(thing, sfx_wdjump); S_StartSound(thing, sfx_wdjump);
P_SetPlayerMobjState(thing, S_PLAY_FALL); P_SetPlayerMobjState(thing, S_PLAY_FALL);
} }

3
src/p_user.c
View file

@ -11950,6 +11950,9 @@ void P_PlayerThink(player_t *player)
break; break;
} }
/* FALLTHRU */ /* FALLTHRU */
case CR_DUSTDEVIL:
player->drawangle += ANG20;
break;
default: default:
player->drawangle = player->mo->angle; player->drawangle = player->mo->angle;
break; break;