From dec1772b7e7a68f4cb0d078f1cb4c37f7775e2eb Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sat, 20 Jan 2024 11:15:24 +0100 Subject: [PATCH] Standarizing header file extensions --- .clang-format | 121 ++++++++++++++++++ .github/workflows/make.yml | 2 - .gitignore | 2 + .run-clang-format.sh | 59 +++++++++ extern/hqn/hqn.h | 2 +- .../quickerNES/{Nes_Cart.h => Nes_Cart.hpp} | 0 .../quickerNES/{Nes_Core.h => Nes_Core.hpp} | 8 +- source/quickerNES/Nes_Cpu.cpp | 4 +- source/quickerNES/{Nes_Cpu.h => Nes_Cpu.hpp} | 0 source/quickerNES/Nes_Emu.cpp | 4 +- source/quickerNES/{Nes_Emu.h => Nes_Emu.hpp} | 6 +- source/quickerNES/apu/Blip_Buffer.cpp | 8 +- .../apu/{Blip_Buffer.h => Blip_Buffer.hpp} | 0 source/quickerNES/apu/Effects_Buffer.cpp | 3 +- .../{Effects_Buffer.h => Effects_Buffer.hpp} | 8 +- source/quickerNES/apu/Multi_Buffer.cpp | 2 +- .../apu/{Multi_Buffer.h => Multi_Buffer.hpp} | 9 +- source/quickerNES/apu/Nes_Buffer.cpp | 4 +- .../apu/{Nes_Buffer.h => Nes_Buffer.hpp} | 9 +- source/quickerNES/apu/Nes_Effects_Buffer.cpp | 4 +- ...ffects_Buffer.h => Nes_Effects_Buffer.hpp} | 11 +- source/quickerNES/apu/Nes_Oscs.cpp | 2 +- .../apu/{Nes_Oscs.h => Nes_Oscs.hpp} | 9 +- source/quickerNES/apu/apu.cpp | 3 +- source/quickerNES/apu/{apu.h => apu.hpp} | 3 +- source/quickerNES/apu/fme7/apu.cpp | 2 +- source/quickerNES/apu/fme7/{apu.h => apu.hpp} | 2 +- source/quickerNES/apu/namco/apu.cpp | 4 +- .../quickerNES/apu/namco/{apu.h => apu.hpp} | 2 +- source/quickerNES/apu/vrc6/apu.cpp | 2 +- source/quickerNES/apu/vrc6/{apu.h => apu.hpp} | 4 +- source/quickerNES/apu/vrc7/apu.cpp | 4 +- source/quickerNES/apu/vrc7/{apu.h => apu.hpp} | 4 +- source/quickerNES/apu/vrc7/emu2413.cpp | 2 +- .../apu/vrc7/{emu2413.h => emu2413.hpp} | 0 source/quickerNES/apu/vrc7/emu2413_state.cpp | 2 +- .../{emu2413_state.h => emu2413_state.hpp} | 2 +- source/quickerNES/mappers/mapper.cpp | 4 +- .../mappers/{mapper.h => mapper.hpp} | 5 +- source/quickerNES/mappers/mapper000.hpp | 2 +- source/quickerNES/mappers/mapper001.hpp | 2 +- source/quickerNES/mappers/mapper002.hpp | 2 +- source/quickerNES/mappers/mapper003.hpp | 2 +- source/quickerNES/mappers/mapper004.hpp | 4 +- source/quickerNES/mappers/mapper005.hpp | 5 +- source/quickerNES/mappers/mapper007.hpp | 2 +- source/quickerNES/mappers/mapper009.hpp | 2 +- source/quickerNES/mappers/mapper010.hpp | 2 +- source/quickerNES/mappers/mapper011.hpp | 2 +- source/quickerNES/mappers/mapper015.hpp | 2 +- source/quickerNES/mappers/mapper019.hpp | 4 +- source/quickerNES/mappers/mapper021.hpp | 2 +- source/quickerNES/mappers/mapper022.hpp | 2 +- source/quickerNES/mappers/mapper023.hpp | 2 +- source/quickerNES/mappers/mapper024.hpp | 4 +- source/quickerNES/mappers/mapper025.hpp | 2 +- source/quickerNES/mappers/mapper026.hpp | 2 +- source/quickerNES/mappers/mapper030.hpp | 2 +- source/quickerNES/mappers/mapper032.hpp | 2 +- source/quickerNES/mappers/mapper033.hpp | 2 +- source/quickerNES/mappers/mapper034.hpp | 2 +- source/quickerNES/mappers/mapper060.hpp | 2 +- source/quickerNES/mappers/mapper066.hpp | 2 +- source/quickerNES/mappers/mapper069.hpp | 4 +- source/quickerNES/mappers/mapper070.hpp | 2 +- source/quickerNES/mappers/mapper071.hpp | 2 +- source/quickerNES/mappers/mapper073.hpp | 2 +- source/quickerNES/mappers/mapper075.hpp | 2 +- source/quickerNES/mappers/mapper078.hpp | 2 +- source/quickerNES/mappers/mapper079.hpp | 2 +- source/quickerNES/mappers/mapper085.hpp | 4 +- source/quickerNES/mappers/mapper087.hpp | 2 +- source/quickerNES/mappers/mapper088.hpp | 2 +- source/quickerNES/mappers/mapper089.hpp | 2 +- source/quickerNES/mappers/mapper093.hpp | 2 +- source/quickerNES/mappers/mapper094.hpp | 2 +- source/quickerNES/mappers/mapper097.hpp | 2 +- source/quickerNES/mappers/mapper140.hpp | 2 +- source/quickerNES/mappers/mapper156.hpp | 2 +- source/quickerNES/mappers/mapper180.hpp | 2 +- source/quickerNES/mappers/mapper184.hpp | 2 +- source/quickerNES/mappers/mapper190.hpp | 2 +- source/quickerNES/mappers/mapper193.hpp | 2 +- source/quickerNES/mappers/mapper206.hpp | 2 +- source/quickerNES/mappers/mapper207.hpp | 2 +- source/quickerNES/mappers/mapper232.hpp | 2 +- source/quickerNES/mappers/mapper240.hpp | 2 +- source/quickerNES/mappers/mapper241.hpp | 2 +- source/quickerNES/mappers/mapper244.hpp | 2 +- source/quickerNES/mappers/mapper246.hpp | 2 +- source/quickerNES/ppu/Nes_Ppu.cpp | 4 +- .../quickerNES/ppu/{Nes_Ppu.h => Nes_Ppu.hpp} | 3 +- source/quickerNES/ppu/Nes_Ppu_Impl.cpp | 2 +- .../ppu/{Nes_Ppu_Impl.h => Nes_Ppu_Impl.hpp} | 0 source/quickerNES/ppu/Nes_Ppu_Rendering.cpp | 6 +- ..._Ppu_Rendering.h => Nes_Ppu_Rendering.hpp} | 3 +- ...{Nes_Ppu_Sprites.h => Nes_Ppu_Sprites.hpp} | 0 source/quickerNES/quickerNESInstance.hpp | 2 +- tests/arkanoid/warpless.test | 2 +- tests/arkanoid/warps.test | 2 +- tests/castlevania1/anyPercent.test | 2 +- tests/castlevania1/pacifist.test | 2 +- tests/galaga/anyPercent.test | 2 +- tests/ironSword/anyPercent.test | 2 +- tests/nigelMansell/anyPercent.test | 2 +- tests/ninjaGaiden/anyPercent.test | 2 +- tests/ninjaGaiden/pacifist.test | 2 +- tests/ninjaGaiden2/anyPercent.test | 2 +- tests/ninjaGaiden2/pacifist.test | 2 +- tests/novaTheSquirrel/anyPercent.test | 2 +- tests/princeOfPersia/anyPercent.test | 2 +- tests/roms/README.md | 3 + tests/{novaTheSquirrel => roms}/nova.nes | Bin tests/{sprilo => roms}/sprilo.nes | Bin tests/saintSeiyaKanketsuHen/anyPercent.test | 2 +- tests/saintSeiyaOugonDensetsu/anyPercent.test | 2 +- tests/saiyuukiWorld/anyPercent.test | 2 +- tests/saiyuukiWorld/lastHalf.test | 2 +- tests/solarJetman/anyPercent.test | 2 +- tests/sprilo/anyPercent.test | 2 +- tests/superMarioBros/warpless.test | 2 +- tests/superMarioBros/warps.test | 2 +- tests/superMarioBros3/warps.test | 2 +- tests/superOffroad/anyPercent.test | 2 +- tests/tennis/anyPercent.test | 2 +- 125 files changed, 330 insertions(+), 178 deletions(-) create mode 100644 .clang-format create mode 100755 .run-clang-format.sh rename source/quickerNES/{Nes_Cart.h => Nes_Cart.hpp} (100%) rename source/quickerNES/{Nes_Core.h => Nes_Core.hpp} (99%) rename source/quickerNES/{Nes_Cpu.h => Nes_Cpu.hpp} (100%) rename source/quickerNES/{Nes_Emu.h => Nes_Emu.hpp} (99%) rename source/quickerNES/apu/{Blip_Buffer.h => Blip_Buffer.hpp} (100%) rename source/quickerNES/apu/{Effects_Buffer.h => Effects_Buffer.hpp} (96%) rename source/quickerNES/apu/{Multi_Buffer.h => Multi_Buffer.hpp} (98%) rename source/quickerNES/apu/{Nes_Buffer.h => Nes_Buffer.hpp} (95%) rename source/quickerNES/apu/{Nes_Effects_Buffer.h => Nes_Effects_Buffer.hpp} (88%) rename source/quickerNES/apu/{Nes_Oscs.h => Nes_Oscs.hpp} (97%) rename source/quickerNES/apu/{apu.h => apu.hpp} (99%) rename source/quickerNES/apu/fme7/{apu.h => apu.hpp} (98%) rename source/quickerNES/apu/namco/{apu.h => apu.hpp} (98%) rename source/quickerNES/apu/vrc6/{apu.h => apu.hpp} (97%) rename source/quickerNES/apu/vrc7/{apu.h => apu.hpp} (95%) rename source/quickerNES/apu/vrc7/{emu2413.h => emu2413.hpp} (100%) rename source/quickerNES/apu/vrc7/{emu2413_state.h => emu2413_state.hpp} (95%) rename source/quickerNES/mappers/{mapper.h => mapper.hpp} (99%) rename source/quickerNES/ppu/{Nes_Ppu.h => Nes_Ppu.hpp} (99%) rename source/quickerNES/ppu/{Nes_Ppu_Impl.h => Nes_Ppu_Impl.hpp} (100%) rename source/quickerNES/ppu/{Nes_Ppu_Rendering.h => Nes_Ppu_Rendering.hpp} (97%) rename source/quickerNES/ppu/{Nes_Ppu_Sprites.h => Nes_Ppu_Sprites.hpp} (100%) create mode 100644 tests/roms/README.md rename tests/{novaTheSquirrel => roms}/nova.nes (100%) rename tests/{sprilo => roms}/sprilo.nes (100%) diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..c818c8e --- /dev/null +++ b/.clang-format @@ -0,0 +1,121 @@ +--- +Language: Cpp +# BasedOnStyle: LLVM +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: Right +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortLambdasOnASingleLine: None +AllowShortBlocksOnASingleLine: true +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: true +AllowShortLoopsOnASingleLine: true +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: Yes +BinPackArguments: false +BinPackParameters: false +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Allman +BreakBeforeInheritanceComma: false +BreakInheritanceList: BeforeColon +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeColon +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 0 +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 2 +ContinuationIndentWidth: 2 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IncludeBlocks: Preserve +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + - Regex: '^(<|"(gtest|gmock|isl|json)/)' + Priority: 3 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +IndentPPDirectives: BeforeHash +IndentWidth: 2 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBinPackProtocolList: Auto +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Right +ReflowComments: true +SortIncludes: true +SortUsingDeclarations: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +StatementMacros: + - Q_UNUSED + - QT_REQUIRE_VERSION +TabWidth: 2 +UseTab: Never +... diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index eeb53a9..bec9971 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -1,8 +1,6 @@ name: Build and Run Tests on: - push: - branches: [ "main" ] pull_request: branches: [ "main" ] diff --git a/.gitignore b/.gitignore index d726022..4dcaec3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +run-clang-format + # Things .vscode diff --git a/.run-clang-format.sh b/.run-clang-format.sh new file mode 100755 index 0000000..68188ea --- /dev/null +++ b/.run-clang-format.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env bash +if [[ $# -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi +task="${1}"; shift + +function check() +{ + if [ ! $? -eq 0 ]; then + echo "Error fixing style." + exit -1 + fi +} + +function check_syntax() +{ + # If run-clang-format is not installed, clone it + if [ ! -f run-clang-format/run-clang-format.py ]; then + + git clone https://github.com/Sarcasm/run-clang-format.git + if [ ! $? -eq 0 ]; then + echo "Error installing run-clang-format." + exit 1 + fi + fi + + python3 run-clang-format/run-clang-format.py --recursive source --extensions "cpp,hpp" + + if [ ! $? -eq 0 ]; then + echo "Error: C++ Code formatting in source is not normalized." + echo "Solution: Please run this program with the 'fix' argument" + exit -1 + fi +} + +function fix_syntax() +{ + src_files=`find source -type f -name "*.cpp" -o -name "*.hpp"` + echo $src_files | xargs -n6 -P2 clang-format -style=file -i "$@" + check +} + +############################################## +### Testing/fixing C++ Code Style +############################################## +command -v clang-format >/dev/null +if [ ! $? -eq 0 ]; then + echo "Error: please install clang-format on your system." + exit -1 +fi + +if [[ "${task}" == 'check' ]]; then + check_syntax +else + fix_syntax +fi + +exit 0 \ No newline at end of file diff --git a/extern/hqn/hqn.h b/extern/hqn/hqn.h index fd48100..3a1dee8 100644 --- a/extern/hqn/hqn.h +++ b/extern/hqn/hqn.h @@ -1,7 +1,7 @@ #ifndef __HQN_H__ #define __HQN_H__ -#include +#include #include #include diff --git a/source/quickerNES/Nes_Cart.h b/source/quickerNES/Nes_Cart.hpp similarity index 100% rename from source/quickerNES/Nes_Cart.h rename to source/quickerNES/Nes_Cart.hpp diff --git a/source/quickerNES/Nes_Core.h b/source/quickerNES/Nes_Core.hpp similarity index 99% rename from source/quickerNES/Nes_Core.h rename to source/quickerNES/Nes_Core.hpp index c4f960c..506a2d4 100644 --- a/source/quickerNES/Nes_Core.h +++ b/source/quickerNES/Nes_Core.hpp @@ -18,10 +18,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include -#include "apu/apu.h" -#include "Nes_Cpu.h" -#include "ppu/Nes_Ppu.h" -#include "mappers/mapper.h" +#include "apu/apu.hpp" +#include "Nes_Cpu.hpp" +#include "ppu/Nes_Ppu.hpp" +#include "mappers/mapper.hpp" class Nes_Cart; diff --git a/source/quickerNES/Nes_Cpu.cpp b/source/quickerNES/Nes_Cpu.cpp index 7a8e9ce..2ccf3f3 100644 --- a/source/quickerNES/Nes_Cpu.cpp +++ b/source/quickerNES/Nes_Cpu.cpp @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include "Nes_Cpu.hpp" +#include "Nes_Core.hpp" /** * Optimizations by Sergio Martin (eien86) 2023-2024 diff --git a/source/quickerNES/Nes_Cpu.h b/source/quickerNES/Nes_Cpu.hpp similarity index 100% rename from source/quickerNES/Nes_Cpu.h rename to source/quickerNES/Nes_Cpu.hpp diff --git a/source/quickerNES/Nes_Emu.cpp b/source/quickerNES/Nes_Emu.cpp index c2188e2..9b0e7f4 100644 --- a/source/quickerNES/Nes_Emu.cpp +++ b/source/quickerNES/Nes_Emu.cpp @@ -1,8 +1,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ #include -#include "mappers/mapper.h" -#include "Nes_Emu.h" +#include "mappers/mapper.hpp" +#include "Nes_Emu.hpp" /* 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_Emu.h b/source/quickerNES/Nes_Emu.hpp similarity index 99% rename from source/quickerNES/Nes_Emu.h rename to source/quickerNES/Nes_Emu.hpp index 0d725c1..c29886b 100644 --- a/source/quickerNES/Nes_Emu.h +++ b/source/quickerNES/Nes_Emu.hpp @@ -4,9 +4,9 @@ // Nes_Emu 0.7.0 -#include "apu/Multi_Buffer.h" -#include "Nes_Cart.h" -#include "Nes_Core.h" +#include "apu/Multi_Buffer.hpp" +#include "Nes_Cart.hpp" +#include "Nes_Core.hpp" class Nes_State; diff --git a/source/quickerNES/apu/Blip_Buffer.cpp b/source/quickerNES/apu/Blip_Buffer.cpp index 9288921..f47d9b9 100644 --- a/source/quickerNES/apu/Blip_Buffer.cpp +++ b/source/quickerNES/apu/Blip_Buffer.cpp @@ -1,12 +1,12 @@ // Blip_Buffer 0.4.0. http://www.slack.net/~ant/ -#include "Blip_Buffer.h" - #include #include #include #include +#include "Blip_Buffer.hpp" + /* Copyright (C) 2003-2006 Shay Green. This module is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -19,10 +19,6 @@ more details. You should have received a copy of the GNU Lesser General Public License along with this module; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef BLARGG_ENABLE_OPTIMIZER - #include BLARGG_ENABLE_OPTIMIZER -#endif - int const buffer_extra = blip_widest_impulse_ + 2; Blip_Buffer::Blip_Buffer() diff --git a/source/quickerNES/apu/Blip_Buffer.h b/source/quickerNES/apu/Blip_Buffer.hpp similarity index 100% rename from source/quickerNES/apu/Blip_Buffer.h rename to source/quickerNES/apu/Blip_Buffer.hpp diff --git a/source/quickerNES/apu/Effects_Buffer.cpp b/source/quickerNES/apu/Effects_Buffer.cpp index 0a8ef9a..737140f 100644 --- a/source/quickerNES/apu/Effects_Buffer.cpp +++ b/source/quickerNES/apu/Effects_Buffer.cpp @@ -1,8 +1,7 @@ - // Game_Music_Emu 0.3.0. http://www.slack.net/~ant/ -#include "Effects_Buffer.h" #include +#include "Effects_Buffer.hpp" /* Copyright (C) 2003-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/apu/Effects_Buffer.h b/source/quickerNES/apu/Effects_Buffer.hpp similarity index 96% rename from source/quickerNES/apu/Effects_Buffer.h rename to source/quickerNES/apu/Effects_Buffer.hpp index 7ad1ff7..26e02be 100644 --- a/source/quickerNES/apu/Effects_Buffer.h +++ b/source/quickerNES/apu/Effects_Buffer.hpp @@ -1,13 +1,10 @@ +#pragma once // Multi-channel effects buffer with panning, echo and reverb - // Game_Music_Emu 0.3.0 -#ifndef EFFECTS_BUFFER_H -#define EFFECTS_BUFFER_H - #include -#include "Multi_Buffer.h" +#include "Multi_Buffer.hpp" // Effects_Buffer uses several buffers and outputs stereo sample pairs. class Effects_Buffer : public Multi_Buffer { @@ -90,4 +87,3 @@ private: return channels [i % chan_count]; } -#endif diff --git a/source/quickerNES/apu/Multi_Buffer.cpp b/source/quickerNES/apu/Multi_Buffer.cpp index 9c2746f..9a016e1 100644 --- a/source/quickerNES/apu/Multi_Buffer.cpp +++ b/source/quickerNES/apu/Multi_Buffer.cpp @@ -1,7 +1,7 @@ // Blip_Buffer 0.4.0. http://www.slack.net/~ant/ -#include "Multi_Buffer.h" +#include "Multi_Buffer.hpp" #include /* Copyright (C) 2003-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/apu/Multi_Buffer.h b/source/quickerNES/apu/Multi_Buffer.hpp similarity index 98% rename from source/quickerNES/apu/Multi_Buffer.h rename to source/quickerNES/apu/Multi_Buffer.hpp index 670a896..54f261a 100644 --- a/source/quickerNES/apu/Multi_Buffer.h +++ b/source/quickerNES/apu/Multi_Buffer.hpp @@ -1,12 +1,10 @@ +#pragma once + // Multi-channel sound buffer interface, and basic mono and stereo buffers - // Blip_Buffer 0.4.0 -#ifndef MULTI_BUFFER_H -#define MULTI_BUFFER_H - -#include "Blip_Buffer.h" +#include "Blip_Buffer.hpp" // Interface to one or more Blip_Buffers mapped to one or more channels // consisting of left, center, and right buffers. @@ -186,4 +184,3 @@ inline long Mono_Buffer::read_samples( blip_sample_t* p, long s ) { return buf.r inline long Mono_Buffer::samples_avail() const { return buf.samples_avail(); } -#endif diff --git a/source/quickerNES/apu/Nes_Buffer.cpp b/source/quickerNES/apu/Nes_Buffer.cpp index 0f76336..317af21 100644 --- a/source/quickerNES/apu/Nes_Buffer.cpp +++ b/source/quickerNES/apu/Nes_Buffer.cpp @@ -1,7 +1,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "apu/Nes_Buffer.h" -#include "apu/apu.h" +#include "apu/Nes_Buffer.hpp" +#include "apu/apu.hpp" /* Library Copyright (C) 2003-2006 Shay Green. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser diff --git a/source/quickerNES/apu/Nes_Buffer.h b/source/quickerNES/apu/Nes_Buffer.hpp similarity index 95% rename from source/quickerNES/apu/Nes_Buffer.h rename to source/quickerNES/apu/Nes_Buffer.hpp index d8a847b..607f2a8 100644 --- a/source/quickerNES/apu/Nes_Buffer.h +++ b/source/quickerNES/apu/Nes_Buffer.hpp @@ -1,12 +1,9 @@ +#pragma once // NES non-linear audio buffer - // Nes_Emu 0.7.0 -#ifndef NES_BUFFER_H -#define NES_BUFFER_H - -#include "Multi_Buffer.h" +#include "Multi_Buffer.hpp" #include class Nes_Apu; @@ -68,5 +65,3 @@ public: virtual void SaveAudioBufferState(); virtual void RestoreAudioBufferState(); }; - -#endif diff --git a/source/quickerNES/apu/Nes_Effects_Buffer.cpp b/source/quickerNES/apu/Nes_Effects_Buffer.cpp index 2b9627e..27e2b01 100644 --- a/source/quickerNES/apu/Nes_Effects_Buffer.cpp +++ b/source/quickerNES/apu/Nes_Effects_Buffer.cpp @@ -1,8 +1,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "apu/Nes_Effects_Buffer.h" -#include "apu/apu.h" +#include "apu/Nes_Effects_Buffer.hpp" +#include "apu/apu.hpp" /* 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/apu/Nes_Effects_Buffer.h b/source/quickerNES/apu/Nes_Effects_Buffer.hpp similarity index 88% rename from source/quickerNES/apu/Nes_Effects_Buffer.h rename to source/quickerNES/apu/Nes_Effects_Buffer.hpp index 2f751c2..b659073 100644 --- a/source/quickerNES/apu/Nes_Effects_Buffer.h +++ b/source/quickerNES/apu/Nes_Effects_Buffer.hpp @@ -1,13 +1,10 @@ +#pragma once // Effects_Buffer with non-linear sound - // Nes_Emu 0.7.0 -#ifndef NES_EFFECTS_BUFFER_H -#define NES_EFFECTS_BUFFER_H - -#include "Nes_Buffer.h" -#include "Effects_Buffer.h" +#include "Nes_Buffer.hpp" +#include "Effects_Buffer.hpp" // Effects_Buffer uses several buffers and outputs stereo sample pairs. class Nes_Effects_Buffer : public Effects_Buffer { @@ -36,5 +33,3 @@ private: Nes_Nonlinearizer nonlin; friend Multi_Buffer* set_apu( Nes_Effects_Buffer*, Nes_Apu* ); }; - -#endif diff --git a/source/quickerNES/apu/Nes_Oscs.cpp b/source/quickerNES/apu/Nes_Oscs.cpp index 485fad6..ad1926e 100644 --- a/source/quickerNES/apu/Nes_Oscs.cpp +++ b/source/quickerNES/apu/Nes_Oscs.cpp @@ -1,7 +1,7 @@ // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu.h" +#include "apu.hpp" /* Copyright (C) 2003-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/apu/Nes_Oscs.h b/source/quickerNES/apu/Nes_Oscs.hpp similarity index 97% rename from source/quickerNES/apu/Nes_Oscs.h rename to source/quickerNES/apu/Nes_Oscs.hpp index 650f64a..6d669f9 100644 --- a/source/quickerNES/apu/Nes_Oscs.h +++ b/source/quickerNES/apu/Nes_Oscs.hpp @@ -1,12 +1,10 @@ +#pragma once + // Private oscillators used by Nes_Apu - // Nes_Snd_Emu 0.1.7 -#ifndef NES_OSCS_H -#define NES_OSCS_H - -#include "Blip_Buffer.h" +#include "Blip_Buffer.hpp" class Nes_Apu; @@ -148,4 +146,3 @@ struct Nes_Dmc : Nes_Osc nes_time_t next_read_time() const; }; -#endif diff --git a/source/quickerNES/apu/apu.cpp b/source/quickerNES/apu/apu.cpp index 119c037..cfd828b 100644 --- a/source/quickerNES/apu/apu.cpp +++ b/source/quickerNES/apu/apu.cpp @@ -1,7 +1,6 @@ - // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu.h" +#include "apu.hpp" /* Copyright (C) 2003-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/apu/apu.h b/source/quickerNES/apu/apu.hpp similarity index 99% rename from source/quickerNES/apu/apu.h rename to source/quickerNES/apu/apu.hpp index 77bfcf4..6da6fdc 100644 --- a/source/quickerNES/apu/apu.h +++ b/source/quickerNES/apu/apu.hpp @@ -1,13 +1,12 @@ #pragma once // NES 2A03 APU sound chip emulator - // Nes_Snd_Emu 0.1.7 #include #include #include -#include "Nes_Oscs.h" +#include "Nes_Oscs.hpp" class Nes_Apu { public: diff --git a/source/quickerNES/apu/fme7/apu.cpp b/source/quickerNES/apu/fme7/apu.cpp index 29a7fd7..d6a2059 100644 --- a/source/quickerNES/apu/fme7/apu.cpp +++ b/source/quickerNES/apu/fme7/apu.cpp @@ -1,8 +1,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "apu/fme7/apu.h" #include +#include "apu/fme7/apu.hpp" /* Copyright (C) 2003-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/apu/fme7/apu.h b/source/quickerNES/apu/fme7/apu.hpp similarity index 98% rename from source/quickerNES/apu/fme7/apu.h rename to source/quickerNES/apu/fme7/apu.hpp index 861d780..d18ec1a 100644 --- a/source/quickerNES/apu/fme7/apu.h +++ b/source/quickerNES/apu/fme7/apu.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0 #include -#include "apu/Blip_Buffer.h" +#include "apu/Blip_Buffer.hpp" struct fme7_apu_state_t { diff --git a/source/quickerNES/apu/namco/apu.cpp b/source/quickerNES/apu/namco/apu.cpp index ffec4d0..1059bdb 100644 --- a/source/quickerNES/apu/namco/apu.cpp +++ b/source/quickerNES/apu/namco/apu.cpp @@ -1,8 +1,8 @@ // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu/Blip_Buffer.h" -#include "apu/namco/apu.h" +#include "apu/Blip_Buffer.hpp" +#include "apu/namco/apu.hpp" /* Copyright (C) 2003-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/apu/namco/apu.h b/source/quickerNES/apu/namco/apu.hpp similarity index 98% rename from source/quickerNES/apu/namco/apu.h rename to source/quickerNES/apu/namco/apu.hpp index e53eb61..e0e5ba5 100644 --- a/source/quickerNES/apu/namco/apu.h +++ b/source/quickerNES/apu/namco/apu.hpp @@ -4,7 +4,7 @@ // Nes_Snd_Emu 0.1.7 #include -#include "apu/apu.h" +#include "apu/apu.hpp" struct namco_state_t { diff --git a/source/quickerNES/apu/vrc6/apu.cpp b/source/quickerNES/apu/vrc6/apu.cpp index 2b636f8..0f1cf95 100644 --- a/source/quickerNES/apu/vrc6/apu.cpp +++ b/source/quickerNES/apu/vrc6/apu.cpp @@ -1,7 +1,7 @@ // Nes_Snd_Emu 0.1.7. http://www.slack.net/~ant/ -#include "apu/vrc6/apu.h" +#include "apu/vrc6/apu.hpp" /* Copyright (C) 2003-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/apu/vrc6/apu.h b/source/quickerNES/apu/vrc6/apu.hpp similarity index 97% rename from source/quickerNES/apu/vrc6/apu.h rename to source/quickerNES/apu/vrc6/apu.hpp index 9883cb2..e6dab48 100644 --- a/source/quickerNES/apu/vrc6/apu.h +++ b/source/quickerNES/apu/vrc6/apu.hpp @@ -5,8 +5,8 @@ // Nes_Snd_Emu 0.1.7 #include -#include "apu/apu.h" -#include "apu/Blip_Buffer.h" +#include "apu/apu.hpp" +#include "apu/Blip_Buffer.hpp" struct vrc6_apu_state_t; diff --git a/source/quickerNES/apu/vrc7/apu.cpp b/source/quickerNES/apu/vrc7/apu.cpp index a7c1617..81afa7f 100644 --- a/source/quickerNES/apu/vrc7/apu.cpp +++ b/source/quickerNES/apu/vrc7/apu.cpp @@ -1,5 +1,5 @@ -#include "apu/vrc7/apu.h" -#include "apu/vrc7/emu2413.h" +#include "apu/vrc7/apu.hpp" +#include "apu/vrc7/emu2413.hpp" #include #define BYTESWAP(xxxx) {uint32_t _temp = (uint32_t)(xxxx);\ diff --git a/source/quickerNES/apu/vrc7/apu.h b/source/quickerNES/apu/vrc7/apu.hpp similarity index 95% rename from source/quickerNES/apu/vrc7/apu.h rename to source/quickerNES/apu/vrc7/apu.hpp index 4a33476..32f9495 100644 --- a/source/quickerNES/apu/vrc7/apu.h +++ b/source/quickerNES/apu/vrc7/apu.hpp @@ -5,8 +5,8 @@ // Nes_Snd_Emu 0.1.7. Copyright (C) 2003-2005 Shay Green. GNU LGPL license. #include -#include "apu/vrc7/emu2413_state.h" -#include "apu/Blip_Buffer.h" +#include "apu/vrc7/emu2413_state.hpp" +#include "apu/Blip_Buffer.hpp" struct vrc7_snapshot_t; typedef long nes_time_t; diff --git a/source/quickerNES/apu/vrc7/emu2413.cpp b/source/quickerNES/apu/vrc7/emu2413.cpp index 5faeb17..284f0a5 100644 --- a/source/quickerNES/apu/vrc7/emu2413.cpp +++ b/source/quickerNES/apu/vrc7/emu2413.cpp @@ -59,7 +59,7 @@ if the origin of this software is not misrepresented. #include #include #include -#include "emu2413.h" +#include "emu2413.hpp" static const unsigned char default_inst[15][8] = { /* 2019-03-19 VRC7 instrument patchset dumped by Nuke.YKT */ diff --git a/source/quickerNES/apu/vrc7/emu2413.h b/source/quickerNES/apu/vrc7/emu2413.hpp similarity index 100% rename from source/quickerNES/apu/vrc7/emu2413.h rename to source/quickerNES/apu/vrc7/emu2413.hpp diff --git a/source/quickerNES/apu/vrc7/emu2413_state.cpp b/source/quickerNES/apu/vrc7/emu2413_state.cpp index ff70eac..c9470aa 100644 --- a/source/quickerNES/apu/vrc7/emu2413_state.cpp +++ b/source/quickerNES/apu/vrc7/emu2413_state.cpp @@ -1,5 +1,5 @@ -#include "emu2413_state.h" #include +#include "emu2413_state.hpp" #ifdef __cplusplus extern "C" diff --git a/source/quickerNES/apu/vrc7/emu2413_state.h b/source/quickerNES/apu/vrc7/emu2413_state.hpp similarity index 95% rename from source/quickerNES/apu/vrc7/emu2413_state.h rename to source/quickerNES/apu/vrc7/emu2413_state.hpp index 6fd4338..cf814cc 100644 --- a/source/quickerNES/apu/vrc7/emu2413_state.h +++ b/source/quickerNES/apu/vrc7/emu2413_state.hpp @@ -1,6 +1,6 @@ #pragma once -#include "emu2413.h" +#include "emu2413.hpp" typedef struct { e_int32 feedback; diff --git a/source/quickerNES/mappers/mapper.cpp b/source/quickerNES/mappers/mapper.cpp index a486055..5ae1ad6 100644 --- a/source/quickerNES/mappers/mapper.cpp +++ b/source/quickerNES/mappers/mapper.cpp @@ -2,8 +2,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ #include -#include "mappers/mapper.h" -#include "Nes_Core.h" +#include "mappers/mapper.hpp" +#include "Nes_Core.hpp" /* 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/mapper.h b/source/quickerNES/mappers/mapper.hpp similarity index 99% rename from source/quickerNES/mappers/mapper.h rename to source/quickerNES/mappers/mapper.hpp index db2b78f..568cbbb 100644 --- a/source/quickerNES/mappers/mapper.h +++ b/source/quickerNES/mappers/mapper.hpp @@ -1,12 +1,11 @@ #pragma once // NES mapper interface - // Nes_Emu 0.7.0 #include -#include "Nes_Cart.h" -#include "Nes_Cpu.h" +#include "Nes_Cart.hpp" +#include "Nes_Cpu.hpp" class Blip_Buffer; class blip_eq_t; diff --git a/source/quickerNES/mappers/mapper000.hpp b/source/quickerNES/mappers/mapper000.hpp index 3ec01e6..d4e54c2 100644 --- a/source/quickerNES/mappers/mapper000.hpp +++ b/source/quickerNES/mappers/mapper000.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper001.hpp b/source/quickerNES/mappers/mapper001.hpp index 4a97cf5..12119d6 100644 --- a/source/quickerNES/mappers/mapper001.hpp +++ b/source/quickerNES/mappers/mapper001.hpp @@ -2,7 +2,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" #include /* Copyright (C) 2004-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/mappers/mapper002.hpp b/source/quickerNES/mappers/mapper002.hpp index 4377f9e..001c513 100644 --- a/source/quickerNES/mappers/mapper002.hpp +++ b/source/quickerNES/mappers/mapper002.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper003.hpp b/source/quickerNES/mappers/mapper003.hpp index d6b99cb..f6f06ca 100644 --- a/source/quickerNES/mappers/mapper003.hpp +++ b/source/quickerNES/mappers/mapper003.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper004.hpp b/source/quickerNES/mappers/mapper004.hpp index 3637dc4..00f8154 100644 --- a/source/quickerNES/mappers/mapper004.hpp +++ b/source/quickerNES/mappers/mapper004.hpp @@ -2,10 +2,10 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" #include -#include "Nes_Core.h" +#include "Nes_Core.hpp" /* 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/mapper005.hpp b/source/quickerNES/mappers/mapper005.hpp index 89cb804..ce27c94 100644 --- a/source/quickerNES/mappers/mapper005.hpp +++ b/source/quickerNES/mappers/mapper005.hpp @@ -4,10 +4,9 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" - -#include "Nes_Core.h" #include +#include "mappers/mapper.hpp" +#include "Nes_Core.hpp" /* 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/mapper007.hpp b/source/quickerNES/mappers/mapper007.hpp index 4b22eae..2030c8f 100644 --- a/source/quickerNES/mappers/mapper007.hpp +++ b/source/quickerNES/mappers/mapper007.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper009.hpp b/source/quickerNES/mappers/mapper009.hpp index 4fe2d14..d6ad87a 100644 --- a/source/quickerNES/mappers/mapper009.hpp +++ b/source/quickerNES/mappers/mapper009.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // MMC2 diff --git a/source/quickerNES/mappers/mapper010.hpp b/source/quickerNES/mappers/mapper010.hpp index 6e2679b..a5486a0 100644 --- a/source/quickerNES/mappers/mapper010.hpp +++ b/source/quickerNES/mappers/mapper010.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // MMC4 diff --git a/source/quickerNES/mappers/mapper011.hpp b/source/quickerNES/mappers/mapper011.hpp index e4a1455..6848e6b 100644 --- a/source/quickerNES/mappers/mapper011.hpp +++ b/source/quickerNES/mappers/mapper011.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper015.hpp b/source/quickerNES/mappers/mapper015.hpp index 9e92d8b..c4db88e 100644 --- a/source/quickerNES/mappers/mapper015.hpp +++ b/source/quickerNES/mappers/mapper015.hpp @@ -17,7 +17,7 @@ * 100-in-1 Contra Function 16 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct Mapper015_state_t { diff --git a/source/quickerNES/mappers/mapper019.hpp b/source/quickerNES/mappers/mapper019.hpp index 8b08097..c5755c7 100644 --- a/source/quickerNES/mappers/mapper019.hpp +++ b/source/quickerNES/mappers/mapper019.hpp @@ -4,8 +4,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" -#include "apu/namco/apu.h" +#include "mappers/mapper.hpp" +#include "apu/namco/apu.hpp" /* 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/mapper021.hpp b/source/quickerNES/mappers/mapper021.hpp index 13ed4a0..2cab53e 100644 --- a/source/quickerNES/mappers/mapper021.hpp +++ b/source/quickerNES/mappers/mapper021.hpp @@ -26,7 +26,7 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct vrc2_state_t { diff --git a/source/quickerNES/mappers/mapper022.hpp b/source/quickerNES/mappers/mapper022.hpp index 0c81c1e..f6bab51 100644 --- a/source/quickerNES/mappers/mapper022.hpp +++ b/source/quickerNES/mappers/mapper022.hpp @@ -26,7 +26,7 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" #include "mappers/mapper021.hpp" typedef Mapper_VRC2_4 Mapper022; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper023.hpp b/source/quickerNES/mappers/mapper023.hpp index d20bf5f..1ac9e69 100644 --- a/source/quickerNES/mappers/mapper023.hpp +++ b/source/quickerNES/mappers/mapper023.hpp @@ -26,6 +26,6 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" 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 4a03cd8..270648e 100644 --- a/source/quickerNES/mappers/mapper024.hpp +++ b/source/quickerNES/mappers/mapper024.hpp @@ -4,8 +4,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ #include -#include "mappers/mapper.h" -#include "apu/vrc6/apu.h" +#include "mappers/mapper.hpp" +#include "apu/vrc6/apu.hpp" /* 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 4efa13f..5448f17 100644 --- a/source/quickerNES/mappers/mapper025.hpp +++ b/source/quickerNES/mappers/mapper025.hpp @@ -26,6 +26,6 @@ * VRC-2/VRC-4 Konami */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" typedef Mapper_VRC2_4 Mapper025; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper026.hpp b/source/quickerNES/mappers/mapper026.hpp index d2b091a..065656e 100644 --- a/source/quickerNES/mappers/mapper026.hpp +++ b/source/quickerNES/mappers/mapper026.hpp @@ -4,6 +4,6 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" typedef Mapper_Vrc6<3> Mapper026; \ No newline at end of file diff --git a/source/quickerNES/mappers/mapper030.hpp b/source/quickerNES/mappers/mapper030.hpp index 06f9b20..5b56593 100644 --- a/source/quickerNES/mappers/mapper030.hpp +++ b/source/quickerNES/mappers/mapper030.hpp @@ -27,7 +27,7 @@ * Tested only on Troll Burner and Mystic Origins demo. */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Unrom512 diff --git a/source/quickerNES/mappers/mapper032.hpp b/source/quickerNES/mappers/mapper032.hpp index 6ac122e..4c15d26 100644 --- a/source/quickerNES/mappers/mapper032.hpp +++ b/source/quickerNES/mappers/mapper032.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct mapper32_state_t { diff --git a/source/quickerNES/mappers/mapper033.hpp b/source/quickerNES/mappers/mapper033.hpp index 894f781..4350721 100644 --- a/source/quickerNES/mappers/mapper033.hpp +++ b/source/quickerNES/mappers/mapper033.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct tc0190_state_t { diff --git a/source/quickerNES/mappers/mapper034.hpp b/source/quickerNES/mappers/mapper034.hpp index c874eb6..9419b41 100644 --- a/source/quickerNES/mappers/mapper034.hpp +++ b/source/quickerNES/mappers/mapper034.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper060.hpp b/source/quickerNES/mappers/mapper060.hpp index 84b6643..b96a42f 100644 --- a/source/quickerNES/mappers/mapper060.hpp +++ b/source/quickerNES/mappers/mapper060.hpp @@ -17,7 +17,7 @@ * 4-in-1 Multicart ( Reset-based ) */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // NROM-128 4-in-1 multicart diff --git a/source/quickerNES/mappers/mapper066.hpp b/source/quickerNES/mappers/mapper066.hpp index b99a842..a43ab5d 100644 --- a/source/quickerNES/mappers/mapper066.hpp +++ b/source/quickerNES/mappers/mapper066.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper069.hpp b/source/quickerNES/mappers/mapper069.hpp index de003a2..d18f0eb 100644 --- a/source/quickerNES/mappers/mapper069.hpp +++ b/source/quickerNES/mappers/mapper069.hpp @@ -4,8 +4,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/libs/ -#include "mappers/mapper.h" -#include "apu/fme7/apu.h" +#include "mappers/mapper.hpp" +#include "apu/fme7/apu.hpp" /* Copyright (C) 2005 Chris Moeller */ /* Copyright (C) 2005-2006 Shay Green. This module is free software; you diff --git a/source/quickerNES/mappers/mapper070.hpp b/source/quickerNES/mappers/mapper070.hpp index eadc6d0..3e51e62 100644 --- a/source/quickerNES/mappers/mapper070.hpp +++ b/source/quickerNES/mappers/mapper070.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Mapper_74x161x162x32 diff --git a/source/quickerNES/mappers/mapper071.hpp b/source/quickerNES/mappers/mapper071.hpp index c90a199..6369f57 100644 --- a/source/quickerNES/mappers/mapper071.hpp +++ b/source/quickerNES/mappers/mapper071.hpp @@ -4,7 +4,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper073.hpp b/source/quickerNES/mappers/mapper073.hpp index e0c013a..0846fda 100644 --- a/source/quickerNES/mappers/mapper073.hpp +++ b/source/quickerNES/mappers/mapper073.hpp @@ -23,7 +23,7 @@ * VRC-3 Konami, Salamander */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct vrc3_state_t { diff --git a/source/quickerNES/mappers/mapper075.hpp b/source/quickerNES/mappers/mapper075.hpp index dd0e62f..92af164 100644 --- a/source/quickerNES/mappers/mapper075.hpp +++ b/source/quickerNES/mappers/mapper075.hpp @@ -17,7 +17,7 @@ * VRC-1 Konami */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct vrc1_state_t { diff --git a/source/quickerNES/mappers/mapper078.hpp b/source/quickerNES/mappers/mapper078.hpp index 0590040..a2cac00 100644 --- a/source/quickerNES/mappers/mapper078.hpp +++ b/source/quickerNES/mappers/mapper078.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Holy Diver and Uchuusen - Cosmo Carrier. diff --git a/source/quickerNES/mappers/mapper079.hpp b/source/quickerNES/mappers/mapper079.hpp index a7f752d..2e97ee1 100644 --- a/source/quickerNES/mappers/mapper079.hpp +++ b/source/quickerNES/mappers/mapper079.hpp @@ -25,7 +25,7 @@ * Nina-03 / Nina-06 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" template < bool multicart > class Mapper_AveNina : public Nes_Mapper { diff --git a/source/quickerNES/mappers/mapper085.hpp b/source/quickerNES/mappers/mapper085.hpp index a7fd31a..99945e1 100644 --- a/source/quickerNES/mappers/mapper085.hpp +++ b/source/quickerNES/mappers/mapper085.hpp @@ -3,8 +3,8 @@ // Nes_Emu 0.5.4. http://www.slack.net/~ant/ #include -#include "mappers/mapper.h" -#include "apu/vrc7/apu.h" +#include "mappers/mapper.hpp" +#include "apu/vrc7/apu.hpp" /* 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/mapper087.hpp b/source/quickerNES/mappers/mapper087.hpp index abf0d1e..e6b8b26 100644 --- a/source/quickerNES/mappers/mapper087.hpp +++ b/source/quickerNES/mappers/mapper087.hpp @@ -3,7 +3,7 @@ // Optional less-common simple mappers // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper088.hpp b/source/quickerNES/mappers/mapper088.hpp index bfa9e01..90a819a 100644 --- a/source/quickerNES/mappers/mapper088.hpp +++ b/source/quickerNES/mappers/mapper088.hpp @@ -25,7 +25,7 @@ * Mapper 206 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct namco_34x3_state_t { diff --git a/source/quickerNES/mappers/mapper089.hpp b/source/quickerNES/mappers/mapper089.hpp index 0937828..c88eb69 100644 --- a/source/quickerNES/mappers/mapper089.hpp +++ b/source/quickerNES/mappers/mapper089.hpp @@ -22,7 +22,7 @@ * Mapper 93 - Sunsoft-2 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Sunsoft2b diff --git a/source/quickerNES/mappers/mapper093.hpp b/source/quickerNES/mappers/mapper093.hpp index 7d2284d..6c78c6a 100644 --- a/source/quickerNES/mappers/mapper093.hpp +++ b/source/quickerNES/mappers/mapper093.hpp @@ -22,7 +22,7 @@ * Mapper 93 - Sunsoft-2 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Sunsoft2a diff --git a/source/quickerNES/mappers/mapper094.hpp b/source/quickerNES/mappers/mapper094.hpp index cf64887..8735940 100644 --- a/source/quickerNES/mappers/mapper094.hpp +++ b/source/quickerNES/mappers/mapper094.hpp @@ -24,7 +24,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Un1rom diff --git a/source/quickerNES/mappers/mapper097.hpp b/source/quickerNES/mappers/mapper097.hpp index a452089..e0103b9 100644 --- a/source/quickerNES/mappers/mapper097.hpp +++ b/source/quickerNES/mappers/mapper097.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Irem_Tam_S1 diff --git a/source/quickerNES/mappers/mapper140.hpp b/source/quickerNES/mappers/mapper140.hpp index ece1c8c..6bd6255 100644 --- a/source/quickerNES/mappers/mapper140.hpp +++ b/source/quickerNES/mappers/mapper140.hpp @@ -24,7 +24,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Jaleco_JF11 diff --git a/source/quickerNES/mappers/mapper156.hpp b/source/quickerNES/mappers/mapper156.hpp index 2f93dde..dabb212 100644 --- a/source/quickerNES/mappers/mapper156.hpp +++ b/source/quickerNES/mappers/mapper156.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // DIS23C01 DAOU ROM CONTROLLER diff --git a/source/quickerNES/mappers/mapper180.hpp b/source/quickerNES/mappers/mapper180.hpp index f2c01c6..b121e31 100644 --- a/source/quickerNES/mappers/mapper180.hpp +++ b/source/quickerNES/mappers/mapper180.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // UxROM (inverted) diff --git a/source/quickerNES/mappers/mapper184.hpp b/source/quickerNES/mappers/mapper184.hpp index 96b8b97..de89eea 100644 --- a/source/quickerNES/mappers/mapper184.hpp +++ b/source/quickerNES/mappers/mapper184.hpp @@ -22,7 +22,7 @@ * Mapper 184 - Sunsoft-1 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Sunsoft1 diff --git a/source/quickerNES/mappers/mapper190.hpp b/source/quickerNES/mappers/mapper190.hpp index 5d09320..2cf0627 100644 --- a/source/quickerNES/mappers/mapper190.hpp +++ b/source/quickerNES/mappers/mapper190.hpp @@ -1,6 +1,6 @@ #pragma once -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // Magic Kid Googoo diff --git a/source/quickerNES/mappers/mapper193.hpp b/source/quickerNES/mappers/mapper193.hpp index e2b2dfa..027ea98 100644 --- a/source/quickerNES/mappers/mapper193.hpp +++ b/source/quickerNES/mappers/mapper193.hpp @@ -25,7 +25,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // NTDEC's TC-112 mapper IC. diff --git a/source/quickerNES/mappers/mapper206.hpp b/source/quickerNES/mappers/mapper206.hpp index 35a00a3..f3dc597 100644 --- a/source/quickerNES/mappers/mapper206.hpp +++ b/source/quickerNES/mappers/mapper206.hpp @@ -25,7 +25,7 @@ * Mapper 206 */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct namco_34xx_state_t { diff --git a/source/quickerNES/mappers/mapper207.hpp b/source/quickerNES/mappers/mapper207.hpp index cb3c159..0c7f69b 100644 --- a/source/quickerNES/mappers/mapper207.hpp +++ b/source/quickerNES/mappers/mapper207.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" struct taito_x1005_state_t { diff --git a/source/quickerNES/mappers/mapper232.hpp b/source/quickerNES/mappers/mapper232.hpp index b8d465f..233eed6 100644 --- a/source/quickerNES/mappers/mapper232.hpp +++ b/source/quickerNES/mappers/mapper232.hpp @@ -5,7 +5,7 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" /* 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/mapper240.hpp b/source/quickerNES/mappers/mapper240.hpp index f2817b3..9b71244 100644 --- a/source/quickerNES/mappers/mapper240.hpp +++ b/source/quickerNES/mappers/mapper240.hpp @@ -21,7 +21,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper240 diff --git a/source/quickerNES/mappers/mapper241.hpp b/source/quickerNES/mappers/mapper241.hpp index 02db4b7..ed26834 100644 --- a/source/quickerNES/mappers/mapper241.hpp +++ b/source/quickerNES/mappers/mapper241.hpp @@ -21,7 +21,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper241 diff --git a/source/quickerNES/mappers/mapper244.hpp b/source/quickerNES/mappers/mapper244.hpp index 038dfa3..69e6aea 100644 --- a/source/quickerNES/mappers/mapper244.hpp +++ b/source/quickerNES/mappers/mapper244.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper244 diff --git a/source/quickerNES/mappers/mapper246.hpp b/source/quickerNES/mappers/mapper246.hpp index bd9d8a9..db3bfca 100644 --- a/source/quickerNES/mappers/mapper246.hpp +++ b/source/quickerNES/mappers/mapper246.hpp @@ -23,7 +23,7 @@ * */ -#include "mappers/mapper.h" +#include "mappers/mapper.hpp" // https://www.nesdev.org/wiki/INES_Mapper246 diff --git a/source/quickerNES/ppu/Nes_Ppu.cpp b/source/quickerNES/ppu/Nes_Ppu.cpp index d459fe3..d23d734 100644 --- a/source/quickerNES/ppu/Nes_Ppu.cpp +++ b/source/quickerNES/ppu/Nes_Ppu.cpp @@ -4,8 +4,8 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ #include -#include "Nes_Ppu.h" -#include "Nes_Core.h" +#include "Nes_Ppu.hpp" +#include "Nes_Core.hpp" /* 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/ppu/Nes_Ppu.h b/source/quickerNES/ppu/Nes_Ppu.hpp similarity index 99% rename from source/quickerNES/ppu/Nes_Ppu.h rename to source/quickerNES/ppu/Nes_Ppu.hpp index 134dd0e..39b6fa3 100644 --- a/source/quickerNES/ppu/Nes_Ppu.h +++ b/source/quickerNES/ppu/Nes_Ppu.hpp @@ -1,10 +1,9 @@ #pragma once // NES PPU emulator - // Nes_Emu 0.7.0 -#include "Nes_Ppu_Rendering.h" +#include "Nes_Ppu_Rendering.hpp" #include class Nes_Mapper; diff --git a/source/quickerNES/ppu/Nes_Ppu_Impl.cpp b/source/quickerNES/ppu/Nes_Ppu_Impl.cpp index 786a33f..a9ec412 100644 --- a/source/quickerNES/ppu/Nes_Ppu_Impl.cpp +++ b/source/quickerNES/ppu/Nes_Ppu_Impl.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "Nes_Ppu_Impl.h" +#include "Nes_Ppu_Impl.hpp" /* 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/ppu/Nes_Ppu_Impl.h b/source/quickerNES/ppu/Nes_Ppu_Impl.hpp similarity index 100% rename from source/quickerNES/ppu/Nes_Ppu_Impl.h rename to source/quickerNES/ppu/Nes_Ppu_Impl.hpp diff --git a/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp b/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp index ce4476b..3f768d3 100644 --- a/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp +++ b/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp @@ -1,9 +1,9 @@ // Nes_Emu 0.7.0. http://www.slack.net/~ant/ -#include "Nes_Ppu_Rendering.h" #include #include #include +#include "Nes_Ppu_Rendering.hpp" /* 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 @@ -287,7 +287,7 @@ void Nes_Ppu_Rendering::draw_sprites_( int begin, int end ) int visible = sprite_height; #define CLIPPED 0 - #include "Nes_Ppu_Sprites.h" + #include "Nes_Ppu_Sprites.hpp" } else { @@ -308,7 +308,7 @@ void Nes_Ppu_Rendering::draw_sprites_( int begin, int end ) // begin, end, top_minus_one + 1, skip, visible ); #define CLIPPED 1 - #include "Nes_Ppu_Sprites.h" + #include "Nes_Ppu_Sprites.hpp" } } while ( index < 0x100 ); diff --git a/source/quickerNES/ppu/Nes_Ppu_Rendering.h b/source/quickerNES/ppu/Nes_Ppu_Rendering.hpp similarity index 97% rename from source/quickerNES/ppu/Nes_Ppu_Rendering.h rename to source/quickerNES/ppu/Nes_Ppu_Rendering.hpp index fbb1506..54acfb5 100644 --- a/source/quickerNES/ppu/Nes_Ppu_Rendering.h +++ b/source/quickerNES/ppu/Nes_Ppu_Rendering.hpp @@ -1,10 +1,9 @@ #pragma once // NES PPU emulator graphics rendering - // Nes_Emu 0.7.0 -#include "Nes_Ppu_Impl.h" +#include "Nes_Ppu_Impl.hpp" class Nes_Ppu_Rendering : public Nes_Ppu_Impl { typedef Nes_Ppu_Impl base; diff --git a/source/quickerNES/ppu/Nes_Ppu_Sprites.h b/source/quickerNES/ppu/Nes_Ppu_Sprites.hpp similarity index 100% rename from source/quickerNES/ppu/Nes_Ppu_Sprites.h rename to source/quickerNES/ppu/Nes_Ppu_Sprites.hpp diff --git a/source/quickerNES/quickerNESInstance.hpp b/source/quickerNES/quickerNESInstance.hpp index 8d504c5..b00f61d 100644 --- a/source/quickerNES/quickerNESInstance.hpp +++ b/source/quickerNES/quickerNESInstance.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include class QuickerNESInstance : public EmuInstance diff --git a/tests/arkanoid/warpless.test b/tests/arkanoid/warpless.test index 480806e..98fe513 100644 --- a/tests/arkanoid/warpless.test +++ b/tests/arkanoid/warpless.test @@ -1,5 +1,5 @@ { - "Rom File": "Arkanoid (U) [!].nes", + "Rom File": "../roms/Arkanoid (U) [!].nes", "Expected ROM SHA1": "B2B30C4F30DD853C215C17B0C67CFE63D61A3062", "Initial State File": "", "Sequence File": "warpless.sol" diff --git a/tests/arkanoid/warps.test b/tests/arkanoid/warps.test index 4b2344e..2cf1843 100644 --- a/tests/arkanoid/warps.test +++ b/tests/arkanoid/warps.test @@ -1,5 +1,5 @@ { - "Rom File": "Arkanoid (U) [!].nes", + "Rom File": "../roms/Arkanoid (U) [!].nes", "Expected ROM SHA1": "B2B30C4F30DD853C215C17B0C67CFE63D61A3062", "Initial State File": "", "Sequence File": "warps.sol" diff --git a/tests/castlevania1/anyPercent.test b/tests/castlevania1/anyPercent.test index 2254d11..ef42c08 100644 --- a/tests/castlevania1/anyPercent.test +++ b/tests/castlevania1/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Castlevania (U) (PRG0) [!].nes", + "Rom File": "../roms/Castlevania (U) (PRG0) [!].nes", "Expected ROM SHA1": "A31B8BD5B370A9103343C866F3C2B2998E889341", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/castlevania1/pacifist.test b/tests/castlevania1/pacifist.test index e03dc39..cfef218 100644 --- a/tests/castlevania1/pacifist.test +++ b/tests/castlevania1/pacifist.test @@ -1,5 +1,5 @@ { - "Rom File": "Castlevania (U) (PRG0) [!].nes", + "Rom File": "../roms/Castlevania (U) (PRG0) [!].nes", "Expected ROM SHA1": "A31B8BD5B370A9103343C866F3C2B2998E889341", "Initial State File": "", "Verification State File": "pacifist.final.state", diff --git a/tests/galaga/anyPercent.test b/tests/galaga/anyPercent.test index 973d82b..fa768b1 100644 --- a/tests/galaga/anyPercent.test +++ b/tests/galaga/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Galaga - Demons of Death (U) [!].nes", + "Rom File": "../roms/Galaga - Demons of Death (U) [!].nes", "Expected ROM SHA1": "DA54C223D79FA59EB95437854B677CF69B5CAC8A", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/ironSword/anyPercent.test b/tests/ironSword/anyPercent.test index c1f525b..c72fe69 100644 --- a/tests/ironSword/anyPercent.test +++ b/tests/ironSword/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Ironsword - Wizards & Warriors II (U) [!].nes", + "Rom File": "../roms/Ironsword - Wizards & Warriors II (U) [!].nes", "Expected ROM SHA1": "97B79E432F62403FB9F877090850C41112A9A168", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/nigelMansell/anyPercent.test b/tests/nigelMansell/anyPercent.test index 72209c6..dfdaade 100644 --- a/tests/nigelMansell/anyPercent.test +++ b/tests/nigelMansell/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Nigel Mansell's World Championship Challenge (U) [!].nes", + "Rom File": "../roms/Nigel Mansell's World Championship Challenge (U) [!].nes", "Expected ROM SHA1": "BBE5CF2DFA0B5422776A530D6F1B617238A8569F", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/ninjaGaiden/anyPercent.test b/tests/ninjaGaiden/anyPercent.test index 090c42c..29e4331 100644 --- a/tests/ninjaGaiden/anyPercent.test +++ b/tests/ninjaGaiden/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Ninja Gaiden (U) [!].nes", + "Rom File": "../roms/Ninja Gaiden (U) [!].nes", "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/ninjaGaiden/pacifist.test b/tests/ninjaGaiden/pacifist.test index 3c06133..fceaa97 100644 --- a/tests/ninjaGaiden/pacifist.test +++ b/tests/ninjaGaiden/pacifist.test @@ -1,5 +1,5 @@ { - "Rom File": "Ninja Gaiden (U) [!].nes", + "Rom File": "../roms/Ninja Gaiden (U) [!].nes", "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Initial State File": "", "Sequence File": "pacifist.sol" diff --git a/tests/ninjaGaiden2/anyPercent.test b/tests/ninjaGaiden2/anyPercent.test index 21d24f7..587249b 100644 --- a/tests/ninjaGaiden2/anyPercent.test +++ b/tests/ninjaGaiden2/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", + "Rom File": "../roms/Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/ninjaGaiden2/pacifist.test b/tests/ninjaGaiden2/pacifist.test index b19685a..dee408d 100644 --- a/tests/ninjaGaiden2/pacifist.test +++ b/tests/ninjaGaiden2/pacifist.test @@ -1,5 +1,5 @@ { - "Rom File": "Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", + "Rom File": "../roms/Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Initial State File": "", "Sequence File": "pacifist.sol" diff --git a/tests/novaTheSquirrel/anyPercent.test b/tests/novaTheSquirrel/anyPercent.test index 0162425..e7085ab 100644 --- a/tests/novaTheSquirrel/anyPercent.test +++ b/tests/novaTheSquirrel/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "nova.nes", + "Rom File": "../roms/nova.nes", "Expected ROM SHA1": "B6B07EE76492ED475F39167C89B342353F999231", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/princeOfPersia/anyPercent.test b/tests/princeOfPersia/anyPercent.test index d093658..82d1af0 100644 --- a/tests/princeOfPersia/anyPercent.test +++ b/tests/princeOfPersia/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Prince of Persia (U) [!].nes", + "Rom File": "../roms/Prince of Persia (U) [!].nes", "Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/roms/README.md b/tests/roms/README.md new file mode 100644 index 0000000..cb04bbc --- /dev/null +++ b/tests/roms/README.md @@ -0,0 +1,3 @@ +Here go all the roms needed for testing + +To prevent copyright violations, only free licensed roms shall be uploaded. The rest should be provisioned locally by the runners. diff --git a/tests/novaTheSquirrel/nova.nes b/tests/roms/nova.nes similarity index 100% rename from tests/novaTheSquirrel/nova.nes rename to tests/roms/nova.nes diff --git a/tests/sprilo/sprilo.nes b/tests/roms/sprilo.nes similarity index 100% rename from tests/sprilo/sprilo.nes rename to tests/roms/sprilo.nes diff --git a/tests/saintSeiyaKanketsuHen/anyPercent.test b/tests/saintSeiyaKanketsuHen/anyPercent.test index 60eb89d..431e6f5 100644 --- a/tests/saintSeiyaKanketsuHen/anyPercent.test +++ b/tests/saintSeiyaKanketsuHen/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Saint Seiya - Ougon Densetsu Kanketsu Hen (J) [!].nes", + "Rom File": "../roms/Saint Seiya - Ougon Densetsu Kanketsu Hen (J) [!].nes", "Expected ROM SHA1": "F871D9B3DAFDDCDAD5F2ACD71044292E5169064E", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/saintSeiyaOugonDensetsu/anyPercent.test b/tests/saintSeiyaOugonDensetsu/anyPercent.test index 6fddec6..d69b8a7 100644 --- a/tests/saintSeiyaOugonDensetsu/anyPercent.test +++ b/tests/saintSeiyaOugonDensetsu/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Saint Seiya - Ougon Densetsu (J) [!].nes", + "Rom File": "../roms/Saint Seiya - Ougon Densetsu (J) [!].nes", "Expected ROM SHA1": "3F3B499CF50386084E053BCA096AE8E52330CFAE", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/saiyuukiWorld/anyPercent.test b/tests/saiyuukiWorld/anyPercent.test index 8dbb390..493fd3f 100644 --- a/tests/saiyuukiWorld/anyPercent.test +++ b/tests/saiyuukiWorld/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Saiyuuki World (J).nes", + "Rom File": "../roms/Saiyuuki World (J).nes", "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", "Initial State File": "", "Sequence File": "anyPercent.sol", diff --git a/tests/saiyuukiWorld/lastHalf.test b/tests/saiyuukiWorld/lastHalf.test index 02e6265..ae3d654 100644 --- a/tests/saiyuukiWorld/lastHalf.test +++ b/tests/saiyuukiWorld/lastHalf.test @@ -1,5 +1,5 @@ { - "Rom File": "Saiyuuki World (J).nes", + "Rom File": "../roms/Saiyuuki World (J).nes", "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", "Initial State File": "lastHalf.state", "Sequence File": "anyPercent.sol", diff --git a/tests/solarJetman/anyPercent.test b/tests/solarJetman/anyPercent.test index 573af2f..9d3bae5 100644 --- a/tests/solarJetman/anyPercent.test +++ b/tests/solarJetman/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Solar Jetman - Hunt for the Golden Warpship (U) [!].nes", + "Rom File": "../roms/Solar Jetman - Hunt for the Golden Warpship (U) [!].nes", "Expected ROM SHA1": "872B91A2F7A2F635061EF43F79E7F7E9F59F5C50", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/sprilo/anyPercent.test b/tests/sprilo/anyPercent.test index d33d626..c8e3328 100644 --- a/tests/sprilo/anyPercent.test +++ b/tests/sprilo/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "sprilo.nes", + "Rom File": "../roms/sprilo.nes", "Expected ROM SHA1": "6EC09B9B51320A536A786D3D4719432B714C5779", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/superMarioBros/warpless.test b/tests/superMarioBros/warpless.test index 0b98499..0838d00 100644 --- a/tests/superMarioBros/warpless.test +++ b/tests/superMarioBros/warpless.test @@ -1,5 +1,5 @@ { - "Rom File": "Super Mario Bros. (W) [!].nes", + "Rom File": "../roms/Super Mario Bros. (W) [!].nes", "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Initial State File": "", "Sequence File": "warpless.sol" diff --git a/tests/superMarioBros/warps.test b/tests/superMarioBros/warps.test index 486c514..d591ad3 100644 --- a/tests/superMarioBros/warps.test +++ b/tests/superMarioBros/warps.test @@ -1,5 +1,5 @@ { - "Rom File": "Super Mario Bros. (W) [!].nes", + "Rom File": "../roms/Super Mario Bros. (W) [!].nes", "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Initial State File": "", "Sequence File": "warps.sol" diff --git a/tests/superMarioBros3/warps.test b/tests/superMarioBros3/warps.test index 77869fb..a242afa 100644 --- a/tests/superMarioBros3/warps.test +++ b/tests/superMarioBros3/warps.test @@ -1,5 +1,5 @@ { - "Rom File": "Super Mario Bros. 3 (U) (PRG0) [!].nes", + "Rom File": "../roms/Super Mario Bros. 3 (U) (PRG0) [!].nes", "Expected ROM SHA1": "A03E7E526E79DF222E048AE22214BCA2BC49C449", "Initial State File": "", "Sequence File": "warps.sol" diff --git a/tests/superOffroad/anyPercent.test b/tests/superOffroad/anyPercent.test index 54fc1f1..c69074e 100644 --- a/tests/superOffroad/anyPercent.test +++ b/tests/superOffroad/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Ivan 'Ironman' Stewart's Super Off Road (USA).nes", + "Rom File": "../roms/Ivan 'Ironman' Stewart's Super Off Road (USA).nes", "Expected ROM SHA1": "57919B685B55EE3ED3AD98FB1D25626B98BE7D39", "Initial State File": "", "Sequence File": "anyPercent.sol" diff --git a/tests/tennis/anyPercent.test b/tests/tennis/anyPercent.test index ed98ccf..8a8816f 100644 --- a/tests/tennis/anyPercent.test +++ b/tests/tennis/anyPercent.test @@ -1,5 +1,5 @@ { - "Rom File": "Tennis (JU) [!].nes", + "Rom File": "../roms/Tennis (JU) [!].nes", "Expected ROM SHA1": "80D99C035E6A5AB9718E413EC25CBE094F085962", "Initial State File": "", "Sequence File": "anyPercent.sol"