Merge branch 'master' into miami

# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
This commit is contained in:
Sergeanur 2020-05-10 01:26:12 +03:00
commit 35c41208f5
15 changed files with 31 additions and 11 deletions

View file

@ -61,6 +61,7 @@ mysrand(unsigned int seed)
myrand_seed = seed;
}
#ifdef DEBUGMENU
void WeaponCheat();
void HealthCheat();
void TankCheat();
@ -386,6 +387,7 @@ DebugMenuPopulate(void)
CTweakVars::AddDBG("Debug");
}
}
#endif
const int re3_buffsize = 1024;
static char re3_buff[re3_buffsize];