Fix mixed mode.

This commit is contained in:
LemonBoy 2014-04-27 23:48:37 +02:00
parent d37d6f0bcf
commit 54d3f3ee3f
4 changed files with 11 additions and 15 deletions

View File

@ -43,7 +43,7 @@ void emu_init ()
int valid_crc;
keysSetRepeat(30, 10);
/*keyboardShow();*/
keyboardShow();
// Set some sane defaults
emu_vsync = 0;

View File

@ -6,13 +6,13 @@ static u8 key_map[12] = {
0x20, // B
0x80, // SELECT
0x80, // START
0x4C, // RIGHT
0x4A, // LEFT
0x4B, // UP
0x80, // DOWN
0x4c, // RIGHT
0x48, // LEFT
0x4b, // UP
0x4a, // DOWN
0x80, // R
0x80, // L
0x80, // X
0x1b, // X
0x80, // Y
};

View File

@ -27,7 +27,7 @@ int main(int argc, char **argv)
/*load_disk("PACMAN.DSK");*/
/*load_disk("Karateka (1984)(Broderbund).dsk");*/
// Awesome!
load_disk("lode.dsk");
/*load_disk("lode.dsk");*/
// AppleII+
/*load_disk("Prince of Persia (1989)(Broderbund)(Disk 1 of 3)[cr].dsk");*/
// Gfx heavy
@ -44,7 +44,7 @@ int main(int argc, char **argv)
/*load_disk("Fracas (1980)(Quality Software).dsk");*/
/*load_disk("Colorix.dsk");*/
/*load_disk("LoRes Games.DSK");*/
/*load_disk("LoRes Hijinks.DSK");*/
load_disk("LoRes Hijinks.DSK");
// SP Crash
/*load_disk("Apple II Business Graphics 1.0 (1981).nib");*/
} else {

View File

@ -112,11 +112,11 @@ u8 video_io_read (u16 addr)
switch (addr&0xf) {
case 0x0:
text_mode = 0;
/*mixed_mode = 0;*/
break;
case 0x1:
text_mode = 1;
/*mixed_mode = 0;*/
// The mixed mode can be enabled only if graphic mode is set
mixed_mode = 0;
break;
case 0x2:
mixed_mode = 0;
@ -305,11 +305,7 @@ void video_draw ()
if (text_mode)
draw_text_scr(text_ptr);
else
if (hires)
draw_hires_scr(gfx_ptr);
else
draw_lores_scr(gfx_ptr);
(hires) ? draw_hires_scr(gfx_ptr) : draw_lores_scr(gfx_ptr);
}
// Clear this here otherwise we won't be able to render a lores