Merge branch 'miami' into lcs

# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
This commit is contained in:
Sergeanur 2021-06-28 05:16:21 +03:00
commit eaebaa6db3
31 changed files with 460 additions and 386 deletions

View file

@ -36,6 +36,7 @@
#include "Automobile.h"
#include "Bike.h"
#include "Debug.h"
#include "SaveBuf.h"
const uint32 CBike::nSaveStructSize =
#ifdef COMPATIBLE_SAVES