Merge command.h

This commit is contained in:
Sally Coolatta 2020-08-10 11:45:27 -04:00
parent 71375e412b
commit 6cf412e99a

View file

@ -207,13 +207,9 @@ void CV_AddValue(consvar_t *var, INT32 increment);
void CV_SaveVariables(FILE *f);
// load/save gamesate (load and save option and for network join in game)
<<<<<<< HEAD
void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
=======
void CV_SaveVars(UINT8 **p, boolean in_demo);
#define CV_SaveNetVars(p) CV_SaveVars(p, false)
>>>>>>> srb2/next
void CV_LoadNetVars(UINT8 **p);
#define CV_SaveDemoVars(p) CV_SaveVars(p, true)