stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 02:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

A better method of

Browse source 
Instead of returning at the very start of P_MoveChaseCamera, just set camstill to true, and add another exiting check to momentum. This lets the mirror mode post process effect to continue working.
This commit is contained in:
TehRealSalt 2018-06-08 01:12:07 -04:00
parent 4e2b30fcae
commit 3dac0e21cc
2 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_inter.c
View file

@ -152,6 +152,9 @@ void P_ResetStarposts(void)
// //
boolean P_CanPickupItem(player_t *player, boolean weapon) boolean P_CanPickupItem(player_t *player, boolean weapon)
{ {
if (player->exiting)
return false;
/*if (G_BattleGametype() && player->kartstuff[k_balloon] <= 0) // No balloons in Match /*if (G_BattleGametype() && player->kartstuff[k_balloon] <= 0) // No balloons in Match
return false;*/ return false;*/

49
src/p_user.c
View file

@ -8138,9 +8138,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
subsector_t *newsubsec; subsector_t *newsubsec;
fixed_t f1, f2; fixed_t f1, f2;
if (player->exiting) // SRB2Kart: Leave the camera behind while exiting, for dramatic effect!
return true;
cameranoclip = (player->pflags & (PF_NOCLIP|PF_NIGHTSMODE)) || (player->mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!! cameranoclip = (player->pflags & (PF_NOCLIP|PF_NIGHTSMODE)) || (player->mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!!
if (!(player->climbing || (player->pflags & PF_NIGHTSMODE) || player->playerstate == PST_DEAD)) if (!(player->climbing || (player->pflags & PF_NIGHTSMODE) || player->playerstate == PST_DEAD))
@ -8275,8 +8272,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
lookback = camspin4; lookback = camspin4;
} }
// SRB2kart - Camera flipper if (player->exiting) // SRB2Kart: Leave the camera behind while exiting, for dramatic effect!
if (lookback) camstill = true;
else if (lookback) // SRB2kart - Camera flipper
{ {
camrotate += 180; camrotate += 180;
camspeed *= 2; camspeed *= 2;
@ -8684,27 +8682,36 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
} }
}*/ }*/
if (twodlevel || (mo->flags2 & MF2_TWOD)) if (player->exiting)
{ {
thiscam->momx = x-thiscam->x; thiscam->momx = 0;
thiscam->momy = y-thiscam->y; thiscam->momy = 0;
thiscam->momz = z-thiscam->z; thiscam->momz = 0;
} }
else else
{ {
thiscam->momx = FixedMul(x - thiscam->x, camspeed); if (twodlevel || (mo->flags2 & MF2_TWOD))
thiscam->momy = FixedMul(y - thiscam->y, camspeed); {
thiscam->momx = x-thiscam->x;
if ((GETSECSPECIAL(thiscam->subsector->sector->special, 1) == 6 thiscam->momy = y-thiscam->y;
&& thiscam->z < thiscam->subsector->sector->floorheight + 256*FRACUNIT thiscam->momz = z-thiscam->z;
&& FixedMul(z - thiscam->z, camspeed) < 0) }
#if 0
|| player->kartstuff[k_pogospring] // SRB2Kart: don't follow while bouncing, experimental
#endif
)
thiscam->momz = 0; // Don't go down a death pit
else else
thiscam->momz = FixedMul(z - thiscam->z, camspeed); {
thiscam->momx = FixedMul(x - thiscam->x, camspeed);
thiscam->momy = FixedMul(y - thiscam->y, camspeed);
if ((GETSECSPECIAL(thiscam->subsector->sector->special, 1) == 6
&& thiscam->z < thiscam->subsector->sector->floorheight + 256*FRACUNIT
&& FixedMul(z - thiscam->z, camspeed) < 0)
#if 0
|| player->kartstuff[k_pogospring] // SRB2Kart: don't follow while bouncing, experimental
#endif
)
thiscam->momz = 0; // Don't go down a death pit
else
thiscam->momz = FixedMul(z - thiscam->z, camspeed);
}
} }
// compute aming to look the viewed point // compute aming to look the viewed point