1
0

Fix VM.restoreData

This commit is contained in:
otya128
2017-07-10 20:26:23 +09:00
parent 165a352ce5
commit 47d064a62b
2 changed files with 1 additions and 2 deletions

View File

@@ -375,6 +375,7 @@ class VM
currentData.index = currentData.table.label[name.name]; currentData.index = currentData.table.label[name.name];
else if (name.name in slot.globalData.table.label) else if (name.name in slot.globalData.table.label)
{ {
currentData.table = slot.globalData.table;
currentData.index = slot.globalData.table.label[name.name]; currentData.index = slot.globalData.table.label[name.name];
} }
else else

View File

@@ -1861,7 +1861,6 @@ class BuiltinFunction
if(va_args[0].isString) if(va_args[0].isString)
{ {
VM vm = p.vm; VM vm = p.vm;
vm.pushDataIndex();
vm.restoreData(va_args[0].castDString); vm.restoreData(va_args[0].castDString);
auto count = vm.readData().castInteger;//読み込むスプライト数 auto count = vm.readData().castInteger;//読み込むスプライト数
int defno = 0;//? int defno = 0;//?
@@ -1877,7 +1876,6 @@ class BuiltinFunction
p.sprite.SPDEFTable[defno] = SpriteDef(U, V, W, H, HX, HY, cast(SpriteAttr)ATTR); p.sprite.SPDEFTable[defno] = SpriteDef(U, V, W, H, HX, HY, cast(SpriteAttr)ATTR);
defno++; defno++;
} }
vm.popDataIndex();
return; return;
} }
throw new IllegalFunctionCall("SPDEF"); throw new IllegalFunctionCall("SPDEF");