Skip to content

Commit 6e77c73

Browse files
committed
Improve error message when core does not implement mem callbacks
1 parent fbe1f9b commit 6e77c73

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs

+11-15
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,11 @@ public EventsLuaLibrary(ILuaLibraries luaLibsImpl, ApiContainer apiContainer, Ac
2929

3030
public override string Name => "event";
3131

32-
private void LogMemoryCallbacksNotImplemented()
33-
{
34-
Log($"{Emulator.Attributes().CoreName} does not implement memory callbacks");
35-
}
32+
private void LogMemoryCallbacksNotImplemented(bool isWildcard)
33+
=> Log($"{Emulator.Attributes().CoreName} does not implement {(isWildcard ? "wildcard " : string.Empty)}memory callbacks");
3634

37-
private void LogMemoryExecuteCallbacksNotImplemented()
38-
{
39-
Log($"{Emulator.Attributes().CoreName} does not implement memory execute callbacks");
40-
}
35+
private void LogMemoryExecuteCallbacksNotImplemented(bool isWildcard)
36+
=> Log($"{Emulator.Attributes().CoreName} does not implement {(isWildcard ? "wildcard " : string.Empty)}memory execute callbacks");
4137

4238
private void LogScopeNotAvailable(string scope)
4339
{
@@ -136,11 +132,11 @@ public string OnBusExec(
136132
}
137133
catch (NotImplementedException)
138134
{
139-
LogMemoryExecuteCallbacksNotImplemented();
135+
LogMemoryExecuteCallbacksNotImplemented(isWildcard: false);
140136
return Guid.Empty.ToString();
141137
}
142138

143-
LogMemoryExecuteCallbacksNotImplemented();
139+
LogMemoryExecuteCallbacksNotImplemented(isWildcard: false);
144140
return Guid.Empty.ToString();
145141
}
146142

@@ -190,7 +186,7 @@ public string OnBusExecAny(
190186
{
191187
// fall through
192188
}
193-
LogMemoryExecuteCallbacksNotImplemented();
189+
LogMemoryExecuteCallbacksNotImplemented(isWildcard: true);
194190
return Guid.Empty.ToString();
195191
}
196192

@@ -232,11 +228,11 @@ public string OnBusRead(
232228
}
233229
catch (NotImplementedException)
234230
{
235-
LogMemoryCallbacksNotImplemented();
231+
LogMemoryCallbacksNotImplemented(isWildcard: address is null);
236232
return Guid.Empty.ToString();
237233
}
238234

239-
LogMemoryCallbacksNotImplemented();
235+
LogMemoryCallbacksNotImplemented(isWildcard: address is null);
240236
return Guid.Empty.ToString();
241237
}
242238

@@ -278,11 +274,11 @@ public string OnBusWrite(
278274
}
279275
catch (NotImplementedException)
280276
{
281-
LogMemoryCallbacksNotImplemented();
277+
LogMemoryCallbacksNotImplemented(isWildcard: address is null);
282278
return Guid.Empty.ToString();
283279
}
284280

285-
LogMemoryCallbacksNotImplemented();
281+
LogMemoryCallbacksNotImplemented(isWildcard: address is null);
286282
return Guid.Empty.ToString();
287283
}
288284

0 commit comments

Comments
 (0)