From 144e2be2629caf1e74aa66b283162ac922944f1f Mon Sep 17 00:00:00 2001 From: Ashnal Date: Sat, 17 May 2025 15:18:53 -0400 Subject: [PATCH] More renaming --- src/g_game.c | 2 +- src/k_grandprix.cpp | 4 ++-- src/k_grandprix.h | 2 +- src/k_hud.cpp | 2 +- src/k_podium.cpp | 16 ++++++++-------- src/k_rank.cpp | 36 ++++++++++++++++++------------------ src/k_rank.h | 6 +++--- src/k_tally.cpp | 26 +++++++++++++------------- src/k_tally.h | 4 ++-- src/m_cond.c | 4 ++-- src/p_mobj.c | 4 ++-- src/p_saveg.cpp | 20 ++++++++++---------- 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index faaa98f0e..111a13d31 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4717,7 +4717,7 @@ static void G_DoCompleted(void) if (grandprixinfo.eventmode == GPEVENT_NONE) { grandprixinfo.rank.winPoints += K_CalculateGPRankPoints(K_GetEXP(player), grandprixinfo.rank.position, grandprixinfo.rank.totalPlayers); - grandprixinfo.rank.laps += K_GetEXP(player); + grandprixinfo.rank.exp += K_GetEXP(player); } else if (grandprixinfo.eventmode == GPEVENT_SPECIAL) { diff --git a/src/k_grandprix.cpp b/src/k_grandprix.cpp index 824e736d1..d4b96a257 100644 --- a/src/k_grandprix.cpp +++ b/src/k_grandprix.cpp @@ -55,7 +55,7 @@ UINT8 K_BotStartingDifficulty(SINT8 value) See header file for description. --------------------------------------------------*/ -INT16 K_CalculateGPRankPoints(UINT16 displayexp, UINT8 position, UINT8 numplayers) +INT16 K_CalculateGPRankPoints(UINT16 exp, UINT8 position, UINT8 numplayers) { INT16 points; @@ -65,7 +65,7 @@ INT16 K_CalculateGPRankPoints(UINT16 displayexp, UINT8 position, UINT8 numplayer return 0; } - points = displayexp; + points = exp; // Give bonus to high-ranking players, depending on player count // This rounds out the point gain when you get 1st every race, diff --git a/src/k_grandprix.h b/src/k_grandprix.h index 531a4797a..8b62187dc 100644 --- a/src/k_grandprix.h +++ b/src/k_grandprix.h @@ -73,7 +73,7 @@ UINT8 K_BotStartingDifficulty(SINT8 value); Number of points to give. --------------------------------------------------*/ -INT16 K_CalculateGPRankPoints(UINT16 displayexp, UINT8 position, UINT8 numplayers); +INT16 K_CalculateGPRankPoints(UINT16 exp, UINT8 position, UINT8 numplayers); /*-------------------------------------------------- diff --git a/src/k_hud.cpp b/src/k_hud.cpp index be37fba77..5ac223fc6 100644 --- a/src/k_hud.cpp +++ b/src/k_hud.cpp @@ -6422,7 +6422,7 @@ static void K_DrawGPRankDebugger(void) V_DrawThinString(0, 10, V_SNAPTOTOP|V_SNAPTOLEFT, va("PTS: %d / %d", grandprixinfo.rank.winPoints, grandprixinfo.rank.totalPoints)); V_DrawThinString(0, 20, V_SNAPTOTOP|V_SNAPTOLEFT, - va("LAPS: %d / %d", grandprixinfo.rank.laps, grandprixinfo.rank.totalLaps)); + va("LAPS: %d / %d", grandprixinfo.rank.exp, grandprixinfo.rank.totalExp)); V_DrawThinString(0, 30, V_SNAPTOTOP|V_SNAPTOLEFT, va("CONTINUES: %d", grandprixinfo.rank.continuesUsed)); V_DrawThinString(0, 40, V_SNAPTOTOP|V_SNAPTOLEFT, diff --git a/src/k_podium.cpp b/src/k_podium.cpp index 5b0c08c88..ea20555e3 100644 --- a/src/k_podium.cpp +++ b/src/k_podium.cpp @@ -144,8 +144,8 @@ void podiumData_s::Init(void) // Randomized winnings INT32 rgs = 0; - INT32 laps = 0; - INT32 tlaps = 0; + INT32 exp = 0; + INT32 texp = 0; INT32 prs = 0; INT32 tprs = 0; @@ -180,7 +180,7 @@ void podiumData_s::Init(void) default: { lvl->totalExp = TARGETEXP; - tlaps += lvl->totalExp; + texp += lvl->totalExp; break; } } @@ -223,13 +223,13 @@ void podiumData_s::Init(void) } } - laps += pexp; + exp += pexp; prs += pprs; } rank.rings = rgs; - rank.laps = laps; - rank.totalLaps = tlaps; + rank.exp = exp; + rank.totalExp = texp; rank.prisons = prs; rank.totalPrisons = tprs; } @@ -829,13 +829,13 @@ void podiumData_s::Draw(void) .xy(44.0, 0.0) .align(srb2::Draw::Align::kCenter) .font(srb2::Draw::Font::kThinTimer) - .text(va("%d / %d", rank.laps, rank.totalLaps)); + .text(va("%d / %d", rank.exp, rank.totalExp)); drawer_totals_right .xy(44.0, 14.0) .align(srb2::Draw::Align::kCenter) .font(srb2::Draw::Font::kZVote) - .text(va("%c%d", (rank.scoreLaps > 0 ? '+' : ' '), rank.scoreLaps)); + .text(va("%c%d", (rank.scoreExp > 0 ? '+' : ' '), rank.scoreExp)); } if ((state == PODIUM_ST_GRADE_APPEAR && delay == 0) diff --git a/src/k_rank.cpp b/src/k_rank.cpp index 138461874..b22197f17 100644 --- a/src/k_rank.cpp +++ b/src/k_rank.cpp @@ -289,7 +289,7 @@ static UINT32 RankCapsules_CountFromMap(const INT32 cupLevelNum) void gpRank_t::Init(void) { UINT8 numHumans = 0; - UINT32 laps = 0; + UINT32 exp = 0; INT32 i; memset(this, 0, sizeof(gpRank_t)); @@ -333,13 +333,13 @@ void gpRank_t::Init(void) if (cupLevelNum < nummapheaders && mapheaderinfo[cupLevelNum] != NULL) { //laps += K_RaceLapCount(cupLevelNum); - laps += TARGETEXP; + exp += TARGETEXP; } } for (i = 0; i < numHumans; i++) { - totalLaps += laps; + totalExp += exp; } // Search through all of the cup's bonus levels @@ -428,24 +428,24 @@ void gpRank_t::Rejigger(UINT16 removedmap, UINT16 removedgt, UINT16 addedmap, UI if (deltaLaps) { - INT32 workingTotalLaps = totalLaps; + INT32 workingTotalExp = totalExp; // +1, since 1st place laps are worth 2 pts. for (i = 0; i < numPlayers+1; i++) { - workingTotalLaps += deltaLaps; + workingTotalExp += deltaLaps; } - if (workingTotalLaps > 0) - totalLaps = workingTotalLaps; + if (workingTotalExp > 0) + totalExp = workingTotalExp; else - totalLaps = 0; + totalExp = 0; - deltaLaps += laps; + deltaLaps += exp; if (deltaLaps > 0) - laps = deltaLaps; + exp = deltaLaps; else - laps = 0; + exp = 0; } if (deltaPrisons) @@ -553,7 +553,7 @@ void gpRank_t::Update(void) dta->position = player->tally.position; dta->rings = player->tally.rings; - dta->exp = player->tally.laps; + dta->exp = player->tally.exp; dta->prisons = player->tally.prisons; dta->gotSpecialPrize = !!!(player->pflags & PF_NOCONTEST); dta->grade = static_cast(player->tally.rank); @@ -594,16 +594,16 @@ gp_rank_e K_CalculateGPGrade(gpRank_t *rankData) rankData->scorePosition = 0; rankData->scoreGPPoints = 0; - rankData->scoreLaps = 0; + rankData->scoreExp = 0; rankData->scorePrisons = 0; rankData->scoreRings = 0; rankData->scoreContinues = 0; rankData->scoreTotal = 0; - const INT32 lapsWeight = (rankData->totalLaps > 0) ? RANK_WEIGHT_LAPS : 0; + const INT32 expWeight = (rankData->totalExp > 0) ? RANK_WEIGHT_LAPS : 0; const INT32 prisonsWeight = (rankData->totalPrisons > 0) ? RANK_WEIGHT_PRISONS : 0; - const INT32 total = RANK_WEIGHT_POSITION + RANK_WEIGHT_SCORE + lapsWeight + prisonsWeight + RANK_WEIGHT_RINGS; + const INT32 total = RANK_WEIGHT_POSITION + RANK_WEIGHT_SCORE + expWeight + prisonsWeight + RANK_WEIGHT_RINGS; const INT32 continuesPenalty = total / RANK_CONTINUE_PENALTY_DIV; if (rankData->position > 0) @@ -618,9 +618,9 @@ gp_rank_e K_CalculateGPGrade(gpRank_t *rankData) rankData->scoreGPPoints += (rankData->winPoints * RANK_WEIGHT_SCORE) / rankData->totalPoints; } - if (rankData->totalLaps > 0) + if (rankData->totalExp > 0) { - rankData->scoreLaps += (rankData->laps * lapsWeight) / rankData->totalLaps; + rankData->scoreExp += (rankData->exp * expWeight) / rankData->totalExp; } if (rankData->totalPrisons > 0) @@ -638,7 +638,7 @@ gp_rank_e K_CalculateGPGrade(gpRank_t *rankData) rankData->scoreTotal = rankData->scorePosition + rankData->scoreGPPoints + - rankData->scoreLaps + + rankData->scoreExp + rankData->scorePrisons + rankData->scoreRings + rankData->scoreContinues; diff --git a/src/k_rank.h b/src/k_rank.h index 59c57eae9..d26f754c8 100644 --- a/src/k_rank.h +++ b/src/k_rank.h @@ -49,8 +49,8 @@ struct gpRank_t UINT32 winPoints; UINT32 totalPoints; - UINT32 laps; - UINT32 totalLaps; + UINT32 exp; + UINT32 totalExp; UINT32 continuesUsed; @@ -64,7 +64,7 @@ struct gpRank_t INT32 scorePosition; INT32 scoreGPPoints; - INT32 scoreLaps; + INT32 scoreExp; INT32 scorePrisons; INT32 scoreRings; INT32 scoreContinues; diff --git a/src/k_tally.cpp b/src/k_tally.cpp index 17dacceb7..7e051e0ca 100644 --- a/src/k_tally.cpp +++ b/src/k_tally.cpp @@ -92,11 +92,11 @@ void level_tally_t::DetermineBonuses(void) } } - if (totalLaps > 0) + if (totalExp > 0) { // Give circuit gamemodes a consolation bonus // for getting good placements on each lap. - temp_bonuses.push_back(TALLY_BONUS_LAP); + temp_bonuses.push_back(TALLY_BONUS_EXP); } if (totalPrisons > 0) @@ -203,7 +203,7 @@ INT32 level_tally_t::CalculateGrade(void) bonusWeights[i] = ((pointLimit != 0) ? 100 : 0); break; } - case TALLY_BONUS_LAP: + case TALLY_BONUS_EXP: case TALLY_BONUS_PRISON: case TALLY_BONUS_POWERSTONES: { @@ -240,12 +240,12 @@ INT32 level_tally_t::CalculateGrade(void) ours += (rings * bonusWeights[i]) / 20; break; } - case TALLY_BONUS_LAP: + case TALLY_BONUS_EXP: { // Use a special curve for this. // Low Exp amounts are guaranteed, higher than half is where skill expression starts // Magic numbers here are to reduce the range from 50-125 to 0-75 and compare with a max of 58, 85% of which is 49.3, which should put an even 100 or higher displayexp at A rank - const fixed_t frac = std::min(FRACUNIT, ((laps-50) * FRACUNIT) / std::max(1, static_cast(totalLaps-42))); + const fixed_t frac = std::min(FRACUNIT, ((exp-50) * FRACUNIT) / std::max(1, static_cast(totalExp-42))); ours += Easing_Linear(frac, 0, bonusWeights[i]); break; } @@ -310,7 +310,7 @@ void level_tally_t::Init(player_t *player) position = numPlayers = 0; rings = 0; - laps = totalLaps = 0; + exp = totalExp = 0; points = pointLimit = 0; powerStones = 0; releasedFastForward = false; @@ -347,8 +347,8 @@ void level_tally_t::Init(player_t *player) if (displayEXP != UINT16_MAX) { - laps = displayEXP; - totalLaps = 100; + exp = displayEXP; + totalExp = 100; } } @@ -664,8 +664,8 @@ boolean level_tally_t::IncrementLine(void) amount = 1; freq = 1; break; - case TALLY_BONUS_LAP: - dest = laps; + case TALLY_BONUS_EXP: + dest = exp; amount = 20; freq = 1; break; @@ -1190,7 +1190,7 @@ void level_tally_t::Draw(void) case TALLY_BONUS_RING: bonus_code = "RB"; break; - case TALLY_BONUS_LAP: + case TALLY_BONUS_EXP: bonus_code = "LA"; break; case TALLY_BONUS_PRISON: @@ -1321,12 +1321,12 @@ void level_tally_t::Draw(void) .text(va("%d / 20", displayBonus[i])); break; } - case TALLY_BONUS_LAP: + case TALLY_BONUS_EXP: { drawer_text .x(197.0 * frac) .align(srb2::Draw::Align::kCenter) - .text(va("%d / %d", displayBonus[i], totalLaps)); + .text(va("%d / %d", displayBonus[i], totalExp)); break; } case TALLY_BONUS_PRISON: diff --git a/src/k_tally.h b/src/k_tally.h index b4f8950ac..335a74979 100644 --- a/src/k_tally.h +++ b/src/k_tally.h @@ -33,7 +33,7 @@ typedef enum { TALLY_BONUS_NA, TALLY_BONUS_RING, - TALLY_BONUS_LAP, + TALLY_BONUS_EXP, TALLY_BONUS_PRISON, TALLY_BONUS_SCORE, TALLY_BONUS_POWERSTONES, @@ -77,7 +77,7 @@ struct level_tally_t // Possible grade metrics UINT8 position, numPlayers; UINT8 rings; - UINT16 laps, totalLaps; + UINT16 exp, totalExp; UINT16 prisons, totalPrisons; INT32 points, pointLimit; UINT8 powerStones; diff --git a/src/m_cond.c b/src/m_cond.c index 8126254c6..5b3d37daf 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -1817,8 +1817,8 @@ boolean M_CheckCondition(condition_t *cn, player_t *player) && M_NotFreePlay() && (gamespeed != KARTSPEED_EASY) && (player->tally.active == true) - && (player->tally.totalLaps > 0) // Only true if not Time Attack - && (player->tally.laps >= player->tally.totalLaps)); + && (player->tally.totalExp > 0) // Only true if not Time Attack + && (player->tally.exp >= player->tally.totalExp)); case UCRP_FINISHALLPRISONS: return (battleprisons && !(player->pflags & PF_NOCONTEST) diff --git a/src/p_mobj.c b/src/p_mobj.c index 683163ee8..6468e2ec6 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9067,8 +9067,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj) (newplayer != NULL) && (gamespeed != KARTSPEED_EASY) && (newplayer->tally.active == true) - && (newplayer->tally.totalLaps > 0) // Only true if not Time Attack - && (newplayer->tally.laps >= newplayer->tally.totalLaps) + && (newplayer->tally.totalExp > 0) // Only true if not Time Attack + && (newplayer->tally.exp >= newplayer->tally.totalExp) ) { UINT8 pnum = (newplayer-players); diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index f74c490d3..a5e4b814c 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -845,8 +845,8 @@ static void P_NetArchivePlayers(savebuffer_t *save) WRITEUINT8(save->p, players[i].tally.position); WRITEUINT8(save->p, players[i].tally.numPlayers); WRITEUINT8(save->p, players[i].tally.rings); - WRITEUINT16(save->p, players[i].tally.laps); - WRITEUINT16(save->p, players[i].tally.totalLaps); + WRITEUINT16(save->p, players[i].tally.exp); + WRITEUINT16(save->p, players[i].tally.totalExp); WRITEUINT16(save->p, players[i].tally.prisons); WRITEUINT16(save->p, players[i].tally.totalPrisons); WRITEINT32(save->p, players[i].tally.points); @@ -1503,8 +1503,8 @@ static void P_NetUnArchivePlayers(savebuffer_t *save) players[i].tally.position = READUINT8(save->p); players[i].tally.numPlayers = READUINT8(save->p); players[i].tally.rings = READUINT8(save->p); - players[i].tally.laps = READUINT16(save->p); - players[i].tally.totalLaps = READUINT16(save->p); + players[i].tally.exp = READUINT16(save->p); + players[i].tally.totalExp = READUINT16(save->p); players[i].tally.prisons = READUINT16(save->p); players[i].tally.totalPrisons = READUINT16(save->p); players[i].tally.points = READINT32(save->p); @@ -6357,8 +6357,8 @@ static inline void P_ArchiveMisc(savebuffer_t *save) WRITEUINT32(save->p, rank->winPoints); WRITEUINT32(save->p, rank->totalPoints); - WRITEUINT32(save->p, rank->laps); - WRITEUINT32(save->p, rank->totalLaps); + WRITEUINT32(save->p, rank->exp); + WRITEUINT32(save->p, rank->totalExp); WRITEUINT32(save->p, (rank->continuesUsed + 1)); @@ -6372,7 +6372,7 @@ static inline void P_ArchiveMisc(savebuffer_t *save) WRITEINT32(save->p, rank->scorePosition); WRITEINT32(save->p, rank->scoreGPPoints); - WRITEINT32(save->p, rank->scoreLaps); + WRITEINT32(save->p, rank->scoreExp); WRITEINT32(save->p, rank->scorePrisons); WRITEINT32(save->p, rank->scoreRings); WRITEINT32(save->p, rank->scoreContinues); @@ -6619,8 +6619,8 @@ static boolean P_UnArchiveSPGame(savebuffer_t *save) rank->winPoints = READUINT32(save->p); rank->totalPoints = READUINT32(save->p); - rank->laps = READUINT32(save->p); - rank->totalLaps = READUINT32(save->p); + rank->exp = READUINT32(save->p); + rank->totalExp = READUINT32(save->p); rank->continuesUsed = READUINT32(save->p); @@ -6634,7 +6634,7 @@ static boolean P_UnArchiveSPGame(savebuffer_t *save) rank->scorePosition = READINT32(save->p); rank->scoreGPPoints = READINT32(save->p); - rank->scoreLaps = READINT32(save->p); + rank->scoreExp = READINT32(save->p); rank->scorePrisons = READINT32(save->p); rank->scoreRings = READINT32(save->p); rank->scoreContinues = READINT32(save->p);