diff --git a/Announce.txt b/Announce.txt index 5acb1c0fe..a93884a04 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 4.6.7 for Linux, MacOSX and Windows + Release 4.7 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,30 +21,30 @@ all of your favourite Atari 2600 games again! Stella was originally developed for Linux by Bradford W. Mott, however, it has been ported to a number of other platforms and is currently maintained by Stephen Anthony. -This is the 4.6.7 release of Stella for Linux, Mac OSX and Windows. The +This is the 4.7 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binaries for Windows XP_SP3(*)/Vista/7/8/10 : - Stella-4.6.7-win32.exe (32-bit EXE installer) - Stella-4.6.7-x64.exe (64-bit EXE installer) - Stella-4.6.7-windows.zip (32/64 bit versions) + Stella-4.7-win32.exe (32-bit EXE installer) + Stella-4.7-x64.exe (64-bit EXE installer) + Stella-4.7-windows.zip (32/64 bit versions) (*) Note: Support for Windows XP is problematic on some systems, and will probably be discontinued in a future release. * Binary distribution for MacOS X 10.7 and above : - Stella-4.6.7-macosx.dmg (64-bit Intel) + Stella-4.7-macosx.dmg (64-bit Intel) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_4.6.7-1_i386.deb - stella_4.6.7-1_amd64.deb + stella_4.7-1_i386.deb + stella_4.7-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-4.6.7-2.i386.rpm - stella-4.6.7-2.x86_64.rpm + stella-4.7-2.i386.rpm + stella-4.7-2.x86_64.rpm * Source code distribution for all platforms : - stella-4.6.7-src.tar.gz + stella-4.7-src.tar.gz Distribution Site diff --git a/Changes.txt b/Changes.txt index 40457b510..0ac9c4481 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -4.6.7 to 4.7: (January xx, 2016) +4.6.7 to 4.7: (January 25, 2016) * Improved paddle emulation in several ways: diff --git a/debian/changelog b/debian/changelog index 482d48de8..5cb24eb32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (4.7-1) stable; urgency=high + + * Version 4.7 release + + -- Stephen Anthony Mon, 25 Jan 2016 17:09:59 -0230 + + stella (4.6.7-1) stable; urgency=high * Version 4.6.7 release diff --git a/docs/index.html b/docs/index.html index 69a6e3638..755e90e26 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 4.6.7

+

Release 4.7



User's Guide

@@ -54,7 +54,7 @@


-
February 1999 - October 2015
+
February 1999 - January 2016
The Stella Team
Stella Homepage
diff --git a/src/common/Version.hxx b/src/common/Version.hxx index 3dedeebde..cd8782d46 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -22,7 +22,7 @@ #include -#define STELLA_VERSION "4.7_pre" +#define STELLA_VERSION "4.7" #define STELLA_BUILD atoi("$Rev$" + 6) #endif diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx index 6ee927c20..af4626416 100644 --- a/src/emucore/Cart.cxx +++ b/src/emucore/Cart.cxx @@ -17,7 +17,6 @@ // $Id$ //============================================================================ -#include #include #include @@ -78,8 +77,7 @@ unique_ptr Cartridge::create(const BytePtr& img, uInt32 size, unique_ptr cartridge; string type = dtype; - // For now, we convert from BytePtr to the raw pointer - // Eventually, the Cartridge hierarchy should probably use BytePtr directly + // The cartridge hierarchy uses raw pointers ... const uInt8* image = img.get(); // Collect some info about the ROM @@ -964,7 +962,7 @@ bool Cartridge::isProbablyX07(const uInt8* image, uInt32 size) string Cartridge::myAboutString= ""; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Cartridge::BankswitchType Cartridge::ourBSList[] = { +Cartridge::BankswitchType Cartridge::ourBSList[ourNumBSTypes] = { { "AUTO", "Auto-detect" }, { "0840", "0840 (8K ECONObank)" }, { "2IN1", "2IN1 Multicart (4-32K)" }, diff --git a/src/emucore/TrackBall.cxx b/src/emucore/TrackBall.cxx index ddd1c07b9..ab0a4adfe 100644 --- a/src/emucore/TrackBall.cxx +++ b/src/emucore/TrackBall.cxx @@ -146,33 +146,3 @@ bool TrackBall::setMouseControl( (xid != -1 || yid != -1); return true; } - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TrackBall::ourTrakBallTableTB_H[2][2] = { - { 0x40, 0x00 }, { 0xc0, 0x80 } -}; - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TrackBall::ourTrakBallTableTB_V[2][2] = { - { 0x00, 0x10 }, { 0x20, 0x30 } -}; - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TrackBall::ourTrakBallTableST_H[4] = { - 0x00, 0x80, 0xc0, 0x40 -}; - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TrackBall::ourTrakBallTableST_V[4] = { - 0x00, 0x10, 0x30, 0x20 -}; - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TrackBall::ourTrakBallTableAM_H[4] = { - 0x00, 0x10, 0x50, 0x40 -}; - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TrackBall::ourTrakBallTableAM_V[4] = { - 0x00, 0x80, 0xa0, 0x20 -}; diff --git a/src/emucore/TrackBall.hxx b/src/emucore/TrackBall.hxx index a8f0380cc..30c3dff2b 100644 --- a/src/emucore/TrackBall.hxx +++ b/src/emucore/TrackBall.hxx @@ -110,16 +110,16 @@ class TrackBall : public Controller int myMouseEnabled; // CX-22 - static const uInt32 ourTrakBallTableTB_H[2][2]; - static const uInt32 ourTrakBallTableTB_V[2][2]; + const uInt32 ourTrakBallTableTB_H[2][2] = {{ 0x40, 0x00 }, { 0xc0, 0x80 }}; + const uInt32 ourTrakBallTableTB_V[2][2] = {{ 0x00, 0x10 }, { 0x20, 0x30 }}; // ST mouse / CX-80 - static const uInt32 ourTrakBallTableST_H[4]; - static const uInt32 ourTrakBallTableST_V[4]; + const uInt32 ourTrakBallTableST_H[4] = { 0x00, 0x80, 0xc0, 0x40 }; + const uInt32 ourTrakBallTableST_V[4] = { 0x00, 0x10, 0x30, 0x20 }; // Amiga mouse - static const uInt32 ourTrakBallTableAM_H[4]; - static const uInt32 ourTrakBallTableAM_V[4]; + const uInt32 ourTrakBallTableAM_H[4] = { 0x00, 0x10, 0x50, 0x40 }; + const uInt32 ourTrakBallTableAM_V[4] = { 0x00, 0x80, 0xa0, 0x20 }; private: // Following constructors and assignment operators not supported diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index 9ad47c69e..0c007e8b6 100644 --- a/src/macosx/Info-Stella.plist +++ b/src/macosx/Info-Stella.plist @@ -53,7 +53,7 @@ CFBundleSignature StLa CFBundleVersion - 4.6.7 + 4.7 LSApplicationCategoryType public.app-category.games LSMinimumSystemVersionByArchitecture diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 0e8223962..c4a36c5be 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 4.6.7 +%define version 4.7 %define rel 1 %define enable_sound 1 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Mon Jan 25 2016 Stephen Anthony 4.7-1 +- Version 4.7 release + * Wed Oct 28 2015 Stephen Anthony 4.6.7-1 - Version 4.6.7 release diff --git a/src/windows/stella.rc b/src/windows/stella.rc index 54f89efe3..5c0728f45 100755 --- a/src/windows/stella.rc +++ b/src/windows/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,6,7,0 - PRODUCTVERSION 4,6,7,0 + FILEVERSION 4,7,0,0 + PRODUCTVERSION 4,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -55,12 +55,12 @@ BEGIN VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2." VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)" VALUE "FileDescription", "Stella" - VALUE "FileVersion", "4.6.7" + VALUE "FileVersion", "4.7" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2016 The Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "4.6.7" + VALUE "ProductVersion", "4.7" END END BLOCK "VarFileInfo"