Removed redundant function from NPC combat control and tidied up a bit.

This commit is contained in:
NovaRain
2018-07-11 10:03:03 +08:00
parent 08b5e3a769
commit bc2dabc461
3 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ MotionScanner=0
Mode=0
;PIDList=62,89,97,107,160,161
;Displays the name of controlled critter in an extra interface box. Must be between 5 and 9
;Displays the name of the controlled critter in a notification box above the interface bar. Must be between 5 and 9
;Set to 0 to disable
DisplayName=0
Binary file not shown.
+6 -4
View File
@@ -36,18 +36,20 @@ procedure combatturn_handler begin
if (status == 1
and (len_array(pidList) == 0 or scan_array(pidList, pid bwand 0xFFFFFF) != -1)
and (controlMode == 1 or party_member_obj(pid))) then begin
set_dude_obj(critter);
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);
end
if displayName then begin
set_iface_tag_text(displayName, obj_name(critter), displayNameColor);
show_iface_tag(displayName);
end
if hasGeckoSkinning then critter_add_trait(critter, TRAIT_PERK, PERK_gecko_skinning_perk, 1);
end else begin
set_dude_obj(real_dude_obj);
hide_iface_tag(displayName);
end
move_to(dude_obj, dude_tile, dude_elevation); // for removing roof tiles
tile_set_center(dude_tile);
// center the screen on the controlled critter and remove roof tiles
move_to(dude_obj, dude_tile, dude_elevation);
end
procedure start begin