diff --git a/src/common/tv_filters/atari_ntsc.c b/src/common/tv_filters/atari_ntsc.c index 97956dd16..625cfb1fa 100644 --- a/src/common/tv_filters/atari_ntsc.c +++ b/src/common/tv_filters/atari_ntsc.c @@ -72,6 +72,7 @@ static void correct_errors( atari_ntsc_rgb_t color, atari_ntsc_rgb_t* out ) void atari_ntsc_init( atari_ntsc_t* ntsc, atari_ntsc_setup_t const* setup ) { + int entry = 0; init_t impl; if ( !setup ) setup = &atari_ntsc_composite; @@ -83,7 +84,7 @@ void atari_ntsc_init( atari_ntsc_t* ntsc, atari_ntsc_setup_t const* setup ) // Burst-phase (TODO - how is this actually used?) // float start_angle = - ((213.0f) * M_PI / 180.0f) - setup->burst_phase * M_PI; - for (int entry = 0; entry < atari_ntsc_palette_size; entry++ ) + for ( entry = 0; entry < atari_ntsc_palette_size; entry++ ) { float r = impl.to_float [*palette++]; float g = impl.to_float [*palette++]; diff --git a/src/macosx/stella.xcodeproj/project.pbxproj b/src/macosx/stella.xcodeproj/project.pbxproj index e5020d6f0..a02bb6d85 100644 --- a/src/macosx/stella.xcodeproj/project.pbxproj +++ b/src/macosx/stella.xcodeproj/project.pbxproj @@ -364,6 +364,9 @@ DCD56D390B247D920092F9F8 /* Cart4A50.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCD56D370B247D920092F9F8 /* Cart4A50.hxx */; }; DCD56D3C0B247DB40092F9F8 /* RectList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCD56D3A0B247DB40092F9F8 /* RectList.cxx */; }; DCD56D3D0B247DB40092F9F8 /* RectList.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCD56D3B0B247DB40092F9F8 /* RectList.hxx */; }; + DCDBD3181556F60C00308CC4 /* CartCTY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCDBD3151556F60C00308CC4 /* CartCTY.cxx */; }; + DCDBD3191556F60C00308CC4 /* CartCTY.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCDBD3161556F60C00308CC4 /* CartCTY.hxx */; }; + DCDBD31A1556F60C00308CC4 /* CartCTYTunes.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCDBD3171556F60C00308CC4 /* CartCTYTunes.hxx */; }; DCE3BBF90C95CEDC00A671DF /* RomInfoWidget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */; }; DCE3BBFA0C95CEDC00A671DF /* RomInfoWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */; }; DCE6EB220DD9ADA00047AC28 /* TrackBall.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCE6EB200DD9ADA00047AC28 /* TrackBall.cxx */; }; @@ -807,6 +810,9 @@ DCD56D370B247D920092F9F8 /* Cart4A50.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = Cart4A50.hxx; path = ../emucore/Cart4A50.hxx; sourceTree = SOURCE_ROOT; }; DCD56D3A0B247DB40092F9F8 /* RectList.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RectList.cxx; path = ../common/RectList.cxx; sourceTree = SOURCE_ROOT; }; DCD56D3B0B247DB40092F9F8 /* RectList.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = RectList.hxx; path = ../common/RectList.hxx; sourceTree = SOURCE_ROOT; }; + DCDBD3151556F60C00308CC4 /* CartCTY.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartCTY.cxx; path = ../emucore/CartCTY.cxx; sourceTree = SOURCE_ROOT; }; + DCDBD3161556F60C00308CC4 /* CartCTY.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartCTY.hxx; path = ../emucore/CartCTY.hxx; sourceTree = SOURCE_ROOT; }; + DCDBD3171556F60C00308CC4 /* CartCTYTunes.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartCTYTunes.hxx; path = ../emucore/CartCTYTunes.hxx; sourceTree = SOURCE_ROOT; }; DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RomInfoWidget.cxx; path = ../gui/RomInfoWidget.cxx; sourceTree = SOURCE_ROOT; }; DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = RomInfoWidget.hxx; path = ../gui/RomInfoWidget.hxx; sourceTree = SOURCE_ROOT; }; DCE6EB200DD9ADA00047AC28 /* TrackBall.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = TrackBall.cxx; path = ../emucore/TrackBall.cxx; sourceTree = SOURCE_ROOT; }; @@ -1091,6 +1097,9 @@ 2DE2DF1B0627AE07006BEC99 /* CartAR.hxx */, DC3E4A6014B25EB30071D7BC /* CartCM.cxx */, DC3E4A6114B25EB30071D7BC /* CartCM.hxx */, + DCDBD3151556F60C00308CC4 /* CartCTY.cxx */, + DCDBD3161556F60C00308CC4 /* CartCTY.hxx */, + DCDBD3171556F60C00308CC4 /* CartCTYTunes.hxx */, 2DE2DF1C0627AE07006BEC99 /* CartCV.cxx */, 2DE2DF1D0627AE07006BEC99 /* CartCV.hxx */, 2DE2DF1E0627AE07006BEC99 /* CartDPC.cxx */, @@ -1608,6 +1617,8 @@ DC49F90614F7D0DB000704B0 /* NTSCFilter.hxx in Headers */, DC752D951513E9F7005B0D24 /* atari_ntsc_impl.h in Headers */, DC752D971513E9F7005B0D24 /* atari_ntsc.h in Headers */, + DCDBD3191556F60C00308CC4 /* CartCTY.hxx in Headers */, + DCDBD31A1556F60C00308CC4 /* CartCTYTunes.hxx in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1881,6 +1892,7 @@ DCAE2A9314CCCCBD004327BB /* MouseControl.cxx in Sources */, DC49F90514F7D0DB000704B0 /* NTSCFilter.cxx in Sources */, DC752D961513E9F7005B0D24 /* atari_ntsc.c in Sources */, + DCDBD3181556F60C00308CC4 /* CartCTY.cxx in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/macosx/stella_intel.xcodeproj/project.pbxproj b/src/macosx/stella_intel.xcodeproj/project.pbxproj index 5c48937cb..788804bad 100644 --- a/src/macosx/stella_intel.xcodeproj/project.pbxproj +++ b/src/macosx/stella_intel.xcodeproj/project.pbxproj @@ -282,6 +282,9 @@ DC5D2C610F129B1E004D1660 /* LauncherFilterDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC5D2C5F0F129B1E004D1660 /* LauncherFilterDialog.hxx */; }; DC5EE7C214F7C165001C628C /* NTSCFilter.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC5EE7C014F7C165001C628C /* NTSCFilter.cxx */; }; DC5EE7C314F7C165001C628C /* NTSCFilter.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC5EE7C114F7C165001C628C /* NTSCFilter.hxx */; }; + DC67270B1556F4860023653B /* CartCTY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC6727081556F4860023653B /* CartCTY.cxx */; }; + DC67270C1556F4860023653B /* CartCTY.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC6727091556F4860023653B /* CartCTY.hxx */; }; + DC67270D1556F4860023653B /* CartCTYTunes.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC67270A1556F4860023653B /* CartCTYTunes.hxx */; }; DC69670B1361FD0A0036499D /* pngdebug.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6967071361FD0A0036499D /* pngdebug.h */; }; DC69670C1361FD0A0036499D /* pnginfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6967081361FD0A0036499D /* pnginfo.h */; }; DC69670D1361FD0A0036499D /* pnglibconf.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6967091361FD0A0036499D /* pnglibconf.h */; }; @@ -722,6 +725,9 @@ DC5D2C5F0F129B1E004D1660 /* LauncherFilterDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = LauncherFilterDialog.hxx; path = ../gui/LauncherFilterDialog.hxx; sourceTree = SOURCE_ROOT; }; DC5EE7C014F7C165001C628C /* NTSCFilter.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NTSCFilter.cxx; path = ../common/tv_filters/NTSCFilter.cxx; sourceTree = SOURCE_ROOT; }; DC5EE7C114F7C165001C628C /* NTSCFilter.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = NTSCFilter.hxx; path = ../common/tv_filters/NTSCFilter.hxx; sourceTree = SOURCE_ROOT; }; + DC6727081556F4860023653B /* CartCTY.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartCTY.cxx; path = ../emucore/CartCTY.cxx; sourceTree = SOURCE_ROOT; }; + DC6727091556F4860023653B /* CartCTY.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartCTY.hxx; path = ../emucore/CartCTY.hxx; sourceTree = SOURCE_ROOT; }; + DC67270A1556F4860023653B /* CartCTYTunes.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartCTYTunes.hxx; path = ../emucore/CartCTYTunes.hxx; sourceTree = SOURCE_ROOT; }; DC6967071361FD0A0036499D /* pngdebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngdebug.h; path = ../libpng/pngdebug.h; sourceTree = SOURCE_ROOT; }; DC6967081361FD0A0036499D /* pnginfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pnginfo.h; path = ../libpng/pnginfo.h; sourceTree = SOURCE_ROOT; }; DC6967091361FD0A0036499D /* pnglibconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pnglibconf.h; path = ../libpng/pnglibconf.h; sourceTree = SOURCE_ROOT; }; @@ -1088,6 +1094,9 @@ 2DE2DF1B0627AE07006BEC99 /* CartAR.hxx */, DC8C1BA714B25DE7006440EE /* CartCM.cxx */, DC8C1BA814B25DE7006440EE /* CartCM.hxx */, + DC6727081556F4860023653B /* CartCTY.cxx */, + DC6727091556F4860023653B /* CartCTY.hxx */, + DC67270A1556F4860023653B /* CartCTYTunes.hxx */, 2DE2DF1C0627AE07006BEC99 /* CartCV.cxx */, 2DE2DF1D0627AE07006BEC99 /* CartCV.hxx */, 2DE2DF1E0627AE07006BEC99 /* CartDPC.cxx */, @@ -1605,6 +1614,8 @@ DC5EE7C314F7C165001C628C /* NTSCFilter.hxx in Headers */, DCC467F014FBECC700E15508 /* atari_ntsc_impl.h in Headers */, DCC467F214FBECC700E15508 /* atari_ntsc.h in Headers */, + DC67270C1556F4860023653B /* CartCTY.hxx in Headers */, + DC67270D1556F4860023653B /* CartCTYTunes.hxx in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1880,6 +1891,7 @@ DC56FCDE14CCCC4900A31CC3 /* MouseControl.cxx in Sources */, DC5EE7C214F7C165001C628C /* NTSCFilter.cxx in Sources */, DCC467F114FBECC700E15508 /* atari_ntsc.c in Sources */, + DC67270B1556F4860023653B /* CartCTY.cxx in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };