Skip to content

Lua: allow teleport on non creatures #4295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
PieterVdc wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −6
Draft

Lua: allow teleport on non creatures #4295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f8cb7
Update thing_creature.c
PieterVdc Oct 10, 2025
c8959bf
Merge remote-tracking branch 'upstream/master' into teleport_non_crea…
PieterVdc Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/thing_creature.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7717,8 +7717,6 @@ void script_move_creature(struct Thing* thing, TbMapLocation location, ThingMode
SYNCDBG(5,"No valid coords for location %d",(int)location);
return;
}
struct CreatureControl *cctrl;
cctrl = creature_control_get_from_thing(thing);

if (effect_id > 0)
{
Expand All @@ -7727,12 +7725,17 @@ void script_move_creature(struct Thing* thing, TbMapLocation location, ThingMode
}
move_thing_in_map(thing, &pos);
reset_interpolation_of_thing(thing);
if (!is_thing_some_way_controlled(thing))
if (thing_is_creature(thing))
{
initialise_thing_state(thing, CrSt_CreatureDoingNothing);
struct CreatureControl *cctrl;
cctrl = creature_control_get_from_thing(thing);
if (!is_thing_some_way_controlled(thing))
{
initialise_thing_state(thing, CrSt_CreatureDoingNothing);
}
cctrl->turns_at_job = -1;
check_map_explored(thing, thing->mappos.x.stl.num, thing->mappos.y.stl.num);
}
cctrl->turns_at_job = -1;
check_map_explored(thing, thing->mappos.x.stl.num, thing->mappos.y.stl.num);
}

void script_move_creature_with_criteria(PlayerNumber plyr_idx, ThingModel crmodel, long select_id, TbMapLocation location, ThingModel effect_id, long count)
Expand Down
Loading