stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-13 05:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix improperly resolved conflicts

Browse source
This commit is contained in:
wolfy852 2019-01-08 16:44:56 -06:00
parent ad01dcc5ac
commit e528750444
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/command.c
View file

@ -1852,8 +1852,11 @@ static boolean CV_Command(void)
return true;
}
CV_Set(v, COM_Argv(1));
v->changed = 1; // now it's been changed by (presumably) the user
if (!(v->flags & CV_SAVE) || CV_FilterVarByVersion(v, COM_Argv(1)))
{
CV_Set(v, COM_Argv(1));
v->changed = 1; // now it's been changed by (presumably) the user
}
return true;
}

1
src/m_misc.c
View file

@ -37,6 +37,7 @@
#include "d_main.h"
#include "m_argv.h"
#include "i_system.h"
#include "command.h" // cv_execversion
#include "m_anigif.h"