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

Cleanup.

Browse source 
* Fixed a major hack from when I SPR2ised NiGHTS by spawning in a null object.
* Made P_LookForEnemies better in preperation for the future.
* Changed some defaulting characteristics of P_GetMobjSprite2.
* Fixed CA_DOUBLEJUMP potentially counting as a float.
* Killed some extremely small boolean functions and replaced them with #defines.
This commit is contained in:
toasterbabe 2017-03-20 16:57:24 +00:00
parent f0c364c71c
commit a4c1c3195f
3 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_local.h
View file

@ -150,7 +150,11 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings);
void P_GivePlayerLives(player_t *player, INT32 numlives);
UINT8 P_GetNextEmerald(void);
void P_GiveEmerald(boolean spawnObj);
#if 0
void P_ResetScore(player_t *player);
#else
#define P_ResetScore(player) player->scoreadd = 0
#endif
boolean P_AutoPause(void);
void P_DoJumpShield(player_t *player);
@ -175,7 +179,11 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius);
void P_HomingAttack(mobj_t *source, mobj_t *enemy); /// \todo doesn't belong in p_user
boolean P_SuperReady(player_t *player);
void P_DoJump(player_t *player, boolean soundandstate);
#if 0
boolean P_AnalogMove(player_t *player);
#else
#define P_AnalogMove(player) (player->pflags & PF_ANALOGMODE)
#endif
boolean P_TransferToNextMare(player_t *player);
UINT8 P_FindLowestMare(void);
void P_FindEmerald(void);

16
src/p_mobj.c
View file

@ -211,9 +211,6 @@ UINT8 P_GetMobjSprite2(mobj_t *mobj, UINT8 spr2)
switch(spr2)
{
case SPR2_DASH:
spr2 = SPR2_RUN ;
break;
case SPR2_RUN:
spr2 = SPR2_WALK;
break;
@ -272,6 +269,10 @@ UINT8 P_GetMobjSprite2(mobj_t *mobj, UINT8 spr2)
spr2 = SPR2_RUN ;
break;
case SPR2_DASH:
spr2 = SPR2_FRUN;
break;
case SPR2_BNCE:
spr2 = SPR2_FALL;
break;
@ -289,10 +290,12 @@ UINT8 P_GetMobjSprite2(mobj_t *mobj, UINT8 spr2)
// NiGHTS sprites.
case SPR2_NSTD:
spr2 = FF_SPR2SUPER|SPR2_STND;
spr2 = SPR2_STND;
super = FF_SPR2SUPER;
break;
case SPR2_NFLT:
spr2 = FF_SPR2SUPER|SPR2_FLT ;
spr2 = SPR2_FLT ;
super = FF_SPR2SUPER;
break;
case SPR2_NSTN:
spr2 = SPR2_STUN;
@ -301,7 +304,8 @@ UINT8 P_GetMobjSprite2(mobj_t *mobj, UINT8 spr2)
spr2 = SPR2_NSTN;
break;
case SPR2_NATK:
spr2 = FF_SPR2SUPER|SPR2_ROLL;
spr2 = SPR2_ROLL;
super = FF_SPR2SUPER;
break;
/*case SPR2_NGT0:
spr2 = SPR2_NFLT;

40
src/p_user.c
View file

@ -325,6 +325,7 @@ void P_GiveEmerald(boolean spawnObj)
}
}
#if 0
//
// P_ResetScore
//
@ -335,6 +336,7 @@ void P_ResetScore(player_t *player)
player->scoreadd = 0;
}
#endif
//
// P_FindLowestMare
@ -3932,7 +3934,7 @@ void P_DoJumpShield(player_t *player)
INT32 i;
#define numangles 6
#define limitangle (360/numangles)
angle_t travelangle = player->mo->angle + P_RandomRange(-limitangle, limitangle)*ANG1;
const angle_t travelangle = player->mo->angle + P_RandomRange(-limitangle, limitangle)*ANG1;
for (i = 0; i < numangles; i++)
{
spark = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_THUNDERCOIN_SPARK);
@ -4364,7 +4366,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
if ((gametype != GT_CTF || !player->gotflag) && !player->exiting)
{
if (player->secondjump == 1)
if (player->secondjump == 1 && player->charability != CA_DOUBLEJUMP)
{
fixed_t potentialmomz;
if (player->charability == CA_SLOWFALL)
@ -4408,10 +4410,12 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
}
}
#if 0
boolean P_AnalogMove(player_t *player)
{
return player->pflags & PF_ANALOGMODE;
}
#endif
//
// P_GetPlayerControlDirection
@ -5164,28 +5168,20 @@ static void P_NightsTransferPoints(player_t *player, fixed_t xspeed, fixed_t rad
if (player->exiting)
return;
/*
In some ways worse, in some ways better.
I did the following this way because the player object has to deal with touchspecials too, not just solids.
There were all sorts of fun bugs when the player got to touch the goal a frame earlier than it should've.
Technically, we lose out on being blocked by MF_SOLID objects, but official stages don't use them on the track.
I know we probably could've kept around MT_NIGHTSCHAR in some fashion, having an invisible hitbox following the
player around... but I'd already removed all its references, restructured the way the chaos emerald follows
the player around to fill the player->mo->tracer gap left behind, and NiGHTS is a lag magnet (lagnet?)
enough as it is... so whatever.
~toast
*/
{
fixed_t prevx = player->mo->x;
fixed_t prevy = player->mo->y;
boolean notallowed;
player->mo->flags |= MF_NOCLIPTHING; // player = NULL; // YIKES
notallowed = (!(P_TryMove(player->mo, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, true)));
P_TeleportMove(player->mo, prevx, prevy, player->mo->z);
player->mo->flags &= ~MF_NOCLIPTHING; // player = player; // unyikes
mobj_t *hack = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_NULL);
hack->flags = MF_NOGRAVITY;
hack->radius = player->mo->radius;
hack->height = player->mo->height;
hack->z = player->mo->z;
P_SetThingPosition(hack);
notallowed = (!(P_TryMove(hack, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, true)));
P_RemoveMobj(hack);
if (notallowed)
return;
}
#endif
{
const INT32 sequence = player->mo->target->threshold;
@ -7825,6 +7821,7 @@ boolean P_LookForEnemies(player_t *player, boolean nonenemies)
thinker_t *think;
mobj_t *closestmo = NULL;
angle_t an;
const UINT32 targetmask = (MF_ENEMY|MF_BOSS|(nonenemies ? (MF_MONITOR|MF_SPRING) : 0));
for (think = thinkercap.next; think != &thinkercap; think = think->next)
{
@ -7832,9 +7829,8 @@ boolean P_LookForEnemies(player_t *player, boolean nonenemies)
continue; // not a mobj thinker
mo = (mobj_t *)think;
if ((nonenemies && !(mo->flags & (MF_ENEMY|MF_BOSS|MF_MONITOR|MF_SPRING)))
|| (!nonenemies && !(mo->flags & (MF_ENEMY|MF_BOSS))))
continue; // not a valid enemy
if (!(mo->flags & targetmask))
continue; // not a valid target
if (mo->health <= 0) // dead
continue;