From 6cf412e99a94e0d8994bc931270330501f927024 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 10 Aug 2020 11:45:27 -0400 Subject: [PATCH] Merge command.h --- src/command.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/command.h b/src/command.h index 7aadf0ad3..27352bc80 100644 --- a/src/command.h +++ b/src/command.h @@ -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)