thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-23 16:32:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-show-character-ghosts' into 'master'

Browse source 
Time Attacking: fix "Show Character" option for ghosts

Closes #1013

See merge request KartKrew/Kart!1896
This commit is contained in:
James R. 2024-02-09 23:47:50 +00:00
commit 6b831a0fa2
3 changed files with 46 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_demo.c
View file

@ -3283,7 +3283,7 @@ void G_DoPlayDemo(const char *defdemoname)
CV_StealthSetValue(&cv_playbackspeed, 1); CV_StealthSetValue(&cv_playbackspeed, 1);
} }
void G_AddGhost(savebuffer_t *buffer, char *defdemoname) void G_AddGhost(savebuffer_t *buffer, const char *defdemoname)
{ {
INT32 i; INT32 i;
char name[17], color[MAXCOLORNAME+1], md5[16]; char name[17], color[MAXCOLORNAME+1], md5[16];

2
src/g_demo.h
View file

@ -181,7 +181,7 @@ extern demoghost *ghosts;
void G_DeferedPlayDemo(const char *demo); void G_DeferedPlayDemo(const char *demo);
void G_DoPlayDemo(const char *defdemoname); void G_DoPlayDemo(const char *defdemoname);
void G_TimeDemo(const char *name); void G_TimeDemo(const char *name);
void G_AddGhost(savebuffer_t *buffer, char *defdemoname); void G_AddGhost(savebuffer_t *buffer, const char *defdemoname);
staffbrief_t *G_GetStaffGhostBrief(UINT8 *buffer); staffbrief_t *G_GetStaffGhostBrief(UINT8 *buffer);
void G_FreeGhosts(void); void G_FreeGhosts(void);
void G_DoneLevelLoad(void); void G_DoneLevelLoad(void);

77
src/p_setup.cpp
View file

@ -7765,7 +7765,7 @@ static void P_ResetSpawnpoints(void)
skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL; skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL;
} }
static void P_TryAddExternalGhost(char *defdemoname) static void P_TryAddExternalGhost(const char *defdemoname)
{ {
if (FIL_FileExists(defdemoname)) if (FIL_FileExists(defdemoname))
{ {
@ -7791,46 +7791,57 @@ static void P_LoadRecordGhosts(void)
gpath = Z_StrDup(va("%s" PATHSEP "media" PATHSEP "replay" PATHSEP "%s" PATHSEP "%s", srb2home, timeattackfolder, G_BuildMapName(gamemap))); gpath = Z_StrDup(va("%s" PATHSEP "media" PATHSEP "replay" PATHSEP "%s" PATHSEP "%s", srb2home, timeattackfolder, G_BuildMapName(gamemap)));
// Best Time ghost enum
if (modeattacking & ATTACKING_TIME)
{ {
if (cv_ghost_besttime.value) kTime = 1 << 0,
{ kLap = 1 << 1,
for (i = 0; i < numskins; ++i) kLast = 1 << 2,
{ };
if (cv_ghost_besttime.value == 1 && players[consoleplayer].skin != i)
continue;
P_TryAddExternalGhost(va("%s-%s-time-best.lmp", gpath, skins[i].name)); auto map_ghosts = [](int value)
}
}
}
// Best Lap ghost
if (modeattacking & ATTACKING_LAP)
{ {
if (cv_ghost_bestlap.value) auto map = [](const consvar_t& cvar, int value, UINT8 bit) { return cvar.value == value ? bit : 0; };
{
for (i = 0; i < numskins; ++i)
{
if (cv_ghost_bestlap.value == 1 && players[consoleplayer].skin != i)
continue;
P_TryAddExternalGhost(va("%s-%s-lap-best.lmp", gpath, skins[i].name)); return
} // Best Time ghost
} ((modeattacking & ATTACKING_TIME) ? map(cv_ghost_besttime, value, kTime) : 0) |
}
// Last ghost // Best Lap ghost
if (cv_ghost_last.value) ((modeattacking & ATTACKING_LAP) ? map(cv_ghost_bestlap, value, kLap) : 0) |
// Best Lap ghost
map(cv_ghost_last, value, kLast);
};
auto add_ghosts = [gpath](const std::string& base, UINT8 bits)
{
auto load = [base](const char* suffix) { P_TryAddExternalGhost(fmt::format("{}-{}.lmp", base, suffix).c_str()); };
if (bits & kTime)
load("time-best");
if (bits & kLap)
load("lap-best");
if (bits & kLast)
load("last");
};
UINT8 allGhosts = map_ghosts(2);
UINT8 sameGhosts = map_ghosts(1);
if (allGhosts)
{ {
for (i = 0; i < numskins; ++i) for (i = 0; i < numskins; ++i)
{ add_ghosts(fmt::format("{}-{}", gpath, skins[i].name), allGhosts);
if (cv_ghost_last.value == 1 && players[consoleplayer].skin != i) }
continue;
P_TryAddExternalGhost(va("%s-%s-last.lmp", gpath, skins[i].name)); if (sameGhosts)
} {
INT32 skin = R_SkinAvailable(cv_skin[0].string);
if (skin < 0 || !R_SkinUsable(consoleplayer, skin, false))
skin = 0; // use default skin
add_ghosts(fmt::format("{}-{}", gpath, skins[skin].name), sameGhosts);
} }
// Guest ghost // Guest ghost