diff --git a/SMILEBASIC/petitcomputer.d b/SMILEBASIC/petitcomputer.d index a0138fa..e9ace9d 100644 --- a/SMILEBASIC/petitcomputer.d +++ b/SMILEBASIC/petitcomputer.d @@ -186,7 +186,7 @@ class PetitComputer int backColor; byte attr; } - SDL_Color PetitColor(byte r, byte g, byte b, byte a) + SDL_Color PetitColor(ubyte r, ubyte g, ubyte b, ubyte a) { return SDL_Color(r >> 5 << 5, g >> 5 << 5, b >> 5 << 5, a == 255 ? 255 : 0); } @@ -302,19 +302,19 @@ class PetitComputer std.algorithm.fill(fontTable, SDL_Rect(488,120, 8, 8));//TODO:480,120とどっちが使われているかは要調査 while(true) { - pos = html.indexOf("U+"); + pos = cast(int)html.indexOf("U+"); if(pos == -1) break; pos += "U+".length; html = html[pos..$]; writeln(index = html.parse!int(16)); file.write(index, ','); - pos = html.indexOf("("); + pos = cast(int)html.indexOf("("); if(pos == -1) break; pos += "(".length; html = html[pos..$]; writeln(fontTable[index].x = html.parse!int); file.write(fontTable[index].x, ','); - pos = html.indexOf(','); + pos = cast(int)html.indexOf(','); html = html[pos + 1..$]; munch(html, " "); writeln(fontTable[index].y = html.parse!int); @@ -478,8 +478,8 @@ class PetitComputer keybuffer[keybufferpos] = cast(wchar)key; keybufferlen++; if(keybufferlen > keybuffer.length) - keybufferlen = keybuffer.length; - keybufferpos = (keybufferpos + 1) % keybuffer.length; + keybufferlen = cast(int)keybuffer.length; + keybufferpos = (keybufferpos + 1) % cast(int)keybuffer.length; } Mutex grpmutex; int displaynum; diff --git a/SMILEBASIC/sprite.d b/SMILEBASIC/sprite.d index df98c15..aaa1f3e 100644 --- a/SMILEBASIC/sprite.d +++ b/SMILEBASIC/sprite.d @@ -370,7 +370,7 @@ class Sprite } if(frame >= data.frame) { - sprite.animindex[i] = (sprite.animindex[i] + 1) % d.length; + sprite.animindex[i] = (sprite.animindex[i] + 1) % cast(int)d.length; data.elapse = 0; if(sprite.animloop[i] == 0) { @@ -612,7 +612,7 @@ class Sprite relative = true; target ^= SpriteAnimTarget.relative; } - int animcount = data.length / ((target == SpriteAnimTarget.XY || target == SpriteAnimTarget.UV) ? 3 : 2); + int animcount = cast(int)data.length / ((target == SpriteAnimTarget.XY || target == SpriteAnimTarget.UV) ? 3 : 2); SpriteAnimData[] animdata = new SpriteAnimData[animcount]; int j; int loop = 1;