From 99d32a43019f928accee5a87034086b1dd65703a Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Fri, 19 Jan 2024 19:55:54 +0100 Subject: [PATCH] Modernizing --- source/quickerNES/Nes_Cart.h | 6 +----- source/quickerNES/Nes_Cpu.cpp | 10 ++++------ source/quickerNES/Nes_Emu.h | 5 +---- source/quickerNES/Nes_Mapper.h | 10 ++-------- source/quickerNES/Nes_Ppu.cpp | 3 +-- source/quickerNES/Nes_Ppu.h | 6 +----- source/quickerNES/Nes_Ppu_Impl.cpp | 9 +++------ source/quickerNES/Nes_Ppu_Impl.h | 3 --- source/quickerNES/Nes_Ppu_Rendering.h | 5 +---- source/quickerNES/Nes_Ppu_Sprites.h | 1 - source/quickerNES/audio/apu.h | 1 - source/quickerNES/mappers/mapper015.hpp | 4 ++-- source/quickerNES/mappers/mapper019.hpp | 1 - source/quickerNES/mappers/mapper021.hpp | 3 ++- source/quickerNES/mappers/mapper022.hpp | 3 ++- source/quickerNES/mappers/mapper023.hpp | 3 ++- source/quickerNES/mappers/mapper024.hpp | 3 +-- source/quickerNES/mappers/mapper025.hpp | 3 ++- source/quickerNES/mappers/mapper030.hpp | 4 ++-- source/quickerNES/mappers/mapper032.hpp | 4 ++-- source/quickerNES/mappers/mapper033.hpp | 4 ++-- source/quickerNES/mappers/mapper060.hpp | 4 ++-- source/quickerNES/mappers/mapper069.hpp | 1 - source/quickerNES/mappers/mapper070.hpp | 4 ++-- source/quickerNES/mappers/mapper071.hpp | 4 ++-- source/quickerNES/mappers/mapper073.hpp | 4 ++-- source/quickerNES/mappers/mapper075.hpp | 4 ++-- source/quickerNES/mappers/mapper079.hpp | 4 ++-- source/quickerNES/mappers/mapper085.hpp | 3 +-- source/quickerNES/mappers/mapper086.hpp | 4 ++-- source/quickerNES/mappers/mapper087.hpp | 4 +--- source/quickerNES/mappers/mapper088.hpp | 4 ++-- source/quickerNES/mappers/mapper089.hpp | 4 ++-- source/quickerNES/mappers/mapper093.hpp | 4 ++-- source/quickerNES/mappers/mapper094.hpp | 4 ++-- source/quickerNES/mappers/mapper097.hpp | 4 ++-- source/quickerNES/mappers/mapper113.hpp | 4 ++-- source/quickerNES/mappers/mapper140.hpp | 4 ++-- source/quickerNES/mappers/mapper152.hpp | 4 ++-- source/quickerNES/mappers/mapper154.hpp | 4 ++-- source/quickerNES/mappers/mapper156.hpp | 3 ++- source/quickerNES/mappers/mapper180.hpp | 4 ++-- source/quickerNES/mappers/mapper184.hpp | 4 ++-- source/quickerNES/mappers/mapper193.hpp | 4 ++-- source/quickerNES/mappers/mapper206.hpp | 4 ++-- source/quickerNES/mappers/mapper207.hpp | 4 ++-- source/quickerNES/mappers/mapper240.hpp | 4 ++-- source/quickerNES/mappers/mapper241.hpp | 4 ++-- source/quickerNES/mappers/mapper244.hpp | 4 ++-- source/quickerNES/mappers/mapper246.hpp | 4 ++-- 50 files changed, 85 insertions(+), 117 deletions(-) diff --git a/source/quickerNES/Nes_Cart.h b/source/quickerNES/Nes_Cart.h index 2bb5ac7..0de8fd2 100644 --- a/source/quickerNES/Nes_Cart.h +++ b/source/quickerNES/Nes_Cart.h @@ -1,3 +1,4 @@ +#pragma once // NES cartridge data (PRG, CHR, mapper) @@ -14,10 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ - -#ifndef NES_CART_H -#define NES_CART_H - #include #include #include @@ -103,4 +100,3 @@ private: }; -#endif diff --git a/source/quickerNES/Nes_Cpu.cpp b/source/quickerNES/Nes_Cpu.cpp index b54614d..e68df6a 100644 --- a/source/quickerNES/Nes_Cpu.cpp +++ b/source/quickerNES/Nes_Cpu.cpp @@ -1,11 +1,9 @@ - // Nes_Emu 0.7.0. http://www.slack.net/~ant/nes-emu/ -#include "Nes_Cpu.h" -#include -#include -#include "blargg_endian.h" -#include +#include +#include +#include +#include #include /** diff --git a/source/quickerNES/Nes_Emu.h b/source/quickerNES/Nes_Emu.h index 9b7ca7e..5f5cedd 100644 --- a/source/quickerNES/Nes_Emu.h +++ b/source/quickerNES/Nes_Emu.h @@ -1,11 +1,9 @@ +#pragma once // NES video game console emulator with snapshot support // Nes_Emu 0.7.0 -#ifndef NES_EMU_H -#define NES_EMU_H - #include "audio/Multi_Buffer.h" #include "Nes_Cart.h" #include "Nes_Core.h" @@ -262,4 +260,3 @@ inline long Nes_Emu::chr_size() const return cart()->chr_size() ? cart()->chr_size() : emu.ppu.chr_addr_size; } -#endif diff --git a/source/quickerNES/Nes_Mapper.h b/source/quickerNES/Nes_Mapper.h index 5c39630..06c064f 100644 --- a/source/quickerNES/Nes_Mapper.h +++ b/source/quickerNES/Nes_Mapper.h @@ -1,14 +1,12 @@ +#pragma once // NES mapper interface // Nes_Emu 0.7.0 -#ifndef NES_MAPPER -#define NES_MAPPER - +#include #include "Nes_Cart.h" #include "Nes_Cpu.h" -#include class Blip_Buffer; class blip_eq_t; @@ -201,7 +199,3 @@ inline void Nes_Mapper::register_state( void* p, unsigned s ) inline bool Nes_Mapper::write_intercepted( nes_time_t, nes_addr_t, int ) { return false; } inline int Nes_Mapper::read( nes_time_t, nes_addr_t ) { return -1; } // signal to caller - - - -#endif diff --git a/source/quickerNES/Nes_Ppu.cpp b/source/quickerNES/Nes_Ppu.cpp index c354424..ba22c13 100644 --- a/source/quickerNES/Nes_Ppu.cpp +++ b/source/quickerNES/Nes_Ppu.cpp @@ -3,9 +3,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ +#include #include "Nes_Ppu.h" - -#include #include "Nes_Mapper.h" #include "Nes_Core.h" diff --git a/source/quickerNES/Nes_Ppu.h b/source/quickerNES/Nes_Ppu.h index 63007be..134dd0e 100644 --- a/source/quickerNES/Nes_Ppu.h +++ b/source/quickerNES/Nes_Ppu.h @@ -1,11 +1,9 @@ +#pragma once // NES PPU emulator // Nes_Emu 0.7.0 -#ifndef NES_PPU_H -#define NES_PPU_H - #include "Nes_Ppu_Rendering.h" #include @@ -138,5 +136,3 @@ inline void Nes_Ppu::update_open_bus( nes_time_t time ) if ( time >= decay_low ) open_bus &= ~0x1F; if ( time >= decay_high ) open_bus &= ~0xE0; } - -#endif diff --git a/source/quickerNES/Nes_Ppu_Impl.cpp b/source/quickerNES/Nes_Ppu_Impl.cpp index c6fd8b1..786a33f 100644 --- a/source/quickerNES/Nes_Ppu_Impl.cpp +++ b/source/quickerNES/Nes_Ppu_Impl.cpp @@ -1,12 +1,9 @@ - // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "Nes_Ppu_Impl.h" - +#include +#include #include -#include -#include "blargg_endian.h" -#include +#include "Nes_Ppu_Impl.h" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/Nes_Ppu_Impl.h b/source/quickerNES/Nes_Ppu_Impl.h index 1098665..13e0bac 100644 --- a/source/quickerNES/Nes_Ppu_Impl.h +++ b/source/quickerNES/Nes_Ppu_Impl.h @@ -5,7 +5,6 @@ #include -class Nes_State_; struct ppu_state_t { @@ -38,8 +37,6 @@ public: const char * open_chr( const uint8_t*, long size ); void rebuild_chr( unsigned long begin, unsigned long end ); void close_chr(); - void save_state( Nes_State_* out ) const; - void load_state( Nes_State_ const& ); static const uint16_t image_width = 256; static const uint16_t image_height = 240; diff --git a/source/quickerNES/Nes_Ppu_Rendering.h b/source/quickerNES/Nes_Ppu_Rendering.h index 63cf738..fbb1506 100644 --- a/source/quickerNES/Nes_Ppu_Rendering.h +++ b/source/quickerNES/Nes_Ppu_Rendering.h @@ -1,11 +1,9 @@ +#pragma once // NES PPU emulator graphics rendering // Nes_Emu 0.7.0 -#ifndef NES_PPU_RENDERING_H -#define NES_PPU_RENDERING_H - #include "Nes_Ppu_Impl.h" class Nes_Ppu_Rendering : public Nes_Ppu_Impl { @@ -58,4 +56,3 @@ inline void Nes_Ppu_Rendering::draw_sprites( int start, int count ) draw_scanlines( start, count, host_pixels + host_row_bytes * start, host_row_bytes, 2 ); } -#endif diff --git a/source/quickerNES/Nes_Ppu_Sprites.h b/source/quickerNES/Nes_Ppu_Sprites.h index d5dd4dc..ad23a0b 100644 --- a/source/quickerNES/Nes_Ppu_Sprites.h +++ b/source/quickerNES/Nes_Ppu_Sprites.h @@ -1,4 +1,3 @@ - int sprite_2 = sprite [2]; // pixels diff --git a/source/quickerNES/audio/apu.h b/source/quickerNES/audio/apu.h index 90fb623..77bfcf4 100644 --- a/source/quickerNES/audio/apu.h +++ b/source/quickerNES/audio/apu.h @@ -7,7 +7,6 @@ #include #include #include -#include "blargg_endian.h" #include "Nes_Oscs.h" class Nes_Apu { diff --git a/source/quickerNES/mappers/mapper015.hpp b/source/quickerNES/mappers/mapper015.hpp index e46e70f..ca77930 100644 --- a/source/quickerNES/mappers/mapper015.hpp +++ b/source/quickerNES/mappers/mapper015.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright (C) 2018. * This module is free software; you * can redistribute it and/or modify it under the terms of the GNU Lesser @@ -15,8 +17,6 @@ * 100-in-1 Contra Function 16 */ -#pragma once - #include "Nes_Mapper.h" struct Mapper015_state_t diff --git a/source/quickerNES/mappers/mapper019.hpp b/source/quickerNES/mappers/mapper019.hpp index 40a1a14..930cdaa 100644 --- a/source/quickerNES/mappers/mapper019.hpp +++ b/source/quickerNES/mappers/mapper019.hpp @@ -5,7 +5,6 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ #include "Nes_Mapper.h" -#include "blargg_endian.h" #include "audio/namco/apu.h" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/mappers/mapper021.hpp b/source/quickerNES/mappers/mapper021.hpp index b21f26d..ff71a3c 100644 --- a/source/quickerNES/mappers/mapper021.hpp +++ b/source/quickerNES/mappers/mapper021.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2004-2006 Shay Green * Copyright (C) 2007 CaH4e3 @@ -24,7 +26,6 @@ * VRC-2/VRC-4 Konami */ -#pragma once #include "Nes_Mapper.h" struct vrc2_state_t diff --git a/source/quickerNES/mappers/mapper022.hpp b/source/quickerNES/mappers/mapper022.hpp index 7200aa1..ba6a106 100644 --- a/source/quickerNES/mappers/mapper022.hpp +++ b/source/quickerNES/mappers/mapper022.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2004-2006 Shay Green * Copyright (C) 2007 CaH4e3 @@ -24,7 +26,6 @@ * VRC-2/VRC-4 Konami */ -#pragma once #include "Nes_Mapper.h" #include "mappers/mapper021.hpp" diff --git a/source/quickerNES/mappers/mapper023.hpp b/source/quickerNES/mappers/mapper023.hpp index dda8c03..7efff5d 100644 --- a/source/quickerNES/mappers/mapper023.hpp +++ b/source/quickerNES/mappers/mapper023.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2004-2006 Shay Green * Copyright (C) 2007 CaH4e3 @@ -24,7 +26,6 @@ * VRC-2/VRC-4 Konami */ -#pragma once #include "Nes_Mapper.h" typedef Mapper_VRC2_4 Mapper023; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper024.hpp b/source/quickerNES/mappers/mapper024.hpp index 7f7ec39..9c921b5 100644 --- a/source/quickerNES/mappers/mapper024.hpp +++ b/source/quickerNES/mappers/mapper024.hpp @@ -1,13 +1,12 @@ +#pragma once // Konami VRC6 mapper - // Nes_Emu 0.7.0. http://www.slack.net/~ant/ #include "Nes_Mapper.h" #include #include "audio/vrc6/apu.h" -#include "blargg_endian.h" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/mappers/mapper025.hpp b/source/quickerNES/mappers/mapper025.hpp index 4669585..ae9af3a 100644 --- a/source/quickerNES/mappers/mapper025.hpp +++ b/source/quickerNES/mappers/mapper025.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2004-2006 Shay Green * Copyright (C) 2007 CaH4e3 @@ -24,7 +26,6 @@ * VRC-2/VRC-4 Konami */ -#pragma once #include "Nes_Mapper.h" typedef Mapper_VRC2_4 Mapper025; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper030.hpp b/source/quickerNES/mappers/mapper030.hpp index c3e817e..b855680 100644 --- a/source/quickerNES/mappers/mapper030.hpp +++ b/source/quickerNES/mappers/mapper030.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -25,8 +27,6 @@ * Tested only on Troll Burner and Mystic Origins demo. */ -#pragma once - #include "Nes_Mapper.h" // Unrom512 diff --git a/source/quickerNES/mappers/mapper032.hpp b/source/quickerNES/mappers/mapper032.hpp index b64ac5d..8b84cba 100644 --- a/source/quickerNES/mappers/mapper032.hpp +++ b/source/quickerNES/mappers/mapper032.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" struct mapper32_state_t diff --git a/source/quickerNES/mappers/mapper033.hpp b/source/quickerNES/mappers/mapper033.hpp index 2fa5385..0f9a294 100644 --- a/source/quickerNES/mappers/mapper033.hpp +++ b/source/quickerNES/mappers/mapper033.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" struct tc0190_state_t diff --git a/source/quickerNES/mappers/mapper060.hpp b/source/quickerNES/mappers/mapper060.hpp index 1c88206..7531e8c 100644 --- a/source/quickerNES/mappers/mapper060.hpp +++ b/source/quickerNES/mappers/mapper060.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright (C) 2018. * This module is free software; you * can redistribute it and/or modify it under the terms of the GNU Lesser @@ -15,8 +17,6 @@ * 4-in-1 Multicart ( Reset-based ) */ -#pragma once - #include "Nes_Mapper.h" // NROM-128 4-in-1 multicart diff --git a/source/quickerNES/mappers/mapper069.hpp b/source/quickerNES/mappers/mapper069.hpp index 3931b05..ed094f8 100644 --- a/source/quickerNES/mappers/mapper069.hpp +++ b/source/quickerNES/mappers/mapper069.hpp @@ -5,7 +5,6 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/ #include "Nes_Mapper.h" -#include "blargg_endian.h" #include "audio/fme7/apu.h" /* Copyright (C) 2005 Chris Moeller */ diff --git a/source/quickerNES/mappers/mapper070.hpp b/source/quickerNES/mappers/mapper070.hpp index 65f5eba..5bf031e 100644 --- a/source/quickerNES/mappers/mapper070.hpp +++ b/source/quickerNES/mappers/mapper070.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // Mapper_74x161x162x32 diff --git a/source/quickerNES/mappers/mapper071.hpp b/source/quickerNES/mappers/mapper071.hpp index 5bd7f5c..cac80c4 100644 --- a/source/quickerNES/mappers/mapper071.hpp +++ b/source/quickerNES/mappers/mapper071.hpp @@ -1,9 +1,9 @@ +#pragma once + // Optional less-common simple mappers // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#pragma once - #include "Nes_Mapper.h" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/mappers/mapper073.hpp b/source/quickerNES/mappers/mapper073.hpp index 9a7ec0a..b487229 100644 --- a/source/quickerNES/mappers/mapper073.hpp +++ b/source/quickerNES/mappers/mapper073.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * VRC-3 Konami, Salamander */ -#pragma once - #include "Nes_Mapper.h" struct vrc3_state_t diff --git a/source/quickerNES/mappers/mapper075.hpp b/source/quickerNES/mappers/mapper075.hpp index e139605..97db8b3 100644 --- a/source/quickerNES/mappers/mapper075.hpp +++ b/source/quickerNES/mappers/mapper075.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright (C) 2018. * This module is free software; you * can redistribute it and/or modify it under the terms of the GNU Lesser @@ -15,8 +17,6 @@ * VRC-1 Konami */ -#pragma once - #include "Nes_Mapper.h" struct vrc1_state_t diff --git a/source/quickerNES/mappers/mapper079.hpp b/source/quickerNES/mappers/mapper079.hpp index 1996f44..1f3e119 100644 --- a/source/quickerNES/mappers/mapper079.hpp +++ b/source/quickerNES/mappers/mapper079.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -25,8 +27,6 @@ #include "Nes_Mapper.h" -#pragma once - template < bool multicart > class Mapper_AveNina : public Nes_Mapper { public: diff --git a/source/quickerNES/mappers/mapper085.hpp b/source/quickerNES/mappers/mapper085.hpp index 3ea48c0..538ab37 100644 --- a/source/quickerNES/mappers/mapper085.hpp +++ b/source/quickerNES/mappers/mapper085.hpp @@ -2,10 +2,9 @@ // Nes_Emu 0.5.4. http://www.slack.net/~ant/ +#include #include "Nes_Mapper.h" #include "audio/vrc7/apu.h" -#include "blargg_endian.h" -#include /* Copyright (C) 2004-2005 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/mappers/mapper086.hpp b/source/quickerNES/mappers/mapper086.hpp index f9e14ed..6c35983 100644 --- a/source/quickerNES/mappers/mapper086.hpp +++ b/source/quickerNES/mappers/mapper086.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -19,6 +21,4 @@ * */ -#pragma once - typedef Mapper_74x161x162x32<86> Mapper086; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper087.hpp b/source/quickerNES/mappers/mapper087.hpp index 00a9d93..bf50fcf 100644 --- a/source/quickerNES/mappers/mapper087.hpp +++ b/source/quickerNES/mappers/mapper087.hpp @@ -1,10 +1,8 @@ +#pragma once // Optional less-common simple mappers - // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#pragma once - #include "Nes_Mapper.h" /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/mappers/mapper088.hpp b/source/quickerNES/mappers/mapper088.hpp index 26e23d5..eff8908 100644 --- a/source/quickerNES/mappers/mapper088.hpp +++ b/source/quickerNES/mappers/mapper088.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -23,8 +25,6 @@ * Mapper 206 */ -#pragma once - #include "Nes_Mapper.h" struct namco_34x3_state_t diff --git a/source/quickerNES/mappers/mapper089.hpp b/source/quickerNES/mappers/mapper089.hpp index fb24c07..9501a82 100644 --- a/source/quickerNES/mappers/mapper089.hpp +++ b/source/quickerNES/mappers/mapper089.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -20,8 +22,6 @@ * Mapper 93 - Sunsoft-2 */ -#pragma once - #include "Nes_Mapper.h" // Sunsoft2b diff --git a/source/quickerNES/mappers/mapper093.hpp b/source/quickerNES/mappers/mapper093.hpp index 7c5efbc..b8da0ef 100644 --- a/source/quickerNES/mappers/mapper093.hpp +++ b/source/quickerNES/mappers/mapper093.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -20,8 +22,6 @@ * Mapper 93 - Sunsoft-2 */ -#pragma once - #include "Nes_Mapper.h" // Sunsoft2a diff --git a/source/quickerNES/mappers/mapper094.hpp b/source/quickerNES/mappers/mapper094.hpp index f68d328..6ba0aec 100644 --- a/source/quickerNES/mappers/mapper094.hpp +++ b/source/quickerNES/mappers/mapper094.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -22,8 +24,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // Un1rom diff --git a/source/quickerNES/mappers/mapper097.hpp b/source/quickerNES/mappers/mapper097.hpp index aa7afa1..c28806a 100644 --- a/source/quickerNES/mappers/mapper097.hpp +++ b/source/quickerNES/mappers/mapper097.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // Irem_Tam_S1 diff --git a/source/quickerNES/mappers/mapper113.hpp b/source/quickerNES/mappers/mapper113.hpp index efd7c85..d43252c 100644 --- a/source/quickerNES/mappers/mapper113.hpp +++ b/source/quickerNES/mappers/mapper113.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -23,6 +25,4 @@ * Nina-03 / Nina-06 */ -#pragma once - typedef Mapper_AveNina Mapper113; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper140.hpp b/source/quickerNES/mappers/mapper140.hpp index 8460695..fea7493 100644 --- a/source/quickerNES/mappers/mapper140.hpp +++ b/source/quickerNES/mappers/mapper140.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -22,8 +24,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // Jaleco_JF11 diff --git a/source/quickerNES/mappers/mapper152.hpp b/source/quickerNES/mappers/mapper152.hpp index f13b155..9cf4bcc 100644 --- a/source/quickerNES/mappers/mapper152.hpp +++ b/source/quickerNES/mappers/mapper152.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -19,6 +21,4 @@ * */ -#pragma once - typedef Mapper_74x161x162x32<152> Mapper152; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper154.hpp b/source/quickerNES/mappers/mapper154.hpp index 9b1f0f6..df363f6 100644 --- a/source/quickerNES/mappers/mapper154.hpp +++ b/source/quickerNES/mappers/mapper154.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -23,6 +25,4 @@ * Mapper 206 */ -#pragma once - typedef Mapper_Namco_34x3 Mapper154; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper156.hpp b/source/quickerNES/mappers/mapper156.hpp index 9998db9..2dfccf2 100644 --- a/source/quickerNES/mappers/mapper156.hpp +++ b/source/quickerNES/mappers/mapper156.hpp @@ -1,6 +1,7 @@ -#include "Nes_Mapper.h" #pragma once +#include "Nes_Mapper.h" + // DIS23C01 DAOU ROM CONTROLLER struct m156_state_t diff --git a/source/quickerNES/mappers/mapper180.hpp b/source/quickerNES/mappers/mapper180.hpp index e5ef616..3ca06ed 100644 --- a/source/quickerNES/mappers/mapper180.hpp +++ b/source/quickerNES/mappers/mapper180.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -20,8 +22,6 @@ * Mapper 180 Crazy Climber * */ - -#pragma once #include "Nes_Mapper.h" diff --git a/source/quickerNES/mappers/mapper184.hpp b/source/quickerNES/mappers/mapper184.hpp index eae52ad..388b310 100644 --- a/source/quickerNES/mappers/mapper184.hpp +++ b/source/quickerNES/mappers/mapper184.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -20,8 +22,6 @@ * Mapper 184 - Sunsoft-1 */ -#pragma once - #include "Nes_Mapper.h" // Sunsoft1 diff --git a/source/quickerNES/mappers/mapper193.hpp b/source/quickerNES/mappers/mapper193.hpp index 1a173f6..bd53925 100644 --- a/source/quickerNES/mappers/mapper193.hpp +++ b/source/quickerNES/mappers/mapper193.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -23,8 +25,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // NTDEC's TC-112 mapper IC. diff --git a/source/quickerNES/mappers/mapper206.hpp b/source/quickerNES/mappers/mapper206.hpp index f85890e..b172682 100644 --- a/source/quickerNES/mappers/mapper206.hpp +++ b/source/quickerNES/mappers/mapper206.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -23,8 +25,6 @@ * Mapper 206 */ -#pragma once - #include "Nes_Mapper.h" struct namco_34xx_state_t diff --git a/source/quickerNES/mappers/mapper207.hpp b/source/quickerNES/mappers/mapper207.hpp index 2164f67..fb0fae7 100644 --- a/source/quickerNES/mappers/mapper207.hpp +++ b/source/quickerNES/mappers/mapper207.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" struct taito_x1005_state_t diff --git a/source/quickerNES/mappers/mapper240.hpp b/source/quickerNES/mappers/mapper240.hpp index b324a37..af8a0ca 100644 --- a/source/quickerNES/mappers/mapper240.hpp +++ b/source/quickerNES/mappers/mapper240.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -19,8 +21,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // https://www.nesdev.org/wiki/INES_Mapper240 diff --git a/source/quickerNES/mappers/mapper241.hpp b/source/quickerNES/mappers/mapper241.hpp index 07859f4..626b33f 100644 --- a/source/quickerNES/mappers/mapper241.hpp +++ b/source/quickerNES/mappers/mapper241.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -19,8 +21,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // https://www.nesdev.org/wiki/INES_Mapper241 diff --git a/source/quickerNES/mappers/mapper244.hpp b/source/quickerNES/mappers/mapper244.hpp index bbbdd57..509a7ef 100644 --- a/source/quickerNES/mappers/mapper244.hpp +++ b/source/quickerNES/mappers/mapper244.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // https://www.nesdev.org/wiki/INES_Mapper244 diff --git a/source/quickerNES/mappers/mapper246.hpp b/source/quickerNES/mappers/mapper246.hpp index 8db8557..8fbc335 100644 --- a/source/quickerNES/mappers/mapper246.hpp +++ b/source/quickerNES/mappers/mapper246.hpp @@ -1,3 +1,5 @@ +#pragma once + /* Copyright notice for this file: * Copyright (C) 2018 * @@ -21,8 +23,6 @@ * */ -#pragma once - #include "Nes_Mapper.h" // https://www.nesdev.org/wiki/INES_Mapper246