bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix GPUTCHR

Browse Source
This commit is contained in:
otya128
2016-12-08 20:41:46 +09:00
parent 372956b507
commit ebed30caba
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SMILEBASIC/builtinfunctions.d
View File

@@ -443,29 +443,32 @@ class BuiltinFunction
color.setDefaultValue(p.graphic.gcolor); color.setDefaultValue(p.graphic.gcolor);
p.graphic.gpaint(p.graphic.useGRP, x, y, cast(int)color); p.graphic.gpaint(p.graphic.useGRP, x, y, cast(int)color);
} }
static void GPUTCHR(PetitComputer p, int x, int y, int str) static void GPUTCHR(PetitComputer p, int x, int y, Value str)
{ {
GPUTCHR(p, x, y, str, 1, 1, p.graphic.gcolor); GPUTCHR(p, x, y, str, 1, 1, p.graphic.gcolor);
} }
static void GPUTCHR(PetitComputer p, int x, int y, int str, int scalex, int scaley) static void GPUTCHR(PetitComputer p, int x, int y, Value str, int color)
{
GPUTCHR(p, x, y, str, scalex, scaley, p.graphic.gcolor);
}
static void GPUTCHR(PetitComputer p, int x, int y, int str, int scalex, int scaley, int color)
{
p.graphic.gputchr(p.graphic.useGRP, x, y, str, scalex, scaley, color);
}
static void GPUTCHR(PetitComputer p, int x, int y, wstring str)
{ {
GPUTCHR(p, x, y, str, 1, 1, p.graphic.gcolor); GPUTCHR(p, x, y, str, 1, 1, p.graphic.gcolor);
} }
static void GPUTCHR(PetitComputer p, int x, int y, wstring str, int scalex, int scaley) static void GPUTCHR(PetitComputer p, int x, int y, Value str, int scalex, int scaley)
{ {
GPUTCHR(p, x, y, str, scalex, scaley, p.graphic.gcolor); GPUTCHR(p, x, y, str, scalex, scaley, p.graphic.gcolor);
} }
static void GPUTCHR(PetitComputer p, int x, int y, wstring str, int scalex, int scaley, int color) static void GPUTCHR(PetitComputer p, int x, int y, Value str, int scalex, int scaley, int color)
{ {
p.graphic.gputchr(p.graphic.useGRP, x, y, str, scalex, scaley, color); if (str.isNumber)
{
p.graphic.gputchr(p.graphic.useGRP, x, y, str.castInteger, scalex, scaley, color);
}
else if (str.isString)
{
p.graphic.gputchr(p.graphic.useGRP, x, y, str.castString, scalex, scaley, color);
}
else
{
throw new TypeMismatch("GPUTCHR", 3);
}
} }
static void BGMPLAY(PetitComputer p, int music) static void BGMPLAY(PetitComputer p, int music)
{ {

10
SMILEBASIC/error.d
View File

@@ -84,6 +84,16 @@ class TypeMismatch : SmileBasicError
this.errnum = 8; this.errnum = 8;
super("Type mismatch"); super("Type mismatch");
} }
this(string func)
{
this.errnum = 8;
super("Type mismatch(" ~ func ~ ")");
}
this(string func, int arg)
{
this.errnum = 8;
super("Type mismatch(" ~ func ~ ":" ~ arg.to!string ~ ")");
}
} }
class OutOfRange : SmileBasicError class OutOfRange : SmileBasicError
{ {