Get rid of the "SPECIAL" mirroring enum.

Just check whether the mapper has defined read_nt() and write_nt() functions instead.
ulfalizer · May 16, 2015 · 8f4406c · 8f4406c
1 parent c0d5133
commit 8f4406c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/include/mapper.h b/include/mapper.h
@@ -66,7 +66,6 @@ extern enum Mirroring {
     ONE_SCREEN_LOW  = 2,
     ONE_SCREEN_HIGH = 3,
     FOUR_SCREEN     = 4,
-    SPECIAL         = 5, // Mapper-specific special mirroring
 
     N_MIRRORING_MODES
 } mirroring;

diff --git a/src/mapper_5.cpp b/src/mapper_5.cpp
@@ -202,7 +202,6 @@ void mapper_5_init() {
 
     prg_mode       = chr_mode = 3;
     wram_6000_bank = 7;
-    set_mirroring(SPECIAL);
     mmc5_mirroring = 0xFF;
     high_chr_bits  = 0;
     multiplicand   = multiplier = 0;

diff --git a/src/ppu.cpp b/src/ppu.cpp
@@ -178,13 +178,13 @@ static uint16_t get_mirrored_addr(uint16_t addr) {
 }
 
 static uint8_t read_nt(uint16_t addr) {
-    return (mirroring == SPECIAL) ?
-      mapper_fns.read_nt(addr) :
-      ciram[get_mirrored_addr(addr)];
+    return mapper_fns.read_nt ?
+             mapper_fns.read_nt(addr) :
+             ciram[get_mirrored_addr(addr)];
 }
 
 static void write_nt(uint16_t addr, uint8_t val) {
-    if (mirroring == SPECIAL)
+    if (mapper_fns.write_nt)
         mapper_fns.write_nt(val, addr);
     else
         ciram[get_mirrored_addr(addr)] = val;

diff --git a/src/rom.cpp b/src/rom.cpp
@@ -41,8 +41,7 @@ char const *const mirroring_to_str[N_MIRRORING_MODES] =
     "vertical",
     "one-screen, low",
     "one-screen, high",
-    "four-screen",
-    "special (internal error - should never get this here)" };
+    "four-screen" };
 
 static void do_rom_specific_overrides();