From c993b2a4e15e3e1ba5b4978039142409b9769f1b Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 16 Oct 2008 06:05:33 +0000 Subject: [PATCH] 02539: phrcraze, phrcrazs: [debug] Access Violation This is actually Couriersud's fix as posted in the bug. --- src/mame/drivers/merit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index a35eb808b58..3577d1d816c 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -199,9 +199,9 @@ static MC6845_UPDATE_ROW( update_row ) for (cx = 0; cx < x_count; cx++) { int i; - int attr = ram_attr[ma]; + int attr = ram_attr[ma & 0x7ff]; int region = (attr & 0x40) >> 6; - int addr = ((ram_video[ma] | ((attr & 0x80) << 1) | (extra_video_bank_bit)) << 4) | (ra & 0x0f); + int addr = ((ram_video[ma & 0x7ff] | ((attr & 0x80) << 1) | (extra_video_bank_bit)) << 4) | (ra & 0x0f); int colour = (attr & 0x7f) << 3; UINT8 *data;