Fixed bugs

diff --git a/gfxboard.cpp b/gfxboard.cpp
index 0a29b18bcf94c382067b0e517aafb627062dbeb9..6af23f7861765b5a2d0338bae3b72c8458100e5d 100644 (file)
--- 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 27ed7bb4b77b404a0be08492e3e63f10345c7faa..59a41434f66ae0a552f779310af19964ff3c1a1f 100644 (file)
--- 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 87c0f1dea5a77f6189429584e1829f0a61ae7d50..05c4f5e9144f6a7fc8165a99bcd54bfe7e133de4 100644 (file)
--- 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)