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

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut

Browse source
This commit is contained in:
toaster 2019-10-28 14:19:25 +00:00
commit ce91bdaaab
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/m_menu.c
View file

@ -400,7 +400,8 @@ consvar_t cv_showfocuslost = {"showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL, 0
static CV_PossibleValue_t map_cons_t[] = { static CV_PossibleValue_t map_cons_t[] = {
{1,"MIN"}, {1,"MIN"},
{NUMMAPS, "MAX"} {NUMMAPS, "MAX"},
{0,NULL}
}; };
consvar_t cv_nextmap = {"nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_nextmap = {"nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};

4
src/p_user.c
View file

@ -11708,8 +11708,8 @@ void P_PlayerThink(player_t *player)
else else
player->powers[pw_justsprung] = 0; player->powers[pw_justsprung] = 0;
if (player->powers[pw_pushing] && player->powers[pw_pushing] < UINT16_MAX) if (player->powers[pw_noautobrake] && player->powers[pw_noautobrake] < UINT16_MAX)
player->powers[pw_pushing]--; player->powers[pw_noautobrake]--;
if (player->powers[pw_underwater] && (player->pflags & PF_GODMODE || (player->powers[pw_shield] & SH_PROTECTWATER))) if (player->powers[pw_underwater] && (player->pflags & PF_GODMODE || (player->powers[pw_shield] & SH_PROTECTWATER)))
{ {