From ff172cc92fae76425b6460559eff7886aa2d12f4 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Mon, 18 Oct 2021 06:15:40 +0000 Subject: [PATCH] fix: follow-up minievents properly wait for the specified time (by rftr) fix: money income from rebel command displays properly in finances (by rftr) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9188 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/finances.cpp | 4 ++++ Strategic/MiniEvents.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index 26d5a3ad..4fedea82 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -1604,6 +1604,10 @@ void ProcessTransactionString(STR16 pString, FinanceUnitPtr pFinance) case MINI_EVENT: swprintf(pString, L"%s", pTransactionText[MINI_EVENT]); break; + + case REBEL_COMMAND: + swprintf(pString, L"%s", pTransactionText[REBEL_COMMAND]); + break; } } diff --git a/Strategic/MiniEvents.cpp b/Strategic/MiniEvents.cpp index f0c7cce4..07c11096 100644 --- a/Strategic/MiniEvents.cpp +++ b/Strategic/MiniEvents.cpp @@ -1511,7 +1511,7 @@ void CheckMiniEvents(UINT32 nextEventId) static void QueueNextMiniEvent(UINT32 nextEventId, UINT32 hoursToNextMiniEvent) { const UINT32 timestamp = GetWorldTotalMin() + gGameExternalOptions.fMiniEventsMinHoursBetweenEvents * 60 + Random((gGameExternalOptions.fMiniEventsMaxHoursBetweenEvents - gGameExternalOptions.fMiniEventsMinHoursBetweenEvents) * 60); - AddStrategicEvent(EVENT_MINIEVENT, hoursToNextMiniEvent > 0 ? hoursToNextMiniEvent : timestamp, nextEventId); + AddStrategicEvent(EVENT_MINIEVENT, hoursToNextMiniEvent > 0 ? GetWorldTotalMin() + 60 * hoursToNextMiniEvent : timestamp, nextEventId); } // LUA STUFF FOLLOWS