stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only Award Bonuses / RA Emblems from Physically Beating a Level

Browse source
This commit is contained in:
SMS Alfredo 2023-09-19 21:48:01 -05:00
parent 6deaf89f72
commit 7bcad024f8
9 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_game.c
View file

@ -3330,7 +3330,7 @@ void G_AddPlayer(INT32 playernum)
p->lives = cv_startinglives.value; p->lives = cv_startinglives.value;
if ((countplayers && !notexiting) || G_IsSpecialStage(gamemap)) if ((countplayers && !notexiting) || G_IsSpecialStage(gamemap))
P_DoPlayerExit(p); P_DoPlayerExit(p, false);
} }
boolean G_EnoughPlayersFinished(void) boolean G_EnoughPlayersFinished(void)
@ -3863,12 +3863,13 @@ static INT16 RandMap(UINT32 tolflags, INT16 pprevmap)
// //
// G_UpdateVisited // G_UpdateVisited
// //
static void G_UpdateVisited(gamedata_t *data, player_t *player, boolean silent) static void G_UpdateVisited(gamedata_t *data, player_t *player, boolean global)
{ {
// Update visitation flags? // Update visitation flags?
if (!demoplayback if (!demoplayback
&& G_CoopGametype() // Campaign mode && G_CoopGametype() // Campaign mode
&& !stagefailed) // Did not fail the stage && !stagefailed // Did not fail the stage
&& (global || player->pflags & PF_FINISHED)) // Actually beat the stage
{ {
UINT8 earnedEmblems; UINT8 earnedEmblems;
UINT16 totalrings = 0; UINT16 totalrings = 0;
@ -3906,12 +3907,12 @@ static void G_UpdateVisited(gamedata_t *data, player_t *player, boolean silent)
data->mapvisited[gamemap-1] |= MV_ALLEMERALDS; data->mapvisited[gamemap-1] |= MV_ALLEMERALDS;
} }
if ((earnedEmblems = M_CompletionEmblems(data)) && !silent) if ((earnedEmblems = M_CompletionEmblems(data)) && !global)
{ {
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : ""); CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : "");
} }
if (silent) if (global)
{ {
M_CheckLevelEmblems(data); M_CheckLevelEmblems(data);
} }

3
src/lua_baselib.c
View file

@ -1546,11 +1546,12 @@ static int lib_pDoPlayerFinish(lua_State *L)
static int lib_pDoPlayerExit(lua_State *L) static int lib_pDoPlayerExit(lua_State *L)
{ {
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
boolean finishedflag = lua_opttrueboolean(L, 2);
NOHUD NOHUD
INLEVEL INLEVEL
if (!player) if (!player)
return LUA_ErrInvalid(L, "player_t"); return LUA_ErrInvalid(L, "player_t");
P_DoPlayerExit(player); P_DoPlayerExit(player, finishedflag);
return 0; return 0;
} }

2
src/netcode/d_netcmd.c
View file

@ -4035,7 +4035,7 @@ static void ExitMove_OnChange(void)
if (players[i].mo->target && players[i].mo->target->type == MT_SIGN) if (players[i].mo->target && players[i].mo->target->type == MT_SIGN)
P_SetTarget(&players[i].mo->target, NULL); P_SetTarget(&players[i].mo->target, NULL);
if (players[i].pflags & PF_FINISHED) if (players[i].pflags & PF_FINISHED && !(players[i].exiting))
P_GiveFinishFlags(&players[i]); P_GiveFinishFlags(&players[i]);
} }

4
src/p_enemy.c
View file

@ -3951,7 +3951,7 @@ static void P_DoBossVictory(mobj_t *mo)
{ {
if (!playeringame[i]) if (!playeringame[i])
continue; continue;
P_DoPlayerExit(&players[i]); P_DoPlayerExit(&players[i], true);
} }
} }
else else
@ -10820,7 +10820,7 @@ void A_ForceWin(mobj_t *actor)
{ {
if (!playeringame[i]) if (!playeringame[i])
continue; continue;
P_DoPlayerExit(&players[i]); P_DoPlayerExit(&players[i], true);
} }
} }

2
src/p_local.h
View file

@ -188,7 +188,7 @@ void P_DoPityCheck(player_t *player);
void P_PlayerThink(player_t *player); void P_PlayerThink(player_t *player);
void P_PlayerAfterThink(player_t *player); void P_PlayerAfterThink(player_t *player);
void P_DoPlayerFinish(player_t *player); void P_DoPlayerFinish(player_t *player);
void P_DoPlayerExit(player_t *player); void P_DoPlayerExit(player_t *player, boolean finishedflag);
void P_NightserizePlayer(player_t *player, INT32 ptime); void P_NightserizePlayer(player_t *player, INT32 ptime);
void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move); void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move);

2
src/p_mobj.c
View file

@ -11715,7 +11715,7 @@ void P_AfterPlayerSpawn(INT32 playernum)
if (CheckForReverseGravity) if (CheckForReverseGravity)
P_CheckGravity(mobj, false); P_CheckGravity(mobj, false);
if (p->pflags & PF_FINISHED) if (p->pflags & PF_FINISHED && !(p->exiting))
P_GiveFinishFlags(p); P_GiveFinishFlags(p);
} }

8
src/p_spec.c
View file

@ -3662,7 +3662,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{ {
if (!playeringame[i]) if (!playeringame[i])
continue; continue;
P_DoPlayerExit(&players[i]); P_DoPlayerExit(&players[i], true);
} }
} }
} }
@ -3716,7 +3716,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{ {
if (!playeringame[i]) if (!playeringame[i])
continue; continue;
P_DoPlayerExit(&players[i]); P_DoPlayerExit(&players[i], true);
} }
} }
} }
@ -4477,7 +4477,7 @@ static void P_ProcessEggCapsule(player_t *player, sector_t *sector)
{ {
if (!playeringame[i]) if (!playeringame[i])
continue; continue;
P_DoPlayerExit(&players[i]); P_DoPlayerExit(&players[i], true);
} }
} }
@ -4787,7 +4787,7 @@ static void P_ProcessFinishLine(player_t *player)
HU_DoCEcho("FINISHED!"); HU_DoCEcho("FINISHED!");
} }
P_DoPlayerExit(player); P_DoPlayerExit(player, true);
} }
} }

12
src/p_user.c
View file

@ -892,7 +892,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
players[i].marescore = 0; players[i].marescore = 0;
players[i].spheres = players[i].rings = 0; players[i].spheres = players[i].rings = 0;
P_DoPlayerExit(&players[i]); P_DoPlayerExit(&players[i], true);
} }
} }
else if (oldmare != player->mare) else if (oldmare != player->mare)
@ -2188,7 +2188,7 @@ void P_DoPlayerFinish(player_t *player)
// P_DoPlayerExit // P_DoPlayerExit
// //
// Player exits the map via sector trigger // Player exits the map via sector trigger
void P_DoPlayerExit(player_t *player) void P_DoPlayerExit(player_t *player, boolean finishedflag)
{ {
if (player->exiting) if (player->exiting)
return; return;
@ -2209,7 +2209,11 @@ void P_DoPlayerExit(player_t *player)
player->exiting = (14*TICRATE)/5 + 1; player->exiting = (14*TICRATE)/5 + 1;
} }
else else
{
player->exiting = (14*TICRATE)/5 + 2; // Accidental death safeguard??? player->exiting = (14*TICRATE)/5 + 2; // Accidental death safeguard???
if (finishedflag)
player->pflags |= PF_FINISHED; // Give PF_FINISHED as proof of a true finish
}
//player->pflags &= ~PF_GLIDING; //player->pflags &= ~PF_GLIDING;
if (player->climbing) if (player->climbing)
@ -11782,7 +11786,7 @@ void P_PlayerThink(player_t *player)
if (((gametyperules & GTR_FRIENDLY) && cv_exitmove.value) && !G_EnoughPlayersFinished()) if (((gametyperules & GTR_FRIENDLY) && cv_exitmove.value) && !G_EnoughPlayersFinished())
player->exiting = 0; player->exiting = 0;
else else
P_DoPlayerExit(player); P_DoPlayerExit(player, false);
} }
// check water content, set stuff in mobj // check water content, set stuff in mobj
@ -11831,7 +11835,7 @@ void P_PlayerThink(player_t *player)
} }
// Synchronizes the "real" amount of time spent in the level. // Synchronizes the "real" amount of time spent in the level.
if (!player->exiting && !stoppedclock) if (!player->exiting && !(player->pflags & PF_FINISHED) && !stoppedclock)
{ {
if (gametyperules & GTR_RACE) if (gametyperules & GTR_RACE)
{ {

9
src/y_inter.c
View file

@ -2043,7 +2043,7 @@ static void Y_AwardCoopBonuses(void)
y_bonus_t localbonuses[4]; y_bonus_t localbonuses[4];
// set score/total first // set score/total first
data.coop.total = players[consoleplayer].recordscore; data.coop.total = (players[consoleplayer].pflags & PF_FINISHED) ? players[consoleplayer].recordscore : 0;
data.coop.score = players[consoleplayer].score; data.coop.score = players[consoleplayer].score;
data.coop.gotperfbonus = -1; data.coop.gotperfbonus = -1;
memset(data.coop.bonuses, 0, sizeof(data.coop.bonuses)); memset(data.coop.bonuses, 0, sizeof(data.coop.bonuses));
@ -2060,7 +2060,12 @@ static void Y_AwardCoopBonuses(void)
for (j = 0; j < 4; ++j) // Set bonuses for (j = 0; j < 4; ++j) // Set bonuses
{ {
(bonuses_list[bonusnum][j])(&players[i], &localbonuses[j]); //Set the bonus, but only if we actually finished
if (players[i].pflags & PF_FINISHED)
(bonuses_list[bonusnum][j])(&players[i], &localbonuses[j]);
else
Y_SetNullBonus(&players[i], &localbonuses[j]);
players[i].score += localbonuses[j].points; players[i].score += localbonuses[j].points;
if (players[i].score > MAXSCORE) if (players[i].score > MAXSCORE)
players[i].score = MAXSCORE; players[i].score = MAXSCORE;