Skip to content

Proc overrides inherit waitfor = FALSE #2555

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

Merged
wixoaGit merged 1 commit into from
May 5, 2026
+9 −7
Merged

Proc overrides inherit waitfor = FALSE #2555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions DMCompiler/DM/DMCodeTree.Procs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ public bool TryDefineProc(DMCompiler compiler) {
var procs = dmObject.GetProcs(procDef.Name);
if (procs != null) {
var parent = compiler.DMObjectTree.AllProcs[procs[0]];
proc.IsVerb = parent.IsVerb;
if (proc.IsVerb) {
if (parent.Attributes.HasFlag(ProcAttributes.DisableWaitfor))
proc.Attributes |= ProcAttributes.DisableWaitfor;
if (parent.IsVerb) {
proc.IsVerb = true;
proc.VerbName = parent.VerbName;
proc.VerbCategory = parent.VerbCategory;
proc.VerbDesc = parent.VerbDesc;
Expand Down
2 changes: 1 addition & 1 deletion OpenDreamRuntime/ServerVerbSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ private void OnRepeatVerbStop(UnregisterRepeatVerbEvent msg, EntitySessionEventA
}
}

private void RunVerb(DreamProc verb, string name, DreamObject? src, DreamConnection usr, params DreamValue[] arguments) {
private void RunVerb(DreamProc verb, string name, DreamObject src, DreamConnection usr, params DreamValue[] arguments) {
using var _ = Profiler.BeginZone("DM Execution", color: (uint)Color.LightPink.ToArgb());

DreamThread.Run($"Execute {name} by {usr.Session!.Name}", async state => {
Expand Down
8 changes: 4 additions & 4 deletions OpenDreamRuntime/WalkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void StartWalk(DreamObjectMovable movable, int dir, int lag, int speed) {
break;

DreamObjectTurf? newLoc = DreamProcNativeHelpers.GetStep(_atomManager, _dreamMapManager, movable, (AtomDirection)dir);
await state.Call(moveProc, movable, null, new(newLoc), new(dir));
await state.CallNoWait(moveProc, movable, null, new(newLoc), new(dir));
}

return DreamValue.Null;
Expand All @@ -75,7 +75,7 @@ public void StartWalkRand(DreamObjectMovable movable, int lag, int speed) { // T
break;
var dir = DreamProcNativeHelpers.GetRandomDirection(_dreamManager);
DreamObjectTurf? newLoc = DreamProcNativeHelpers.GetStep(_atomManager, _dreamMapManager, movable, dir);
await state.Call(moveProc, movable, null, new(newLoc), new((int)dir));
await state.CallNoWait(moveProc, movable, null, new(newLoc), new((int)dir));
}

return DreamValue.Null;
Expand Down Expand Up @@ -106,7 +106,7 @@ public void StartWalkTowards(DreamObjectMovable movable, DreamObjectAtom target,
continue;

DreamObjectTurf? newLoc = DreamProcNativeHelpers.GetStep(_atomManager, _dreamMapManager, movable, dir);
await state.Call(moveProc, movable, null, new(newLoc), new((int)dir));
await state.CallNoWait(moveProc, movable, null, new(newLoc), new((int)dir));
}

return DreamValue.Null;
Expand Down Expand Up @@ -141,7 +141,7 @@ public void StartWalkTo(DreamObjectMovable movable, DreamObjectAtom target, int

var dir = enumerator.Current;
var newLoc = DreamProcNativeHelpers.GetStep(_atomManager, _dreamMapManager, movable, dir);
await state.Call(moveProc, movable, null, new(newLoc), new((int)dir));
await state.CallNoWait(moveProc, movable, null, new(newLoc), new((int)dir));
}

return DreamValue.Null;
Expand Down
Loading