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

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into spinny-sign

Browse source
This commit is contained in:
toaster 2019-11-09 16:44:06 +00:00
commit aaddfada50
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -2803,7 +2803,7 @@ void G_AddPlayer(INT32 playernum)
countplayers++; countplayers++;
if (!players->exiting) if (!players[i].exiting)
notexiting++; notexiting++;
if (!(cv_coopstarposts.value && (gametype == GT_COOP) && (p->starpostnum < players[i].starpostnum))) if (!(cv_coopstarposts.value && (gametype == GT_COOP) && (p->starpostnum < players[i].starpostnum)))

2
src/p_inter.c
View file

@ -633,7 +633,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (!(netgame || multiplayer)) if (!(netgame || multiplayer))
{ {
player->continues += 1; player->continues += 1;
players->gotcontinue = true; player->gotcontinue = true;
if (P_IsLocalPlayer(player)) if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_s3kac); S_StartSound(NULL, sfx_s3kac);
else else

2
src/p_map.c
View file

@ -540,7 +540,7 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
static void P_DoPterabyteCarry(player_t *player, mobj_t *ptera) static void P_DoPterabyteCarry(player_t *player, mobj_t *ptera)
{ {
if (player->powers[pw_carry] && players->powers[pw_carry] != CR_ROLLOUT) if (player->powers[pw_carry] && player->powers[pw_carry] != CR_ROLLOUT)
return; return;
if (ptera->extravalue1 != 1) if (ptera->extravalue1 != 1)
return; // Not swooping return; // Not swooping