[Vice-emu-commit] SF.net SVN: vice-emu:[19063] branches/viceplus/v2.0-x64dtv/vice/src/vicii/ vicii-

Revision: 19063
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19063&view=rev
Author:   nojoopa
Date:     2008-07-21 16:33:00 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
Fixed bugs (introduced in ifdef removal) in d020/d024 read.

Modified Paths:
--------------
    branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c

Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c	2008-07-20 23:11:18 UTC (rev 19062)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c	2008-07-21 16:33:00 UTC (rev 19063)
@@ -1698,7 +1698,7 @@
       case 0x20:                  /* $D020: Border color */
         VICII_DEBUG_REGISTER(("Border Color register: $%02X",
                              vicii.regs[addr]));
-        return vicii.viciidtv?vicii.regs[addr] | 0xf0:vicii.regs[addr];
+        return vicii.viciidtv?vicii.regs[addr]:(vicii.regs[addr] | 0xf0);
 
       case 0x21:                  /* $D021: Background #0 color */
       case 0x22:                  /* $D022: Background #1 color */
@@ -1706,7 +1706,7 @@
       case 0x24:                  /* $D024: Background #3 color */
         VICII_DEBUG_REGISTER(("Background Color #%d register: $%02X",
                              addr - 0x21, vicii.regs[addr]));
-        return vicii.viciidtv?vicii.regs[addr] | 0xf0:vicii.regs[addr];
+        return vicii.viciidtv?vicii.regs[addr]:(vicii.regs[addr] | 0xf0);
 
       case 0x25:                  /* $D025: Sprite multicolor register #0 */
       case 0x26:                  /* $D026: Sprite multicolor register #1 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.