Fix some EventHandler related code if in firmament

diff --git a/Questionable/Controller/GameUi/InteractionUiController.cs b/Questionable/Controller/GameUi/InteractionUiController.cs
index 99b2dd51aa2b629ef3d33b43816ef5ce89f470c2..e94a5716124903a3256b7eb6e3341e412a963389 100644 (file)
--- a/Questionable/Controller/GameUi/InteractionUiController.cs
+++ b/Questionable/Controller/GameUi/InteractionUiController.cs
@@ -517,8 +517,8 @@ internal sealed class InteractionUiController : IDisposable
 
         _logger.LogTrace("Prompt: '{Prompt}'", actualPrompt);
         var director = UIState.Instance()->DirectorTodo.Director;
-        if (director != null && director->EventHandlerInfo != null &&
-            director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
+        if (director != null &&
+            director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
             director->Sequence == 254)
         {
             // just close the dialogue for 'do you want to return to next settlement', should prolly be different for

diff --git a/Questionable/Controller/GatheringController.cs b/Questionable/Controller/GatheringController.cs
index f97a9b37e9ff3ccb5c61bd895334a40a5d781177..4af7ede2e9aee69126488415e8ed75d600fd9558 100644 (file)
--- a/Questionable/Controller/GatheringController.cs
+++ b/Questionable/Controller/GatheringController.cs
@@ -135,8 +135,7 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
             return;
 
         var director = UIState.Instance()->DirectorTodo.Director;
-        if (director != null && director->EventHandlerInfo != null &&
-            director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector)
+        if (director != null && director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector)
         {
             if (director->Sequence == 254)
                 return;

diff --git a/Questionable/Controller/Steps/Leves/InitiateLeve.cs b/Questionable/Controller/Steps/Leves/InitiateLeve.cs
index 4014b2fb3152aa4285d1010f51e9d0c000ce925b..ab584cefc69f8e7c9cd83a5e186acfa3ef650e02 100644 (file)
--- a/Questionable/Controller/Steps/Leves/InitiateLeve.cs
+++ b/Questionable/Controller/Steps/Leves/InitiateLeve.cs
@@ -44,8 +44,7 @@ internal static class InitiateLeve
         {
             var director = UIState.Instance()->DirectorTodo.Director;
             if (director != null &&
-                director->EventHandlerInfo != null &&
-                director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
+                director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
                 director->ContentId == Task.ElementId.Value)
                 return ETaskResult.SkipRemainingTasksForStep;