From: lainon Date: Wed, 21 Sep 2022 12:26:42 +0000 (+0300) Subject: Fixed bugs X-Git-Tag: 41000~143^2~2 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=0e645e53208bc7c063b77c5a30f3cbab99a669db;p=francis%2Fwinuae.git Fixed bugs --- diff --git a/gfxboard.cpp b/gfxboard.cpp index 0a29b18b..6af23f78 100644 --- a/gfxboard.cpp +++ b/gfxboard.cpp @@ -2665,7 +2665,7 @@ static void REGPARAM2 gfxboard_wput_mem_autoconfig (uaecptr addr, uae_u32 b) gb->configured_regs = gb->gfxmem_bank->start >> 16; gb->pcem_vram_mask = 0x3fffff; - } if (boardnum == GFXBOARD_ID_CV643D_Z3) { + } else if (boardnum == GFXBOARD_ID_CV643D_Z3) { map_banks_z3(&gb->gfxboard_bank_vram_pcem, (start + 0x4000000) >> 16, gb->gfxboard_bank_vram_pcem.allocated_size >> 16); map_banks_z3(&gb->gfxboard_bank_vram_pcem, (start + 0x4400000) >> 16, gb->gfxboard_bank_vram_pcem.allocated_size >> 16); diff --git a/pcem/pic.cpp b/pcem/pic.cpp index 27ed7bb4..59a41434 100644 --- a/pcem/pic.cpp +++ b/pcem/pic.cpp @@ -42,7 +42,7 @@ void pic_reset() pic.read=1; pic2.icw=0; pic2.mask=0xFF; - pic.mask2=0; + pic2.mask2=0; pic2.pend=pic2.ins=0; pic_intpending = 0; pic.level_sensitive = 0; diff --git a/pcem/vid_voodoo_codegen_x86.h b/pcem/vid_voodoo_codegen_x86.h index 87c0f1de..05c4f5e9 100644 --- a/pcem/vid_voodoo_codegen_x86.h +++ b/pcem/vid_voodoo_codegen_x86.h @@ -792,7 +792,7 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo if (depth_jump_pos) *(uint8_t *)&code_block[depth_jump_pos] = (block_pos - depth_jump_pos) - 1; - if (depth_jump_pos) + if (depth_jump_pos2) *(uint8_t *)&code_block[depth_jump_pos2] = (block_pos - depth_jump_pos2) - 1; if ((params->fogMode & (FOG_ENABLE|FOG_CONSTANT|FOG_Z|FOG_ALPHA)) == FOG_ENABLE)