bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix SPSET

Browse Source
This commit is contained in:
otya128
2016-12-31 19:57:40 +09:00
parent bc11fddd02
commit 4866a1d32d
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
SMILEBASIC/builtinfunctions.d
View File

@@ -1398,7 +1398,7 @@ class BuiltinFunction
formatValue(w, val, f); formatValue(w, val, f);
return cast(immutable)(w.data); return cast(immutable)(w.data);
} }
static void SPSET(PetitComputer p, int id, int defno, DefaultValue!(int, false) V, DefaultValue!(int, false) W, DefaultValue!(int, false) H, DefaultValue!(int, false) ATTR) static void SPSET(PetitComputer p, int id, int defno)
{ {
if (!p.sprite.isValidSpriteId(id)) if (!p.sprite.isValidSpriteId(id))
{ {
@@ -1408,34 +1408,34 @@ class BuiltinFunction
{ {
throw new OutOfRange(smilebasicFunctionName, 2); throw new OutOfRange(smilebasicFunctionName, 2);
} }
if(!V.isDefault && !W.isDefault)
{
int u = defno;
int v = cast(int)V;
int w = 16, h = 16, attr = 1;
if(!ATTR.isDefault)
{
w = cast(int)W;
h = cast(int)H;
attr = cast(int)ATTR;
}
else
{
if(!W.isDefault && !H.isDefault)
{
w = cast(int)W;
h = cast(int)H;
}
if(!W.isDefault && H.isDefault)
{
attr = cast(int)W;
}
}
p.sprite.spset(id, u, v, w, h, cast(SpriteAttr)attr);
return;
}
p.sprite.spset(id, defno); p.sprite.spset(id, defno);
} }
static void SPSET(PetitComputer p, int id, int U, int V)
{
SPSET(p, id, U, V, 16, 16, 1);
}
static void SPSET(PetitComputer p, int id, int U, int V, int ATTR)
{
SPSET(p, id, U, V, 16, 16, ATTR);
}
static void SPSET(PetitComputer p, int id, int U, int V, int W, int H)
{
SPSET(p, id, U, V, W, H, 1);
}
static void SPSET(PetitComputer p, int id, int u, int v, int w, int h, int attr)
{
if (!p.sprite.isValidSpriteId(id))
throw new OutOfRange(smilebasicFunctionName, 1);
if (u < 0)
throw new OutOfRange(smilebasicFunctionName, 2);
if (v < 0)
throw new OutOfRange(smilebasicFunctionName, 3);
if (u + w >= p.graphic.width)
throw new OutOfRange(smilebasicFunctionName);
if (v + h >= p.graphic.height)
throw new OutOfRange(smilebasicFunctionName);
p.sprite.spset(id, u, v, w, h, cast(SpriteAttr)attr);
}
static void SPSET(PetitComputer p, int lower, int upper, int defno, out int ix) static void SPSET(PetitComputer p, int lower, int upper, int defno, out int ix)
{ {
if (!p.sprite.isValidSpriteId(upper)) if (!p.sprite.isValidSpriteId(upper))