|
|
| version 1.6, 2004/02/21 00:25:33 | version 1.8, 2004/02/21 06:26:34 |
|---|---|
| Line 23 REG8 lio_gcls(LIOWORK lio) { | Line 23 REG8 lio_gcls(LIOWORK lio) { |
| lio_updatedraw(lio); | lio_updatedraw(lio); |
| for (y=lio->draw.y1; y<=lio->draw.y2; y++) { | for (y=lio->draw.y1; y<=lio->draw.y2; y++) { |
| lio_line(lio, lio->draw.x1, lio->draw.x2, y, lio->gcolor1.bgcolor); | lio_line(lio, lio->draw.x1, lio->draw.x2, y, lio->mem.bgcolor); |
| } | } |
| return(LIO_SUCCESS); | return(LIO_SUCCESS); |
| } | } |
| Line 43 REG8 lio_gpset(LIOWORK lio) { | Line 43 REG8 lio_gpset(LIOWORK lio) { |
| y = (SINT16)LOADINTELWORD(dat.y); | y = (SINT16)LOADINTELWORD(dat.y); |
| if (dat.pal == 0xff) { | if (dat.pal == 0xff) { |
| if (CPU_AH == 1) { | if (CPU_AH == 1) { |
| dat.pal = lio->gcolor1.fgcolor; | dat.pal = lio->mem.fgcolor; |
| } | } |
| else { | else { |
| dat.pal = lio->gcolor1.bgcolor; | dat.pal = lio->mem.bgcolor; |
| } | } |
| } | } |
| lio_pset(lio, x, y, dat.pal); | lio_pset(lio, x, y, dat.pal); |
| Line 78 const BYTE *ptr; | Line 78 const BYTE *ptr; |
| else { | else { |
| ret = 0; | ret = 0; |
| addr = (x >> 3) + (y * 80); | addr = (x >> 3) + (y * 80); |
| if (lio->scrn.top) { | if (lio->draw.flag & LIODRAW_UPPER) { |
| addr += 16000; | addr += 16000; |
| } | } |
| addr += lio->draw.base; | addr += lio->draw.base; |
| sft = (~x) & 7; | sft = (~x) & 7; |
| if (lio->scrn.plane & 0x80) { | if (!(lio->draw.flag & LIODRAW_MONO)) { |
| for (pl=0; pl<3; pl++) { | for (pl=0; pl<3; pl++) { |
| ptr = mem + addr + lioplaneadrs[pl]; | ptr = mem + addr + lioplaneadrs[pl]; |
| ret += (((*ptr) >> sft) & 1) << pl; | ret += (((*ptr) >> sft) & 1) << pl; |
| } | } |
| if (lio->gcolor1.palmode == 2) { | if (lio->draw.flag & LIODRAW_4BPP) { |
| ptr = mem + addr + lioplaneadrs[3]; | ptr = mem + addr + lioplaneadrs[3]; |
| ret += (((*ptr) >> sft) & 1) << 3; | ret += (((*ptr) >> sft) & 1) << 3; |
| } | } |
| } | } |
| else { | else { |
| ptr = mem + addr + lioplaneadrs[lio->scrn.plane & 3]; | ptr = mem + addr + lioplaneadrs[lio->draw.flag & LIODRAW_PMASK]; |
| ret = ((*ptr) >> sft) & 1; | ret = ((*ptr) >> sft) & 1; |
| } | } |
| } | } |