bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

さらに修正

Browse Source
This commit is contained in:
otya128
2015-08-26 22:13:08 +09:00
parent 6d1acbee10
commit 9ebb872c51
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SMILEBASIC/petitcomputer.d
View File

@@ -186,7 +186,7 @@ class PetitComputer
int backColor; int backColor;
byte attr; 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); 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とどっちが使われているかは要調査 std.algorithm.fill(fontTable, SDL_Rect(488,120, 8, 8));//TODO:480,120とどっちが使われているかは要調査
while(true) while(true)
{ {
pos = html.indexOf("<tr><th>U+"); pos = cast(int)html.indexOf("<tr><th>U+");
if(pos == -1) break; if(pos == -1) break;
pos += "<tr><th>U+".length; pos += "<tr><th>U+".length;
html = html[pos..$]; html = html[pos..$];
writeln(index = html.parse!int(16)); writeln(index = html.parse!int(16));
file.write(index, ','); file.write(index, ',');
pos = html.indexOf("</td><td>("); pos = cast(int)html.indexOf("</td><td>(");
if(pos == -1) break; if(pos == -1) break;
pos += "</td><td>(".length; pos += "</td><td>(".length;
html = html[pos..$]; html = html[pos..$];
writeln(fontTable[index].x = html.parse!int); writeln(fontTable[index].x = html.parse!int);
file.write(fontTable[index].x, ','); file.write(fontTable[index].x, ',');
pos = html.indexOf(','); pos = cast(int)html.indexOf(',');
html = html[pos + 1..$]; html = html[pos + 1..$];
munch(html, " "); munch(html, " ");
writeln(fontTable[index].y = html.parse!int); writeln(fontTable[index].y = html.parse!int);
@@ -478,8 +478,8 @@ class PetitComputer
keybuffer[keybufferpos] = cast(wchar)key; keybuffer[keybufferpos] = cast(wchar)key;
keybufferlen++; keybufferlen++;
if(keybufferlen > keybuffer.length) if(keybufferlen > keybuffer.length)
keybufferlen = keybuffer.length; keybufferlen = cast(int)keybuffer.length;
keybufferpos = (keybufferpos + 1) % keybuffer.length; keybufferpos = (keybufferpos + 1) % cast(int)keybuffer.length;
} }
Mutex grpmutex; Mutex grpmutex;
int displaynum; int displaynum;

4
SMILEBASIC/sprite.d
View File

@@ -370,7 +370,7 @@ class Sprite
} }
if(frame >= data.frame) 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; data.elapse = 0;
if(sprite.animloop[i] == 0) if(sprite.animloop[i] == 0)
{ {
@@ -612,7 +612,7 @@ class Sprite
relative = true; relative = true;
target ^= SpriteAnimTarget.relative; 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]; SpriteAnimData[] animdata = new SpriteAnimData[animcount];
int j; int j;
int loop = 1; int loop = 1;