Merge branch 'miami' into lcs

# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
This commit is contained in:
Sergeanur 2021-01-20 19:32:03 +02:00
commit cc94419a72
28 changed files with 510 additions and 329 deletions

View file

@ -3250,7 +3250,9 @@ CMenuManager::PrintBriefs()
void
CMenuManager::PrintStats()
{
static uint8 pirateCheck = 0;
#ifdef SECUROM
static uint8 statsPirateCheck = 0;
#endif
static float scrollY = 0;
int rowNum = CStats::ConstructStatLine(99999);
@ -3263,11 +3265,13 @@ CMenuManager::PrintStats()
CFont::SetPropOn();
CFont::SetDropShadowPosition(0);
if (pirateCheck == 0)
#ifdef SECUROM
if (statsPirateCheck == 0)
// if not pirated game
pirateCheck = 46;
// statsPirateCheck = 46;
// else
// pirateCheck = 45;
statsPirateCheck = 45;
#endif
if (m_PrefsLanguage == LANGUAGE_AMERICAN)
CFont::SetScale(MENU_X(0.43f), MENU_Y(0.75f));
@ -3287,8 +3291,10 @@ CMenuManager::PrintStats()
lastCheck = CTimer::GetTimeInMillisecondsPauseMode();
}
if (pirateCheck == 45)
#ifdef SECUROM
if (statsPirateCheck == 45)
return;
#endif
float nextYChange, y, alpha;