1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: guiBaseJA2Clock overflow (by MH17)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-02-12 05:31:14 +00:00
parent 18dcced82a
commit 39776dc569
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Timer Control.cpp
+15
View File
@@ -139,6 +139,8 @@ extern INT32 giFlashContractBaseTime;
extern UINT32 guiFlashCursorBaseTime; extern UINT32 guiFlashCursorBaseTime;
extern INT32 giPotCharPathBaseTime; extern INT32 giPotCharPathBaseTime;
// sevenfm: display overflow detection
extern void MapScreenMessage(UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...);
typedef void (*TIMER_NOTIFY_CALLBACK) ( INT32 timer, PTR state ); typedef void (*TIMER_NOTIFY_CALLBACK) ( INT32 timer, PTR state );
struct TIMER_NOTIFY_ITEM struct TIMER_NOTIFY_ITEM
@@ -203,8 +205,21 @@ void CALLBACK TimeProc( UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2
if ( !gfPauseClock ) if ( !gfPauseClock )
{ {
UINT32 uiOldClock = guiBaseJA2Clock;
guiBaseJA2Clock += BASETIMESLICE; guiBaseJA2Clock += BASETIMESLICE;
// detect overflow
if (uiOldClock > guiBaseJA2Clock)
{
MapScreenMessage(162, 0, L"guiBaseJA2Clock overflow detected!");
for (gCNT = 0; gCNT < TOTAL_SOLDIERS; gCNT++)
{
if (MercPtrs[gCNT])
MercPtrs[gCNT]->ResetSoldierChangeStatTimer();
}
}
for ( gCNT = 0; gCNT < NUMTIMERS; gCNT++ ) for ( gCNT = 0; gCNT < NUMTIMERS; gCNT++ )
{ {
timerDone |= UpdateCounter( gCNT, iTimeLeft ); timerDone |= UpdateCounter( gCNT, iTimeLeft );