Merge remote-tracking branch 'origin/master' into version/4.1
This commit is contained in:
@@ -1407,7 +1407,6 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
|
|||||||
uint32_t trans_col = (tgui->accel.flags & TGUI_TRANSREV) ? tgui->accel.fg_col : tgui->accel.bg_col;
|
uint32_t trans_col = (tgui->accel.flags & TGUI_TRANSREV) ? tgui->accel.fg_col : tgui->accel.bg_col;
|
||||||
uint16_t *vram_w = (uint16_t *) svga->vram;
|
uint16_t *vram_w = (uint16_t *) svga->vram;
|
||||||
uint32_t *vram_l = (uint32_t *) svga->vram;
|
uint32_t *vram_l = (uint32_t *) svga->vram;
|
||||||
uint8_t ger22upper = (tgui->accel.ger22 >> 8);
|
|
||||||
|
|
||||||
if (tgui->accel.bpp == 0) {
|
if (tgui->accel.bpp == 0) {
|
||||||
trans_col &= 0xff;
|
trans_col &= 0xff;
|
||||||
|
Reference in New Issue
Block a user