1
0

Fix SPCHR

This commit is contained in:
otya128
2016-12-06 19:10:22 +09:00
parent acc5c19043
commit 6e8a4bc396
2 changed files with 4 additions and 4 deletions

View File

@@ -1062,7 +1062,7 @@ class BuiltinFunction
{ {
throw new IllegalFunctionCall("SPCHR", 1); throw new IllegalFunctionCall("SPCHR", 1);
} }
p.sprite.spchr(id, defno); p.sprite.getSpchr(id, defno);
} }
static void SPCHR(PetitComputer p, int id, out int u, out int v, out int w, out int h, out int attr) static void SPCHR(PetitComputer p, int id, out int u, out int v, out int w, out int h, out int attr)
{ {
@@ -1071,7 +1071,7 @@ class BuiltinFunction
throw new IllegalFunctionCall("SPCHR", 1); throw new IllegalFunctionCall("SPCHR", 1);
} }
SpriteAttr spriteattr; SpriteAttr spriteattr;
p.sprite.spchr(id, u, v, w, h, spriteattr); p.sprite.getSpchr(id, u, v, w, h, spriteattr);
attr = cast(int)spriteattr; attr = cast(int)spriteattr;
} }
static void SPCHR(PetitComputer p, int id, out int u, out int v) static void SPCHR(PetitComputer p, int id, out int u, out int v)

View File

@@ -359,12 +359,12 @@ class Sprite
auto spdef = SpriteDef(u, v, w, h, sprites[id].homex, sprites[id].homey, attr); auto spdef = SpriteDef(u, v, w, h, sprites[id].homex, sprites[id].homey, attr);
sprites[id].change(spdef); sprites[id].change(spdef);
} }
void spchr(int i, out int d) void getSpchr(int i, out int d)
{ {
i = spid(i); i = spid(i);
d = sprites[i].defno; d = sprites[i].defno;
} }
void spchr(int id, out int u, out int v, out int w, out int h, out SpriteAttr attr) void getSpchr(int id, out int u, out int v, out int w, out int h, out SpriteAttr attr)
{ {
id = spid(id); id = spid(id);
u = sprites[id].u; u = sprites[id].u;