From 033376000c30132d8586db4be0939991f880b02f Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Fri, 13 Jul 2018 11:25:42 +0800
Subject: [PATCH] Fixed the screen flickering during switching critters in NPC
 combat control.

Now the mod does not center the screen on PC and display name box for the first turn of a player-initiated combat or when there's no other controllable critter in combat.
---
 artifacts/mods/gl_partycontrol.int | Bin 2142 -> 2346 bytes
 artifacts/mods/gl_partycontrol.ssl |  23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index c3289d172203626988ae7a8d004865a67e569979..59a4e14d3365814d18b22e568a58320a84678e2a 100644
GIT binary patch
delta 779
zcmca7uu4dvf$0Dv0|SFl122eXdNff$ww|4Vfq{(y1u#oMxiA{a1&cE?Ffgb<1)vo3
zGzJC+CI$uu6Q}@`VsV3tFM<j{DVBdw#tsGsJtz}QvGaf_28K&e8cMNyKp9si9;)Ty
z%FJ`l&nqd)&zWq?sKYOjo|v1Oo1c=JoROH9p1L`XF^6&TJ|;Gf24;{i**zv-Vsd7z
znJmU!BgLWu5@KL#Fgn2a|NsC04aN=9AQ2Xh$!nN18LK9XvFI{Bne4(6$=ES@9!s|6
z4v;JZ14ums0|O&WJ?n-Bi3a@!DX=VKgHV$pn8kpQpX|hHX!!z36+?p%SPjAqkgO}*
z6y^q_M(+lFkQ%m-$!l13+1)^F2G+?BSk?3x7{MHt24N7*wgE&kurvrY=r`<d*xzua
zVSmG$hHVfBv2B>l!Dj3FrGW*citP)Cgs7bWiv25K@<>xzQ#n*UL<JMbG_YEx2BF5g
zU>3t<2WANsc7w+CV6H=hLxU^CjSLK65vYS0zzTUdg&I>J0m_~=c@CQq6Z?kA7ufU}
zA53D`W8x5)YyhI{CMU3~NO81)^)o?3g|)#PqLHIy@;r7ODNaaW!2*q;!2)6}$G*u=
w*o_&#O_t!0HD`r{1_L+>8CaT<z(&f0NmeM2p@FwSvO%jsvw^2U229HU0L;OoL;wH)

delta 534
zcmZ1_bWcE_f$0Dv0|SFl122eXS~5{Uww{fFfdPaW5P<0llq~_Jp%hr0nSp^p1u6ig
zn1dJ?7?>Cs7)+o7P>Ka42Ex;z0#J%&7nHGvfk6z)1XFBXV2XiZ-Nak9lam>>HZNyP
zWSq>$%*MplHCc?=nbBf$6myLf^8=9k8JHT34lw@z|Nno3af38Sg!#zi56qd2W|N~>
zbQu>+?qG>zbea5!C7aP>vLCBBW6tC>R(Zyp$!)BLj7ui(V3n0#(jd{`+MwSc1=7vH
z++ft`-JlO*voTHnz^cm*2``q(Dr{;@Yz~tv*lcxE8dxTP0`Ur%JknIwR1Ve7)F9M&
zw_$(7{)Q_J`y1XgY-^C3Y``wZ!{OGL0&ySPn#ob@Moes<Cik)HGb&Bq$F9f39yIwK
zh-#QD$Dty{ehg$g15<+#m}YG-hv;PAHaUhvM~cG@EX)9vW@xa0IG2NA@*)mnT??q}
delYFX@EIb@zzF8EGzf!fa8NO@Ocvmj0svm4ZbAS6

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index a5d93531..125141d7 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -21,6 +21,7 @@ variable
    pidList,
    displayName,
    displayNameColor,
+   inControl := false,
    hasGeckoSkinning := false;
 
 
@@ -39,17 +40,24 @@ procedure combatturn_handler begin
       if not(critter == real_dude_obj) then begin
          set_dude_obj(critter);
          if hasGeckoSkinning then critter_add_trait(critter, TRAIT_PERK, PERK_gecko_skinning_perk, 1);
+         inControl := true;
       end
-      if displayName then begin
-         set_iface_tag_text(displayName, obj_name(critter), displayNameColor);
-         show_iface_tag(displayName);
+      if inControl then begin
+         // center the screen on the controlled critter and remove roof tiles
+         move_to(dude_obj, dude_tile, dude_elevation);
+         if displayName then begin
+            set_iface_tag_text(displayName, obj_name(critter), displayNameColor);
+            show_iface_tag(displayName);
+         end
       end
-   end else begin
+   end else if inControl then begin
       set_dude_obj(real_dude_obj);
-      hide_iface_tag(displayName);
+      if displayName then hide_iface_tag(displayName);
    end
-   // center the screen on the controlled critter and remove roof tiles
-   move_to(dude_obj, dude_tile, dude_elevation);
+end
+
+procedure gamemodechange_handler begin
+   if not(get_game_mode BWAND COMBAT) then inControl := false;
 end
 
 procedure start begin
@@ -67,6 +75,7 @@ procedure start begin
          if has_trait(TRAIT_PERK, dude_obj, PERK_gecko_skinning_perk) then hasGeckoSkinning := true;
 
          register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
+         register_hook_proc(HOOK_GAMEMODECHANGE, gamemodechange_handler);
       end
    end
 end