diff --git a/src/hardware/vga_draw.cpp b/src/hardware/vga_draw.cpp index d7bc789f..55b8c484 100644 --- a/src/hardware/vga_draw.cpp +++ b/src/hardware/vga_draw.cpp @@ -444,10 +444,10 @@ static Bit8u* VGA_TEXT_Draw_Line(Bitu vidstart, Bitu line) { // keep it aligned: Bit8u* draw = ((Bit8u*)TempLine) + 16 - vga.draw.panning; const Bit8u* vidmem = VGA_Text_Memwrap(vidstart); // pointer to chars+attribs - Bitu blocks = vga.draw.blocks; - if (vga.draw.panning) blocks++; // if the text is panned part of an - // additional character becomes visible - while (blocks--) { // for each character in the line + Bitu blocks = vga.draw.blocks; + if (vga.draw.panning) blocks++; // if the text is panned part of an + // additional character becomes visible + while (blocks--) { // for each character in the line Bitu chr = *vidmem++; Bitu attr = *vidmem++; // the font pattern @@ -485,16 +485,16 @@ static Bit8u* VGA_TEXT_Draw_Line(Bitu vidstart, Bitu line) { // the adress of the attribute that makes up the cell the cursor is in Bits attr_addr = (vga.draw.cursor.address-vidstart) >> 1; if (attr_addr >= 0 && attr_addr < (Bits)vga.draw.blocks) { - Bitu index = attr_addr * (vga.draw.char9dot? 9:8); - draw = (Bit8u*)(&TempLine[index]) + 16 - vga.draw.panning; - - Bitu foreground = vga.tandy.draw_base[vga.draw.cursor.address+1] & 0xf; + Bitu index = attr_addr * (vga.draw.char9dot? 9:8); + draw = (Bit8u*)(&TempLine[index]) + 16 - vga.draw.panning; + + Bitu foreground = vga.tandy.draw_base[vga.draw.cursor.address+1] & 0xf; for (Bitu i = 0; i < 8; i++) { *draw++ = foreground; } } } - return TempLine+16; + return TempLine+16; } */ // combined 8/9-dot wide text mode 16bpp line drawing function @@ -502,10 +502,10 @@ static Bit8u* VGA_TEXT_Xlat16_Draw_Line(Bitu vidstart, Bitu line) { // keep it aligned: Bit16u* draw = ((Bit16u*)TempLine) + 16 - vga.draw.panning; const Bit8u* vidmem = VGA_Text_Memwrap(vidstart); // pointer to chars+attribs - Bitu blocks = vga.draw.blocks; - if (vga.draw.panning) blocks++; // if the text is panned part of an - // additional character becomes visible - while (blocks--) { // for each character in the line + Bitu blocks = vga.draw.blocks; + if (vga.draw.panning) blocks++; // if the text is panned part of an + // additional character becomes visible + while (blocks--) { // for each character in the line Bitu chr = *vidmem++; Bitu attr = *vidmem++; // the font pattern @@ -543,16 +543,16 @@ static Bit8u* VGA_TEXT_Xlat16_Draw_Line(Bitu vidstart, Bitu line) { // the adress of the attribute that makes up the cell the cursor is in Bits attr_addr = (vga.draw.cursor.address-vidstart) >> 1; if (attr_addr >= 0 && attr_addr < (Bits)vga.draw.blocks) { - Bitu index = attr_addr * (vga.draw.char9dot? 18:16); - draw = (Bit16u*)(&TempLine[index]) + 16 - vga.draw.panning; - - Bitu foreground = vga.tandy.draw_base[vga.draw.cursor.address+1] & 0xf; + Bitu index = attr_addr * (vga.draw.char9dot? 18:16); + draw = (Bit16u*)(&TempLine[index]) + 16 - vga.draw.panning; + + Bitu foreground = vga.tandy.draw_base[vga.draw.cursor.address+1] & 0xf; for (Bitu i = 0; i < 8; i++) { *draw++ = vga.dac.xlat16[foreground]; } } } - return TempLine+32; + return TempLine+32; } #ifdef VGA_KEEP_CHANGES @@ -576,10 +576,10 @@ static INLINE void VGA_ChangesEnd(void ) { static void VGA_ProcessSplit() { if (vga.attr.mode_control&0x20) { vga.draw.address=0; - // reset panning to 0 here so we don't have to check for - // it in the character draw functions. It will be set back - // to its proper value in v-retrace - vga.draw.panning=0; + // reset panning to 0 here so we don't have to check for + // it in the character draw functions. It will be set back + // to its proper value in v-retrace + vga.draw.panning=0; } else { // In text mode only the characters are shifted by panning, not the address; // this is done in the text line draw function.