lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Mutiability flag-ised as requested by Rob.

Browse source
This commit is contained in:
toasterbabe 2017-03-27 15:03:21 +01:00
parent 79f2d616fc
commit 5065fa302a
3 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -46,6 +46,7 @@ typedef enum
SF_MACHINE = 1<<10, // Beep boop. Are you a robot? SF_MACHINE = 1<<10, // Beep boop. Are you a robot?
SF_DASHMODE = 1<<11, // Sonic Advance 2 style top speed increase? SF_DASHMODE = 1<<11, // Sonic Advance 2 style top speed increase?
SF_FASTEDGE = 1<<12, // Faster edge teeter? SF_FASTEDGE = 1<<12, // Faster edge teeter?
SF_MULTIABILITY = 1<<13, // Revenge of Final Demo.
// free up to and including 1<<31 // free up to and including 1<<31
} skinflags_t; } skinflags_t;
@ -75,7 +76,6 @@ typedef enum
{ {
CA2_NONE=0, CA2_NONE=0,
CA2_SPINDASH, CA2_SPINDASH,
CA2_MULTIABILITY,
CA2_GUNSLINGER, CA2_GUNSLINGER,
CA2_MELEE CA2_MELEE
} charability2_t; } charability2_t;

2
src/dehacked.c
View file

@ -7387,6 +7387,7 @@ struct {
{"SF_MACHINE",SF_MACHINE}, {"SF_MACHINE",SF_MACHINE},
{"SF_DASHMODE",SF_DASHMODE}, {"SF_DASHMODE",SF_DASHMODE},
{"SF_FASTEDGE",SF_FASTEDGE}, {"SF_FASTEDGE",SF_FASTEDGE},
{"SF_MULTIABILITY",SF_MULTIABILITY},
// Character abilities! // Character abilities!
// Primary // Primary
@ -7409,7 +7410,6 @@ struct {
// Secondary // Secondary
{"CA2_NONE",CA2_NONE}, // now slot 0! {"CA2_NONE",CA2_NONE}, // now slot 0!
{"CA2_SPINDASH",CA2_SPINDASH}, {"CA2_SPINDASH",CA2_SPINDASH},
{"CA2_MULTIABILITY",CA2_MULTIABILITY},
{"CA2_GUNSLINGER",CA2_GUNSLINGER}, {"CA2_GUNSLINGER",CA2_GUNSLINGER},
{"CA2_MELEE",CA2_MELEE}, {"CA2_MELEE",CA2_MELEE},

55
src/p_user.c
View file

@ -3628,7 +3628,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
player->mo->momz = 7*FRACUNIT; player->mo->momz = 7*FRACUNIT;
if (player->charability == CA_JUMPBOOST && onground) if (player->charability == CA_JUMPBOOST && onground)
{ {
if (player->charability2 == CA2_MULTIABILITY) if (player->charflags & SF_MULTIABILITY)
player->mo->momz += FixedMul(FRACUNIT/4, dist6); player->mo->momz += FixedMul(FRACUNIT/4, dist6);
else else
player->mo->momz += FixedMul(FRACUNIT/8, dist6); player->mo->momz += FixedMul(FRACUNIT/8, dist6);
@ -3643,7 +3643,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
// Add a boost for super characters with float/slowfall and multiability. // Add a boost for super characters with float/slowfall and multiability.
if (player->charability == CA_JUMPBOOST) if (player->charability == CA_JUMPBOOST)
{ {
if (player->charability2 == CA2_MULTIABILITY) if (player->charflags & SF_MULTIABILITY)
player->mo->momz += FixedMul(FRACUNIT/4, dist6); player->mo->momz += FixedMul(FRACUNIT/4, dist6);
else else
player->mo->momz += FixedMul(FRACUNIT/8, dist6); player->mo->momz += FixedMul(FRACUNIT/8, dist6);
@ -3654,7 +3654,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
player->mo->momz = 39*(FRACUNIT/4); // Default jump momentum. player->mo->momz = 39*(FRACUNIT/4); // Default jump momentum.
if (player->charability == CA_JUMPBOOST && onground) if (player->charability == CA_JUMPBOOST && onground)
{ {
if (player->charability2 == CA2_MULTIABILITY) if (player->charflags & SF_MULTIABILITY)
player->mo->momz += FixedMul(FRACUNIT/4, dist6); player->mo->momz += FixedMul(FRACUNIT/4, dist6);
else else
player->mo->momz += FixedMul(FRACUNIT/8, dist6); player->mo->momz += FixedMul(FRACUNIT/8, dist6);
@ -3673,7 +3673,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
if (twodlevel || (player->mo->flags2 & MF2_TWOD)) if (twodlevel || (player->mo->flags2 & MF2_TWOD))
factor += player->jumpfactor / 10; factor += player->jumpfactor / 10;
if (player->charability2 == CA2_MULTIABILITY && player->charability == CA_DOUBLEJUMP) if (player->charflags & SF_MULTIABILITY && player->charability == CA_DOUBLEJUMP)
factor -= max(0, player->secondjump * player->jumpfactor / ((player->actionspd >> FRACBITS) + 1)); // Reduce the jump height each time factor -= max(0, player->secondjump * player->jumpfactor / ((player->actionspd >> FRACBITS) + 1)); // Reduce the jump height each time
P_SetObjectMomZ(player->mo, FixedMul(factor, player->mo->momz), false); // Custom height P_SetObjectMomZ(player->mo, FixedMul(factor, player->mo->momz), false); // Custom height
@ -4117,7 +4117,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
if (player->pflags & PF_JUMPSTASIS) if (player->pflags & PF_JUMPSTASIS)
return; return;
if ((player->charability == CA_HOMINGTHOK) && !player->homing && (player->pflags & PF_JUMPED) && (!(player->pflags & PF_THOKKED) || (player->charability2 == CA2_MULTIABILITY)) && (lockon = P_LookForEnemies(player, true, false)) && !((leveltime & 4) && (lockon->flags & (MF_ENEMY|MF_BOSS)) && player->powers[pw_shield] == SH_ATTRACT)) if ((player->charability == CA_HOMINGTHOK) && !player->homing && (player->pflags & PF_JUMPED) && (!(player->pflags & PF_THOKKED) || (player->charflags & SF_MULTIABILITY)) && (lockon = P_LookForEnemies(player, true, false)))
{ {
if (player == &players[consoleplayer] || player == &players[secondarydisplayplayer] || player == &players[displayplayer]) // Only display it on your own view. if (player == &players[consoleplayer] || player == &players[secondarydisplayplayer] || player == &players[displayplayer]) // Only display it on your own view.
{ {
@ -4146,7 +4146,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
case CA_TELEKINESIS: case CA_TELEKINESIS:
if (player->pflags & PF_JUMPED) if (player->pflags & PF_JUMPED)
{ {
if (!(player->pflags & PF_THOKKED) || (player->charability2 == CA2_MULTIABILITY)) if (!(player->pflags & PF_THOKKED) || (player->charflags & SF_MULTIABILITY))
{ {
P_Telekinesis(player, P_Telekinesis(player,
-FixedMul(player->actionspd, player->mo->scale), // -ve thrust (pulling towards player) -FixedMul(player->actionspd, player->mo->scale), // -ve thrust (pulling towards player)
@ -4241,7 +4241,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
case CA_JUMPTHOK: // Credit goes to CZ64 and Sryder13 for the original case CA_JUMPTHOK: // Credit goes to CZ64 and Sryder13 for the original
// Now it's Sonic's abilities turn! // Now it's Sonic's abilities turn!
// THOK! // THOK!
if (!(player->pflags & PF_THOKKED) || (player->charability2 == CA2_MULTIABILITY)) if (!(player->pflags & PF_THOKKED) || (player->charflags & SF_MULTIABILITY))
{ {
// Catapult the player // Catapult the player
fixed_t actionspd = player->actionspd; fixed_t actionspd = player->actionspd;
@ -4315,7 +4315,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break; break;
case CA_GLIDEANDCLIMB: case CA_GLIDEANDCLIMB:
// Now Knuckles-type abilities are checked. // Now Knuckles-type abilities are checked.
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
INT32 glidespeed = player->actionspd; INT32 glidespeed = player->actionspd;
@ -4328,7 +4328,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_DOUBLEJUMP: // Double-Jump case CA_DOUBLEJUMP: // Double-Jump
if (!(player->pflags & PF_THOKKED) || ((player->charability2 == CA2_MULTIABILITY) && (player->secondjump < (player->actionspd >> FRACBITS)))) if (!(player->pflags & PF_THOKKED) || ((player->charflags & SF_MULTIABILITY) && (player->secondjump < (player->actionspd >> FRACBITS))))
{ {
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
player->pflags &= ~PF_JUMPED; player->pflags &= ~PF_JUMPED;
@ -4338,7 +4338,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break; break;
case CA_FLOAT: // Float case CA_FLOAT: // Float
case CA_SLOWFALL: // Slow descent hover case CA_SLOWFALL: // Slow descent hover
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
if (player->charflags & SF_DASHMODE && player->dashmode >= 3*TICRATE) if (player->charflags & SF_DASHMODE && player->dashmode >= 3*TICRATE)
P_SetPlayerMobjState(player->mo, S_PLAY_DASH); P_SetPlayerMobjState(player->mo, S_PLAY_DASH);
@ -4352,7 +4352,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_TELEKINESIS: case CA_TELEKINESIS:
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
P_Telekinesis(player, P_Telekinesis(player,
FixedMul(player->actionspd, player->mo->scale), // +ve thrust (pushing away from player) FixedMul(player->actionspd, player->mo->scale), // +ve thrust (pushing away from player)
@ -4360,7 +4360,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_FALLSWITCH: case CA_FALLSWITCH:
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
player->mo->momz = -player->mo->momz; player->mo->momz = -player->mo->momz;
P_SpawnThokMobj(player); P_SpawnThokMobj(player);
@ -4368,7 +4368,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_AIRDRILL: case CA_AIRDRILL:
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
player->flyangle = 56 + (60-(player->actionspd>>FRACBITS))/3; player->flyangle = 56 + (60-(player->actionspd>>FRACBITS))/3;
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
@ -4376,7 +4376,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_BOUNCE: case CA_BOUNCE:
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE); P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE);
player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE); player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE);
@ -4387,7 +4387,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_TWINSPIN: case CA_TWINSPIN:
if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
{ {
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
S_StartSound(player->mo, sfx_s3k42); S_StartSound(player->mo, sfx_s3k42);
@ -4461,17 +4461,15 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
// Repeat abilities, but not double jump! // Repeat abilities, but not double jump!
if (player->secondjump == 1 && player->charability != CA_DOUBLEJUMP) if (player->secondjump == 1 && player->charability != CA_DOUBLEJUMP)
{ {
if (player->charability2 == CA2_MULTIABILITY) if (player->charflags & SF_MULTIABILITY)
{ {
player->pflags |= (PF_JUMPED|((player->charflags & SF_NOJUMPDAMAGE) ? PF_NOJUMPDAMAGE : 0)); player->pflags |= (PF_JUMPED|PF_NOJUMPDAMAGE);
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
player->secondjump = 0; player->secondjump = 0;
} }
else else
{
P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
player->secondjump = 2; player->secondjump = 2;
}
P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
} }
// If letting go of the jump button while still on ascent, cut the jump height. // If letting go of the jump button while still on ascent, cut the jump height.
@ -6917,7 +6915,7 @@ static void P_MovePlayer(player_t *player)
P_ResetPlayer(player); // down, stop gliding. P_ResetPlayer(player); // down, stop gliding.
if (onground) if (onground)
P_SetPlayerMobjState(player->mo, S_PLAY_WALK); P_SetPlayerMobjState(player->mo, S_PLAY_WALK);
else if (player->charability2 == CA2_MULTIABILITY) else if (player->charflags & SF_MULTIABILITY)
{ {
player->pflags |= (PF_JUMPED|((player->charflags & SF_NOJUMPDAMAGE) ? PF_NOJUMPDAMAGE : 0)); player->pflags |= (PF_JUMPED|((player->charflags & SF_NOJUMPDAMAGE) ? PF_NOJUMPDAMAGE : 0));
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP); P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
@ -6954,7 +6952,7 @@ static void P_MovePlayer(player_t *player)
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
if (onground) if (onground)
P_SetPlayerMobjState(player->mo, S_PLAY_WALK); P_SetPlayerMobjState(player->mo, S_PLAY_WALK);
else if (player->charability2 == CA2_MULTIABILITY) else if (player->charflags & SF_MULTIABILITY)
{ {
player->pflags |= (PF_JUMPED|((player->charflags & SF_NOJUMPDAMAGE) ? PF_NOJUMPDAMAGE : 0)); player->pflags |= (PF_JUMPED|((player->charflags & SF_NOJUMPDAMAGE) ? PF_NOJUMPDAMAGE : 0));
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP); P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
@ -7034,7 +7032,7 @@ static void P_MovePlayer(player_t *player)
{ {
const fixed_t actionspd = player->actionspd/100; const fixed_t actionspd = player->actionspd/100;
if (player->charability2 == CA2_MULTIABILITY) if (player->charflags & SF_MULTIABILITY)
{ {
// Adventure-style flying by just holding the button down // Adventure-style flying by just holding the button down
if (cmd->buttons & BT_JUMP && !(player->pflags & PF_STASIS) && !player->exiting) if (cmd->buttons & BT_JUMP && !(player->pflags & PF_STASIS) && !player->exiting)
@ -9139,8 +9137,8 @@ void P_PlayerThink(player_t *player)
if (player->panim != PA_ABILITY) if (player->panim != PA_ABILITY)
P_SetPlayerMobjState(player->mo, S_PLAY_GLIDE); P_SetPlayerMobjState(player->mo, S_PLAY_GLIDE);
} }
else if ((player->pflags & PF_JUMPED) else if ((player->pflags & PF_JUMPED && !(player->pflags & PF_NOJUMPDAMAGE))
&& ((player->charflags & SF_NOJUMPSPIN && !(player->pflags & PF_NOJUMPDAMAGE) && player->panim != PA_ROLL) && ((player->charflags & SF_NOJUMPSPIN && player->panim != PA_ROLL)
|| (!(player->charflags & SF_NOJUMPSPIN) && player->panim != PA_JUMP))) || (!(player->charflags & SF_NOJUMPSPIN) && player->panim != PA_JUMP)))
{ {
if (!(player->charflags & SF_NOJUMPSPIN)) if (!(player->charflags & SF_NOJUMPSPIN))
@ -9806,11 +9804,6 @@ void P_PlayerAfterThink(player_t *player)
} }
else if (player->pflags & PF_SLIDING) else if (player->pflags & PF_SLIDING)
P_SetPlayerMobjState(player->mo, player->mo->info->painstate); P_SetPlayerMobjState(player->mo, player->mo->info->painstate);
else if (player->pflags & PF_JUMPED
&& ((!player->powers[pw_super] && player->panim != PA_JUMP)
|| player->mo->state == &states[player->mo->info->painstate])
&& !(player->charflags & SF_NOJUMPSPIN))
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
/* if (player->powers[pw_carry] == CR_NONE && player->mo->tracer && !player->homing) /* if (player->powers[pw_carry] == CR_NONE && player->mo->tracer && !player->homing)
P_SetTarget(&player->mo->tracer, NULL); P_SetTarget(&player->mo->tracer, NULL);