mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-07 15:33:24 +00:00
Merge command.h
This commit is contained in:
parent
71375e412b
commit
6cf412e99a
1 changed files with 0 additions and 4 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue