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

WIP fix signpost issues with exitmove

This commit is contained in:
lachwright 2019-11-20 21:02:34 +08:00
parent d1d1098f7c
commit cde56dbe6c
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_spec.c
View File

@ -4072,8 +4072,8 @@ void P_SetupSignExit(player_t *player)
if (thing->type != MT_SIGN)
continue;
if (!player->mo->target || player->mo->target->type != MT_SIGN)
P_SetTarget(&player->mo->target, thing);
if (!endsign || P_MobjWasRemoved(endsign))
endsign = thing;
if (thing->state != &states[thing->info->spawnstate])
continue;
@ -4101,8 +4101,8 @@ void P_SetupSignExit(player_t *player)
if (thing->type != MT_SIGN)
continue;
if (!player->mo->target || player->mo->target->type != MT_SIGN)
P_SetTarget(&player->mo->target, thing);
if (!endsign || P_MobjWasRemoved(endsign))
endsign = thing;
if (thing->state != &states[thing->info->spawnstate])
continue;

2
src/p_spec.h
View File

@ -21,6 +21,8 @@ extern mobj_t *skyboxmo[2]; // current skybox mobjs: 0 = viewpoint, 1 = centerpo
extern mobj_t *skyboxviewpnts[16]; // array of MT_SKYBOX viewpoint mobjs
extern mobj_t *skyboxcenterpnts[16]; // array of MT_SKYBOX centerpoint mobjs
mobj_t *endsign;
// GETSECSPECIAL (specialval, section)
//
// Pulls out the special # from a particular section.

6
src/p_user.c
View File

@ -9629,10 +9629,10 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
mo = player->mo;
if (player->exiting && mo->target && mo->target->type == MT_SIGN)
sign = mo->target;
if (player->exiting && endsign && !P_MobjWasRemoved(endsign))
sign = endsign;
cameranoclip = (player->powers[pw_carry] == CR_NIGHTSMODE || player->pflags & PF_NOCLIP) || (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!!
cameranoclip = (sign || player->powers[pw_carry] == CR_NIGHTSMODE || player->pflags & PF_NOCLIP) || (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!!
if (!(player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || tutorialmode))
{