incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blankart-dev' into portv1objects

Browse source
This commit is contained in:
NepDisk 2025-04-13 06:54:03 -04:00
commit f153776929
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/g_game.c
View file

@ -462,15 +462,15 @@ SINT8 G_RecordPresetIndex(void)
boolean purpledrift = cv_dummyattackingpurpledrift.value;
if (!rings && !stacking && !chaining && !slipdash && !purpledrift)
return 0;
return RP_KART;
if (stacking && chaining && !rings && !slipdash && !purpledrift)
return 1;
return RP_TECH;
if (rings && stacking && chaining && slipdash && purpledrift)
return 2;
return RP_BLAN;
return 3;
return RP_CUST;
}
// Allocation for time and nights data
@ -620,7 +620,7 @@ static void G_UpdateRecordReplays(void)
}
free(gpath);
free(gamemode);
Z_Free(gamemode);
// Check emblems when level data is updated
if ((earnedEmblems = M_CheckLevelEmblems()))

7
src/g_game.h
View file

@ -249,6 +249,13 @@ void G_SetGamestate(gamestate_t newstate);
boolean G_GamestateUsesLevel(void);
// Gamedata record shit
typedef enum
{
RP_KART = 0,
RP_TECH,
RP_BLAN,
RP_CUST,
} recordpreset_e;
SINT8 G_RecordPresetIndex(void);
void G_AllocMainRecordData(INT16 i, SINT8 preset);
void G_ClearRecords(void);

7
src/k_kart.c
View file

@ -1621,6 +1621,13 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
if (P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_itrolf);
}
else if (itembreaker)
{
K_KartGetItemResult(player, KITEM_SNEAKER);
player->itemblinkmode = 1;
if (P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_itrolm);
}
}
player->itemblink = TICRATE;

2
src/m_menu.c
View file

@ -564,7 +564,7 @@ void Nextmap_OnChange(void)
leveltitle = cv_nextmap.value ? G_BuildMapTitle(cv_nextmap.value) : Z_StrDup("Random");
cv_nextmap.string = cv_nextmap.zstring = leveltitle;
if (menustack[0] == MN_SP_TIMEATTACK || menustack[0] == MN_SP_MODS)
if (menustack[0] == MN_SP_TIMEATTACK || menustack[0] == MN_SP_MODS || menustack[0] == MN_SP_PRES)
{
// see also p_setup.c's P_LoadRecordGhosts
char *gamemode = M_AppendGametypeAndModName();

4
src/p_map.c
View file

@ -3710,13 +3710,13 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
mmomx = mo->player->rmomx;
mmomy = mo->player->rmomy;
if (!cv_kartbumpspark.value)
if (!cv_kartbumpspark.value || modeattacking != ATTACKING_NONE)
{
mo->player->drift = 0;
mo->player->driftcharge = 0;
}
if (!cv_kartbumpspring.value)
if (!cv_kartbumpspring.value || modeattacking != ATTACKING_NONE)
{
mo->player->pogospring = 0;
}