Skip to content
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

More computer checks for tasks #3678

Merged
merged 6 commits into from
Dec 9, 2024
Merged

More computer checks for tasks #3678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33fb768
More computer checks for tasks
AdamPlenty Nov 15, 2024
9622704
Update player_compevents.c
AdamPlenty Nov 15, 2024
8f40175
Update player_compevents.c
AdamPlenty Nov 15, 2024
3c52953
Revert "Update player_compevents.c"
AdamPlenty Nov 15, 2024
c544f45
Update player_compprocs.c
AdamPlenty Nov 15, 2024
547e32b
Merge remote-tracking branch 'upstream/master' into ComputerChecks
AdamPlenty Dec 8, 2024
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
5 changes: 4 additions & 1 deletion src/player_compchecks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ struct Thing * find_imp_for_pickup(struct Computer2 *comp, MapSubtlCoord stl_x,
{
struct Thing* thing = thing_get(i);
struct CreatureControl* cctrl = creature_control_get_from_thing(thing);
if (thing_is_invalid(thing) || creature_control_invalid(cctrl))
if (!thing_is_creature(thing) || creature_control_invalid(cctrl))
{
ERRORLOG("Jump to invalid creature detected");
break;
Expand Down Expand Up @@ -655,6 +655,9 @@ long computer_check_for_pretty(struct Computer2 *comp, struct ComputerCheck * ch
if (!computer_able_to_use_power(comp, PwrK_HAND, 1, 1)) {
return CTaskRet_Unk4;
}
if (is_task_in_progress_using_hand(comp)) {
return CTaskRet_Unk4;
}
{
long stack_len = dungeon->digger_stack_length;
if (stack_len <= check->param1 * dungeon->total_area / 100) {
Expand Down
Loading