Merge branch 'master' into ExtraMercs

This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
601 changed files with 4005 additions and 10278 deletions
+6 -1
View File
@@ -10,7 +10,7 @@
#include "jascreens.h"
#include "screenids.h"
#include "Items.h"
#include "Random.h"
#include "random.h"
#include "finances.h"
#include "history.h"
#include "Dialogue Control.h"
@@ -86,6 +86,11 @@ CHAR16 zString[128];
if(is_networked)
return;
if (stopTimeCompressionNextHour)
{
SetGameTimeCompressionLevel( TIME_COMPRESS_X0);
}
// hourly update of town loyalty
HandleTownLoyalty();