III armour cheat now consistent between versions

This commit is contained in:
Silent 2014-08-28 22:49:22 +02:00
parent 9bfbcd83f0
commit 3b817a2fe7
2 changed files with 3 additions and 16 deletions

View File

@ -256,6 +256,9 @@ __forceinline void Patch_III_10()
InjectHook(0x509A65, AlteredPrintStringMinus<0x509A5E,0x509A3D>); InjectHook(0x509A65, AlteredPrintStringMinus<0x509A5E,0x509A3D>);
InjectHook(0x50A142, AlteredPrintStringXOnly<0x50A139>); InjectHook(0x50A142, AlteredPrintStringXOnly<0x50A139>);
InjectHook(0x57E9F5, AlteredPrintString<0x57E9EE,0x57E9CD>); InjectHook(0x57E9F5, AlteredPrintString<0x57E9EE,0x57E9CD>);
// Armour cheat as TORTOISE - like in 1.1 and Steam
Patch<const char*>(0x4925FB, "ESIOTROT");
} }
__forceinline void Patch_III_11() __forceinline void Patch_III_11()

View File

@ -79,33 +79,17 @@ void CTimer::Initialise()
void CTimer::Suspend() void CTimer::Suspend()
{ {
if ( suspendDepth++ == 0 ) if ( suspendDepth++ == 0 )
{
#ifdef SILENTPATCH_VC_VER
// MVL fix
InitTimerFunc();
#endif
suspendTime = timerFunction(); suspendTime = timerFunction();
}
} }
void CTimer::Resume() void CTimer::Resume()
{ {
if ( --suspendDepth == 0 ) if ( --suspendDepth == 0 )
{
#ifdef SILENTPATCH_VC_VER
// MVL fix
InitTimerFunc();
#endif
oldTime += timerFunction() - suspendTime; oldTime += timerFunction() - suspendTime;
}
} }
unsigned int CTimer::GetCyclesPerFrame() unsigned int CTimer::GetCyclesPerFrame()
{ {
#ifdef SILENTPATCH_VC_VER
// MVL fix
InitTimerFunc();
#endif
return static_cast<unsigned int>(timerFunction() - oldTime); return static_cast<unsigned int>(timerFunction() - oldTime);
} }