bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix CALLBACK

Browse Source
This commit is contained in:
otya128
2017-07-10 20:53:44 +09:00
parent 47d064a62b
commit a69ade8a03
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SMILEBASIC/VM.d
View File

@@ -76,10 +76,13 @@ struct Callback
CallbackType type;
Function func;
VMSlot slot;
VM vm;
size_t slotUnique;
int label;
bool isCallable()
bool isCallable(VM vm)
{
if (vm != this.vm)
return false;
if (type == CallbackType.label)
return slot.unique == slotUnique;
if (type == CallbackType.function_)
@@ -88,7 +91,7 @@ struct Callback
}
void opCall(VM vm)
{
if (!isCallable)
if (!isCallable(vm))
return;
if (type == CallbackType.label)
{
@@ -528,6 +531,7 @@ class VM
{
slot = currentSlot;
}
result.vm = this;
result.slot = slot;
result.slotUnique = slot.unique;
Function func;
@@ -2759,7 +2763,7 @@ class CallSprite : Code
}
auto callback = vm.petitcomputer.sprite.getCallback(vm.petitcomputer.callidx);
vm.pc--;
if (!callback.isCallable)
if (!callback.isCallable(vm))
{
return;
}
@@ -2783,7 +2787,7 @@ class CallBG : Code
}
auto callback = vm.petitcomputer.getBG(vm.petitcomputer.callidx).callback;
vm.pc--;
if (!callback.isCallable)
if (!callback.isCallable(vm))
{
return;
}