- Fixed: possible crash when talking to Katja when escaping the milit…

…ary base (incorrect talk_p_proc setup, closes #235)
rotators · May 1, 2024 · 781fc32 · 781fc32
1 parent ee8c44f
commit 781fc32
Showing 1 changed file with 17 additions and 22 deletions.
diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/MAIN/KATJA.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/MAIN/KATJA.ssl
@@ -226,29 +226,24 @@ procedure talk_p_proc begin
       self_look_at_dude;
    dude_look_at_self;
 
-   start_gdialog(623, self_obj, 4, -1, -1);
-   gsay_start;
-      if (Katja_In_Party or party_is_waiting) then begin
-         gdialog_set_barter_mod(255);
-      end
+   if (Katja_In_Party or party_is_waiting) then begin
+      gdialog_set_barter_mod(255);
+   end
 
-      if katja_is_prisoner then begin
-         float_katja(3503);
-         set_katja_prisoner(false);
-         katja_joins_party;
-      end
-      else if (Katja_In_Party or party_is_waiting) then begin
-         //call Katja24;
-         call Node1000;
-      end
-      else if (global_var(GVAR_KATJA_HIRELING_STATUS) == 1) then begin
-         call Katja25;
-      end
-      else begin
-         call Katja01;
-      end
-   gsay_end;
-   end_dialogue;
+   if katja_is_prisoner then begin
+      float_katja(3503);
+      set_katja_prisoner(false);
+      katja_joins_party;
+   end
+   else if (Katja_In_Party or party_is_waiting) then begin
+      start_dialog_at_node(Node1000);
+   end
+   else if (global_var(GVAR_KATJA_HIRELING_STATUS) == 1) then begin
+      start_dialog_at_node(Katja25);
+   end
+   else begin
+      start_dialog_at_node(Katja01);
+   end
 
    if (lock) then begin
       call pick_lock;